diff --git a/bookwyrm/templates/settings/announcement.html b/bookwyrm/templates/settings/announcements/announcement.html
similarity index 100%
rename from bookwyrm/templates/settings/announcement.html
rename to bookwyrm/templates/settings/announcements/announcement.html
diff --git a/bookwyrm/templates/settings/announcement_form.html b/bookwyrm/templates/settings/announcements/announcement_form.html
similarity index 100%
rename from bookwyrm/templates/settings/announcement_form.html
rename to bookwyrm/templates/settings/announcements/announcement_form.html
diff --git a/bookwyrm/templates/settings/announcements.html b/bookwyrm/templates/settings/announcements/announcements.html
similarity index 100%
rename from bookwyrm/templates/settings/announcements.html
rename to bookwyrm/templates/settings/announcements/announcements.html
diff --git a/bookwyrm/templates/settings/dashboard.html b/bookwyrm/templates/settings/dashboard/dashboard.html
similarity index 100%
rename from bookwyrm/templates/settings/dashboard.html
rename to bookwyrm/templates/settings/dashboard/dashboard.html
diff --git a/bookwyrm/templates/settings/dashboard_status_chart.html b/bookwyrm/templates/settings/dashboard/dashboard_status_chart.html
similarity index 100%
rename from bookwyrm/templates/settings/dashboard_status_chart.html
rename to bookwyrm/templates/settings/dashboard/dashboard_status_chart.html
diff --git a/bookwyrm/templates/settings/dashboard_user_chart.html b/bookwyrm/templates/settings/dashboard/dashboard_user_chart.html
similarity index 100%
rename from bookwyrm/templates/settings/dashboard_user_chart.html
rename to bookwyrm/templates/settings/dashboard/dashboard_user_chart.html
diff --git a/bookwyrm/templates/settings/domain_form.html b/bookwyrm/templates/settings/email_blocklist/domain_form.html
similarity index 100%
rename from bookwyrm/templates/settings/domain_form.html
rename to bookwyrm/templates/settings/email_blocklist/domain_form.html
diff --git a/bookwyrm/templates/settings/email_blocklist.html b/bookwyrm/templates/settings/email_blocklist/email_blocklist.html
similarity index 100%
rename from bookwyrm/templates/settings/email_blocklist.html
rename to bookwyrm/templates/settings/email_blocklist/email_blocklist.html
diff --git a/bookwyrm/templates/settings/edit_server.html b/bookwyrm/templates/settings/federation/edit_server.html
similarity index 100%
rename from bookwyrm/templates/settings/edit_server.html
rename to bookwyrm/templates/settings/federation/edit_server.html
diff --git a/bookwyrm/templates/settings/federated_server.html b/bookwyrm/templates/settings/federation/federated_server.html
similarity index 100%
rename from bookwyrm/templates/settings/federated_server.html
rename to bookwyrm/templates/settings/federation/federated_server.html
diff --git a/bookwyrm/templates/settings/federation.html b/bookwyrm/templates/settings/federation/federation.html
similarity index 100%
rename from bookwyrm/templates/settings/federation.html
rename to bookwyrm/templates/settings/federation/federation.html
diff --git a/bookwyrm/templates/settings/server_blocklist.html b/bookwyrm/templates/settings/federation/server_blocklist.html
similarity index 100%
rename from bookwyrm/templates/settings/server_blocklist.html
rename to bookwyrm/templates/settings/federation/server_blocklist.html
diff --git a/bookwyrm/templates/settings/invite_request_filters.html b/bookwyrm/templates/settings/invites/invite_request_filters.html
similarity index 100%
rename from bookwyrm/templates/settings/invite_request_filters.html
rename to bookwyrm/templates/settings/invites/invite_request_filters.html
diff --git a/bookwyrm/templates/settings/manage_invite_requests.html b/bookwyrm/templates/settings/invites/manage_invite_requests.html
similarity index 100%
rename from bookwyrm/templates/settings/manage_invite_requests.html
rename to bookwyrm/templates/settings/invites/manage_invite_requests.html
diff --git a/bookwyrm/templates/settings/manage_invites.html b/bookwyrm/templates/settings/invites/manage_invites.html
similarity index 100%
rename from bookwyrm/templates/settings/manage_invites.html
rename to bookwyrm/templates/settings/invites/manage_invites.html
diff --git a/bookwyrm/templates/settings/status_filter.html b/bookwyrm/templates/settings/invites/status_filter.html
similarity index 100%
rename from bookwyrm/templates/settings/status_filter.html
rename to bookwyrm/templates/settings/invites/status_filter.html
diff --git a/bookwyrm/templates/settings/ip_address_form.html b/bookwyrm/templates/settings/ip_blocklist/ip_address_form.html
similarity index 100%
rename from bookwyrm/templates/settings/ip_address_form.html
rename to bookwyrm/templates/settings/ip_blocklist/ip_address_form.html
diff --git a/bookwyrm/templates/settings/ip_blocklist.html b/bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html
similarity index 100%
rename from bookwyrm/templates/settings/ip_blocklist.html
rename to bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html
diff --git a/bookwyrm/templates/settings/ip_tooltip.html b/bookwyrm/templates/settings/ip_blocklist/ip_tooltip.html
similarity index 100%
rename from bookwyrm/templates/settings/ip_tooltip.html
rename to bookwyrm/templates/settings/ip_blocklist/ip_tooltip.html