diff --git a/src/Web/Contents/Data/Content.cs b/src/Web/Features/Contents/Data/Content.cs
similarity index 84%
rename from src/Web/Contents/Data/Content.cs
rename to src/Web/Features/Contents/Data/Content.cs
index b67a92f..c4bdea1 100644
--- a/src/Web/Contents/Data/Content.cs
+++ b/src/Web/Features/Contents/Data/Content.cs
@@ -1,4 +1,4 @@
-namespace Hutopy.Web.Contents.Data;
+namespace Hutopy.Web.Features.Contents.Data;
 
 public class Content
 {
diff --git a/src/Web/Contents/Data/ContentDbContext.cs b/src/Web/Features/Contents/Data/ContentDbContext.cs
similarity index 91%
rename from src/Web/Contents/Data/ContentDbContext.cs
rename to src/Web/Features/Contents/Data/ContentDbContext.cs
index bf6eaf5..657ab6d 100644
--- a/src/Web/Contents/Data/ContentDbContext.cs
+++ b/src/Web/Features/Contents/Data/ContentDbContext.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 
-namespace Hutopy.Web.Contents.Data;
+namespace Hutopy.Web.Features.Contents.Data;
 
 public class ContentDbContext(
     DbContextOptions<ContentDbContext> options)
diff --git a/src/Web/Contents/DependencyInjection.cs b/src/Web/Features/Contents/DependencyInjection.cs
similarity index 80%
rename from src/Web/Contents/DependencyInjection.cs
rename to src/Web/Features/Contents/DependencyInjection.cs
index a62df6c..8cac7cb 100644
--- a/src/Web/Contents/DependencyInjection.cs
+++ b/src/Web/Features/Contents/DependencyInjection.cs
@@ -1,7 +1,7 @@
-using Hutopy.Web.Contents.Data;
+using Hutopy.Web.Features.Contents.Data;
 using Microsoft.EntityFrameworkCore;
 
-namespace Hutopy.Web.Contents;
+namespace Hutopy.Web.Features.Contents;
 
 public static class DependencyInjection
 {
diff --git a/src/Web/Contents/Handlers/GetContents.cs b/src/Web/Features/Contents/Handlers/GetContents.cs
similarity index 90%
rename from src/Web/Contents/Handlers/GetContents.cs
rename to src/Web/Features/Contents/Handlers/GetContents.cs
index 26d1348..6fe1674 100644
--- a/src/Web/Contents/Handlers/GetContents.cs
+++ b/src/Web/Features/Contents/Handlers/GetContents.cs
@@ -1,8 +1,8 @@
 using FastEndpoints;
-using Hutopy.Web.Contents.Data;
+using Hutopy.Web.Features.Contents.Data;
 using Microsoft.EntityFrameworkCore;
 
-namespace Hutopy.Web.Contents.Handlers;
+namespace Hutopy.Web.Features.Contents.Handlers;
 
 public sealed class GetContentsRequest
 {
diff --git a/src/Web/Contents/Handlers/GetContentsByUser.cs b/src/Web/Features/Contents/Handlers/GetContentsByUser.cs
similarity index 92%
rename from src/Web/Contents/Handlers/GetContentsByUser.cs
rename to src/Web/Features/Contents/Handlers/GetContentsByUser.cs
index 50cb478..34c085f 100644
--- a/src/Web/Contents/Handlers/GetContentsByUser.cs
+++ b/src/Web/Features/Contents/Handlers/GetContentsByUser.cs
@@ -1,8 +1,8 @@
 using FastEndpoints;
-using Hutopy.Web.Contents.Data;
+using Hutopy.Web.Features.Contents.Data;
 using Microsoft.EntityFrameworkCore;
 
-namespace Hutopy.Web.Contents.Handlers;
+namespace Hutopy.Web.Features.Contents.Handlers;
 
 public sealed class GetContentsByUserRequest
 {
diff --git a/src/Web/Contents/Handlers/PostContent.cs b/src/Web/Features/Contents/Handlers/PostContent.cs
similarity index 90%
rename from src/Web/Contents/Handlers/PostContent.cs
rename to src/Web/Features/Contents/Handlers/PostContent.cs
index e741c18..71bebd5 100644
--- a/src/Web/Contents/Handlers/PostContent.cs
+++ b/src/Web/Features/Contents/Handlers/PostContent.cs
@@ -1,8 +1,8 @@
 using FastEndpoints;
 using Hutopy.Web.Common;
-using Hutopy.Web.Contents.Data;
+using Hutopy.Web.Features.Contents.Data;
 
-namespace Hutopy.Web.Contents.Handlers;
+namespace Hutopy.Web.Features.Contents.Handlers;
 
 public record struct PostContentRequest(
     string? Title,
diff --git a/src/Web/Contents/Migrations/20240718034516_Initial.Designer.cs b/src/Web/Features/Contents/Migrations/20240718034516_Initial.Designer.cs
similarity index 97%
rename from src/Web/Contents/Migrations/20240718034516_Initial.Designer.cs
rename to src/Web/Features/Contents/Migrations/20240718034516_Initial.Designer.cs
index 9fb4610..4ea464a 100644
--- a/src/Web/Contents/Migrations/20240718034516_Initial.Designer.cs
+++ b/src/Web/Features/Contents/Migrations/20240718034516_Initial.Designer.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using Hutopy.Web.Contents.Data;
+using Hutopy.Web.Features.Contents.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Web/Contents/Migrations/20240718034516_Initial.cs b/src/Web/Features/Contents/Migrations/20240718034516_Initial.cs
similarity index 100%
rename from src/Web/Contents/Migrations/20240718034516_Initial.cs
rename to src/Web/Features/Contents/Migrations/20240718034516_Initial.cs
diff --git a/src/Web/Contents/Migrations/ContentDbContextModelSnapshot.cs b/src/Web/Features/Contents/Migrations/ContentDbContextModelSnapshot.cs
similarity index 97%
rename from src/Web/Contents/Migrations/ContentDbContextModelSnapshot.cs
rename to src/Web/Features/Contents/Migrations/ContentDbContextModelSnapshot.cs
index 5a7fbbf..e01f3a9 100644
--- a/src/Web/Contents/Migrations/ContentDbContextModelSnapshot.cs
+++ b/src/Web/Features/Contents/Migrations/ContentDbContextModelSnapshot.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using Hutopy.Web.Contents.Data;
+using Hutopy.Web.Features.Contents.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
diff --git a/src/Web/Messages/Data/Message.cs b/src/Web/Features/Messages/Data/Message.cs
similarity index 84%
rename from src/Web/Messages/Data/Message.cs
rename to src/Web/Features/Messages/Data/Message.cs
index f1255ed..8bcd258 100644
--- a/src/Web/Messages/Data/Message.cs
+++ b/src/Web/Features/Messages/Data/Message.cs
@@ -1,4 +1,4 @@
-namespace Hutopy.Web.Messages.Data;
+namespace Hutopy.Web.Features.Messages.Data;
 
 public class Message
 {
diff --git a/src/Web/Messages/Data/MessagingDbContext.cs b/src/Web/Features/Messages/Data/MessagingDbContext.cs
similarity index 92%
rename from src/Web/Messages/Data/MessagingDbContext.cs
rename to src/Web/Features/Messages/Data/MessagingDbContext.cs
index 7674b30..16fc14a 100644
--- a/src/Web/Messages/Data/MessagingDbContext.cs
+++ b/src/Web/Features/Messages/Data/MessagingDbContext.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 
-namespace Hutopy.Web.Messages.Data;
+namespace Hutopy.Web.Features.Messages.Data;
 
 public class MessagingDbContext(
     DbContextOptions<MessagingDbContext> options)
diff --git a/src/Web/Messages/DependencyInjection.cs b/src/Web/Features/Messages/DependencyInjection.cs
similarity index 81%
rename from src/Web/Messages/DependencyInjection.cs
rename to src/Web/Features/Messages/DependencyInjection.cs
index 8e89468..0693a3e 100644
--- a/src/Web/Messages/DependencyInjection.cs
+++ b/src/Web/Features/Messages/DependencyInjection.cs
@@ -1,7 +1,7 @@
-using Hutopy.Web.Messages.Data;
+using Hutopy.Web.Features.Messages.Data;
 using Microsoft.EntityFrameworkCore;
 
-namespace Hutopy.Web.Messages;
+namespace Hutopy.Web.Features.Messages;
 
 public static class DependencyInjection
 {
diff --git a/src/Web/Messages/Handlers/GetMessages.cs b/src/Web/Features/Messages/Handlers/GetMessages.cs
similarity index 89%
rename from src/Web/Messages/Handlers/GetMessages.cs
rename to src/Web/Features/Messages/Handlers/GetMessages.cs
index b29c9c4..c14c11f 100644
--- a/src/Web/Messages/Handlers/GetMessages.cs
+++ b/src/Web/Features/Messages/Handlers/GetMessages.cs
@@ -1,8 +1,8 @@
 using FastEndpoints;
-using Hutopy.Web.Messages.Data;
+using Hutopy.Web.Features.Messages.Data;
 using Microsoft.EntityFrameworkCore;
 
-namespace Hutopy.Web.Messages.Handlers;
+namespace Hutopy.Web.Features.Messages.Handlers;
 
 public class GetMessagesRequest
 {
diff --git a/src/Web/Messages/Handlers/GetMessagesByParent.cs b/src/Web/Features/Messages/Handlers/GetMessagesByParent.cs
similarity index 89%
rename from src/Web/Messages/Handlers/GetMessagesByParent.cs
rename to src/Web/Features/Messages/Handlers/GetMessagesByParent.cs
index 39ff534..ab05d51 100644
--- a/src/Web/Messages/Handlers/GetMessagesByParent.cs
+++ b/src/Web/Features/Messages/Handlers/GetMessagesByParent.cs
@@ -1,8 +1,8 @@
 using FastEndpoints;
-using Hutopy.Web.Messages.Data;
+using Hutopy.Web.Features.Messages.Data;
 using Microsoft.EntityFrameworkCore;
 
-namespace Hutopy.Web.Messages.Handlers;
+namespace Hutopy.Web.Features.Messages.Handlers;
 
 public class GetMessagesRepliesRequest
 {
diff --git a/src/Web/Messages/Handlers/GetMessagesByUser.cs b/src/Web/Features/Messages/Handlers/GetMessagesByUser.cs
similarity index 90%
rename from src/Web/Messages/Handlers/GetMessagesByUser.cs
rename to src/Web/Features/Messages/Handlers/GetMessagesByUser.cs
index c6f6a72..0b39cef 100644
--- a/src/Web/Messages/Handlers/GetMessagesByUser.cs
+++ b/src/Web/Features/Messages/Handlers/GetMessagesByUser.cs
@@ -1,8 +1,8 @@
 using FastEndpoints;
-using Hutopy.Web.Messages.Data;
+using Hutopy.Web.Features.Messages.Data;
 using Microsoft.EntityFrameworkCore;
 
-namespace Hutopy.Web.Messages.Handlers;
+namespace Hutopy.Web.Features.Messages.Handlers;
 
 public class GetMessagesByUserRequest
 {
diff --git a/src/Web/Messages/Handlers/PostMessage.cs b/src/Web/Features/Messages/Handlers/PostMessage.cs
similarity index 90%
rename from src/Web/Messages/Handlers/PostMessage.cs
rename to src/Web/Features/Messages/Handlers/PostMessage.cs
index a4d5240..401f0c7 100644
--- a/src/Web/Messages/Handlers/PostMessage.cs
+++ b/src/Web/Features/Messages/Handlers/PostMessage.cs
@@ -1,8 +1,8 @@
 using FastEndpoints;
 using Hutopy.Web.Common;
-using Hutopy.Web.Messages.Data;
+using Hutopy.Web.Features.Messages.Data;
 
-namespace Hutopy.Web.Messages.Handlers;
+namespace Hutopy.Web.Features.Messages.Handlers;
 
 public class PostMessageRequest
 {
diff --git a/src/Web/Messages/Handlers/PostReplyMessage.cs b/src/Web/Features/Messages/Handlers/PostReplyMessage.cs
similarity index 91%
rename from src/Web/Messages/Handlers/PostReplyMessage.cs
rename to src/Web/Features/Messages/Handlers/PostReplyMessage.cs
index 277b3f1..9b3d905 100644
--- a/src/Web/Messages/Handlers/PostReplyMessage.cs
+++ b/src/Web/Features/Messages/Handlers/PostReplyMessage.cs
@@ -1,8 +1,8 @@
 using FastEndpoints;
 using Hutopy.Web.Common;
-using Hutopy.Web.Messages.Data;
+using Hutopy.Web.Features.Messages.Data;
 
-namespace Hutopy.Web.Messages.Handlers;
+namespace Hutopy.Web.Features.Messages.Handlers;
 
 internal sealed class PostReplyMessageRequest
 {
diff --git a/src/Web/Messages/Migrations/20240718173016_Initial.Designer.cs b/src/Web/Features/Messages/Migrations/20240718173016_Initial.Designer.cs
similarity index 97%
rename from src/Web/Messages/Migrations/20240718173016_Initial.Designer.cs
rename to src/Web/Features/Messages/Migrations/20240718173016_Initial.Designer.cs
index e5d2cf2..21a45b2 100644
--- a/src/Web/Messages/Migrations/20240718173016_Initial.Designer.cs
+++ b/src/Web/Features/Messages/Migrations/20240718173016_Initial.Designer.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using Hutopy.Web.Messages.Data;
+using Hutopy.Web.Features.Messages.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/src/Web/Messages/Migrations/20240718173016_Initial.cs b/src/Web/Features/Messages/Migrations/20240718173016_Initial.cs
similarity index 100%
rename from src/Web/Messages/Migrations/20240718173016_Initial.cs
rename to src/Web/Features/Messages/Migrations/20240718173016_Initial.cs
diff --git a/src/Web/Messages/Migrations/MessagingDbContextModelSnapshot.cs b/src/Web/Features/Messages/Migrations/MessagingDbContextModelSnapshot.cs
similarity index 97%
rename from src/Web/Messages/Migrations/MessagingDbContextModelSnapshot.cs
rename to src/Web/Features/Messages/Migrations/MessagingDbContextModelSnapshot.cs
index 22fe571..c01bd22 100644
--- a/src/Web/Messages/Migrations/MessagingDbContextModelSnapshot.cs
+++ b/src/Web/Features/Messages/Migrations/MessagingDbContextModelSnapshot.cs
@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using Hutopy.Web.Messages.Data;
+using Hutopy.Web.Features.Messages.Data;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
diff --git a/src/Web/Program.cs b/src/Web/Program.cs
index bef36d9..759f533 100644
--- a/src/Web/Program.cs
+++ b/src/Web/Program.cs
@@ -5,8 +5,8 @@ using Hutopy.Infrastructure;
 using Hutopy.Infrastructure.Data;
 using Hutopy.Infrastructure.Identity;
 using Hutopy.Web;
-using Hutopy.Web.Contents;
-using Hutopy.Web.Messages;
+using Hutopy.Web.Features.Contents;
+using Hutopy.Web.Features.Messages;
 using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.EntityFrameworkCore;
 using NSwag;
diff --git a/src/Web/TestDataSeeder.cs b/src/Web/TestDataSeeder.cs
index 4e1e7f9..a34ea8a 100644
--- a/src/Web/TestDataSeeder.cs
+++ b/src/Web/TestDataSeeder.cs
@@ -2,8 +2,8 @@
 using Hutopy.Infrastructure.Identity;
 using Hutopy.Infrastructure.Identity.OwnedEntities;
 using Hutopy.Web.Common;
-using Hutopy.Web.Contents.Data;
-using Hutopy.Web.Messages.Data;
+using Hutopy.Web.Features.Contents.Data;
+using Hutopy.Web.Features.Messages.Data;
 
 namespace Hutopy.Web;
 
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index 761a54d..ead4845 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -31,9 +31,4 @@
     <PackageReference Include="FluentValidation.AspNetCore" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Contents\Migrations\" />
-    <Folder Include="Messages\Migrations\" />
-  </ItemGroup>
-
 </Project>