diff --git a/bookwyrm/templates/settings/federation/edit_server.html b/bookwyrm/templates/settings/federation/edit_instances.html
similarity index 100%
rename from bookwyrm/templates/settings/federation/edit_server.html
rename to bookwyrm/templates/settings/federation/edit_instances.html
diff --git a/bookwyrm/templates/settings/federation/federated_server.html b/bookwyrm/templates/settings/federation/instance.html
similarity index 100%
rename from bookwyrm/templates/settings/federation/federated_server.html
rename to bookwyrm/templates/settings/federation/instance.html
diff --git a/bookwyrm/templates/settings/federation/server_blocklist.html b/bookwyrm/templates/settings/federation/instance_blocklist.html
similarity index 100%
rename from bookwyrm/templates/settings/federation/server_blocklist.html
rename to bookwyrm/templates/settings/federation/instance_blocklist.html
diff --git a/bookwyrm/templates/settings/federation/federation.html b/bookwyrm/templates/settings/federation/instance_list.html
similarity index 100%
rename from bookwyrm/templates/settings/federation/federation.html
rename to bookwyrm/templates/settings/federation/instance_list.html
diff --git a/bookwyrm/views/admin/announcements.py b/bookwyrm/views/admin/announcements.py
index e778b709a..92ec1766c 100644
--- a/bookwyrm/views/admin/announcements.py
+++ b/bookwyrm/views/admin/announcements.py
@@ -41,7 +41,9 @@ class Announcements(View):
             "form": forms.AnnouncementForm(),
             "sort": sort,
         }
-        return TemplateResponse(request, "settings/announcements.html", data)
+        return TemplateResponse(
+            request, "settings/announcements/announcements.html", data
+        )
 
     def post(self, request):
         """edit the site settings"""
@@ -56,7 +58,9 @@ class Announcements(View):
             ).get_page(request.GET.get("page")),
             "form": form,
         }
-        return TemplateResponse(request, "settings/announcements.html", data)
+        return TemplateResponse(
+            request, "settings/announcements/announcements.html", data
+        )
 
 
 @method_decorator(login_required, name="dispatch")
@@ -74,7 +78,9 @@ class Announcement(View):
             "announcement": announcement,
             "form": forms.AnnouncementForm(instance=announcement),
         }
-        return TemplateResponse(request, "settings/announcement.html", data)
+        return TemplateResponse(
+            request, "settings/announcements/announcement.html", data
+        )
 
     def post(self, request, announcement_id):
         """edit announcement"""
@@ -87,7 +93,9 @@ class Announcement(View):
             "announcement": announcement,
             "form": form,
         }
-        return TemplateResponse(request, "settings/announcement.html", data)
+        return TemplateResponse(
+            request, "settings/announcements/announcement.html", data
+        )
 
 
 @login_required
diff --git a/bookwyrm/views/admin/dashboard.py b/bookwyrm/views/admin/dashboard.py
index 161dc6da1..e02b9143e 100644
--- a/bookwyrm/views/admin/dashboard.py
+++ b/bookwyrm/views/admin/dashboard.py
@@ -85,4 +85,4 @@ class Dashboard(View):
             "user_stats": user_stats,
             "status_stats": status_stats,
         }
-        return TemplateResponse(request, "settings/dashboard.html", data)
+        return TemplateResponse(request, "settings/dashboard/dashboard.html", data)
diff --git a/bookwyrm/views/admin/email_blocklist.py b/bookwyrm/views/admin/email_blocklist.py
index cd3d83fdb..eecad4ffb 100644
--- a/bookwyrm/views/admin/email_blocklist.py
+++ b/bookwyrm/views/admin/email_blocklist.py
@@ -22,7 +22,9 @@ class EmailBlocklist(View):
             "domains": models.EmailBlocklist.objects.order_by("-created_date").all(),
             "form": forms.EmailBlocklistForm(),
         }
-        return TemplateResponse(request, "settings/email_blocklist.html", data)
+        return TemplateResponse(
+            request, "settings/email_blocklist/email_blocklist.html", data
+        )
 
     def post(self, request, domain_id=None):
         """create a new domain block"""
@@ -35,11 +37,15 @@ class EmailBlocklist(View):
             "form": form,
         }
         if not form.is_valid():
-            return TemplateResponse(request, "settings/email_blocklist.html", data)
+            return TemplateResponse(
+                request, "settings/email_blocklist/email_blocklist.html", data
+            )
         form.save()
 
         data["form"] = forms.EmailBlocklistForm()
-        return TemplateResponse(request, "settings/email_blocklist.html", data)
+        return TemplateResponse(
+            request, "settings/email_blocklist/email_blocklist.html", data
+        )
 
     # pylint: disable=unused-argument
     def delete(self, request, domain_id):
diff --git a/bookwyrm/views/admin/federation.py b/bookwyrm/views/admin/federation.py
index 97dfd6ff0..19bba30d6 100644
--- a/bookwyrm/views/admin/federation.py
+++ b/bookwyrm/views/admin/federation.py
@@ -44,7 +44,7 @@ class Federation(View):
             "sort": sort,
             "form": forms.ServerForm(),
         }
-        return TemplateResponse(request, "settings/federation.html", data)
+        return TemplateResponse(request, "settings/federation/instance_list.html", data)
 
 
 class AddFederatedServer(View):
@@ -53,14 +53,16 @@ class AddFederatedServer(View):
     def get(self, request):
         """add server form"""
         data = {"form": forms.ServerForm()}
-        return TemplateResponse(request, "settings/edit_server.html", data)
+        return TemplateResponse(request, "settings/federation/edit_instance.html", data)
 
     def post(self, request):
         """add a server from the admin panel"""
         form = forms.ServerForm(request.POST)
         if not form.is_valid():
             data = {"form": form}
-            return TemplateResponse(request, "settings/edit_server.html", data)
+            return TemplateResponse(
+                request, "settings/federation/edit_instance.html", data
+            )
         server = form.save()
         return redirect("settings-federated-server", server.id)
 
@@ -75,7 +77,7 @@ class ImportServerBlocklist(View):
 
     def get(self, request):
         """add server form"""
-        return TemplateResponse(request, "settings/server_blocklist.html")
+        return TemplateResponse(request, "settings/federation/instance_blocklist.html")
 
     def post(self, request):
         """add a server from the admin panel"""
@@ -98,7 +100,9 @@ class ImportServerBlocklist(View):
                 server.block()
             success_count += 1
         data = {"failed": failed, "succeeded": success_count}
-        return TemplateResponse(request, "settings/server_blocklist.html", data)
+        return TemplateResponse(
+            request, "settings/federation/instance_blocklist.html", data
+        )
 
 
 @method_decorator(login_required, name="dispatch")
@@ -123,7 +127,7 @@ class FederatedServer(View):
                 user_subject__in=users.all()
             ),
         }
-        return TemplateResponse(request, "settings/federated_server.html", data)
+        return TemplateResponse(request, "settings/federation/instance.html", data)
 
     def post(self, request, server):  # pylint: disable=unused-argument
         """update note"""
diff --git a/bookwyrm/views/admin/invite.py b/bookwyrm/views/admin/invite.py
index f4c82e485..8a3db61a9 100644
--- a/bookwyrm/views/admin/invite.py
+++ b/bookwyrm/views/admin/invite.py
@@ -45,7 +45,7 @@ class ManageInvites(View):
             ),
             "form": forms.CreateInviteForm(),
         }
-        return TemplateResponse(request, "settings/manage_invites.html", data)
+        return TemplateResponse(request, "settings/invites/manage_invites.html", data)
 
     def post(self, request):
         """creates an invite database entry"""
@@ -64,7 +64,7 @@ class ManageInvites(View):
             PAGE_LENGTH,
         )
         data = {"invites": paginated.page(1), "form": form}
-        return TemplateResponse(request, "settings/manage_invites.html", data)
+        return TemplateResponse(request, "settings/invites/manage_invites.html", data)
 
 
 class Invite(View):
@@ -135,7 +135,9 @@ class ManageInviteRequests(View):
             ),
             "sort": sort,
         }
-        return TemplateResponse(request, "settings/manage_invite_requests.html", data)
+        return TemplateResponse(
+            request, "settings/invites/manage_invite_requests.html", data
+        )
 
     def post(self, request):
         """send out an invite"""
diff --git a/bookwyrm/views/admin/ip_blocklist.py b/bookwyrm/views/admin/ip_blocklist.py
index 643dae22c..d57a2422c 100644
--- a/bookwyrm/views/admin/ip_blocklist.py
+++ b/bookwyrm/views/admin/ip_blocklist.py
@@ -22,7 +22,9 @@ class IPBlocklist(View):
             "addresses": models.IPBlocklist.objects.all(),
             "form": forms.IPBlocklistForm(),
         }
-        return TemplateResponse(request, "settings/ip_blocklist.html", data)
+        return TemplateResponse(
+            request, "settings/ip_blocklist/ip_blocklist.html", data
+        )
 
     def post(self, request, block_id=None):
         """create a new ip address block"""
@@ -35,11 +37,15 @@ class IPBlocklist(View):
             "form": form,
         }
         if not form.is_valid():
-            return TemplateResponse(request, "settings/ip_blocklist.html", data)
+            return TemplateResponse(
+                request, "settings/ip_blocklist/ip_blocklist.html", data
+            )
         form.save()
 
         data["form"] = forms.IPBlocklistForm()
-        return TemplateResponse(request, "settings/ip_blocklist.html", data)
+        return TemplateResponse(
+            request, "settings/ip_blocklist/ip_blocklist.html", data
+        )
 
     # pylint: disable=unused-argument
     def delete(self, request, domain_id):