diff --git a/Moonlight/App/Http/Controllers/Api/Moonlight/ResourcesController.cs b/Moonlight/App/Http/Controllers/Api/Moonlight/ResourcesController.cs
index 24dbdc26..329fa63a 100644
--- a/Moonlight/App/Http/Controllers/Api/Moonlight/ResourcesController.cs
+++ b/Moonlight/App/Http/Controllers/Api/Moonlight/ResourcesController.cs
@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc;
 using Moonlight.App.Helpers;
 using Moonlight.App.Models.Misc;
 using Moonlight.App.Services;
+using Moonlight.App.Services.Files;
 using Moonlight.App.Services.LogServices;
 
 namespace Moonlight.App.Http.Controllers.Api.Moonlight;
diff --git a/Moonlight/App/Services/CleanupService.cs b/Moonlight/App/Services/Background/CleanupService.cs
similarity index 99%
rename from Moonlight/App/Services/CleanupService.cs
rename to Moonlight/App/Services/Background/CleanupService.cs
index ffd2d947..6491db28 100644
--- a/Moonlight/App/Services/CleanupService.cs
+++ b/Moonlight/App/Services/Background/CleanupService.cs
@@ -1,16 +1,15 @@
-using System.Diagnostics;
+using Logging.Net;
 using Microsoft.EntityFrameworkCore;
 using MineStatLib;
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Repositories;
-using Moonlight.App.Repositories.Servers;
-using Logging.Net;
 using Moonlight.App.ApiClients.Daemon.Resources;
 using Moonlight.App.ApiClients.Wings;
+using Moonlight.App.Database.Entities;
 using Moonlight.App.Events;
+using Moonlight.App.Repositories;
+using Moonlight.App.Repositories.Servers;
 using Newtonsoft.Json;
 
-namespace Moonlight.App.Services;
+namespace Moonlight.App.Services.Background;
 
 public class CleanupService
 {
diff --git a/Moonlight/App/Services/DiscordNotificationService.cs b/Moonlight/App/Services/Background/DiscordNotificationService.cs
similarity index 97%
rename from Moonlight/App/Services/DiscordNotificationService.cs
rename to Moonlight/App/Services/Background/DiscordNotificationService.cs
index c0e1e9db..f8157ad4 100644
--- a/Moonlight/App/Services/DiscordNotificationService.cs
+++ b/Moonlight/App/Services/Background/DiscordNotificationService.cs
@@ -3,8 +3,9 @@ using Discord.Webhook;
 using Logging.Net;
 using Moonlight.App.Database.Entities;
 using Moonlight.App.Events;
+using Moonlight.App.Services.Files;
 
-namespace Moonlight.App.Services;
+namespace Moonlight.App.Services.Background;
 
 public class DiscordNotificationService
 {
diff --git a/Moonlight/App/Services/ConfigService.cs b/Moonlight/App/Services/ConfigService.cs
index f57d9c06..94275e32 100644
--- a/Moonlight/App/Services/ConfigService.cs
+++ b/Moonlight/App/Services/ConfigService.cs
@@ -2,6 +2,7 @@
 using Logging.Net;
 using Microsoft.Extensions.Primitives;
 using Moonlight.App.Helpers;
+using Moonlight.App.Services.Files;
 
 namespace Moonlight.App.Services;
 
diff --git a/Moonlight/App/Services/BucketService.cs b/Moonlight/App/Services/Files/BucketService.cs
similarity index 94%
rename from Moonlight/App/Services/BucketService.cs
rename to Moonlight/App/Services/Files/BucketService.cs
index a1417dfa..e85fdaa6 100644
--- a/Moonlight/App/Services/BucketService.cs
+++ b/Moonlight/App/Services/Files/BucketService.cs
@@ -1,7 +1,6 @@
-using Logging.Net;
-using Moonlight.App.Helpers;
+using Moonlight.App.Helpers;
 
-namespace Moonlight.App.Services;
+namespace Moonlight.App.Services.Files;
 
 public class BucketService
 {
diff --git a/Moonlight/App/Services/ResourceService.cs b/Moonlight/App/Services/Files/ResourceService.cs
similarity index 94%
rename from Moonlight/App/Services/ResourceService.cs
rename to Moonlight/App/Services/Files/ResourceService.cs
index 8b126340..5858fa9f 100644
--- a/Moonlight/App/Services/ResourceService.cs
+++ b/Moonlight/App/Services/Files/ResourceService.cs
@@ -1,6 +1,6 @@
 using Moonlight.App.Database.Entities;
 
-namespace Moonlight.App.Services;
+namespace Moonlight.App.Services.Files;
 
 public class ResourceService
 {
diff --git a/Moonlight/App/Services/StorageService.cs b/Moonlight/App/Services/Files/StorageService.cs
similarity index 97%
rename from Moonlight/App/Services/StorageService.cs
rename to Moonlight/App/Services/Files/StorageService.cs
index f9474581..1bae49cc 100644
--- a/Moonlight/App/Services/StorageService.cs
+++ b/Moonlight/App/Services/Files/StorageService.cs
@@ -1,7 +1,7 @@
 using Logging.Net;
 using Moonlight.App.Helpers;
 
-namespace Moonlight.App.Services;
+namespace Moonlight.App.Services.Files;
 
 public class StorageService
 {
diff --git a/Moonlight/App/Services/LogService.cs b/Moonlight/App/Services/LogServices/LogService.cs
similarity index 95%
rename from Moonlight/App/Services/LogService.cs
rename to Moonlight/App/Services/LogServices/LogService.cs
index 87a30a5f..10b1925a 100644
--- a/Moonlight/App/Services/LogService.cs
+++ b/Moonlight/App/Services/LogServices/LogService.cs
@@ -2,7 +2,7 @@
 using Moonlight.App.Helpers;
 using Moonlight.App.Models.Misc;
 
-namespace Moonlight.App.Services;
+namespace Moonlight.App.Services.LogServices;
 
 public class LogService
 {
diff --git a/Moonlight/App/Services/MailService.cs b/Moonlight/App/Services/Mail/MailService.cs
similarity index 96%
rename from Moonlight/App/Services/MailService.cs
rename to Moonlight/App/Services/Mail/MailService.cs
index 9bcab325..85e2d60c 100644
--- a/Moonlight/App/Services/MailService.cs
+++ b/Moonlight/App/Services/Mail/MailService.cs
@@ -1,13 +1,11 @@
-using System.Net;
-using System.Net.Mail;
-using Logging.Net;
+using Logging.Net;
 using MimeKit;
 using Moonlight.App.Database.Entities;
 using Moonlight.App.Exceptions;
 using Moonlight.App.Helpers;
 using SmtpClient = MailKit.Net.Smtp.SmtpClient;
 
-namespace Moonlight.App.Services;
+namespace Moonlight.App.Services.Mail;
 
 public class MailService
 {
diff --git a/Moonlight/App/Services/TrashMailDetectorService.cs b/Moonlight/App/Services/Mail/TrashMailDetectorService.cs
similarity index 96%
rename from Moonlight/App/Services/TrashMailDetectorService.cs
rename to Moonlight/App/Services/Mail/TrashMailDetectorService.cs
index eba090b5..35d57aaf 100644
--- a/Moonlight/App/Services/TrashMailDetectorService.cs
+++ b/Moonlight/App/Services/Mail/TrashMailDetectorService.cs
@@ -1,7 +1,7 @@
 using System.Net;
 using Logging.Net;
 
-namespace Moonlight.App.Services;
+namespace Moonlight.App.Services.Mail;
 
 public class TrashMailDetectorService
 {
diff --git a/Moonlight/App/Services/SupportChat/SupportChatAdminService.cs b/Moonlight/App/Services/SupportChat/SupportChatAdminService.cs
index d77b355e..d9acc9ef 100644
--- a/Moonlight/App/Services/SupportChat/SupportChatAdminService.cs
+++ b/Moonlight/App/Services/SupportChat/SupportChatAdminService.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Components.Forms;
 using Moonlight.App.Database.Entities;
 using Moonlight.App.Events;
+using Moonlight.App.Services.Files;
 using Moonlight.App.Services.Sessions;
 
 namespace Moonlight.App.Services.SupportChat;
diff --git a/Moonlight/App/Services/SupportChat/SupportChatClientService.cs b/Moonlight/App/Services/SupportChat/SupportChatClientService.cs
index c6a10f9c..1c4918fc 100644
--- a/Moonlight/App/Services/SupportChat/SupportChatClientService.cs
+++ b/Moonlight/App/Services/SupportChat/SupportChatClientService.cs
@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Components.Forms;
 using Moonlight.App.Database.Entities;
 using Moonlight.App.Events;
+using Moonlight.App.Services.Files;
 using Moonlight.App.Services.Sessions;
 
 namespace Moonlight.App.Services.SupportChat;
diff --git a/Moonlight/App/Services/UserService.cs b/Moonlight/App/Services/UserService.cs
index 81633b14..940f3c09 100644
--- a/Moonlight/App/Services/UserService.cs
+++ b/Moonlight/App/Services/UserService.cs
@@ -6,6 +6,7 @@ using Moonlight.App.Helpers;
 using Moonlight.App.Models.Misc;
 using Moonlight.App.Repositories;
 using Moonlight.App.Services.LogServices;
+using Moonlight.App.Services.Mail;
 using Moonlight.App.Services.Sessions;
 
 namespace Moonlight.App.Services;
diff --git a/Moonlight/Program.cs b/Moonlight/Program.cs
index 2993e7a0..b6404a3b 100644
--- a/Moonlight/Program.cs
+++ b/Moonlight/Program.cs
@@ -15,9 +15,12 @@ using Moonlight.App.Repositories.Domains;
 using Moonlight.App.Repositories.LogEntries;
 using Moonlight.App.Repositories.Servers;
 using Moonlight.App.Services;
+using Moonlight.App.Services.Background;
 using Moonlight.App.Services.DiscordBot;
+using Moonlight.App.Services.Files;
 using Moonlight.App.Services.Interop;
 using Moonlight.App.Services.LogServices;
+using Moonlight.App.Services.Mail;
 using Moonlight.App.Services.Notifications;
 using Moonlight.App.Services.OAuth2;
 using Moonlight.App.Services.Sessions;
diff --git a/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor b/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor
index 360b8802..f4804368 100644
--- a/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor
+++ b/Moonlight/Shared/Views/Admin/Servers/Cleanup.razor
@@ -4,6 +4,7 @@
 @using Moonlight.App.Models.Misc
 @using Moonlight.App.Services.LogServices
 @using Moonlight.App.Events
+@using Moonlight.App.Services.Background
 
 @inject CleanupService CleanupService
 @inject AuditLogService AuditLogService
diff --git a/Moonlight/Shared/Views/Admin/Support/View.razor b/Moonlight/Shared/Views/Admin/Support/View.razor
index a59c6a87..4edff144 100644
--- a/Moonlight/Shared/Views/Admin/Support/View.razor
+++ b/Moonlight/Shared/Views/Admin/Support/View.razor
@@ -5,6 +5,7 @@
 @using Moonlight.App.Services
 @using Moonlight.App.Services.SupportChat
 @using System.Text.RegularExpressions
+@using Moonlight.App.Services.Files
 
 @inject SupportChatAdminService AdminService
 @inject UserRepository UserRepository
diff --git a/Moonlight/Shared/Views/Admin/Sys/Logs.razor b/Moonlight/Shared/Views/Admin/Sys/Logs.razor
index deed919c..ac152a90 100644
--- a/Moonlight/Shared/Views/Admin/Sys/Logs.razor
+++ b/Moonlight/Shared/Views/Admin/Sys/Logs.razor
@@ -3,6 +3,7 @@
 @using BlazorTable
 @using Moonlight.App.Models.Misc
 @using Moonlight.App.Services
+@using Moonlight.App.Services.LogServices
 @using Moonlight.Shared.Components.Navigations
 
 @inject LogService LogService
diff --git a/Moonlight/Shared/Views/Support.razor b/Moonlight/Shared/Views/Support.razor
index f292a271..d7395f4b 100644
--- a/Moonlight/Shared/Views/Support.razor
+++ b/Moonlight/Shared/Views/Support.razor
@@ -5,6 +5,7 @@
 @using Moonlight.App.Services.SupportChat
 @using Logging.Net
 @using System.Text.RegularExpressions
+@using Moonlight.App.Services.Files
 
 @inject ResourceService ResourceService
 @inject SupportChatClientService ClientService