diff --git a/Moonlight/App/Helpers/DaemonApiHelper.cs b/Moonlight/App/ApiClients/Daemon/DaemonApiHelper.cs
similarity index 97%
rename from Moonlight/App/Helpers/DaemonApiHelper.cs
rename to Moonlight/App/ApiClients/Daemon/DaemonApiHelper.cs
index b9ffdcce..7cdf11ae 100644
--- a/Moonlight/App/Helpers/DaemonApiHelper.cs
+++ b/Moonlight/App/ApiClients/Daemon/DaemonApiHelper.cs
@@ -3,7 +3,7 @@ using Moonlight.App.Exceptions;
 using Newtonsoft.Json;
 using RestSharp;
 
-namespace Moonlight.App.Helpers;
+namespace Moonlight.App.ApiClients.Daemon;
 
 public class DaemonApiHelper
 {
diff --git a/Moonlight/App/Models/Daemon/Resources/ContainerStats.cs b/Moonlight/App/ApiClients/Daemon/Resources/ContainerStats.cs
similarity index 86%
rename from Moonlight/App/Models/Daemon/Resources/ContainerStats.cs
rename to Moonlight/App/ApiClients/Daemon/Resources/ContainerStats.cs
index db1a2c8a..b8b30c25 100644
--- a/Moonlight/App/Models/Daemon/Resources/ContainerStats.cs
+++ b/Moonlight/App/ApiClients/Daemon/Resources/ContainerStats.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Models.Daemon.Resources;
+namespace Moonlight.App.ApiClients.Daemon.Resources;
 
 public class ContainerStats
 {
diff --git a/Moonlight/App/Models/Daemon/Resources/CpuStats.cs b/Moonlight/App/ApiClients/Daemon/Resources/CpuStats.cs
similarity index 71%
rename from Moonlight/App/Models/Daemon/Resources/CpuStats.cs
rename to Moonlight/App/ApiClients/Daemon/Resources/CpuStats.cs
index 9282627e..ff72425f 100644
--- a/Moonlight/App/Models/Daemon/Resources/CpuStats.cs
+++ b/Moonlight/App/ApiClients/Daemon/Resources/CpuStats.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Models.Daemon.Resources;
+namespace Moonlight.App.ApiClients.Daemon.Resources;
 
 public class CpuStats
 {
diff --git a/Moonlight/App/Models/Daemon/Resources/DiskStats.cs b/Moonlight/App/ApiClients/Daemon/Resources/DiskStats.cs
similarity index 77%
rename from Moonlight/App/Models/Daemon/Resources/DiskStats.cs
rename to Moonlight/App/ApiClients/Daemon/Resources/DiskStats.cs
index ea19ae90..4bcd8467 100644
--- a/Moonlight/App/Models/Daemon/Resources/DiskStats.cs
+++ b/Moonlight/App/ApiClients/Daemon/Resources/DiskStats.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Models.Daemon.Resources;
+namespace Moonlight.App.ApiClients.Daemon.Resources;
 
 public class DiskStats
 {
diff --git a/Moonlight/App/Models/Daemon/Resources/MemoryStats.cs b/Moonlight/App/ApiClients/Daemon/Resources/MemoryStats.cs
similarity index 85%
rename from Moonlight/App/Models/Daemon/Resources/MemoryStats.cs
rename to Moonlight/App/ApiClients/Daemon/Resources/MemoryStats.cs
index 26823099..6e3a20bf 100644
--- a/Moonlight/App/Models/Daemon/Resources/MemoryStats.cs
+++ b/Moonlight/App/ApiClients/Daemon/Resources/MemoryStats.cs
@@ -1,4 +1,4 @@
-namespace Moonlight.App.Models.Daemon.Resources;
+namespace Moonlight.App.ApiClients.Daemon.Resources;
 
 public class MemoryStats
 {
diff --git a/Moonlight/App/Services/CleanupService.cs b/Moonlight/App/Services/CleanupService.cs
index cbc854d0..ffd2d947 100644
--- a/Moonlight/App/Services/CleanupService.cs
+++ b/Moonlight/App/Services/CleanupService.cs
@@ -2,10 +2,10 @@
 using Microsoft.EntityFrameworkCore;
 using MineStatLib;
 using Moonlight.App.Database.Entities;
-using Moonlight.App.Models.Daemon.Resources;
 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.Events;
 using Newtonsoft.Json;
diff --git a/Moonlight/App/Services/NodeService.cs b/Moonlight/App/Services/NodeService.cs
index 89910d8a..a2607086 100644
--- a/Moonlight/App/Services/NodeService.cs
+++ b/Moonlight/App/Services/NodeService.cs
@@ -1,8 +1,9 @@
-using Moonlight.App.ApiClients.Wings;
+using Moonlight.App.ApiClients.Daemon;
+using Moonlight.App.ApiClients.Daemon.Resources;
+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.Repositories;
 
 namespace Moonlight.App.Services;
diff --git a/Moonlight/Moonlight.csproj b/Moonlight/Moonlight.csproj
index feae4b72..0a03fbaa 100644
--- a/Moonlight/Moonlight.csproj
+++ b/Moonlight/Moonlight.csproj
@@ -71,8 +71,9 @@
 
   <ItemGroup>
     <Folder Include="App\ApiClients\CloudPanel\Resources\" />
+    <Folder Include="App\ApiClients\Daemon\Requests\" />
     <Folder Include="App\Http\Middleware" />
-    <Folder Include="App\Models\Daemon\Requests" />
+    <Folder Include="App\Models\Daemon\" />
     <Folder Include="App\Models\Google\Resources" />
   </ItemGroup>
 
diff --git a/Moonlight/Program.cs b/Moonlight/Program.cs
index c1ffc6c3..8a9e846a 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.Daemon;
 using Moonlight.App.ApiClients.Wings;
 using Moonlight.App.Database;
 using Moonlight.App.Events;
diff --git a/Moonlight/Shared/Views/Admin/Nodes/View.razor b/Moonlight/Shared/Views/Admin/Nodes/View.razor
index e8bd25e5..de6f61ab 100644
--- a/Moonlight/Shared/Views/Admin/Nodes/View.razor
+++ b/Moonlight/Shared/Views/Admin/Nodes/View.razor
@@ -3,9 +3,9 @@
 @using Moonlight.App.Repositories
 @using Moonlight.App.Database.Entities
 @using Moonlight.App.Helpers
-@using Moonlight.App.Models.Daemon.Resources
 @using Moonlight.App.Services
 @using Moonlight.App.ApiClients.Wings.Resources
+@using Moonlight.App.ApiClients.Daemon.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 c54e62e1..e399974b 100644
--- a/Moonlight/Shared/Views/Admin/Servers/Manager.razor
+++ b/Moonlight/Shared/Views/Admin/Servers/Manager.razor
@@ -4,9 +4,9 @@
 @using Moonlight.App.Services
 @using Moonlight.App.Services.Interop
 @using Moonlight.App.Database.Entities
-@using Moonlight.App.Models.Daemon.Resources
 @using BlazorTable
 @using Microsoft.EntityFrameworkCore
+@using Moonlight.App.ApiClients.Daemon.Resources
 @using Moonlight.App.ApiClients.Wings
 @using Moonlight.App.Helpers