diff --git a/src/invidious.cr b/src/invidious.cr
index 89292f05..ba818a3a 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -675,7 +675,7 @@ get "/data_control" do |env|
 
   user = user.as(User)
 
-  templated "data_control"
+  templated "account/data_control"
 end
 
 post "/data_control" do |env|
@@ -856,7 +856,7 @@ get "/change_password" do |env|
   sid = sid.as(String)
   csrf_token = generate_response(sid, {":change_password"}, HMAC_KEY, PG_DB)
 
-  templated "change_password"
+  templated "account/change_password"
 end
 
 post "/change_password" do |env|
@@ -930,7 +930,7 @@ get "/delete_account" do |env|
   sid = sid.as(String)
   csrf_token = generate_response(sid, {":delete_account"}, HMAC_KEY, PG_DB)
 
-  templated "delete_account"
+  templated "account/delete_account"
 end
 
 post "/delete_account" do |env|
@@ -1035,7 +1035,7 @@ get "/authorize_token" do |env|
 
   expire = env.params.query["expire"]?.try &.to_i?
 
-  templated "authorize_token"
+  templated "account/authorize_token"
 end
 
 post "/authorize_token" do |env|
@@ -1082,7 +1082,7 @@ post "/authorize_token" do |env|
   else
     csrf_token = ""
     env.set "access_token", access_token
-    templated "authorize_token"
+    templated "account/authorize_token"
   end
 end
 
@@ -1101,7 +1101,7 @@ get "/token_manager" do |env|
 
   tokens = PG_DB.query_all("SELECT id, issued FROM session_ids WHERE email = $1 ORDER BY issued DESC", user.email, as: {session: String, issued: Time})
 
-  templated "token_manager"
+  templated "account/token_manager"
 end
 
 post "/token_ajax" do |env|
@@ -3110,7 +3110,7 @@ post "/api/v1/auth/tokens/register" do |env|
     env.response.content_type = "text/html"
 
     csrf_token = generate_response(sid, {":authorize_token"}, HMAC_KEY, PG_DB, use_nonce: true)
-    next templated "authorize_token"
+    next templated "account/authorize_token"
   else
     env.response.content_type = "application/json"
 
diff --git a/src/invidious/views/authorize_token.ecr b/src/invidious/views/account/authorize_token.ecr
similarity index 100%
rename from src/invidious/views/authorize_token.ecr
rename to src/invidious/views/account/authorize_token.ecr
diff --git a/src/invidious/views/change_password.ecr b/src/invidious/views/account/change_password.ecr
similarity index 100%
rename from src/invidious/views/change_password.ecr
rename to src/invidious/views/account/change_password.ecr
diff --git a/src/invidious/views/data_control.ecr b/src/invidious/views/account/data_control.ecr
similarity index 100%
rename from src/invidious/views/data_control.ecr
rename to src/invidious/views/account/data_control.ecr
diff --git a/src/invidious/views/delete_account.ecr b/src/invidious/views/account/delete_account.ecr
similarity index 100%
rename from src/invidious/views/delete_account.ecr
rename to src/invidious/views/account/delete_account.ecr
diff --git a/src/invidious/views/token_manager.ecr b/src/invidious/views/account/token_manager.ecr
similarity index 100%
rename from src/invidious/views/token_manager.ecr
rename to src/invidious/views/account/token_manager.ecr