diff --git a/MareSynchronos/FileCacheDB/FileCacheContext.cs b/MareSynchronos/FileCacheDB/FileCacheContext.cs
index 63fa39f..133fc92 100644
--- a/MareSynchronos/FileCacheDB/FileCacheContext.cs
+++ b/MareSynchronos/FileCacheDB/FileCacheContext.cs
@@ -1,6 +1,4 @@
-using System;
-using System.IO;
-using Dalamud.Logging;
+using System.IO;
 using MareSynchronos.Utils;
 using Microsoft.EntityFrameworkCore;
 
diff --git a/MareSynchronos/Interop/Weapon.cs b/MareSynchronos/Interop/Weapon.cs
index 97ac51c..0588559 100644
--- a/MareSynchronos/Interop/Weapon.cs
+++ b/MareSynchronos/Interop/Weapon.cs
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
 using Penumbra.Interop.Structs;
 
diff --git a/MareSynchronos/Managers/IpcManager.cs b/MareSynchronos/Managers/IpcManager.cs
index e096233..84a1c8d 100644
--- a/MareSynchronos/Managers/IpcManager.cs
+++ b/MareSynchronos/Managers/IpcManager.cs
@@ -1,11 +1,8 @@
-using Dalamud.Logging;
-using Dalamud.Plugin;
+using Dalamud.Plugin;
 using Dalamud.Plugin.Ipc;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Dalamud.Game.ClientState.Objects.Types;
-using Lumina.Excel.GeneratedSheets;
 using MareSynchronos.Utils;
 using MareSynchronos.WebAPI;
 
diff --git a/MareSynchronos/Managers/PlayerManager.cs b/MareSynchronos/Managers/PlayerManager.cs
index 65577a8..33fc240 100644
--- a/MareSynchronos/Managers/PlayerManager.cs
+++ b/MareSynchronos/Managers/PlayerManager.cs
@@ -1,10 +1,8 @@
 using MareSynchronos.Factories;
-using MareSynchronos.Models;
 using MareSynchronos.Utils;
 using MareSynchronos.WebAPI;
 using Newtonsoft.Json;
 using System;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using MareSynchronos.API;
diff --git a/MareSynchronos/Plugin.cs b/MareSynchronos/Plugin.cs
index 851035c..81360dd 100644
--- a/MareSynchronos/Plugin.cs
+++ b/MareSynchronos/Plugin.cs
@@ -11,7 +11,6 @@ using Dalamud.Interface.ImGuiFileDialog;
 using MareSynchronos.Managers;
 using MareSynchronos.WebAPI;
 using Dalamud.Interface.Windowing;
-using Dalamud.Logging;
 using MareSynchronos.UI;
 using MareSynchronos.Utils;
 
diff --git a/MareSynchronos/Utils/Logger.cs b/MareSynchronos/Utils/Logger.cs
index 232f7ac..b0729de 100644
--- a/MareSynchronos/Utils/Logger.cs
+++ b/MareSynchronos/Utils/Logger.cs
@@ -1,5 +1,4 @@
 using System.Diagnostics;
-using System.Text;
 using Dalamud.Logging;
 using Dalamud.Utility;
 
diff --git a/MareSynchronos/WebAPI/ApIController.Functions.Files.cs b/MareSynchronos/WebAPI/ApIController.Functions.Files.cs
index 6100d26..2ae03d0 100644
--- a/MareSynchronos/WebAPI/ApIController.Functions.Files.cs
+++ b/MareSynchronos/WebAPI/ApIController.Functions.Files.cs
@@ -23,19 +23,19 @@ namespace MareSynchronos.WebAPI
             {
                 Logger.Warn("Cancelling upload");
                 _uploadCancellationTokenSource?.Cancel();
-                _mareHub!.SendAsync(FilesHubAPI.SendAbortUpload);
+                _mareHub!.SendAsync(Api.SendFileAbortUpload);
                 CurrentUploads.Clear();
             }
         }
 
         public async Task DeleteAllMyFiles()
         {
-            await _mareHub!.SendAsync(FilesHubAPI.SendDeleteAllFiles);
+            await _mareHub!.SendAsync(Api.SendFileDeleteAllFiles);
         }
 
         private async Task<string> DownloadFile(int downloadId, string hash, CancellationToken ct)
         {
-            var reader = _mareHub!.StreamAsync<byte[]>(FilesHubAPI.StreamDownloadFileAsync, hash, ct);
+            var reader = _mareHub!.StreamAsync<byte[]>(Api.StreamFileDownloadFileAsync, hash, ct);
             string fileName = Path.GetTempFileName();
             await using var fs = File.OpenWrite(fileName);
             await foreach (var data in reader.WithCancellation(ct))
@@ -56,7 +56,7 @@ namespace MareSynchronos.WebAPI
             List<DownloadFileDto> downloadFileInfoFromService = new List<DownloadFileDto>();
             foreach (var file in fileReplacementDto)
             {
-                downloadFileInfoFromService.Add(await _mareHub!.InvokeAsync<DownloadFileDto>(FilesHubAPI.InvokeGetFileSize, file.Hash, ct));
+                downloadFileInfoFromService.Add(await _mareHub!.InvokeAsync<DownloadFileDto>(Api.InvokeFileGetFileSize, file.Hash, ct));
             }
 
             CurrentDownloads[currentDownloadId] = downloadFileInfoFromService.Distinct().Select(d => new DownloadFileTransfer(d))
@@ -128,7 +128,7 @@ namespace MareSynchronos.WebAPI
             var uploadToken = _uploadCancellationTokenSource.Token;
             Logger.Verbose("New Token Created");
 
-            var filesToUpload = await _mareHub!.InvokeAsync<List<UploadFileDto>>(FilesHubAPI.InvokeSendFiles, character.FileReplacements.Select(c => c.Hash).Distinct(), uploadToken);
+            var filesToUpload = await _mareHub!.InvokeAsync<List<UploadFileDto>>(Api.InvokeFileSendFiles, character.FileReplacements.Select(c => c.Hash).Distinct(), uploadToken);
 
             foreach (var file in filesToUpload.Where(f => !f.IsForbidden))
             {
@@ -183,11 +183,11 @@ namespace MareSynchronos.WebAPI
             }
 
             Logger.Verbose("Upload tasks complete, waiting for server to confirm");
-            var anyUploadsOpen = await _mareHub!.InvokeAsync<bool>(FilesHubAPI.InvokeIsUploadFinished, uploadToken);
+            var anyUploadsOpen = await _mareHub!.InvokeAsync<bool>(Api.InvokeFileIsUploadFinished, uploadToken);
             Logger.Verbose("Uploads open: " + anyUploadsOpen);
             while (anyUploadsOpen && !uploadToken.IsCancellationRequested)
             {
-                anyUploadsOpen = await _mareHub!.InvokeAsync<bool>(FilesHubAPI.InvokeIsUploadFinished, uploadToken);
+                anyUploadsOpen = await _mareHub!.InvokeAsync<bool>(Api.InvokeFileIsUploadFinished, uploadToken);
                 await Task.Delay(TimeSpan.FromSeconds(0.5), uploadToken);
                 Logger.Verbose("Waiting for uploads to finish");
             }
@@ -197,7 +197,7 @@ namespace MareSynchronos.WebAPI
             if (!uploadToken.IsCancellationRequested)
             {
                 Logger.Verbose("=== Pushing character data ===");
-                await _mareHub!.InvokeAsync(UserHubAPI.InvokePushCharacterDataToVisibleClients, character, visibleCharacterIds, uploadToken);
+                await _mareHub!.InvokeAsync(Api.InvokeUserPushCharacterDataToVisibleClients, character, visibleCharacterIds, uploadToken);
             }
             else
             {
@@ -234,7 +234,7 @@ namespace MareSynchronos.WebAPI
                 }
             }
 
-            await _mareHub!.SendAsync(FilesHubAPI.SendUploadFileStreamAsync, fileHash, AsyncFileData(uploadToken), uploadToken);
+            await _mareHub!.SendAsync(Api.SendFileUploadFileStreamAsync, fileHash, AsyncFileData(uploadToken), uploadToken);
         }
 
         public void CancelDownload(int downloadId)
diff --git a/MareSynchronos/WebAPI/ApIController.Functions.Users.cs b/MareSynchronos/WebAPI/ApIController.Functions.Users.cs
index 1ae78ed..6512a35 100644
--- a/MareSynchronos/WebAPI/ApIController.Functions.Users.cs
+++ b/MareSynchronos/WebAPI/ApIController.Functions.Users.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using MareSynchronos.API;
 using MareSynchronos.Utils;
@@ -13,8 +12,8 @@ namespace MareSynchronos.WebAPI
         {
             _pluginConfiguration.ClientSecret.Remove(ApiUri);
             _pluginConfiguration.Save();
-            await _mareHub!.SendAsync(FilesHubAPI.SendDeleteAllFiles);
-            await _mareHub!.SendAsync(UserHubAPI.SendDeleteAccount);
+            await _mareHub!.SendAsync(Api.SendFileDeleteAllFiles);
+            await _mareHub!.SendAsync(Api.SendUserDeleteAccount);
             await CreateConnections();
         }
 
@@ -22,7 +21,7 @@ namespace MareSynchronos.WebAPI
         {
             if (!ServerAlive) return;
             Logger.Debug("Registering at service " + ApiUri);
-            var response = await _mareHub!.InvokeAsync<string>(UserHubAPI.InvokeRegister);
+            var response = await _mareHub!.InvokeAsync<string>(Api.InvokeUserRegister);
             _pluginConfiguration.ClientSecret[ApiUri] = response;
             _pluginConfiguration.Save();
             if (!isIntroUi)
@@ -35,25 +34,25 @@ namespace MareSynchronos.WebAPI
 
         public async Task<List<string>> GetOnlineCharacters()
         {
-            return await _mareHub!.InvokeAsync<List<string>>(UserHubAPI.InvokeGetOnlineCharacters);
+            return await _mareHub!.InvokeAsync<List<string>>(Api.InvokeUserGetOnlineCharacters);
         }
 
         public async Task SendPairedClientAddition(string uid)
         {
             if (!IsConnected || SecretKey == "-") return;
-            await _mareHub!.SendAsync(UserHubAPI.SendPairedClientAddition, uid);
+            await _mareHub!.SendAsync(Api.SendUserPairedClientAddition, uid);
         }
 
         public async Task SendPairedClientPauseChange(string uid, bool paused)
         {
             if (!IsConnected || SecretKey == "-") return;
-            await _mareHub!.SendAsync(UserHubAPI.SendPairedClientPauseChange, uid, paused);
+            await _mareHub!.SendAsync(Api.SendUserPairedClientPauseChange, uid, paused);
         }
 
         public async Task SendPairedClientRemoval(string uid)
         {
             if (!IsConnected || SecretKey == "-") return;
-            await _mareHub!.SendAsync(UserHubAPI.SendPairedClientRemoval, uid);
+            await _mareHub!.SendAsync(Api.SendUserPairedClientRemoval, uid);
         }
     }
 
diff --git a/MareSynchronos/WebAPI/ApiController.Connectivity.cs b/MareSynchronos/WebAPI/ApiController.Connectivity.cs
index 33e342c..0019acb 100644
--- a/MareSynchronos/WebAPI/ApiController.Connectivity.cs
+++ b/MareSynchronos/WebAPI/ApiController.Connectivity.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using Dalamud.Logging;
 using MareSynchronos.API;
 using MareSynchronos.Utils;
 using MareSynchronos.WebAPI.Utils;
@@ -31,7 +28,7 @@ namespace MareSynchronos.WebAPI
         public const string MainServer = "Lunae Crescere Incipientis (Central Server EU)";
         public const string MainServiceUri = "wss://v2202207178628194299.powersrv.de:6872";
 
-        public readonly int[] SupportedServerVersions = { API.API.Version };
+        public readonly int[] SupportedServerVersions = { Api.Version };
 
         private readonly Configuration _pluginConfiguration;
         private readonly DalamudUtil _dalamudUtil;
@@ -171,11 +168,11 @@ namespace MareSynchronos.WebAPI
 
                     if (token.IsCancellationRequested) break;
 
-                    _mareHub = BuildHubConnection(API.API.Path);
+                    _mareHub = BuildHubConnection(Api.Path);
 
                     await _mareHub.StartAsync(token);
 
-                    _mareHub.On<SystemInfoDto>(ConnectionHubAPI.OnUpdateSystemInfo, (dto) => SystemInfoDto = dto);
+                    _mareHub.On<SystemInfoDto>(Api.OnUpdateSystemInfo, (dto) => SystemInfoDto = dto);
 
                     if (_pluginConfiguration.FullPause)
                     {
@@ -184,22 +181,22 @@ namespace MareSynchronos.WebAPI
                     }
 
                     _connectionDto =
-                        await _mareHub.InvokeAsync<ConnectionDto>(ConnectionHubAPI.InvokeHeartbeat, _dalamudUtil.PlayerNameHashed, token);
+                        await _mareHub.InvokeAsync<ConnectionDto>(Api.InvokeHeartbeat, _dalamudUtil.PlayerNameHashed, token);
                     if (ServerState is ServerState.Connected) // user is authorized && server is legit
                     {
                         Logger.Debug("Initializing data");
-                        _mareHub.On<ClientPairDto, string>(UserHubAPI.OnUpdateClientPairs,
+                        _mareHub.On<ClientPairDto, string>(Api.OnUserUpdateClientPairs,
                             UpdateLocalClientPairsCallback);
-                        _mareHub.On<CharacterCacheDto, string>(UserHubAPI.OnReceiveCharacterData,
+                        _mareHub.On<CharacterCacheDto, string>(Api.OnUserReceiveCharacterData,
                             ReceiveCharacterDataCallback);
-                        _mareHub.On<string>(UserHubAPI.OnRemoveOnlinePairedPlayer,
+                        _mareHub.On<string>(Api.OnUserRemoveOnlinePairedPlayer,
                             (s) => PairedClientOffline?.Invoke(s));
-                        _mareHub.On<string>(UserHubAPI.OnAddOnlinePairedPlayer,
+                        _mareHub.On<string>(Api.OnUserAddOnlinePairedPlayer,
                             (s) => PairedClientOnline?.Invoke(s));
-                        _mareHub.On(AdminHubAPI.OnForcedReconnect, UserForcedReconnectCallback);
+                        _mareHub.On(Api.OnAdminForcedReconnect, UserForcedReconnectCallback);
 
                         PairedClients =
-                            await _mareHub!.InvokeAsync<List<ClientPairDto>>(UserHubAPI.InvokeGetPairedClients, token);
+                            await _mareHub!.InvokeAsync<List<ClientPairDto>>(Api.InvokeUserGetPairedClients, token);
 
                         _mareHub.Closed += MareHubOnClosed;
                         _mareHub.Reconnected += MareHubOnReconnected;
@@ -208,17 +205,17 @@ namespace MareSynchronos.WebAPI
                         if (IsModerator)
                         {
                             AdminForbiddenFiles =
-                                await _mareHub.InvokeAsync<List<ForbiddenFileDto>>(AdminHubAPI.InvokeGetForbiddenFiles,
+                                await _mareHub.InvokeAsync<List<ForbiddenFileDto>>(Api.InvokeAdminGetForbiddenFiles,
                                     token);
                             AdminBannedUsers =
-                                await _mareHub.InvokeAsync<List<BannedUserDto>>(AdminHubAPI.InvokeGetBannedUsers,
+                                await _mareHub.InvokeAsync<List<BannedUserDto>>(Api.InvokeAdminGetBannedUsers,
                                     token);
-                            _mareHub.On<BannedUserDto>(AdminHubAPI.OnUpdateOrAddBannedUser,
+                            _mareHub.On<BannedUserDto>(Api.OnAdminUpdateOrAddBannedUser,
                                 UpdateOrAddBannedUserCallback);
-                            _mareHub.On<BannedUserDto>(AdminHubAPI.OnDeleteBannedUser, DeleteBannedUserCallback);
-                            _mareHub.On<ForbiddenFileDto>(AdminHubAPI.OnUpdateOrAddForbiddenFile,
+                            _mareHub.On<BannedUserDto>(Api.OnAdminDeleteBannedUser, DeleteBannedUserCallback);
+                            _mareHub.On<ForbiddenFileDto>(Api.OnAdminUpdateOrAddForbiddenFile,
                                 UpdateOrAddForbiddenFileCallback);
-                            _mareHub.On<ForbiddenFileDto>(AdminHubAPI.OnDeleteForbiddenFile,
+                            _mareHub.On<ForbiddenFileDto>(Api.OnAdminDeleteForbiddenFile,
                                 DeleteForbiddenFileCallback);
                         }
 
@@ -281,7 +278,7 @@ namespace MareSynchronos.WebAPI
         {
             Logger.Debug("Connection restored");
             await Task.Delay(TimeSpan.FromSeconds(new Random().Next(5, 10)));
-            _connectionDto = await _mareHub!.InvokeAsync<ConnectionDto>(ConnectionHubAPI.InvokeHeartbeat, _dalamudUtil.PlayerNameHashed);
+            _connectionDto = await _mareHub!.InvokeAsync<ConnectionDto>(Api.InvokeHeartbeat, _dalamudUtil.PlayerNameHashed);
             Connected?.Invoke();
         }
 
diff --git a/MareSynchronos/WebAPI/ApiController.Functions.Admin.cs b/MareSynchronos/WebAPI/ApiController.Functions.Admin.cs
index 0ff7727..868c4e9 100644
--- a/MareSynchronos/WebAPI/ApiController.Functions.Admin.cs
+++ b/MareSynchronos/WebAPI/ApiController.Functions.Admin.cs
@@ -9,39 +9,39 @@ namespace MareSynchronos.WebAPI
     {
         public async Task AddOrUpdateForbiddenFileEntry(ForbiddenFileDto forbiddenFile)
         {
-            await _mareHub!.SendAsync(AdminHubAPI.SendUpdateOrAddForbiddenFile, forbiddenFile);
+            await _mareHub!.SendAsync(Api.SendAdminUpdateOrAddForbiddenFile, forbiddenFile);
         }
 
         public async Task DeleteForbiddenFileEntry(ForbiddenFileDto forbiddenFile)
         {
-            await _mareHub!.SendAsync(AdminHubAPI.SendDeleteForbiddenFile, forbiddenFile);
+            await _mareHub!.SendAsync(Api.SendAdminDeleteForbiddenFile, forbiddenFile);
         }
 
         public async Task AddOrUpdateBannedUserEntry(BannedUserDto bannedUser)
         {
-            await _mareHub!.SendAsync(AdminHubAPI.SendUpdateOrAddBannedUser, bannedUser);
+            await _mareHub!.SendAsync(Api.SendAdminUpdateOrAddBannedUser, bannedUser);
         }
 
         public async Task DeleteBannedUserEntry(BannedUserDto bannedUser)
         {
-            await _mareHub!.SendAsync(AdminHubAPI.SendDeleteBannedUser, bannedUser);
+            await _mareHub!.SendAsync(Api.SendAdminDeleteBannedUser, bannedUser);
         }
 
         public async Task RefreshOnlineUsers()
         {
-            AdminOnlineUsers = await _mareHub!.InvokeAsync<List<OnlineUserDto>>(AdminHubAPI.InvokeGetOnlineUsers);
+            AdminOnlineUsers = await _mareHub!.InvokeAsync<List<OnlineUserDto>>(Api.InvokeAdminGetOnlineUsers);
         }
 
         public List<OnlineUserDto> AdminOnlineUsers { get; set; } = new List<OnlineUserDto>();
 
         public void PromoteToModerator(string onlineUserUID)
         {
-            _mareHub!.SendAsync(AdminHubAPI.SendChangeModeratorStatus, onlineUserUID, true);
+            _mareHub!.SendAsync(Api.SendAdminChangeModeratorStatus, onlineUserUID, true);
         }
 
         public void DemoteFromModerator(string onlineUserUID)
         {
-            _mareHub!.SendAsync(AdminHubAPI.SendChangeModeratorStatus, onlineUserUID, false);
+            _mareHub!.SendAsync(Api.SendAdminChangeModeratorStatus, onlineUserUID, false);
         }
     }
 }
diff --git a/MareSynchronos/WebAPI/ApiController.Functions.Callbacks.cs b/MareSynchronos/WebAPI/ApiController.Functions.Callbacks.cs
index be7e59d..beebc73 100644
--- a/MareSynchronos/WebAPI/ApiController.Functions.Callbacks.cs
+++ b/MareSynchronos/WebAPI/ApiController.Functions.Callbacks.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using MareSynchronos.API;
 using MareSynchronos.Utils;