diff --git a/Iceshrimp.Backend/Controllers/Federation/ActivityPubController.cs b/Iceshrimp.Backend/Controllers/Federation/ActivityPubController.cs
index 30f04657..64d154a8 100644
--- a/Iceshrimp.Backend/Controllers/Federation/ActivityPubController.cs
+++ b/Iceshrimp.Backend/Controllers/Federation/ActivityPubController.cs
@@ -1,6 +1,6 @@
 using System.Text;
-using Iceshrimp.Backend.Controllers.Attributes;
 using Iceshrimp.Backend.Controllers.Federation.Attributes;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Iceshrimp.Backend.Core.Configuration;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Extensions;
diff --git a/Iceshrimp.Backend/Controllers/Attributes/MediaTypeRouteFilterAttribute.cs b/Iceshrimp.Backend/Controllers/Federation/Attributes/MediaTypeRouteFilterAttribute.cs
similarity index 94%
rename from Iceshrimp.Backend/Controllers/Attributes/MediaTypeRouteFilterAttribute.cs
rename to Iceshrimp.Backend/Controllers/Federation/Attributes/MediaTypeRouteFilterAttribute.cs
index 10785c08..8458efbd 100644
--- a/Iceshrimp.Backend/Controllers/Attributes/MediaTypeRouteFilterAttribute.cs
+++ b/Iceshrimp.Backend/Controllers/Federation/Attributes/MediaTypeRouteFilterAttribute.cs
@@ -2,7 +2,7 @@ using System.Net.Http.Headers;
 using Microsoft.AspNetCore.Mvc.ActionConstraints;
 using Microsoft.Net.Http.Headers;
 
-namespace Iceshrimp.Backend.Controllers.Attributes;
+namespace Iceshrimp.Backend.Controllers.Federation.Attributes;
 
 [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
 public class MediaTypeRouteFilterAttribute(params string[] mediaTypes) : Attribute, IActionConstraint
diff --git a/Iceshrimp.Backend/Controllers/Mastodon/AccountController.cs b/Iceshrimp.Backend/Controllers/Mastodon/AccountController.cs
index 812462d1..78bc73ed 100644
--- a/Iceshrimp.Backend/Controllers/Mastodon/AccountController.cs
+++ b/Iceshrimp.Backend/Controllers/Mastodon/AccountController.cs
@@ -1,10 +1,10 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Net.Mime;
-using Iceshrimp.Backend.Controllers.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Renderers;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas.Entities;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Iceshrimp.Backend.Core.Configuration;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
diff --git a/Iceshrimp.Backend/Controllers/Mastodon/ConversationsController.cs b/Iceshrimp.Backend/Controllers/Mastodon/ConversationsController.cs
index ae7e72f3..ada76740 100644
--- a/Iceshrimp.Backend/Controllers/Mastodon/ConversationsController.cs
+++ b/Iceshrimp.Backend/Controllers/Mastodon/ConversationsController.cs
@@ -1,10 +1,10 @@
 using System.Net;
 using System.Net.Mime;
-using Iceshrimp.Backend.Controllers.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Renderers;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas.Entities;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
 using Iceshrimp.Backend.Core.Extensions;
diff --git a/Iceshrimp.Backend/Controllers/Mastodon/ListController.cs b/Iceshrimp.Backend/Controllers/Mastodon/ListController.cs
index 7639f17a..5618f270 100644
--- a/Iceshrimp.Backend/Controllers/Mastodon/ListController.cs
+++ b/Iceshrimp.Backend/Controllers/Mastodon/ListController.cs
@@ -1,10 +1,10 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Net.Mime;
-using Iceshrimp.Backend.Controllers.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Renderers;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas.Entities;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
 using Iceshrimp.Backend.Core.Extensions;
diff --git a/Iceshrimp.Backend/Controllers/Mastodon/NotificationController.cs b/Iceshrimp.Backend/Controllers/Mastodon/NotificationController.cs
index 93b10eb0..9df2eeef 100644
--- a/Iceshrimp.Backend/Controllers/Mastodon/NotificationController.cs
+++ b/Iceshrimp.Backend/Controllers/Mastodon/NotificationController.cs
@@ -1,9 +1,9 @@
 using System.Net.Mime;
-using Iceshrimp.Backend.Controllers.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Renderers;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas.Entities;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Extensions;
 using Iceshrimp.Backend.Core.Middleware;
diff --git a/Iceshrimp.Backend/Controllers/Mastodon/Schemas/MastodonPaginationQuery.cs b/Iceshrimp.Backend/Controllers/Mastodon/Schemas/MastodonPaginationQuery.cs
index fb47e744..e9f0185f 100644
--- a/Iceshrimp.Backend/Controllers/Mastodon/Schemas/MastodonPaginationQuery.cs
+++ b/Iceshrimp.Backend/Controllers/Mastodon/Schemas/MastodonPaginationQuery.cs
@@ -1,4 +1,4 @@
-using Iceshrimp.Backend.Controllers.Attributes;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Iceshrimp.Backend.Controllers.Mastodon.Schemas;
diff --git a/Iceshrimp.Backend/Controllers/Mastodon/SearchController.cs b/Iceshrimp.Backend/Controllers/Mastodon/SearchController.cs
index 27c2b26c..3a9299e3 100644
--- a/Iceshrimp.Backend/Controllers/Mastodon/SearchController.cs
+++ b/Iceshrimp.Backend/Controllers/Mastodon/SearchController.cs
@@ -1,11 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Net.Mime;
 using System.Text.RegularExpressions;
-using Iceshrimp.Backend.Controllers.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Renderers;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas.Entities;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Iceshrimp.Backend.Core.Configuration;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Extensions;
diff --git a/Iceshrimp.Backend/Controllers/Mastodon/StatusController.cs b/Iceshrimp.Backend/Controllers/Mastodon/StatusController.cs
index 1ed2db7b..06980115 100644
--- a/Iceshrimp.Backend/Controllers/Mastodon/StatusController.cs
+++ b/Iceshrimp.Backend/Controllers/Mastodon/StatusController.cs
@@ -1,10 +1,10 @@
 using System.Net.Mime;
 using AsyncKeyedLock;
-using Iceshrimp.Backend.Controllers.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Renderers;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas.Entities;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Iceshrimp.Backend.Core.Configuration;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
diff --git a/Iceshrimp.Backend/Controllers/Mastodon/TimelineController.cs b/Iceshrimp.Backend/Controllers/Mastodon/TimelineController.cs
index 3c190c6b..90d7209e 100644
--- a/Iceshrimp.Backend/Controllers/Mastodon/TimelineController.cs
+++ b/Iceshrimp.Backend/Controllers/Mastodon/TimelineController.cs
@@ -1,9 +1,9 @@
 using System.Net.Mime;
-using Iceshrimp.Backend.Controllers.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Renderers;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas.Entities;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
 using Iceshrimp.Backend.Core.Extensions;
diff --git a/Iceshrimp.Backend/Controllers/Attributes/LinkPaginationAttribute.cs b/Iceshrimp.Backend/Controllers/Shared/Attributes/LinkPaginationAttribute.cs
similarity index 98%
rename from Iceshrimp.Backend/Controllers/Attributes/LinkPaginationAttribute.cs
rename to Iceshrimp.Backend/Controllers/Shared/Attributes/LinkPaginationAttribute.cs
index c382d921..1f043f02 100644
--- a/Iceshrimp.Backend/Controllers/Attributes/LinkPaginationAttribute.cs
+++ b/Iceshrimp.Backend/Controllers/Shared/Attributes/LinkPaginationAttribute.cs
@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 
-namespace Iceshrimp.Backend.Controllers.Attributes;
+namespace Iceshrimp.Backend.Controllers.Shared.Attributes;
 
 public class LinkPaginationAttribute(int defaultLimit, int maxLimit, bool offset = false) : ActionFilterAttribute
 {
diff --git a/Iceshrimp.Backend/Controllers/Attributes/UseJsonAttribute.cs b/Iceshrimp.Backend/Controllers/Shared/Attributes/UseJsonAttribute.cs
similarity index 97%
rename from Iceshrimp.Backend/Controllers/Attributes/UseJsonAttribute.cs
rename to Iceshrimp.Backend/Controllers/Shared/Attributes/UseJsonAttribute.cs
index d1f197cc..8a82a172 100644
--- a/Iceshrimp.Backend/Controllers/Attributes/UseJsonAttribute.cs
+++ b/Iceshrimp.Backend/Controllers/Shared/Attributes/UseJsonAttribute.cs
@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.Extensions.Options;
 
-namespace Iceshrimp.Backend.Controllers.Attributes;
+namespace Iceshrimp.Backend.Controllers.Shared.Attributes;
 
 public abstract class UseJsonAttribute : Attribute, IAsyncActionFilter
 {
diff --git a/Iceshrimp.Backend/Controllers/Schemas/PaginationQuery.cs b/Iceshrimp.Backend/Controllers/Shared/Schemas/PaginationQuery.cs
similarity index 71%
rename from Iceshrimp.Backend/Controllers/Schemas/PaginationQuery.cs
rename to Iceshrimp.Backend/Controllers/Shared/Schemas/PaginationQuery.cs
index 5f68c021..17ac9122 100644
--- a/Iceshrimp.Backend/Controllers/Schemas/PaginationQuery.cs
+++ b/Iceshrimp.Backend/Controllers/Shared/Schemas/PaginationQuery.cs
@@ -1,7 +1,7 @@
-using Iceshrimp.Backend.Controllers.Attributes;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Iceshrimp.Backend.Controllers.Schemas;
+namespace Iceshrimp.Backend.Controllers.Shared.Schemas;
 
 public class PaginationQuery : IPaginationQuery
 {
diff --git a/Iceshrimp.Backend/Controllers/AdminController.cs b/Iceshrimp.Backend/Controllers/Web/AdminController.cs
similarity index 98%
rename from Iceshrimp.Backend/Controllers/AdminController.cs
rename to Iceshrimp.Backend/Controllers/Web/AdminController.cs
index d8ed6ebc..3e4e9404 100644
--- a/Iceshrimp.Backend/Controllers/AdminController.cs
+++ b/Iceshrimp.Backend/Controllers/Web/AdminController.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Net.Mime;
-using Iceshrimp.Backend.Controllers.Attributes;
 using Iceshrimp.Backend.Controllers.Federation;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Iceshrimp.Backend.Core.Configuration;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
@@ -16,7 +16,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [Authenticate]
 [Authorize("role:admin")]
diff --git a/Iceshrimp.Backend/Controllers/AuthController.cs b/Iceshrimp.Backend/Controllers/Web/AuthController.cs
similarity index 98%
rename from Iceshrimp.Backend/Controllers/AuthController.cs
rename to Iceshrimp.Backend/Controllers/Web/AuthController.cs
index 972005d4..0dae3df2 100644
--- a/Iceshrimp.Backend/Controllers/AuthController.cs
+++ b/Iceshrimp.Backend/Controllers/Web/AuthController.cs
@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Net.Mime;
-using Iceshrimp.Backend.Controllers.Renderers;
+using Iceshrimp.Backend.Controllers.Web.Renderers;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
 using Iceshrimp.Backend.Core.Helpers;
@@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.RateLimiting;
 using Microsoft.EntityFrameworkCore;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [ApiController]
 [Tags("Authentication")]
diff --git a/Iceshrimp.Backend/Controllers/DriveController.cs b/Iceshrimp.Backend/Controllers/Web/DriveController.cs
similarity index 98%
rename from Iceshrimp.Backend/Controllers/DriveController.cs
rename to Iceshrimp.Backend/Controllers/Web/DriveController.cs
index 5cfddd4c..54f5b573 100644
--- a/Iceshrimp.Backend/Controllers/DriveController.cs
+++ b/Iceshrimp.Backend/Controllers/Web/DriveController.cs
@@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [ApiController]
 [Route("/api/iceshrimp/drive")]
diff --git a/Iceshrimp.Backend/Controllers/EmojiController.cs b/Iceshrimp.Backend/Controllers/Web/EmojiController.cs
similarity index 99%
rename from Iceshrimp.Backend/Controllers/EmojiController.cs
rename to Iceshrimp.Backend/Controllers/Web/EmojiController.cs
index d8caaa89..1fe5d59a 100644
--- a/Iceshrimp.Backend/Controllers/EmojiController.cs
+++ b/Iceshrimp.Backend/Controllers/Web/EmojiController.cs
@@ -9,7 +9,7 @@ using Microsoft.AspNetCore.RateLimiting;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [ApiController]
 [Authenticate]
diff --git a/Iceshrimp.Backend/Controllers/FallbackController.cs b/Iceshrimp.Backend/Controllers/Web/FallbackController.cs
similarity index 92%
rename from Iceshrimp.Backend/Controllers/FallbackController.cs
rename to Iceshrimp.Backend/Controllers/Web/FallbackController.cs
index 10534fcc..88aa87c4 100644
--- a/Iceshrimp.Backend/Controllers/FallbackController.cs
+++ b/Iceshrimp.Backend/Controllers/Web/FallbackController.cs
@@ -5,7 +5,7 @@ using Iceshrimp.Shared.Schemas.Web;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [Produces(MediaTypeNames.Application.Json)]
 public class FallbackController : ControllerBase
diff --git a/Iceshrimp.Backend/Controllers/IdenticonController.cs b/Iceshrimp.Backend/Controllers/Web/IdenticonController.cs
similarity index 99%
rename from Iceshrimp.Backend/Controllers/IdenticonController.cs
rename to Iceshrimp.Backend/Controllers/Web/IdenticonController.cs
index 13266692..57954e11 100644
--- a/Iceshrimp.Backend/Controllers/IdenticonController.cs
+++ b/Iceshrimp.Backend/Controllers/Web/IdenticonController.cs
@@ -8,7 +8,7 @@ using SixLabors.ImageSharp.Drawing.Processing;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [ApiController]
 [EnableCors("drive")]
diff --git a/Iceshrimp.Backend/Controllers/NoteController.cs b/Iceshrimp.Backend/Controllers/Web/NoteController.cs
similarity index 98%
rename from Iceshrimp.Backend/Controllers/NoteController.cs
rename to Iceshrimp.Backend/Controllers/Web/NoteController.cs
index 8804a809..d59ddbf2 100644
--- a/Iceshrimp.Backend/Controllers/NoteController.cs
+++ b/Iceshrimp.Backend/Controllers/Web/NoteController.cs
@@ -2,8 +2,8 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.Net.Mime;
 using AsyncKeyedLock;
-using Iceshrimp.Backend.Controllers.Attributes;
-using Iceshrimp.Backend.Controllers.Renderers;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
+using Iceshrimp.Backend.Controllers.Web.Renderers;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
 using Iceshrimp.Backend.Core.Extensions;
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.RateLimiting;
 using Microsoft.EntityFrameworkCore;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [ApiController]
 [EnableRateLimiting("sliding")]
diff --git a/Iceshrimp.Backend/Controllers/NotificationController.cs b/Iceshrimp.Backend/Controllers/Web/NotificationController.cs
similarity index 94%
rename from Iceshrimp.Backend/Controllers/NotificationController.cs
rename to Iceshrimp.Backend/Controllers/Web/NotificationController.cs
index 99f9ffc0..02c563f6 100644
--- a/Iceshrimp.Backend/Controllers/NotificationController.cs
+++ b/Iceshrimp.Backend/Controllers/Web/NotificationController.cs
@@ -1,7 +1,7 @@
 using System.Net.Mime;
-using Iceshrimp.Backend.Controllers.Attributes;
-using Iceshrimp.Backend.Controllers.Renderers;
-using Iceshrimp.Backend.Controllers.Schemas;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
+using Iceshrimp.Backend.Controllers.Shared.Schemas;
+using Iceshrimp.Backend.Controllers.Web.Renderers;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Extensions;
 using Iceshrimp.Backend.Core.Middleware;
@@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.RateLimiting;
 using Microsoft.EntityFrameworkCore;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [ApiController]
 [Authenticate]
diff --git a/Iceshrimp.Backend/Controllers/Renderers/NoteRenderer.cs b/Iceshrimp.Backend/Controllers/Web/Renderers/NoteRenderer.cs
similarity index 99%
rename from Iceshrimp.Backend/Controllers/Renderers/NoteRenderer.cs
rename to Iceshrimp.Backend/Controllers/Web/Renderers/NoteRenderer.cs
index 702d57a6..281f0bc4 100644
--- a/Iceshrimp.Backend/Controllers/Renderers/NoteRenderer.cs
+++ b/Iceshrimp.Backend/Controllers/Web/Renderers/NoteRenderer.cs
@@ -8,7 +8,7 @@ using Iceshrimp.Shared.Schemas.Web;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace Iceshrimp.Backend.Controllers.Renderers;
+namespace Iceshrimp.Backend.Controllers.Web.Renderers;
 
 public class NoteRenderer(
 	UserRenderer userRenderer,
diff --git a/Iceshrimp.Backend/Controllers/Renderers/NotificationRenderer.cs b/Iceshrimp.Backend/Controllers/Web/Renderers/NotificationRenderer.cs
similarity index 98%
rename from Iceshrimp.Backend/Controllers/Renderers/NotificationRenderer.cs
rename to Iceshrimp.Backend/Controllers/Web/Renderers/NotificationRenderer.cs
index a0e268bc..2a9d061f 100644
--- a/Iceshrimp.Backend/Controllers/Renderers/NotificationRenderer.cs
+++ b/Iceshrimp.Backend/Controllers/Web/Renderers/NotificationRenderer.cs
@@ -2,7 +2,7 @@ using Iceshrimp.Backend.Core.Database.Tables;
 using Iceshrimp.Backend.Core.Extensions;
 using Iceshrimp.Shared.Schemas.Web;
 
-namespace Iceshrimp.Backend.Controllers.Renderers;
+namespace Iceshrimp.Backend.Controllers.Web.Renderers;
 
 public class NotificationRenderer(
 	UserRenderer userRenderer,
diff --git a/Iceshrimp.Backend/Controllers/Renderers/UserProfileRenderer.cs b/Iceshrimp.Backend/Controllers/Web/Renderers/UserProfileRenderer.cs
similarity index 98%
rename from Iceshrimp.Backend/Controllers/Renderers/UserProfileRenderer.cs
rename to Iceshrimp.Backend/Controllers/Web/Renderers/UserProfileRenderer.cs
index 0a043c7c..64e271d4 100644
--- a/Iceshrimp.Backend/Controllers/Renderers/UserProfileRenderer.cs
+++ b/Iceshrimp.Backend/Controllers/Web/Renderers/UserProfileRenderer.cs
@@ -4,7 +4,7 @@ using Iceshrimp.Backend.Core.Extensions;
 using Iceshrimp.Shared.Schemas.Web;
 using Microsoft.EntityFrameworkCore;
 
-namespace Iceshrimp.Backend.Controllers.Renderers;
+namespace Iceshrimp.Backend.Controllers.Web.Renderers;
 
 public class UserProfileRenderer(DatabaseContext db)
 {
diff --git a/Iceshrimp.Backend/Controllers/Renderers/UserRenderer.cs b/Iceshrimp.Backend/Controllers/Web/Renderers/UserRenderer.cs
similarity index 97%
rename from Iceshrimp.Backend/Controllers/Renderers/UserRenderer.cs
rename to Iceshrimp.Backend/Controllers/Web/Renderers/UserRenderer.cs
index 947b2f7e..0614be8c 100644
--- a/Iceshrimp.Backend/Controllers/Renderers/UserRenderer.cs
+++ b/Iceshrimp.Backend/Controllers/Web/Renderers/UserRenderer.cs
@@ -6,7 +6,7 @@ using Iceshrimp.Shared.Schemas.Web;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace Iceshrimp.Backend.Controllers.Renderers;
+namespace Iceshrimp.Backend.Controllers.Web.Renderers;
 
 public class UserRenderer(IOptions<Config.InstanceSection> config, DatabaseContext db)
 {
diff --git a/Iceshrimp.Backend/Controllers/SearchController.cs b/Iceshrimp.Backend/Controllers/Web/SearchController.cs
similarity index 96%
rename from Iceshrimp.Backend/Controllers/SearchController.cs
rename to Iceshrimp.Backend/Controllers/Web/SearchController.cs
index c9afc897..d502818a 100644
--- a/Iceshrimp.Backend/Controllers/SearchController.cs
+++ b/Iceshrimp.Backend/Controllers/Web/SearchController.cs
@@ -1,8 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Net.Mime;
-using Iceshrimp.Backend.Controllers.Attributes;
-using Iceshrimp.Backend.Controllers.Renderers;
-using Iceshrimp.Backend.Controllers.Schemas;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
+using Iceshrimp.Backend.Controllers.Shared.Schemas;
+using Iceshrimp.Backend.Controllers.Web.Renderers;
 using Iceshrimp.Backend.Core.Configuration;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.RateLimiting;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [ApiController]
 [Authenticate]
diff --git a/Iceshrimp.Backend/Controllers/SettingsController.cs b/Iceshrimp.Backend/Controllers/Web/SettingsController.cs
similarity index 97%
rename from Iceshrimp.Backend/Controllers/SettingsController.cs
rename to Iceshrimp.Backend/Controllers/Web/SettingsController.cs
index 78cd5eaf..1ca2dab2 100644
--- a/Iceshrimp.Backend/Controllers/SettingsController.cs
+++ b/Iceshrimp.Backend/Controllers/Web/SettingsController.cs
@@ -6,7 +6,7 @@ using Iceshrimp.Shared.Schemas.Web;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.RateLimiting;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [ApiController]
 [Authenticate]
diff --git a/Iceshrimp.Backend/Controllers/TimelineController.cs b/Iceshrimp.Backend/Controllers/Web/TimelineController.cs
similarity index 88%
rename from Iceshrimp.Backend/Controllers/TimelineController.cs
rename to Iceshrimp.Backend/Controllers/Web/TimelineController.cs
index 3739bbae..022b4214 100644
--- a/Iceshrimp.Backend/Controllers/TimelineController.cs
+++ b/Iceshrimp.Backend/Controllers/Web/TimelineController.cs
@@ -1,7 +1,7 @@
 using System.Net.Mime;
-using Iceshrimp.Backend.Controllers.Attributes;
-using Iceshrimp.Backend.Controllers.Renderers;
-using Iceshrimp.Backend.Controllers.Schemas;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
+using Iceshrimp.Backend.Controllers.Shared.Schemas;
+using Iceshrimp.Backend.Controllers.Web.Renderers;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
 using Iceshrimp.Backend.Core.Extensions;
@@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.RateLimiting;
 using Microsoft.EntityFrameworkCore;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [ApiController]
 [LinkPagination(20, 80)]
diff --git a/Iceshrimp.Backend/Controllers/UserController.cs b/Iceshrimp.Backend/Controllers/Web/UserController.cs
similarity index 96%
rename from Iceshrimp.Backend/Controllers/UserController.cs
rename to Iceshrimp.Backend/Controllers/Web/UserController.cs
index 212fc8af..63e3929b 100644
--- a/Iceshrimp.Backend/Controllers/UserController.cs
+++ b/Iceshrimp.Backend/Controllers/Web/UserController.cs
@@ -1,7 +1,7 @@
 using System.Net.Mime;
-using Iceshrimp.Backend.Controllers.Attributes;
-using Iceshrimp.Backend.Controllers.Renderers;
-using Iceshrimp.Backend.Controllers.Schemas;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
+using Iceshrimp.Backend.Controllers.Shared.Schemas;
+using Iceshrimp.Backend.Controllers.Web.Renderers;
 using Iceshrimp.Backend.Core.Configuration;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
@@ -14,7 +14,7 @@ using Microsoft.AspNetCore.RateLimiting;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
-namespace Iceshrimp.Backend.Controllers;
+namespace Iceshrimp.Backend.Controllers.Web;
 
 [ApiController]
 [Authenticate]
diff --git a/Iceshrimp.Backend/Core/Extensions/MvcBuilderExtensions.cs b/Iceshrimp.Backend/Core/Extensions/MvcBuilderExtensions.cs
index e80c00b5..93e1fd5d 100644
--- a/Iceshrimp.Backend/Core/Extensions/MvcBuilderExtensions.cs
+++ b/Iceshrimp.Backend/Core/Extensions/MvcBuilderExtensions.cs
@@ -1,7 +1,7 @@
 using System.Buffers;
 using System.Net;
 using System.Text.Encodings.Web;
-using Iceshrimp.Backend.Controllers.Attributes;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
 using Iceshrimp.Backend.Core.Middleware;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Formatters;
diff --git a/Iceshrimp.Backend/Core/Extensions/QueryableExtensions.cs b/Iceshrimp.Backend/Core/Extensions/QueryableExtensions.cs
index db93c04a..7f68690f 100644
--- a/Iceshrimp.Backend/Core/Extensions/QueryableExtensions.cs
+++ b/Iceshrimp.Backend/Core/Extensions/QueryableExtensions.cs
@@ -1,11 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq.Expressions;
 using EntityFrameworkCore.Projectables;
-using Iceshrimp.Backend.Controllers.Attributes;
 using Iceshrimp.Backend.Controllers.Mastodon.Renderers;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas;
 using Iceshrimp.Backend.Controllers.Mastodon.Schemas.Entities;
-using Iceshrimp.Backend.Controllers.Schemas;
+using Iceshrimp.Backend.Controllers.Shared.Attributes;
+using Iceshrimp.Backend.Controllers.Shared.Schemas;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
 using Iceshrimp.Backend.Core.Middleware;
diff --git a/Iceshrimp.Backend/Core/Extensions/ServiceExtensions.cs b/Iceshrimp.Backend/Core/Extensions/ServiceExtensions.cs
index bd55eb98..5bc2b962 100644
--- a/Iceshrimp.Backend/Core/Extensions/ServiceExtensions.cs
+++ b/Iceshrimp.Backend/Core/Extensions/ServiceExtensions.cs
@@ -3,7 +3,7 @@ using System.Threading.RateLimiting;
 using System.Xml.Linq;
 using Iceshrimp.Backend.Controllers.Federation;
 using Iceshrimp.Backend.Controllers.Mastodon.Renderers;
-using Iceshrimp.Backend.Controllers.Renderers;
+using Iceshrimp.Backend.Controllers.Web.Renderers;
 using Iceshrimp.Backend.Core.Configuration;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Federation.WebFinger;
@@ -28,9 +28,9 @@ using Microsoft.Extensions.Options;
 using Microsoft.OpenApi.Models;
 using AuthenticationMiddleware = Iceshrimp.Backend.Core.Middleware.AuthenticationMiddleware;
 using AuthorizationMiddleware = Iceshrimp.Backend.Core.Middleware.AuthorizationMiddleware;
-using NoteRenderer = Iceshrimp.Backend.Controllers.Renderers.NoteRenderer;
-using NotificationRenderer = Iceshrimp.Backend.Controllers.Renderers.NotificationRenderer;
-using UserRenderer = Iceshrimp.Backend.Controllers.Renderers.UserRenderer;
+using NoteRenderer = Iceshrimp.Backend.Controllers.Web.Renderers.NoteRenderer;
+using NotificationRenderer = Iceshrimp.Backend.Controllers.Web.Renderers.NotificationRenderer;
+using UserRenderer = Iceshrimp.Backend.Controllers.Web.Renderers.UserRenderer;
 
 namespace Iceshrimp.Backend.Core.Extensions;
 
diff --git a/Iceshrimp.Backend/Core/Services/StreamingService.cs b/Iceshrimp.Backend/Core/Services/StreamingService.cs
index 9d20bb35..e3bfcc70 100644
--- a/Iceshrimp.Backend/Core/Services/StreamingService.cs
+++ b/Iceshrimp.Backend/Core/Services/StreamingService.cs
@@ -1,6 +1,6 @@
 using System.Collections.Concurrent;
 using AsyncKeyedLock;
-using Iceshrimp.Backend.Controllers.Renderers;
+using Iceshrimp.Backend.Controllers.Web.Renderers;
 using Iceshrimp.Backend.Core.Database.Tables;
 using Iceshrimp.Backend.Hubs;
 using Iceshrimp.Backend.Hubs.Helpers;
diff --git a/Iceshrimp.Backend/Hubs/Helpers/StreamingConnectionAggregate.cs b/Iceshrimp.Backend/Hubs/Helpers/StreamingConnectionAggregate.cs
index 33b66e3a..a4a227ec 100644
--- a/Iceshrimp.Backend/Hubs/Helpers/StreamingConnectionAggregate.cs
+++ b/Iceshrimp.Backend/Hubs/Helpers/StreamingConnectionAggregate.cs
@@ -1,6 +1,6 @@
 using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
-using Iceshrimp.Backend.Controllers.Renderers;
+using Iceshrimp.Backend.Controllers.Web.Renderers;
 using Iceshrimp.Backend.Core.Database;
 using Iceshrimp.Backend.Core.Database.Tables;
 using Iceshrimp.Backend.Core.Events;
diff --git a/Iceshrimp.Backend/Iceshrimp.Backend.csproj b/Iceshrimp.Backend/Iceshrimp.Backend.csproj
index 7f4628fe..714af7d4 100644
--- a/Iceshrimp.Backend/Iceshrimp.Backend.csproj
+++ b/Iceshrimp.Backend/Iceshrimp.Backend.csproj
@@ -98,6 +98,10 @@
         <None Remove="Core\Database\prune-designer-cs-files.sh"/>
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="Controllers\Shared\" />
+    </ItemGroup>
+
     <Target Name="KeepOnlyBrotliCompressedStaticAssets" AfterTargets="Publish">
         <ItemGroup>
             <CompressedFiles Include="$(PublishDir)\wwwroot\_framework\*.br"/>