diff --git a/Moonlight/App/Models/Wings/PowerSignal.cs b/Moonlight/App/ApiClients/Wings/PowerSignal.cs
similarity index 61%
rename from Moonlight/App/Models/Wings/PowerSignal.cs
rename to Moonlight/App/ApiClients/Wings/PowerSignal.cs
index 921adc8e..b036b9d5 100644
--- a/Moonlight/App/Models/Wings/PowerSignal.cs
+++ b/Moonlight/App/ApiClients/Wings/PowerSignal.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Models.Wings;
+namespace Moonlight.App.ApiClients.Wings;
 
 public enum PowerSignal
 {
diff --git a/Moonlight/App/Models/Wings/Requests/CompressFiles.cs b/Moonlight/App/ApiClients/Wings/Requests/CompressFiles.cs
similarity index 78%
rename from Moonlight/App/Models/Wings/Requests/CompressFiles.cs
rename to Moonlight/App/ApiClients/Wings/Requests/CompressFiles.cs
index 2c866671..4a90c9dd 100644
--- a/Moonlight/App/Models/Wings/Requests/CompressFiles.cs
+++ b/Moonlight/App/ApiClients/Wings/Requests/CompressFiles.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Moonlight.App.Models.Wings.Requests;
+namespace Moonlight.App.ApiClients.Wings.Requests;
 
 public class CompressFiles
 {
diff --git a/Moonlight/App/Models/Wings/Requests/CreateBackup.cs b/Moonlight/App/ApiClients/Wings/Requests/CreateBackup.cs
similarity index 83%
rename from Moonlight/App/Models/Wings/Requests/CreateBackup.cs
rename to Moonlight/App/ApiClients/Wings/Requests/CreateBackup.cs
index 779abf1f..0d9aaae9 100644
--- a/Moonlight/App/Models/Wings/Requests/CreateBackup.cs
+++ b/Moonlight/App/ApiClients/Wings/Requests/CreateBackup.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Moonlight.App.Models.Wings.Requests;
+namespace Moonlight.App.ApiClients.Wings.Requests;
 
 public class CreateBackup
 {
diff --git a/Moonlight/App/Models/Wings/Requests/CreateDirectory.cs b/Moonlight/App/ApiClients/Wings/Requests/CreateDirectory.cs
similarity index 79%
rename from Moonlight/App/Models/Wings/Requests/CreateDirectory.cs
rename to Moonlight/App/ApiClients/Wings/Requests/CreateDirectory.cs
index 1dc6617c..424fc962 100644
--- a/Moonlight/App/Models/Wings/Requests/CreateDirectory.cs
+++ b/Moonlight/App/ApiClients/Wings/Requests/CreateDirectory.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Moonlight.App.Models.Wings.Requests;
+namespace Moonlight.App.ApiClients.Wings.Requests;
 
 public class CreateDirectory
 {
diff --git a/Moonlight/App/Models/Wings/Requests/CreateServer.cs b/Moonlight/App/ApiClients/Wings/Requests/CreateServer.cs
similarity index 80%
rename from Moonlight/App/Models/Wings/Requests/CreateServer.cs
rename to Moonlight/App/ApiClients/Wings/Requests/CreateServer.cs
index 7e939a4a..2cf980aa 100644
--- a/Moonlight/App/Models/Wings/Requests/CreateServer.cs
+++ b/Moonlight/App/ApiClients/Wings/Requests/CreateServer.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Moonlight.App.Models.Wings.Requests;
+namespace Moonlight.App.ApiClients.Wings.Requests;
 
 public class CreateServer
 {
diff --git a/Moonlight/App/Models/Wings/Requests/DecompressFile.cs b/Moonlight/App/ApiClients/Wings/Requests/DecompressFile.cs
similarity index 78%
rename from Moonlight/App/Models/Wings/Requests/DecompressFile.cs
rename to Moonlight/App/ApiClients/Wings/Requests/DecompressFile.cs
index 5fb7073d..298ec83a 100644
--- a/Moonlight/App/Models/Wings/Requests/DecompressFile.cs
+++ b/Moonlight/App/ApiClients/Wings/Requests/DecompressFile.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Moonlight.App.Models.Wings.Requests;
+namespace Moonlight.App.ApiClients.Wings.Requests;
 
 public class DecompressFile
 {
diff --git a/Moonlight/App/Models/Wings/Requests/DeleteFiles.cs b/Moonlight/App/ApiClients/Wings/Requests/DeleteFiles.cs
similarity index 79%
rename from Moonlight/App/Models/Wings/Requests/DeleteFiles.cs
rename to Moonlight/App/ApiClients/Wings/Requests/DeleteFiles.cs
index 9988ff0f..82d0d389 100644
--- a/Moonlight/App/Models/Wings/Requests/DeleteFiles.cs
+++ b/Moonlight/App/ApiClients/Wings/Requests/DeleteFiles.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Moonlight.App.Models.Wings.Requests;
+namespace Moonlight.App.ApiClients.Wings.Requests;
 
 public class DeleteFiles
 {
diff --git a/Moonlight/App/Models/Wings/Requests/RenameFiles.cs b/Moonlight/App/ApiClients/Wings/Requests/RenameFiles.cs
similarity index 87%
rename from Moonlight/App/Models/Wings/Requests/RenameFiles.cs
rename to Moonlight/App/ApiClients/Wings/Requests/RenameFiles.cs
index f565a32d..57c37bb7 100644
--- a/Moonlight/App/Models/Wings/Requests/RenameFiles.cs
+++ b/Moonlight/App/ApiClients/Wings/Requests/RenameFiles.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Moonlight.App.Models.Wings.Requests;
+namespace Moonlight.App.ApiClients.Wings.Requests;
 
 public class RenameFiles
 {
diff --git a/Moonlight/App/Models/Wings/Requests/RestoreBackup.cs b/Moonlight/App/ApiClients/Wings/Requests/RestoreBackup.cs
similarity index 85%
rename from Moonlight/App/Models/Wings/Requests/RestoreBackup.cs
rename to Moonlight/App/ApiClients/Wings/Requests/RestoreBackup.cs
index fcd7b8a1..18f0f51c 100644
--- a/Moonlight/App/Models/Wings/Requests/RestoreBackup.cs
+++ b/Moonlight/App/ApiClients/Wings/Requests/RestoreBackup.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Moonlight.App.Models.Wings.Requests;
+namespace Moonlight.App.ApiClients.Wings.Requests;
 
 public class RestoreBackup
 {
diff --git a/Moonlight/App/Models/Wings/Requests/ServerPower.cs b/Moonlight/App/ApiClients/Wings/Requests/ServerPower.cs
similarity index 70%
rename from Moonlight/App/Models/Wings/Requests/ServerPower.cs
rename to Moonlight/App/ApiClients/Wings/Requests/ServerPower.cs
index e877fb71..75ee64ce 100644
--- a/Moonlight/App/Models/Wings/Requests/ServerPower.cs
+++ b/Moonlight/App/ApiClients/Wings/Requests/ServerPower.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Moonlight.App.Models.Wings.Requests;
+namespace Moonlight.App.ApiClients.Wings.Requests;
 
 public class ServerPower
 {
diff --git a/Moonlight/App/Models/Wings/Resources/ListDirectory.cs b/Moonlight/App/ApiClients/Wings/Resources/ListDirectory.cs
similarity index 92%
rename from Moonlight/App/Models/Wings/Resources/ListDirectory.cs
rename to Moonlight/App/ApiClients/Wings/Resources/ListDirectory.cs
index d99e15d7..304c7656 100644
--- a/Moonlight/App/Models/Wings/Resources/ListDirectory.cs
+++ b/Moonlight/App/ApiClients/Wings/Resources/ListDirectory.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Moonlight.App.Models.Wings.Resources;
+namespace Moonlight.App.ApiClients.Wings.Resources;
 
 public class ListDirectory
 {
diff --git a/Moonlight/App/Models/Wings/Resources/ServerDetails.cs b/Moonlight/App/ApiClients/Wings/Resources/ServerDetails.cs
similarity index 95%
rename from Moonlight/App/Models/Wings/Resources/ServerDetails.cs
rename to Moonlight/App/ApiClients/Wings/Resources/ServerDetails.cs
index b14ac561..6756128a 100644
--- a/Moonlight/App/Models/Wings/Resources/ServerDetails.cs
+++ b/Moonlight/App/ApiClients/Wings/Resources/ServerDetails.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Moonlight.App.Models.Wings.Resources;
+namespace Moonlight.App.ApiClients.Wings.Resources;
 
 public class ServerDetails
 {
diff --git a/Moonlight/App/Models/Wings/Resources/SystemStatus.cs b/Moonlight/App/ApiClients/Wings/Resources/SystemStatus.cs
similarity index 89%
rename from Moonlight/App/Models/Wings/Resources/SystemStatus.cs
rename to Moonlight/App/ApiClients/Wings/Resources/SystemStatus.cs
index 26a30dea..66b4d4cc 100644
--- a/Moonlight/App/Models/Wings/Resources/SystemStatus.cs
+++ b/Moonlight/App/ApiClients/Wings/Resources/SystemStatus.cs
@@ -1,6 +1,6 @@
 using Newtonsoft.Json;
 
-namespace Moonlight.App.Models.Wings.Resources;
+namespace Moonlight.App.ApiClients.Wings.Resources;
 
 public class SystemStatus
 {
diff --git a/Moonlight/App/Helpers/WingsApiHelper.cs b/Moonlight/App/ApiClients/Wings/WingsApiHelper.cs
similarity index 99%
rename from Moonlight/App/Helpers/WingsApiHelper.cs
rename to Moonlight/App/ApiClients/Wings/WingsApiHelper.cs
index 9611d645..bf727d53 100644
--- a/Moonlight/App/Helpers/WingsApiHelper.cs
+++ b/Moonlight/App/ApiClients/Wings/WingsApiHelper.cs
@@ -3,7 +3,7 @@ using Moonlight.App.Exceptions;
 using Newtonsoft.Json;
 using RestSharp;
 
-namespace Moonlight.App.Helpers;
+namespace Moonlight.App.ApiClients.Wings;
 
 public class WingsApiHelper
 {
diff --git a/Moonlight/App/Helpers/Files/WingsFileAccess.cs b/Moonlight/App/Helpers/Files/WingsFileAccess.cs
index b1c2296c..47acdc9d 100644
--- a/Moonlight/App/Helpers/Files/WingsFileAccess.cs
+++ b/Moonlight/App/Helpers/Files/WingsFileAccess.cs
@@ -1,7 +1,8 @@
 using System.Web;
+using Moonlight.App.ApiClients.Wings;
+using Moonlight.App.ApiClients.Wings.Requests;
+using Moonlight.App.ApiClients.Wings.Resources;
 using Moonlight.App.Database.Entities;
-using Moonlight.App.Models.Wings.Requests;
-using Moonlight.App.Models.Wings.Resources;
 using Moonlight.App.Services;
 using RestSharp;
 
diff --git a/Moonlight/App/Services/CleanupService.cs b/Moonlight/App/Services/CleanupService.cs
index 1ccb78c9..cbc854d0 100644
--- a/Moonlight/App/Services/CleanupService.cs
+++ b/Moonlight/App/Services/CleanupService.cs
@@ -3,10 +3,10 @@ using Microsoft.EntityFrameworkCore;
 using MineStatLib;
 using Moonlight.App.Database.Entities;
 using Moonlight.App.Models.Daemon.Resources;
-using Moonlight.App.Models.Wings;
 using Moonlight.App.Repositories;
 using Moonlight.App.Repositories.Servers;
 using Logging.Net;
+using Moonlight.App.ApiClients.Wings;
 using Moonlight.App.Events;
 using Newtonsoft.Json;
 
diff --git a/Moonlight/App/Services/DiscordBot/Modules/ServerListComponentHandlerModule.cs b/Moonlight/App/Services/DiscordBot/Modules/ServerListComponentHandlerModule.cs
index 1a529bc0..24bcb79d 100644
--- a/Moonlight/App/Services/DiscordBot/Modules/ServerListComponentHandlerModule.cs
+++ b/Moonlight/App/Services/DiscordBot/Modules/ServerListComponentHandlerModule.cs
@@ -2,7 +2,7 @@
 using Discord.WebSocket;
 using Logging.Net;
 using Microsoft.EntityFrameworkCore;
-using Moonlight.App.Models.Wings;
+using Moonlight.App.ApiClients.Wings;
 using Moonlight.App.Repositories;
 using Moonlight.App.Repositories.Servers;
 
diff --git a/Moonlight/App/Services/NodeService.cs b/Moonlight/App/Services/NodeService.cs
index 87f0c307..89910d8a 100644
--- a/Moonlight/App/Services/NodeService.cs
+++ b/Moonlight/App/Services/NodeService.cs
@@ -1,7 +1,8 @@
-using Moonlight.App.Database.Entities;
+using Moonlight.App.ApiClients.Wings;
+using Moonlight.App.ApiClients.Wings.Resources;
+using Moonlight.App.Database.Entities;
 using Moonlight.App.Helpers;
 using Moonlight.App.Models.Daemon.Resources;
-using Moonlight.App.Models.Wings.Resources;
 using Moonlight.App.Repositories;
 
 namespace Moonlight.App.Services;
diff --git a/Moonlight/App/Services/ServerService.cs b/Moonlight/App/Services/ServerService.cs
index d61ae7d4..fb9c4db0 100644
--- a/Moonlight/App/Services/ServerService.cs
+++ b/Moonlight/App/Services/ServerService.cs
@@ -1,4 +1,7 @@
 using Microsoft.EntityFrameworkCore;
+using Moonlight.App.ApiClients.Wings;
+using Moonlight.App.ApiClients.Wings.Requests;
+using Moonlight.App.ApiClients.Wings.Resources;
 using Moonlight.App.Database;
 using Moonlight.App.Database.Entities;
 using Moonlight.App.Events;
@@ -6,9 +9,6 @@ using Moonlight.App.Exceptions;
 using Moonlight.App.Helpers;
 using Moonlight.App.Helpers.Files;
 using Moonlight.App.Models.Misc;
-using Moonlight.App.Models.Wings;
-using Moonlight.App.Models.Wings.Requests;
-using Moonlight.App.Models.Wings.Resources;
 using Moonlight.App.Repositories;
 using Moonlight.App.Repositories.Servers;
 using Moonlight.App.Services.LogServices;
diff --git a/Moonlight/Program.cs b/Moonlight/Program.cs
index c5da41f0..c1ffc6c3 100644
--- a/Moonlight/Program.cs
+++ b/Moonlight/Program.cs
@@ -3,6 +3,7 @@ using BlazorTable;
 using CurrieTechnologies.Razor.SweetAlert2;
 using Logging.Net;
 using Moonlight.App.ApiClients.CloudPanel;
+using Moonlight.App.ApiClients.Wings;
 using Moonlight.App.Database;
 using Moonlight.App.Events;
 using Moonlight.App.Helpers;
diff --git a/Moonlight/Shared/Components/ServerControl/ServerFiles.razor b/Moonlight/Shared/Components/ServerControl/ServerFiles.razor
index 63a30dab..6267a9b8 100644
--- a/Moonlight/Shared/Components/ServerControl/ServerFiles.razor
+++ b/Moonlight/Shared/Components/ServerControl/ServerFiles.razor
@@ -3,6 +3,7 @@
 @using Moonlight.App.Helpers
 @using Moonlight.App.Helpers.Files
 @using Moonlight.App.Services
+@using Moonlight.App.ApiClients.Wings
 
 @inject WingsApiHelper WingsApiHelper
 @inject WingsJwtHelper WingsJwtHelper
diff --git a/Moonlight/Shared/Views/Admin/Nodes/Index.razor b/Moonlight/Shared/Views/Admin/Nodes/Index.razor
index c18205b6..ad259578 100644
--- a/Moonlight/Shared/Views/Admin/Nodes/Index.razor
+++ b/Moonlight/Shared/Views/Admin/Nodes/Index.razor
@@ -1,12 +1,12 @@
 @page "/admin/nodes"
 @using Moonlight.App.Repositories
 @using Moonlight.App.Database.Entities
-@using Moonlight.App.Models.Wings.Resources
 @using Moonlight.Shared.Components.Navigations
 @using Moonlight.App.Services
 @using Moonlight.App.Services.Interop
 @using Logging.Net
 @using BlazorTable
+@using Moonlight.App.ApiClients.Wings.Resources
 
 @inject NodeRepository NodeRepository
 @inject AlertService AlertService
diff --git a/Moonlight/Shared/Views/Admin/Nodes/View.razor b/Moonlight/Shared/Views/Admin/Nodes/View.razor
index 4b64b6dd..e8bd25e5 100644
--- a/Moonlight/Shared/Views/Admin/Nodes/View.razor
+++ b/Moonlight/Shared/Views/Admin/Nodes/View.razor
@@ -4,8 +4,8 @@
 @using Moonlight.App.Database.Entities
 @using Moonlight.App.Helpers
 @using Moonlight.App.Models.Daemon.Resources
-@using Moonlight.App.Models.Wings.Resources
 @using Moonlight.App.Services
+@using Moonlight.App.ApiClients.Wings.Resources
 
 @inject NodeRepository NodeRepository
 @inject NodeService NodeService
diff --git a/Moonlight/Shared/Views/Admin/Servers/Manager.razor b/Moonlight/Shared/Views/Admin/Servers/Manager.razor
index 1c96755e..c54e62e1 100644
--- a/Moonlight/Shared/Views/Admin/Servers/Manager.razor
+++ b/Moonlight/Shared/Views/Admin/Servers/Manager.razor
@@ -5,9 +5,9 @@
 @using Moonlight.App.Services.Interop
 @using Moonlight.App.Database.Entities
 @using Moonlight.App.Models.Daemon.Resources
-@using Moonlight.App.Models.Wings
 @using BlazorTable
 @using Microsoft.EntityFrameworkCore
+@using Moonlight.App.ApiClients.Wings
 @using Moonlight.App.Helpers
 
 @inject NodeRepository NodeRepository