diff --git a/DysonNetwork.Pass/Account/AccountController.cs b/DysonNetwork.Pass/Account/AccountController.cs
index c1b35cb..5533cbc 100644
--- a/DysonNetwork.Pass/Account/AccountController.cs
+++ b/DysonNetwork.Pass/Account/AccountController.cs
@@ -2,8 +2,8 @@ using System.ComponentModel.DataAnnotations;
 using DysonNetwork.Pass.Auth;
 using DysonNetwork.Pass.Credit;
 using DysonNetwork.Pass.Wallet;
-using DysonNetwork.Shared.Error;
 using DysonNetwork.Shared.GeoIp;
+using DysonNetwork.Shared.Http;
 using DysonNetwork.Shared.Models;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
diff --git a/DysonNetwork.Pass/Account/AccountCurrentController.cs b/DysonNetwork.Pass/Account/AccountCurrentController.cs
index c7280c2..0d99529 100644
--- a/DysonNetwork.Pass/Account/AccountCurrentController.cs
+++ b/DysonNetwork.Pass/Account/AccountCurrentController.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using DysonNetwork.Pass.Permission;
 using DysonNetwork.Pass.Wallet;
-using DysonNetwork.Shared.Error;
+using DysonNetwork.Shared.Http;
 using DysonNetwork.Shared.Models;
 using DysonNetwork.Shared.Proto;
 using Microsoft.AspNetCore.Authorization;
diff --git a/DysonNetwork.Shared/Content/TextSanitizer.cs b/DysonNetwork.Shared/Data/TextSanitizer.cs
similarity index 95%
rename from DysonNetwork.Shared/Content/TextSanitizer.cs
rename to DysonNetwork.Shared/Data/TextSanitizer.cs
index a34d92c..3f004f9 100644
--- a/DysonNetwork.Shared/Content/TextSanitizer.cs
+++ b/DysonNetwork.Shared/Data/TextSanitizer.cs
@@ -1,7 +1,7 @@
-using System.Text;
 using System.Globalization;
+using System.Text;
 
-namespace DysonNetwork.Shared.Content;
+namespace DysonNetwork.Shared.Data;
 
 public abstract partial class TextSanitizer
 {
diff --git a/DysonNetwork.Shared/DysonNetwork.Shared.csproj b/DysonNetwork.Shared/DysonNetwork.Shared.csproj
index c48dec0..95d0124 100644
--- a/DysonNetwork.Shared/DysonNetwork.Shared.csproj
+++ b/DysonNetwork.Shared/DysonNetwork.Shared.csproj
@@ -39,10 +39,6 @@
         <Protobuf Include="Proto\*.proto" ProtoRoot="Proto" GrpcServices="Both" AdditionalFileExtensions="Proto\" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Folder Include="Error\" />
-    </ItemGroup>
-
     <ItemGroup>
       <ProjectReference Include="..\DysonNetwork.ServiceDefaults\DysonNetwork.ServiceDefaults.csproj" />
     </ItemGroup>
diff --git a/DysonNetwork.Shared/Error/ApiError.cs b/DysonNetwork.Shared/Http/ApiError.cs
similarity index 99%
rename from DysonNetwork.Shared/Error/ApiError.cs
rename to DysonNetwork.Shared/Http/ApiError.cs
index 3c229d3..e600285 100644
--- a/DysonNetwork.Shared/Error/ApiError.cs
+++ b/DysonNetwork.Shared/Http/ApiError.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace DysonNetwork.Shared.Error;
+namespace DysonNetwork.Shared.Http;
 
 /// <summary>
 /// Standardized error payload to return to clients.
diff --git a/DysonNetwork.Shared/Models/Badge.cs b/DysonNetwork.Shared/Models/Badge.cs
index 2ce80b7..7846228 100644
--- a/DysonNetwork.Shared/Models/Badge.cs
+++ b/DysonNetwork.Shared/Models/Badge.cs
@@ -2,7 +2,6 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 using DysonNetwork.Shared.Proto;
-using Google.Protobuf.WellKnownTypes;
 using NodaTime;
 using NodaTime.Serialization.Protobuf;
 
diff --git a/DysonNetwork.Sphere/Chat/ChatController.cs b/DysonNetwork.Sphere/Chat/ChatController.cs
index 4800d34..67db829 100644
--- a/DysonNetwork.Sphere/Chat/ChatController.cs
+++ b/DysonNetwork.Sphere/Chat/ChatController.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.RegularExpressions;
 using DysonNetwork.Shared.Auth;
-using DysonNetwork.Shared.Content;
+using DysonNetwork.Shared.Data;
 using DysonNetwork.Shared.Models;
 using DysonNetwork.Shared.Proto;
 using Microsoft.AspNetCore.Authorization;
diff --git a/DysonNetwork.Sphere/Post/PostController.cs b/DysonNetwork.Sphere/Post/PostController.cs
index 33cb15d..2d9ce23 100644
--- a/DysonNetwork.Sphere/Post/PostController.cs
+++ b/DysonNetwork.Sphere/Post/PostController.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Globalization;
 using DysonNetwork.Shared.Auth;
-using DysonNetwork.Shared.Content;
+using DysonNetwork.Shared.Data;
 using DysonNetwork.Shared.Models;
 using DysonNetwork.Shared.Proto;
 using DysonNetwork.Sphere.Poll;