diff --git a/app/controllers/accounts/entropy_configurations_controller.rb b/app/controllers/account/entropy_configurations_controller.rb
similarity index 81%
rename from app/controllers/accounts/entropy_configurations_controller.rb
rename to app/controllers/account/entropy_configurations_controller.rb
index 07e828242..f3e1b7ebd 100644
--- a/app/controllers/accounts/entropy_configurations_controller.rb
+++ b/app/controllers/account/entropy_configurations_controller.rb
@@ -1,4 +1,4 @@
-class Accounts::EntropyConfigurationsController < ApplicationController
+class Account::EntropyConfigurationsController < ApplicationController
   def update
     Entropy::Configuration.default.update!(entropy_configuration_params)
 
diff --git a/app/controllers/accounts/join_codes_controller.rb b/app/controllers/account/join_codes_controller.rb
similarity index 78%
rename from app/controllers/accounts/join_codes_controller.rb
rename to app/controllers/account/join_codes_controller.rb
index b6f08bf3c..5c981a2ba 100644
--- a/app/controllers/accounts/join_codes_controller.rb
+++ b/app/controllers/account/join_codes_controller.rb
@@ -1,4 +1,4 @@
-class Accounts::JoinCodesController < ApplicationController
+class Account::JoinCodesController < ApplicationController
   def show
     render svg: RQRCode::QRCode.new(join_url(Account.sole.join_code)).as_svg(viewbox: true, fill: :white, color: :black)
   end
diff --git a/app/controllers/accounts/settings_controller.rb b/app/controllers/account/settings_controller.rb
similarity index 55%
rename from app/controllers/accounts/settings_controller.rb
rename to app/controllers/account/settings_controller.rb
index 60e60ceaf..2ad289342 100644
--- a/app/controllers/accounts/settings_controller.rb
+++ b/app/controllers/account/settings_controller.rb
@@ -1,4 +1,4 @@
-class Accounts::SettingsController < ApplicationController
+class Account::SettingsController < ApplicationController
   def show
     @account = Account.sole
     @users = User.active
diff --git a/app/views/accounts/_invite.html.erb b/app/views/account/_invite.html.erb
similarity index 100%
rename from app/views/accounts/_invite.html.erb
rename to app/views/account/_invite.html.erb
diff --git a/app/views/accounts/_user.html.erb b/app/views/account/_user.html.erb
similarity index 100%
rename from app/views/accounts/_user.html.erb
rename to app/views/account/_user.html.erb
diff --git a/app/views/accounts/settings/_entropy_configuration.html.erb b/app/views/account/settings/_entropy_configuration.html.erb
similarity index 100%
rename from app/views/accounts/settings/_entropy_configuration.html.erb
rename to app/views/account/settings/_entropy_configuration.html.erb
diff --git a/app/views/accounts/settings/_users.html.erb b/app/views/account/settings/_users.html.erb
similarity index 83%
rename from app/views/accounts/settings/_users.html.erb
rename to app/views/account/settings/_users.html.erb
index 6c834f0e6..cbcbaee50 100644
--- a/app/views/accounts/settings/_users.html.erb
+++ b/app/views/account/settings/_users.html.erb
@@ -5,13 +5,13 @@
   navigable_list_actionable_items_value: true
 } do %>
   <h2 class="divider txt-large">People on the account</h2>
-  <%#= render "accounts/invite" # Scheduled work in https://3.basecamp.com/2914079/buckets/37331921/todos/8746162337 %>
+  <%#= render "account/invite" # Scheduled work in https://3.basecamp.com/2914079/buckets/37331921/todos/8746162337 %>
 
   <div class="settings__user-filter">
     <input placeholder="Filter…" class="input input--transparent full-width" type="search" autocorrect="off" autocomplete="off" data-1p-ignore="true" data-filter-target="input" data-action="input->filter#filter">
 
     <ul class="settings__user-list" data-filter-target="list">
-      <%= render partial: "accounts/user", collection: users %>
+      <%= render partial: "account/user", collection: users %>
     </ul>
 
     <footer class="settings__user-list-tips">
diff --git a/app/views/accounts/settings/show.html.erb b/app/views/account/settings/show.html.erb
similarity index 80%
rename from app/views/accounts/settings/show.html.erb
rename to app/views/account/settings/show.html.erb
index 3d1b34514..7325da23c 100644
--- a/app/views/accounts/settings/show.html.erb
+++ b/app/views/account/settings/show.html.erb
@@ -18,6 +18,6 @@
 <% end %>
 
 <section class="settings">
-  <%= render "accounts/settings/users", users: @users %>
-  <%= render "accounts/settings/entropy_configuration", account: @account %>
+  <%= render "account/settings/users", users: @users %>
+  <%= render "account/settings/entropy_configuration", account: @account %>
 </section>
diff --git a/config/routes.rb b/config/routes.rb
index 6d55b04e5..985445f66 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,11 +1,8 @@
 Rails.application.routes.draw do
-  resource :account do
-    resource :join_code, module: :accounts
-
-    scope module: :accounts do
-      resource :settings
-      resource :entropy_configuration
-    end
+  namespace :account do
+    resource :join_code
+    resource :settings
+    resource :entropy_configuration
   end
 
   resources :users do
diff --git a/test/controllers/accounts/entropy_configurations_controller_test.rb b/test/controllers/accounts/entropy_configurations_controller_test.rb
index b888b8deb..9d477ca24 100644
--- a/test/controllers/accounts/entropy_configurations_controller_test.rb
+++ b/test/controllers/accounts/entropy_configurations_controller_test.rb
@@ -1,6 +1,6 @@
 require "test_helper"
 
-class Accounts::EntropyConfigurationsControllerTest < ActionDispatch::IntegrationTest
+class Account::EntropyConfigurationsControllerTest < ActionDispatch::IntegrationTest
   setup do
     sign_in_as :kevin
   end
diff --git a/test/controllers/accounts/settings_controller_test.rb b/test/controllers/accounts/settings_controller_test.rb
index 606245612..d475ad40d 100644
--- a/test/controllers/accounts/settings_controller_test.rb
+++ b/test/controllers/accounts/settings_controller_test.rb
@@ -1,6 +1,6 @@
 require "test_helper"
 
-class Accounts::SettingsControllerTest < ActionDispatch::IntegrationTest
+class Account::SettingsControllerTest < ActionDispatch::IntegrationTest
   setup do
     sign_in_as :kevin
   end
diff --git a/test/routes_test.rb b/test/routes_test.rb
index a270d2498..d1663037b 100644
--- a/test/routes_test.rb
+++ b/test/routes_test.rb
@@ -2,14 +2,14 @@ require "test_helper"
 
 class RouteTest < ActionDispatch::IntegrationTest
   test "account/join_code" do
-    assert_recognizes({ controller: "accounts/join_codes", action: "show" }, "/account/join_code")
+    assert_recognizes({ controller: "account/join_codes", action: "show" }, "/account/join_code")
   end
 
   test "account/settings" do
-    assert_recognizes({ controller: "accounts/settings", action: "show" }, "/account/settings")
+    assert_recognizes({ controller: "account/settings", action: "show" }, "/account/settings")
   end
 
   test "account/entropy_configuration" do
-    assert_recognizes({ controller: "accounts/entropy_configurations", action: "show" }, "/account/entropy_configuration")
+    assert_recognizes({ controller: "account/entropy_configurations", action: "show" }, "/account/entropy_configuration")
   end
 end