diff --git a/app/Filament/Admin/Resources/ApiKeyResource.php b/app/Filament/Admin/Resources/ApiKeys/ApiKeyResource.php
similarity index 96%
rename from app/Filament/Admin/Resources/ApiKeyResource.php
rename to app/Filament/Admin/Resources/ApiKeys/ApiKeyResource.php
index bf45707da..f8a512078 100644
--- a/app/Filament/Admin/Resources/ApiKeyResource.php
+++ b/app/Filament/Admin/Resources/ApiKeys/ApiKeyResource.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Filament\Admin\Resources;
+namespace App\Filament\Admin\Resources\ApiKeys;
 
 use Filament\Schemas\Schema;
-use App\Filament\Admin\Resources\ApiKeyResource\Pages\ListApiKeys;
-use App\Filament\Admin\Resources\ApiKeyResource\Pages\CreateApiKey;
-use App\Filament\Admin\Resources\UserResource\Pages\EditUser;
+use App\Filament\Admin\Resources\ApiKeys\Pages\ListApiKeys;
+use App\Filament\Admin\Resources\ApiKeys\Pages\CreateApiKey;
+use App\Filament\Admin\Resources\Users\Pages\EditUser;
 use App\Filament\Components\Tables\Columns\DateTimeColumn;
 use App\Models\ApiKey;
 use App\Traits\Filament\CanCustomizePages;
diff --git a/app/Filament/Admin/Resources/ApiKeyResource/Pages/CreateApiKey.php b/app/Filament/Admin/Resources/ApiKeys/Pages/CreateApiKey.php
similarity index 93%
rename from app/Filament/Admin/Resources/ApiKeyResource/Pages/CreateApiKey.php
rename to app/Filament/Admin/Resources/ApiKeys/Pages/CreateApiKey.php
index 351c577a2..be7f1a60e 100644
--- a/app/Filament/Admin/Resources/ApiKeyResource/Pages/CreateApiKey.php
+++ b/app/Filament/Admin/Resources/ApiKeys/Pages/CreateApiKey.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\ApiKeyResource\Pages;
+namespace App\Filament\Admin\Resources\ApiKeys\Pages;
 
-use App\Filament\Admin\Resources\ApiKeyResource;
+use App\Filament\Admin\Resources\ApiKeys\ApiKeyResource;
 use App\Models\ApiKey;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
diff --git a/app/Filament/Admin/Resources/ApiKeyResource/Pages/ListApiKeys.php b/app/Filament/Admin/Resources/ApiKeys/Pages/ListApiKeys.php
similarity index 86%
rename from app/Filament/Admin/Resources/ApiKeyResource/Pages/ListApiKeys.php
rename to app/Filament/Admin/Resources/ApiKeys/Pages/ListApiKeys.php
index e8a996c5e..7425a61eb 100644
--- a/app/Filament/Admin/Resources/ApiKeyResource/Pages/ListApiKeys.php
+++ b/app/Filament/Admin/Resources/ApiKeys/Pages/ListApiKeys.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\ApiKeyResource\Pages;
+namespace App\Filament\Admin\Resources\ApiKeys\Pages;
 
-use App\Filament\Admin\Resources\ApiKeyResource;
+use App\Filament\Admin\Resources\ApiKeys\ApiKeyResource;
 use App\Models\ApiKey;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
diff --git a/app/Filament/Admin/Resources/DatabaseHostResource.php b/app/Filament/Admin/Resources/DatabaseHosts/DatabaseHostResource.php
similarity index 94%
rename from app/Filament/Admin/Resources/DatabaseHostResource.php
rename to app/Filament/Admin/Resources/DatabaseHosts/DatabaseHostResource.php
index 534b67ea3..dea97a56d 100644
--- a/app/Filament/Admin/Resources/DatabaseHostResource.php
+++ b/app/Filament/Admin/Resources/DatabaseHosts/DatabaseHostResource.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Filament\Admin\Resources;
+namespace App\Filament\Admin\Resources\DatabaseHosts;
 
-use App\Filament\Admin\Resources\DatabaseHostResource\RelationManagers\DatabasesRelationManager;
-use App\Filament\Admin\Resources\DatabaseHostResource\Pages\ListDatabaseHosts;
-use App\Filament\Admin\Resources\DatabaseHostResource\Pages\CreateDatabaseHost;
-use App\Filament\Admin\Resources\DatabaseHostResource\Pages\ViewDatabaseHost;
-use App\Filament\Admin\Resources\DatabaseHostResource\Pages\EditDatabaseHost;
+use App\Filament\Admin\Resources\DatabaseHosts\RelationManagers\DatabasesRelationManager;
+use App\Filament\Admin\Resources\DatabaseHosts\Pages\ListDatabaseHosts;
+use App\Filament\Admin\Resources\DatabaseHosts\Pages\CreateDatabaseHost;
+use App\Filament\Admin\Resources\DatabaseHosts\Pages\ViewDatabaseHost;
+use App\Filament\Admin\Resources\DatabaseHosts\Pages\EditDatabaseHost;
 use App\Models\DatabaseHost;
 use App\Traits\Filament\CanCustomizePages;
 use App\Traits\Filament\CanCustomizeRelations;
diff --git a/app/Filament/Admin/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php b/app/Filament/Admin/Resources/DatabaseHosts/Pages/CreateDatabaseHost.php
similarity index 98%
rename from app/Filament/Admin/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php
rename to app/Filament/Admin/Resources/DatabaseHosts/Pages/CreateDatabaseHost.php
index f4d3528b3..16d579ce2 100644
--- a/app/Filament/Admin/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php
+++ b/app/Filament/Admin/Resources/DatabaseHosts/Pages/CreateDatabaseHost.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\DatabaseHostResource\Pages;
+namespace App\Filament\Admin\Resources\DatabaseHosts\Pages;
 
-use App\Filament\Admin\Resources\DatabaseHostResource;
+use App\Filament\Admin\Resources\DatabaseHosts\DatabaseHostResource;
 use App\Services\Databases\Hosts\HostCreationService;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
diff --git a/app/Filament/Admin/Resources/DatabaseHostResource/Pages/EditDatabaseHost.php b/app/Filament/Admin/Resources/DatabaseHosts/Pages/EditDatabaseHost.php
similarity index 94%
rename from app/Filament/Admin/Resources/DatabaseHostResource/Pages/EditDatabaseHost.php
rename to app/Filament/Admin/Resources/DatabaseHosts/Pages/EditDatabaseHost.php
index 2c5041ef5..40117abd7 100644
--- a/app/Filament/Admin/Resources/DatabaseHostResource/Pages/EditDatabaseHost.php
+++ b/app/Filament/Admin/Resources/DatabaseHosts/Pages/EditDatabaseHost.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\DatabaseHostResource\Pages;
+namespace App\Filament\Admin\Resources\DatabaseHosts\Pages;
 
-use App\Filament\Admin\Resources\DatabaseHostResource;
+use App\Filament\Admin\Resources\DatabaseHosts\DatabaseHostResource;
 use App\Models\DatabaseHost;
 use App\Services\Databases\Hosts\HostUpdateService;
 use App\Traits\Filament\CanCustomizeHeaderActions;
diff --git a/app/Filament/Admin/Resources/DatabaseHostResource/Pages/ListDatabaseHosts.php b/app/Filament/Admin/Resources/DatabaseHosts/Pages/ListDatabaseHosts.php
similarity index 84%
rename from app/Filament/Admin/Resources/DatabaseHostResource/Pages/ListDatabaseHosts.php
rename to app/Filament/Admin/Resources/DatabaseHosts/Pages/ListDatabaseHosts.php
index ccb1d3de6..22f887823 100644
--- a/app/Filament/Admin/Resources/DatabaseHostResource/Pages/ListDatabaseHosts.php
+++ b/app/Filament/Admin/Resources/DatabaseHosts/Pages/ListDatabaseHosts.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\DatabaseHostResource\Pages;
+namespace App\Filament\Admin\Resources\DatabaseHosts\Pages;
 
-use App\Filament\Admin\Resources\DatabaseHostResource;
+use App\Filament\Admin\Resources\DatabaseHosts\DatabaseHostResource;
 use App\Models\DatabaseHost;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
diff --git a/app/Filament/Admin/Resources/DatabaseHostResource/Pages/ViewDatabaseHost.php b/app/Filament/Admin/Resources/DatabaseHosts/Pages/ViewDatabaseHost.php
similarity index 82%
rename from app/Filament/Admin/Resources/DatabaseHostResource/Pages/ViewDatabaseHost.php
rename to app/Filament/Admin/Resources/DatabaseHosts/Pages/ViewDatabaseHost.php
index dcd2a74cd..318d979b2 100644
--- a/app/Filament/Admin/Resources/DatabaseHostResource/Pages/ViewDatabaseHost.php
+++ b/app/Filament/Admin/Resources/DatabaseHosts/Pages/ViewDatabaseHost.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\DatabaseHostResource\Pages;
+namespace App\Filament\Admin\Resources\DatabaseHosts\Pages;
 
-use App\Filament\Admin\Resources\DatabaseHostResource;
+use App\Filament\Admin\Resources\DatabaseHosts\DatabaseHostResource;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
diff --git a/app/Filament/Admin/Resources/DatabaseHostResource/RelationManagers/DatabasesRelationManager.php b/app/Filament/Admin/Resources/DatabaseHosts/RelationManagers/DatabasesRelationManager.php
similarity index 97%
rename from app/Filament/Admin/Resources/DatabaseHostResource/RelationManagers/DatabasesRelationManager.php
rename to app/Filament/Admin/Resources/DatabaseHosts/RelationManagers/DatabasesRelationManager.php
index 836778389..bb6870f5b 100644
--- a/app/Filament/Admin/Resources/DatabaseHostResource/RelationManagers/DatabasesRelationManager.php
+++ b/app/Filament/Admin/Resources/DatabaseHosts/RelationManagers/DatabasesRelationManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Admin\Resources\DatabaseHostResource\RelationManagers;
+namespace App\Filament\Admin\Resources\DatabaseHosts\RelationManagers;
 
 use Filament\Actions\DeleteAction;
 use Filament\Actions\ViewAction;
diff --git a/app/Filament/Admin/Resources/EggResource.php b/app/Filament/Admin/Resources/Eggs/EggResource.php
similarity index 85%
rename from app/Filament/Admin/Resources/EggResource.php
rename to app/Filament/Admin/Resources/Eggs/EggResource.php
index 2805bfa24..f0a7f84e2 100644
--- a/app/Filament/Admin/Resources/EggResource.php
+++ b/app/Filament/Admin/Resources/Eggs/EggResource.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Filament\Admin\Resources;
+namespace App\Filament\Admin\Resources\Eggs;
 
-use App\Filament\Admin\Resources\EggResource\RelationManagers\ServersRelationManager;
-use App\Filament\Admin\Resources\EggResource\Pages\ListEggs;
-use App\Filament\Admin\Resources\EggResource\Pages\CreateEgg;
-use App\Filament\Admin\Resources\EggResource\Pages\EditEgg;
+use App\Filament\Admin\Resources\Eggs\RelationManagers\ServersRelationManager;
+use App\Filament\Admin\Resources\Eggs\Pages\ListEggs;
+use App\Filament\Admin\Resources\Eggs\Pages\CreateEgg;
+use App\Filament\Admin\Resources\Eggs\Pages\EditEgg;
 use App\Models\Egg;
 use App\Traits\Filament\CanCustomizePages;
 use App\Traits\Filament\CanCustomizeRelations;
diff --git a/app/Filament/Admin/Resources/EggResource/Pages/CreateEgg.php b/app/Filament/Admin/Resources/Eggs/Pages/CreateEgg.php
similarity index 99%
rename from app/Filament/Admin/Resources/EggResource/Pages/CreateEgg.php
rename to app/Filament/Admin/Resources/Eggs/Pages/CreateEgg.php
index 88ea69af8..936f883e1 100644
--- a/app/Filament/Admin/Resources/EggResource/Pages/CreateEgg.php
+++ b/app/Filament/Admin/Resources/Eggs/Pages/CreateEgg.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Admin\Resources\EggResource\Pages;
+namespace App\Filament\Admin\Resources\Eggs\Pages;
 
 use Exception;
-use App\Filament\Admin\Resources\EggResource;
+use App\Filament\Admin\Resources\Eggs\EggResource;
 use App\Filament\Components\Forms\Fields\CopyFrom;
 use App\Models\EggVariable;
 use App\Traits\Filament\CanCustomizeHeaderActions;
diff --git a/app/Filament/Admin/Resources/EggResource/Pages/EditEgg.php b/app/Filament/Admin/Resources/Eggs/Pages/EditEgg.php
similarity index 99%
rename from app/Filament/Admin/Resources/EggResource/Pages/EditEgg.php
rename to app/Filament/Admin/Resources/Eggs/Pages/EditEgg.php
index ab289214d..cf622157d 100644
--- a/app/Filament/Admin/Resources/EggResource/Pages/EditEgg.php
+++ b/app/Filament/Admin/Resources/Eggs/Pages/EditEgg.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Admin\Resources\EggResource\Pages;
+namespace App\Filament\Admin\Resources\Eggs\Pages;
 
 use Exception;
-use App\Filament\Admin\Resources\EggResource;
+use App\Filament\Admin\Resources\Eggs\EggResource;
 use App\Filament\Components\Actions\ExportEggAction;
 use App\Filament\Components\Actions\ImportEggAction;
 use App\Filament\Components\Forms\Fields\CopyFrom;
diff --git a/app/Filament/Admin/Resources/EggResource/Pages/ListEggs.php b/app/Filament/Admin/Resources/Eggs/Pages/ListEggs.php
similarity index 97%
rename from app/Filament/Admin/Resources/EggResource/Pages/ListEggs.php
rename to app/Filament/Admin/Resources/Eggs/Pages/ListEggs.php
index e40f7194f..844c637e8 100644
--- a/app/Filament/Admin/Resources/EggResource/Pages/ListEggs.php
+++ b/app/Filament/Admin/Resources/Eggs/Pages/ListEggs.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Admin\Resources\EggResource\Pages;
+namespace App\Filament\Admin\Resources\Eggs\Pages;
 
 use Exception;
-use App\Filament\Admin\Resources\EggResource;
+use App\Filament\Admin\Resources\Eggs\EggResource;
 use App\Filament\Components\Actions\ExportEggAction;
 use App\Filament\Components\Actions\ImportEggAction;
 use App\Filament\Components\Actions\UpdateEggAction;
diff --git a/app/Filament/Admin/Resources/EggResource/RelationManagers/ServersRelationManager.php b/app/Filament/Admin/Resources/Eggs/RelationManagers/ServersRelationManager.php
similarity index 96%
rename from app/Filament/Admin/Resources/EggResource/RelationManagers/ServersRelationManager.php
rename to app/Filament/Admin/Resources/Eggs/RelationManagers/ServersRelationManager.php
index 1016b0238..c216b21ce 100644
--- a/app/Filament/Admin/Resources/EggResource/RelationManagers/ServersRelationManager.php
+++ b/app/Filament/Admin/Resources/Eggs/RelationManagers/ServersRelationManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Admin\Resources\EggResource\RelationManagers;
+namespace App\Filament\Admin\Resources\Eggs\RelationManagers;
 
 use App\Models\Server;
 use Filament\Resources\RelationManagers\RelationManager;
diff --git a/app/Filament/Admin/Resources/MountResource.php b/app/Filament/Admin/Resources/Mounts/MountResource.php
similarity index 96%
rename from app/Filament/Admin/Resources/MountResource.php
rename to app/Filament/Admin/Resources/Mounts/MountResource.php
index 9e07201de..335394ff8 100644
--- a/app/Filament/Admin/Resources/MountResource.php
+++ b/app/Filament/Admin/Resources/Mounts/MountResource.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Filament\Admin\Resources;
+namespace App\Filament\Admin\Resources\Mounts;
 
-use App\Filament\Admin\Resources\MountResource\Pages\ListMounts;
-use App\Filament\Admin\Resources\MountResource\Pages\CreateMount;
-use App\Filament\Admin\Resources\MountResource\Pages\ViewMount;
-use App\Filament\Admin\Resources\MountResource\Pages\EditMount;
+use App\Filament\Admin\Resources\Mounts\Pages\ListMounts;
+use App\Filament\Admin\Resources\Mounts\Pages\CreateMount;
+use App\Filament\Admin\Resources\Mounts\Pages\ViewMount;
+use App\Filament\Admin\Resources\Mounts\Pages\EditMount;
 use Exception;
 use App\Models\Mount;
 use App\Traits\Filament\CanCustomizePages;
diff --git a/app/Filament/Admin/Resources/MountResource/Pages/CreateMount.php b/app/Filament/Admin/Resources/Mounts/Pages/CreateMount.php
similarity index 90%
rename from app/Filament/Admin/Resources/MountResource/Pages/CreateMount.php
rename to app/Filament/Admin/Resources/Mounts/Pages/CreateMount.php
index 9ce6692f6..d29b754f7 100644
--- a/app/Filament/Admin/Resources/MountResource/Pages/CreateMount.php
+++ b/app/Filament/Admin/Resources/Mounts/Pages/CreateMount.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\MountResource\Pages;
+namespace App\Filament\Admin\Resources\Mounts\Pages;
 
-use App\Filament\Admin\Resources\MountResource;
+use App\Filament\Admin\Resources\Mounts\MountResource;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
diff --git a/app/Filament/Admin/Resources/MountResource/Pages/EditMount.php b/app/Filament/Admin/Resources/Mounts/Pages/EditMount.php
similarity index 87%
rename from app/Filament/Admin/Resources/MountResource/Pages/EditMount.php
rename to app/Filament/Admin/Resources/Mounts/Pages/EditMount.php
index 428863085..ccf1ab140 100644
--- a/app/Filament/Admin/Resources/MountResource/Pages/EditMount.php
+++ b/app/Filament/Admin/Resources/Mounts/Pages/EditMount.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\MountResource\Pages;
+namespace App\Filament\Admin\Resources\Mounts\Pages;
 
-use App\Filament\Admin\Resources\MountResource;
+use App\Filament\Admin\Resources\Mounts\MountResource;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
diff --git a/app/Filament/Admin/Resources/MountResource/Pages/ListMounts.php b/app/Filament/Admin/Resources/Mounts/Pages/ListMounts.php
similarity index 86%
rename from app/Filament/Admin/Resources/MountResource/Pages/ListMounts.php
rename to app/Filament/Admin/Resources/Mounts/Pages/ListMounts.php
index ee7dfe7fa..c09300ced 100644
--- a/app/Filament/Admin/Resources/MountResource/Pages/ListMounts.php
+++ b/app/Filament/Admin/Resources/Mounts/Pages/ListMounts.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\MountResource\Pages;
+namespace App\Filament\Admin\Resources\Mounts\Pages;
 
-use App\Filament\Admin\Resources\MountResource;
+use App\Filament\Admin\Resources\Mounts\MountResource;
 use App\Models\Mount;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
diff --git a/app/Filament/Admin/Resources/MountResource/Pages/ViewMount.php b/app/Filament/Admin/Resources/Mounts/Pages/ViewMount.php
similarity index 84%
rename from app/Filament/Admin/Resources/MountResource/Pages/ViewMount.php
rename to app/Filament/Admin/Resources/Mounts/Pages/ViewMount.php
index 95b818f7a..7e4fab51c 100644
--- a/app/Filament/Admin/Resources/MountResource/Pages/ViewMount.php
+++ b/app/Filament/Admin/Resources/Mounts/Pages/ViewMount.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\MountResource\Pages;
+namespace App\Filament\Admin\Resources\Mounts\Pages;
 
-use App\Filament\Admin\Resources\MountResource;
+use App\Filament\Admin\Resources\Mounts\MountResource;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
diff --git a/app/Filament/Admin/Resources/NodeResource.php b/app/Filament/Admin/Resources/Nodes/NodeResource.php
similarity index 83%
rename from app/Filament/Admin/Resources/NodeResource.php
rename to app/Filament/Admin/Resources/Nodes/NodeResource.php
index 5fc676e4d..c0f21ba49 100644
--- a/app/Filament/Admin/Resources/NodeResource.php
+++ b/app/Filament/Admin/Resources/Nodes/NodeResource.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Filament\Admin\Resources;
+namespace App\Filament\Admin\Resources\Nodes;
 
-use App\Filament\Admin\Resources\NodeResource\RelationManagers\AllocationsRelationManager;
-use App\Filament\Admin\Resources\NodeResource\RelationManagers\NodesRelationManager;
-use App\Filament\Admin\Resources\NodeResource\Pages\ListNodes;
-use App\Filament\Admin\Resources\NodeResource\Pages\CreateNode;
-use App\Filament\Admin\Resources\NodeResource\Pages\EditNode;
+use App\Filament\Admin\Resources\Nodes\RelationManagers\AllocationsRelationManager;
+use App\Filament\Admin\Resources\Nodes\RelationManagers\NodesRelationManager;
+use App\Filament\Admin\Resources\Nodes\Pages\ListNodes;
+use App\Filament\Admin\Resources\Nodes\Pages\CreateNode;
+use App\Filament\Admin\Resources\Nodes\Pages\EditNode;
 use App\Models\Node;
 use App\Traits\Filament\CanCustomizePages;
 use App\Traits\Filament\CanCustomizeRelations;
diff --git a/app/Filament/Admin/Resources/NodeResource/Pages/CreateNode.php b/app/Filament/Admin/Resources/Nodes/Pages/CreateNode.php
similarity index 99%
rename from app/Filament/Admin/Resources/NodeResource/Pages/CreateNode.php
rename to app/Filament/Admin/Resources/Nodes/Pages/CreateNode.php
index 59b335219..21ea0f70e 100644
--- a/app/Filament/Admin/Resources/NodeResource/Pages/CreateNode.php
+++ b/app/Filament/Admin/Resources/Nodes/Pages/CreateNode.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\NodeResource\Pages;
+namespace App\Filament\Admin\Resources\Nodes\Pages;
 
-use App\Filament\Admin\Resources\NodeResource;
+use App\Filament\Admin\Resources\Nodes\NodeResource;
 use App\Models\Node;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
diff --git a/app/Filament/Admin/Resources/NodeResource/Pages/EditNode.php b/app/Filament/Admin/Resources/Nodes/Pages/EditNode.php
similarity index 99%
rename from app/Filament/Admin/Resources/NodeResource/Pages/EditNode.php
rename to app/Filament/Admin/Resources/Nodes/Pages/EditNode.php
index 89d644ff7..9d25d0448 100644
--- a/app/Filament/Admin/Resources/NodeResource/Pages/EditNode.php
+++ b/app/Filament/Admin/Resources/Nodes/Pages/EditNode.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Filament\Admin\Resources\NodeResource\Pages;
+namespace App\Filament\Admin\Resources\Nodes\Pages;
 
 use Filament\Actions\Action;
 use Filament\Actions\DeleteAction;
 use Filament\Schemas\Components\Actions;
 use Filament\Schemas\Components\Grid;
 use Throwable;
-use App\Filament\Admin\Resources\NodeResource;
+use App\Filament\Admin\Resources\Nodes\NodeResource;
 use App\Models\Node;
 use App\Repositories\Daemon\DaemonConfigurationRepository;
 use App\Services\Helpers\SoftwareVersionService;
diff --git a/app/Filament/Admin/Resources/NodeResource/Pages/ListNodes.php b/app/Filament/Admin/Resources/Nodes/Pages/ListNodes.php
similarity index 96%
rename from app/Filament/Admin/Resources/NodeResource/Pages/ListNodes.php
rename to app/Filament/Admin/Resources/Nodes/Pages/ListNodes.php
index 53f04be88..aa8f9d1a2 100644
--- a/app/Filament/Admin/Resources/NodeResource/Pages/ListNodes.php
+++ b/app/Filament/Admin/Resources/Nodes/Pages/ListNodes.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\NodeResource\Pages;
+namespace App\Filament\Admin\Resources\Nodes\Pages;
 
-use App\Filament\Admin\Resources\NodeResource;
+use App\Filament\Admin\Resources\Nodes\NodeResource;
 use App\Filament\Components\Tables\Columns\NodeHealthColumn;
 use App\Filament\Components\Tables\Filters\TagsFilter;
 use App\Models\Node;
diff --git a/app/Filament/Admin/Resources/NodeResource/RelationManagers/AllocationsRelationManager.php b/app/Filament/Admin/Resources/Nodes/RelationManagers/AllocationsRelationManager.php
similarity index 97%
rename from app/Filament/Admin/Resources/NodeResource/RelationManagers/AllocationsRelationManager.php
rename to app/Filament/Admin/Resources/Nodes/RelationManagers/AllocationsRelationManager.php
index 6fb17e178..33c8e4f5a 100644
--- a/app/Filament/Admin/Resources/NodeResource/RelationManagers/AllocationsRelationManager.php
+++ b/app/Filament/Admin/Resources/Nodes/RelationManagers/AllocationsRelationManager.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\NodeResource\RelationManagers;
+namespace App\Filament\Admin\Resources\Nodes\RelationManagers;
 
-use App\Filament\Admin\Resources\ServerResource\Pages\CreateServer;
+use App\Filament\Admin\Resources\Servers\Pages\CreateServer;
 use App\Models\Allocation;
 use App\Models\Node;
 use App\Services\Allocations\AssignmentService;
diff --git a/app/Filament/Admin/Resources/NodeResource/RelationManagers/NodesRelationManager.php b/app/Filament/Admin/Resources/Nodes/RelationManagers/NodesRelationManager.php
similarity index 97%
rename from app/Filament/Admin/Resources/NodeResource/RelationManagers/NodesRelationManager.php
rename to app/Filament/Admin/Resources/Nodes/RelationManagers/NodesRelationManager.php
index 1ae50e2a4..58181ec1c 100644
--- a/app/Filament/Admin/Resources/NodeResource/RelationManagers/NodesRelationManager.php
+++ b/app/Filament/Admin/Resources/Nodes/RelationManagers/NodesRelationManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Admin\Resources\NodeResource\RelationManagers;
+namespace App\Filament\Admin\Resources\Nodes\RelationManagers;
 
 use App\Models\Server;
 use Filament\Resources\RelationManagers\RelationManager;
diff --git a/app/Filament/Admin/Resources/NodeResource/Widgets/NodeCpuChart.php b/app/Filament/Admin/Resources/Nodes/Widgets/NodeCpuChart.php
similarity index 97%
rename from app/Filament/Admin/Resources/NodeResource/Widgets/NodeCpuChart.php
rename to app/Filament/Admin/Resources/Nodes/Widgets/NodeCpuChart.php
index 22c0f6b42..60346c143 100644
--- a/app/Filament/Admin/Resources/NodeResource/Widgets/NodeCpuChart.php
+++ b/app/Filament/Admin/Resources/Nodes/Widgets/NodeCpuChart.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Admin\Resources\NodeResource\Widgets;
+namespace App\Filament\Admin\Resources\Nodes\Widgets;
 
 use App\Models\Node;
 use Filament\Support\RawJs;
diff --git a/app/Filament/Admin/Resources/NodeResource/Widgets/NodeMemoryChart.php b/app/Filament/Admin/Resources/Nodes/Widgets/NodeMemoryChart.php
similarity index 97%
rename from app/Filament/Admin/Resources/NodeResource/Widgets/NodeMemoryChart.php
rename to app/Filament/Admin/Resources/Nodes/Widgets/NodeMemoryChart.php
index 77e2b4091..eb5e16c70 100644
--- a/app/Filament/Admin/Resources/NodeResource/Widgets/NodeMemoryChart.php
+++ b/app/Filament/Admin/Resources/Nodes/Widgets/NodeMemoryChart.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Admin\Resources\NodeResource\Widgets;
+namespace App\Filament\Admin\Resources\Nodes\Widgets;
 
 use App\Models\Node;
 use Filament\Support\RawJs;
diff --git a/app/Filament/Admin/Resources/NodeResource/Widgets/NodeStorageChart.php b/app/Filament/Admin/Resources/Nodes/Widgets/NodeStorageChart.php
similarity index 97%
rename from app/Filament/Admin/Resources/NodeResource/Widgets/NodeStorageChart.php
rename to app/Filament/Admin/Resources/Nodes/Widgets/NodeStorageChart.php
index b82d32946..028d4f9de 100644
--- a/app/Filament/Admin/Resources/NodeResource/Widgets/NodeStorageChart.php
+++ b/app/Filament/Admin/Resources/Nodes/Widgets/NodeStorageChart.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Admin\Resources\NodeResource\Widgets;
+namespace App\Filament\Admin\Resources\Nodes\Widgets;
 
 use App\Models\Node;
 use Filament\Widgets\ChartWidget;
diff --git a/app/Filament/Admin/Resources/RoleResource/Pages/CreateRole.php b/app/Filament/Admin/Resources/Roles/Pages/CreateRole.php
similarity index 94%
rename from app/Filament/Admin/Resources/RoleResource/Pages/CreateRole.php
rename to app/Filament/Admin/Resources/Roles/Pages/CreateRole.php
index 63b1581b5..f9674ad3d 100644
--- a/app/Filament/Admin/Resources/RoleResource/Pages/CreateRole.php
+++ b/app/Filament/Admin/Resources/Roles/Pages/CreateRole.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\RoleResource\Pages;
+namespace App\Filament\Admin\Resources\Roles\Pages;
 
-use App\Filament\Admin\Resources\RoleResource;
+use App\Filament\Admin\Resources\Roles\RoleResource;
 use App\Models\Role;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
diff --git a/app/Filament/Admin/Resources/RoleResource/Pages/EditRole.php b/app/Filament/Admin/Resources/Roles/Pages/EditRole.php
similarity index 95%
rename from app/Filament/Admin/Resources/RoleResource/Pages/EditRole.php
rename to app/Filament/Admin/Resources/Roles/Pages/EditRole.php
index fee7c7df2..d2c65d2b1 100644
--- a/app/Filament/Admin/Resources/RoleResource/Pages/EditRole.php
+++ b/app/Filament/Admin/Resources/Roles/Pages/EditRole.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\RoleResource\Pages;
+namespace App\Filament\Admin\Resources\Roles\Pages;
 
-use App\Filament\Admin\Resources\RoleResource;
+use App\Filament\Admin\Resources\Roles\RoleResource;
 use App\Models\Role;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
diff --git a/app/Filament/Admin/Resources/RoleResource/Pages/ListRoles.php b/app/Filament/Admin/Resources/Roles/Pages/ListRoles.php
similarity index 84%
rename from app/Filament/Admin/Resources/RoleResource/Pages/ListRoles.php
rename to app/Filament/Admin/Resources/Roles/Pages/ListRoles.php
index 7af5402a6..4bae2247e 100644
--- a/app/Filament/Admin/Resources/RoleResource/Pages/ListRoles.php
+++ b/app/Filament/Admin/Resources/Roles/Pages/ListRoles.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\RoleResource\Pages;
+namespace App\Filament\Admin\Resources\Roles\Pages;
 
-use App\Filament\Admin\Resources\RoleResource;
+use App\Filament\Admin\Resources\Roles\RoleResource;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
diff --git a/app/Filament/Admin/Resources/RoleResource/Pages/ViewRole.php b/app/Filament/Admin/Resources/Roles/Pages/ViewRole.php
similarity index 84%
rename from app/Filament/Admin/Resources/RoleResource/Pages/ViewRole.php
rename to app/Filament/Admin/Resources/Roles/Pages/ViewRole.php
index ab7e7e218..aacca83a6 100644
--- a/app/Filament/Admin/Resources/RoleResource/Pages/ViewRole.php
+++ b/app/Filament/Admin/Resources/Roles/Pages/ViewRole.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\RoleResource\Pages;
+namespace App\Filament\Admin\Resources\Roles\Pages;
 
-use App\Filament\Admin\Resources\RoleResource;
+use App\Filament\Admin\Resources\Roles\RoleResource;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
diff --git a/app/Filament/Admin/Resources/RoleResource.php b/app/Filament/Admin/Resources/Roles/RoleResource.php
similarity index 96%
rename from app/Filament/Admin/Resources/RoleResource.php
rename to app/Filament/Admin/Resources/Roles/RoleResource.php
index 7d1a1854a..76ba6638c 100644
--- a/app/Filament/Admin/Resources/RoleResource.php
+++ b/app/Filament/Admin/Resources/Roles/RoleResource.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Filament\Admin\Resources;
+namespace App\Filament\Admin\Resources\Roles;
 
-use App\Filament\Admin\Resources\RoleResource\Pages\ListRoles;
-use App\Filament\Admin\Resources\RoleResource\Pages\CreateRole;
-use App\Filament\Admin\Resources\RoleResource\Pages\ViewRole;
-use App\Filament\Admin\Resources\RoleResource\Pages\EditRole;
+use App\Filament\Admin\Resources\Roles\Pages\ListRoles;
+use App\Filament\Admin\Resources\Roles\Pages\CreateRole;
+use App\Filament\Admin\Resources\Roles\Pages\ViewRole;
+use App\Filament\Admin\Resources\Roles\Pages\EditRole;
 use BackedEnum;
 use App\Models\Role;
 use Exception;
diff --git a/app/Filament/Admin/Resources/ServerResource/Pages/CreateServer.php b/app/Filament/Admin/Resources/Servers/Pages/CreateServer.php
similarity index 99%
rename from app/Filament/Admin/Resources/ServerResource/Pages/CreateServer.php
rename to app/Filament/Admin/Resources/Servers/Pages/CreateServer.php
index 2dded2bd3..73fca3366 100644
--- a/app/Filament/Admin/Resources/ServerResource/Pages/CreateServer.php
+++ b/app/Filament/Admin/Resources/Servers/Pages/CreateServer.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\ServerResource\Pages;
+namespace App\Filament\Admin\Resources\Servers\Pages;
 
-use App\Filament\Admin\Resources\ServerResource;
+use App\Filament\Admin\Resources\Servers\ServerResource;
 use App\Models\Allocation;
 use App\Models\Egg;
 use App\Models\Node;
diff --git a/app/Filament/Admin/Resources/ServerResource/Pages/EditServer.php b/app/Filament/Admin/Resources/Servers/Pages/EditServer.php
similarity index 99%
rename from app/Filament/Admin/Resources/ServerResource/Pages/EditServer.php
rename to app/Filament/Admin/Resources/Servers/Pages/EditServer.php
index 596b941e2..004b2a97f 100644
--- a/app/Filament/Admin/Resources/ServerResource/Pages/EditServer.php
+++ b/app/Filament/Admin/Resources/Servers/Pages/EditServer.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Filament\Admin\Resources\ServerResource\Pages;
+namespace App\Filament\Admin\Resources\Servers\Pages;
 
 use App\Enums\SuspendAction;
-use App\Filament\Admin\Resources\ServerResource;
-use App\Filament\Admin\Resources\ServerResource\RelationManagers\AllocationsRelationManager;
-use App\Filament\Admin\Resources\ServerResource\RelationManagers\DatabasesRelationManager;
+use App\Filament\Admin\Resources\Servers\ServerResource;
+use App\Filament\Admin\Resources\Servers\RelationManagers\AllocationsRelationManager;
+use App\Filament\Admin\Resources\Servers\RelationManagers\DatabasesRelationManager;
 use App\Filament\Components\Actions\PreviewStartupAction;
 use App\Filament\Server\Pages\Console;
 use App\Models\Allocation;
diff --git a/app/Filament/Admin/Resources/ServerResource/Pages/ListServers.php b/app/Filament/Admin/Resources/Servers/Pages/ListServers.php
similarity index 98%
rename from app/Filament/Admin/Resources/ServerResource/Pages/ListServers.php
rename to app/Filament/Admin/Resources/Servers/Pages/ListServers.php
index 0ae0ab03c..e1afac3e0 100644
--- a/app/Filament/Admin/Resources/ServerResource/Pages/ListServers.php
+++ b/app/Filament/Admin/Resources/Servers/Pages/ListServers.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Admin\Resources\ServerResource\Pages;
+namespace App\Filament\Admin\Resources\Servers\Pages;
 
 use App\Filament\Server\Pages\Console;
-use App\Filament\Admin\Resources\ServerResource;
+use App\Filament\Admin\Resources\Servers\ServerResource;
 use App\Models\Server;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
diff --git a/app/Filament/Admin/Resources/ServerResource/RelationManagers/AllocationsRelationManager.php b/app/Filament/Admin/Resources/Servers/RelationManagers/AllocationsRelationManager.php
similarity index 97%
rename from app/Filament/Admin/Resources/ServerResource/RelationManagers/AllocationsRelationManager.php
rename to app/Filament/Admin/Resources/Servers/RelationManagers/AllocationsRelationManager.php
index a373ad303..418ee1744 100644
--- a/app/Filament/Admin/Resources/ServerResource/RelationManagers/AllocationsRelationManager.php
+++ b/app/Filament/Admin/Resources/Servers/RelationManagers/AllocationsRelationManager.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\ServerResource\RelationManagers;
+namespace App\Filament\Admin\Resources\Servers\RelationManagers;
 
-use App\Filament\Admin\Resources\ServerResource\Pages\CreateServer;
+use App\Filament\Admin\Resources\Servers\Pages\CreateServer;
 use App\Models\Allocation;
 use App\Models\Server;
 use App\Services\Allocations\AssignmentService;
diff --git a/app/Filament/Admin/Resources/ServerResource/RelationManagers/DatabasesRelationManager.php b/app/Filament/Admin/Resources/Servers/RelationManagers/DatabasesRelationManager.php
similarity index 98%
rename from app/Filament/Admin/Resources/ServerResource/RelationManagers/DatabasesRelationManager.php
rename to app/Filament/Admin/Resources/Servers/RelationManagers/DatabasesRelationManager.php
index 1b55bc840..97a9f14a6 100644
--- a/app/Filament/Admin/Resources/ServerResource/RelationManagers/DatabasesRelationManager.php
+++ b/app/Filament/Admin/Resources/Servers/RelationManagers/DatabasesRelationManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Admin\Resources\ServerResource\RelationManagers;
+namespace App\Filament\Admin\Resources\Servers\RelationManagers;
 
 use Filament\Actions\DeleteAction;
 use Filament\Actions\ViewAction;
diff --git a/app/Filament/Admin/Resources/ServerResource.php b/app/Filament/Admin/Resources/Servers/ServerResource.php
similarity index 90%
rename from app/Filament/Admin/Resources/ServerResource.php
rename to app/Filament/Admin/Resources/Servers/ServerResource.php
index f03a3798d..19a45eb73 100644
--- a/app/Filament/Admin/Resources/ServerResource.php
+++ b/app/Filament/Admin/Resources/Servers/ServerResource.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Filament\Admin\Resources;
+namespace App\Filament\Admin\Resources\Servers;
 
-use App\Filament\Admin\Resources\ServerResource\RelationManagers\AllocationsRelationManager;
-use App\Filament\Admin\Resources\ServerResource\Pages\ListServers;
-use App\Filament\Admin\Resources\ServerResource\Pages\CreateServer;
-use App\Filament\Admin\Resources\ServerResource\Pages\EditServer;
+use App\Filament\Admin\Resources\Servers\RelationManagers\AllocationsRelationManager;
+use App\Filament\Admin\Resources\Servers\Pages\ListServers;
+use App\Filament\Admin\Resources\Servers\Pages\CreateServer;
+use App\Filament\Admin\Resources\Servers\Pages\EditServer;
 use Exception;
 use App\Models\Mount;
 use App\Models\Server;
diff --git a/app/Filament/Admin/Resources/UserResource/Pages/CreateUser.php b/app/Filament/Admin/Resources/Users/Pages/CreateUser.php
similarity index 93%
rename from app/Filament/Admin/Resources/UserResource/Pages/CreateUser.php
rename to app/Filament/Admin/Resources/Users/Pages/CreateUser.php
index 6bac7c970..134e3f4f3 100644
--- a/app/Filament/Admin/Resources/UserResource/Pages/CreateUser.php
+++ b/app/Filament/Admin/Resources/Users/Pages/CreateUser.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\UserResource\Pages;
+namespace App\Filament\Admin\Resources\Users\Pages;
 
-use App\Filament\Admin\Resources\UserResource;
+use App\Filament\Admin\Resources\Users\UserResource;
 use App\Models\Role;
 use App\Services\Users\UserCreationService;
 use App\Traits\Filament\CanCustomizeHeaderActions;
diff --git a/app/Filament/Admin/Resources/UserResource/Pages/EditUser.php b/app/Filament/Admin/Resources/Users/Pages/EditUser.php
similarity index 93%
rename from app/Filament/Admin/Resources/UserResource/Pages/EditUser.php
rename to app/Filament/Admin/Resources/Users/Pages/EditUser.php
index f947be702..efb54950f 100644
--- a/app/Filament/Admin/Resources/UserResource/Pages/EditUser.php
+++ b/app/Filament/Admin/Resources/Users/Pages/EditUser.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\UserResource\Pages;
+namespace App\Filament\Admin\Resources\Users\Pages;
 
-use App\Filament\Admin\Resources\UserResource;
+use App\Filament\Admin\Resources\Users\UserResource;
 use App\Models\User;
 use App\Services\Users\UserUpdateService;
 use App\Traits\Filament\CanCustomizeHeaderActions;
diff --git a/app/Filament/Admin/Resources/UserResource/Pages/ListUsers.php b/app/Filament/Admin/Resources/Users/Pages/ListUsers.php
similarity index 84%
rename from app/Filament/Admin/Resources/UserResource/Pages/ListUsers.php
rename to app/Filament/Admin/Resources/Users/Pages/ListUsers.php
index 1efa6e1d6..656003b85 100644
--- a/app/Filament/Admin/Resources/UserResource/Pages/ListUsers.php
+++ b/app/Filament/Admin/Resources/Users/Pages/ListUsers.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\UserResource\Pages;
+namespace App\Filament\Admin\Resources\Users\Pages;
 
-use App\Filament\Admin\Resources\UserResource;
+use App\Filament\Admin\Resources\Users\UserResource;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Resources\Pages\ListRecords;
diff --git a/app/Filament/Admin/Resources/UserResource/Pages/ViewUser.php b/app/Filament/Admin/Resources/Users/Pages/ViewUser.php
similarity index 84%
rename from app/Filament/Admin/Resources/UserResource/Pages/ViewUser.php
rename to app/Filament/Admin/Resources/Users/Pages/ViewUser.php
index 73b8336b3..386deece2 100644
--- a/app/Filament/Admin/Resources/UserResource/Pages/ViewUser.php
+++ b/app/Filament/Admin/Resources/Users/Pages/ViewUser.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\UserResource\Pages;
+namespace App\Filament\Admin\Resources\Users\Pages;
 
-use App\Filament\Admin\Resources\UserResource;
+use App\Filament\Admin\Resources\Users\UserResource;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
diff --git a/app/Filament/Admin/Resources/UserResource/RelationManagers/ServersRelationManager.php b/app/Filament/Admin/Resources/Users/RelationManagers/ServersRelationManager.php
similarity index 98%
rename from app/Filament/Admin/Resources/UserResource/RelationManagers/ServersRelationManager.php
rename to app/Filament/Admin/Resources/Users/RelationManagers/ServersRelationManager.php
index dbd3fef66..ec8566b00 100644
--- a/app/Filament/Admin/Resources/UserResource/RelationManagers/ServersRelationManager.php
+++ b/app/Filament/Admin/Resources/Users/RelationManagers/ServersRelationManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Admin\Resources\UserResource\RelationManagers;
+namespace App\Filament\Admin\Resources\Users\RelationManagers;
 
 use App\Enums\ServerState;
 use App\Enums\SuspendAction;
diff --git a/app/Filament/Admin/Resources/UserResource.php b/app/Filament/Admin/Resources/Users/UserResource.php
similarity index 94%
rename from app/Filament/Admin/Resources/UserResource.php
rename to app/Filament/Admin/Resources/Users/UserResource.php
index f0f0d44e1..4ec86030a 100644
--- a/app/Filament/Admin/Resources/UserResource.php
+++ b/app/Filament/Admin/Resources/Users/UserResource.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Filament\Admin\Resources;
+namespace App\Filament\Admin\Resources\Users;
 
-use App\Filament\Admin\Resources\UserResource\RelationManagers\ServersRelationManager;
-use App\Filament\Admin\Resources\UserResource\Pages\ListUsers;
-use App\Filament\Admin\Resources\UserResource\Pages\CreateUser;
-use App\Filament\Admin\Resources\UserResource\Pages\ViewUser;
-use App\Filament\Admin\Resources\UserResource\Pages\EditUser;
+use App\Filament\Admin\Resources\Users\RelationManagers\ServersRelationManager;
+use App\Filament\Admin\Resources\Users\Pages\ListUsers;
+use App\Filament\Admin\Resources\Users\Pages\CreateUser;
+use App\Filament\Admin\Resources\Users\Pages\ViewUser;
+use App\Filament\Admin\Resources\Users\Pages\EditUser;
 use App\Models\Role;
 use App\Models\User;
 use App\Traits\Filament\CanCustomizePages;
diff --git a/app/Filament/Admin/Resources/WebhookResource/Pages/CreateWebhookConfiguration.php b/app/Filament/Admin/Resources/Webhooks/Pages/CreateWebhookConfiguration.php
similarity index 95%
rename from app/Filament/Admin/Resources/WebhookResource/Pages/CreateWebhookConfiguration.php
rename to app/Filament/Admin/Resources/Webhooks/Pages/CreateWebhookConfiguration.php
index 03996df8c..c3f42774e 100644
--- a/app/Filament/Admin/Resources/WebhookResource/Pages/CreateWebhookConfiguration.php
+++ b/app/Filament/Admin/Resources/Webhooks/Pages/CreateWebhookConfiguration.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\WebhookResource\Pages;
+namespace App\Filament\Admin\Resources\Webhooks\Pages;
 
-use App\Filament\Admin\Resources\WebhookResource;
+use App\Filament\Admin\Resources\Webhooks\WebhookResource;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
diff --git a/app/Filament/Admin/Resources/WebhookResource/Pages/EditWebhookConfiguration.php b/app/Filament/Admin/Resources/Webhooks/Pages/EditWebhookConfiguration.php
similarity index 97%
rename from app/Filament/Admin/Resources/WebhookResource/Pages/EditWebhookConfiguration.php
rename to app/Filament/Admin/Resources/Webhooks/Pages/EditWebhookConfiguration.php
index 1da3baa0a..07a86e591 100644
--- a/app/Filament/Admin/Resources/WebhookResource/Pages/EditWebhookConfiguration.php
+++ b/app/Filament/Admin/Resources/Webhooks/Pages/EditWebhookConfiguration.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\WebhookResource\Pages;
+namespace App\Filament\Admin\Resources\Webhooks\Pages;
 
-use App\Filament\Admin\Resources\WebhookResource;
+use App\Filament\Admin\Resources\Webhooks\WebhookResource;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
diff --git a/app/Filament/Admin/Resources/WebhookResource/Pages/ListWebhookConfigurations.php b/app/Filament/Admin/Resources/Webhooks/Pages/ListWebhookConfigurations.php
similarity index 86%
rename from app/Filament/Admin/Resources/WebhookResource/Pages/ListWebhookConfigurations.php
rename to app/Filament/Admin/Resources/Webhooks/Pages/ListWebhookConfigurations.php
index ca418c886..9aaf589b1 100644
--- a/app/Filament/Admin/Resources/WebhookResource/Pages/ListWebhookConfigurations.php
+++ b/app/Filament/Admin/Resources/Webhooks/Pages/ListWebhookConfigurations.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\WebhookResource\Pages;
+namespace App\Filament\Admin\Resources\Webhooks\Pages;
 
-use App\Filament\Admin\Resources\WebhookResource;
+use App\Filament\Admin\Resources\Webhooks\WebhookResource;
 use App\Models\WebhookConfiguration;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
diff --git a/app/Filament/Admin/Resources/WebhookResource/Pages/ViewWebhookConfiguration.php b/app/Filament/Admin/Resources/Webhooks/Pages/ViewWebhookConfiguration.php
similarity index 84%
rename from app/Filament/Admin/Resources/WebhookResource/Pages/ViewWebhookConfiguration.php
rename to app/Filament/Admin/Resources/Webhooks/Pages/ViewWebhookConfiguration.php
index be738cfd8..226b64cda 100644
--- a/app/Filament/Admin/Resources/WebhookResource/Pages/ViewWebhookConfiguration.php
+++ b/app/Filament/Admin/Resources/Webhooks/Pages/ViewWebhookConfiguration.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\WebhookResource\Pages;
+namespace App\Filament\Admin\Resources\Webhooks\Pages;
 
-use App\Filament\Admin\Resources\WebhookResource;
+use App\Filament\Admin\Resources\Webhooks\WebhookResource;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
diff --git a/app/Filament/Admin/Resources/WebhookResource.php b/app/Filament/Admin/Resources/Webhooks/WebhookResource.php
similarity index 97%
rename from app/Filament/Admin/Resources/WebhookResource.php
rename to app/Filament/Admin/Resources/Webhooks/WebhookResource.php
index ab81ad643..4f3237f5a 100644
--- a/app/Filament/Admin/Resources/WebhookResource.php
+++ b/app/Filament/Admin/Resources/Webhooks/WebhookResource.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Filament\Admin\Resources;
+namespace App\Filament\Admin\Resources\Webhooks;
 
-use App\Filament\Admin\Resources\WebhookResource\Pages\CreateWebhookConfiguration;
-use App\Filament\Admin\Resources\WebhookResource\Pages\EditWebhookConfiguration;
-use App\Filament\Admin\Resources\WebhookResource\Pages\ListWebhookConfigurations;
-use App\Filament\Admin\Resources\WebhookResource\Pages\ViewWebhookConfiguration;
+use App\Filament\Admin\Resources\Webhooks\Pages\CreateWebhookConfiguration;
+use App\Filament\Admin\Resources\Webhooks\Pages\EditWebhookConfiguration;
+use App\Filament\Admin\Resources\Webhooks\Pages\ListWebhookConfigurations;
+use App\Filament\Admin\Resources\Webhooks\Pages\ViewWebhookConfiguration;
 use App\Livewire\AlertBanner;
 use App\Models\WebhookConfiguration;
 use Exception;
diff --git a/app/Filament/Admin/Widgets/NoNodesWidget.php b/app/Filament/Admin/Widgets/NoNodesWidget.php
index 3798c143f..24d2ce690 100644
--- a/app/Filament/Admin/Widgets/NoNodesWidget.php
+++ b/app/Filament/Admin/Widgets/NoNodesWidget.php
@@ -3,7 +3,7 @@
 namespace App\Filament\Admin\Widgets;
 
 use Exception;
-use App\Filament\Admin\Resources\NodeResource\Pages\CreateNode;
+use App\Filament\Admin\Resources\Nodes\Pages\CreateNode;
 use App\Models\Node;
 use Filament\Actions\Action;
 use Filament\Infolists\Components\TextEntry;
diff --git a/app/Filament/App/Resources/ServerResource/Pages/ListServers.php b/app/Filament/App/Resources/Servers/Pages/ListServers.php
similarity index 99%
rename from app/Filament/App/Resources/ServerResource/Pages/ListServers.php
rename to app/Filament/App/Resources/Servers/Pages/ListServers.php
index 54970441e..0a10b982f 100644
--- a/app/Filament/App/Resources/ServerResource/Pages/ListServers.php
+++ b/app/Filament/App/Resources/Servers/Pages/ListServers.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\App\Resources\ServerResource\Pages;
+namespace App\Filament\App\Resources\Servers\Pages;
 
 use App\Enums\ServerResourceType;
-use App\Filament\App\Resources\ServerResource;
+use App\Filament\App\Resources\Servers\ServerResource;
 use App\Filament\Components\Tables\Columns\ServerEntryColumn;
 use App\Filament\Server\Pages\Console;
 use App\Models\Permission;
diff --git a/app/Filament/App/Resources/ServerResource.php b/app/Filament/App/Resources/Servers/ServerResource.php
similarity index 82%
rename from app/Filament/App/Resources/ServerResource.php
rename to app/Filament/App/Resources/Servers/ServerResource.php
index 809cc642b..ba6f737d3 100644
--- a/app/Filament/App/Resources/ServerResource.php
+++ b/app/Filament/App/Resources/Servers/ServerResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\App\Resources;
+namespace App\Filament\App\Resources\Servers;
 
-use App\Filament\App\Resources\ServerResource\Pages\ListServers;
+use App\Filament\App\Resources\Servers\Pages\ListServers;
 use App\Models\Server;
 use Filament\Resources\Resource;
 
diff --git a/app/Filament/Server/Resources/ActivityResource.php b/app/Filament/Server/Resources/Activities/ActivityResource.php
similarity index 97%
rename from app/Filament/Server/Resources/ActivityResource.php
rename to app/Filament/Server/Resources/Activities/ActivityResource.php
index 3ef18ae31..99feb54be 100644
--- a/app/Filament/Server/Resources/ActivityResource.php
+++ b/app/Filament/Server/Resources/Activities/ActivityResource.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Server\Resources;
+namespace App\Filament\Server\Resources\Activities;
 
-use App\Filament\Server\Resources\ActivityResource\Pages\ListActivities;
+use App\Filament\Server\Resources\Activities\Pages\ListActivities;
 use Exception;
-use App\Filament\Admin\Resources\UserResource\Pages\EditUser;
+use App\Filament\Admin\Resources\Users\Pages\EditUser;
 use App\Filament\Components\Tables\Columns\DateTimeColumn;
 use App\Models\ActivityLog;
 use App\Models\Permission;
diff --git a/app/Filament/Server/Resources/ActivityResource/Pages/ListActivities.php b/app/Filament/Server/Resources/Activities/Pages/ListActivities.php
similarity index 80%
rename from app/Filament/Server/Resources/ActivityResource/Pages/ListActivities.php
rename to app/Filament/Server/Resources/Activities/Pages/ListActivities.php
index 3ca559b0a..bc1a9779c 100644
--- a/app/Filament/Server/Resources/ActivityResource/Pages/ListActivities.php
+++ b/app/Filament/Server/Resources/Activities/Pages/ListActivities.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Server\Resources\ActivityResource\Pages;
+namespace App\Filament\Server\Resources\Activities\Pages;
 
-use App\Filament\Server\Resources\ActivityResource;
+use App\Filament\Server\Resources\Activities\ActivityResource;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Resources\Pages\ListRecords;
diff --git a/app/Filament/Server/Resources/AllocationResource.php b/app/Filament/Server/Resources/Allocations/AllocationResource.php
similarity index 98%
rename from app/Filament/Server/Resources/AllocationResource.php
rename to app/Filament/Server/Resources/Allocations/AllocationResource.php
index fef880499..9db1392f5 100644
--- a/app/Filament/Server/Resources/AllocationResource.php
+++ b/app/Filament/Server/Resources/Allocations/AllocationResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Server\Resources;
+namespace App\Filament\Server\Resources\Allocations;
 
-use App\Filament\Server\Resources\AllocationResource\Pages\ListAllocations;
+use App\Filament\Server\Resources\Allocations\Pages\ListAllocations;
 use App\Facades\Activity;
 use App\Models\Allocation;
 use App\Models\Permission;
diff --git a/app/Filament/Server/Resources/AllocationResource/Pages/ListAllocations.php b/app/Filament/Server/Resources/Allocations/Pages/ListAllocations.php
similarity index 87%
rename from app/Filament/Server/Resources/AllocationResource/Pages/ListAllocations.php
rename to app/Filament/Server/Resources/Allocations/Pages/ListAllocations.php
index c41995456..35ceef0e0 100644
--- a/app/Filament/Server/Resources/AllocationResource/Pages/ListAllocations.php
+++ b/app/Filament/Server/Resources/Allocations/Pages/ListAllocations.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Server\Resources\AllocationResource\Pages;
+namespace App\Filament\Server\Resources\Allocations\Pages;
 
-use App\Filament\Server\Resources\AllocationResource;
+use App\Filament\Server\Resources\Allocations\AllocationResource;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
diff --git a/app/Filament/Server/Resources/BackupResource.php b/app/Filament/Server/Resources/Backups/BackupResource.php
similarity index 99%
rename from app/Filament/Server/Resources/BackupResource.php
rename to app/Filament/Server/Resources/Backups/BackupResource.php
index 0c77a785e..136b47a29 100644
--- a/app/Filament/Server/Resources/BackupResource.php
+++ b/app/Filament/Server/Resources/Backups/BackupResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Server\Resources;
+namespace App\Filament\Server\Resources\Backups;
 
-use App\Filament\Server\Resources\BackupResource\Pages\ListBackups;
+use App\Filament\Server\Resources\Backups\Pages\ListBackups;
 use App\Enums\BackupStatus;
 use App\Enums\ServerState;
 use App\Facades\Activity;
diff --git a/app/Filament/Server/Resources/BackupResource/Pages/ListBackups.php b/app/Filament/Server/Resources/Backups/Pages/ListBackups.php
similarity index 86%
rename from app/Filament/Server/Resources/BackupResource/Pages/ListBackups.php
rename to app/Filament/Server/Resources/Backups/Pages/ListBackups.php
index 14fd1c063..8ce269220 100644
--- a/app/Filament/Server/Resources/BackupResource/Pages/ListBackups.php
+++ b/app/Filament/Server/Resources/Backups/Pages/ListBackups.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Server\Resources\BackupResource\Pages;
+namespace App\Filament\Server\Resources\Backups\Pages;
 
-use App\Filament\Server\Resources\BackupResource;
+use App\Filament\Server\Resources\Backups\BackupResource;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
diff --git a/app/Filament/Server/Resources/DatabaseResource.php b/app/Filament/Server/Resources/Databases/DatabaseResource.php
similarity index 98%
rename from app/Filament/Server/Resources/DatabaseResource.php
rename to app/Filament/Server/Resources/Databases/DatabaseResource.php
index f16a97cff..2322e112c 100644
--- a/app/Filament/Server/Resources/DatabaseResource.php
+++ b/app/Filament/Server/Resources/Databases/DatabaseResource.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Server\Resources;
+namespace App\Filament\Server\Resources\Databases;
 
 use App\Filament\Components\Actions\CopyAction;
 use App\Filament\Components\Actions\RotateDatabasePasswordAction;
-use App\Filament\Server\Resources\DatabaseResource\Pages\ListDatabases;
+use App\Filament\Server\Resources\Databases\Pages\ListDatabases;
 use App\Filament\Components\Tables\Columns\DateTimeColumn;
 use App\Models\Database;
 use App\Models\DatabaseHost;
diff --git a/app/Filament/Server/Resources/DatabaseResource/Pages/ListDatabases.php b/app/Filament/Server/Resources/Databases/Pages/ListDatabases.php
similarity index 85%
rename from app/Filament/Server/Resources/DatabaseResource/Pages/ListDatabases.php
rename to app/Filament/Server/Resources/Databases/Pages/ListDatabases.php
index 0e61c0ba3..b7fc59130 100644
--- a/app/Filament/Server/Resources/DatabaseResource/Pages/ListDatabases.php
+++ b/app/Filament/Server/Resources/Databases/Pages/ListDatabases.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Server\Resources\DatabaseResource\Pages;
+namespace App\Filament\Server\Resources\Databases\Pages;
 
-use App\Filament\Server\Resources\DatabaseResource;
+use App\Filament\Server\Resources\Databases\DatabaseResource;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
diff --git a/app/Filament/Server/Resources/FileResource.php b/app/Filament/Server/Resources/Files/FileResource.php
similarity index 85%
rename from app/Filament/Server/Resources/FileResource.php
rename to app/Filament/Server/Resources/Files/FileResource.php
index 6cd29dd24..d30ea802f 100644
--- a/app/Filament/Server/Resources/FileResource.php
+++ b/app/Filament/Server/Resources/Files/FileResource.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Filament\Server\Resources;
+namespace App\Filament\Server\Resources\Files;
 
-use App\Filament\Server\Resources\FileResource\Pages\EditFiles;
-use App\Filament\Server\Resources\FileResource\Pages\SearchFiles;
-use App\Filament\Server\Resources\FileResource\Pages\DownloadFiles;
-use App\Filament\Server\Resources\FileResource\Pages\ListFiles;
+use App\Filament\Server\Resources\Files\Pages\EditFiles;
+use App\Filament\Server\Resources\Files\Pages\SearchFiles;
+use App\Filament\Server\Resources\Files\Pages\DownloadFiles;
+use App\Filament\Server\Resources\Files\Pages\ListFiles;
 use App\Models\File;
 use App\Models\Permission;
 use App\Traits\Filament\BlockAccessInConflict;
diff --git a/app/Filament/Server/Resources/FileResource/Pages/DownloadFiles.php b/app/Filament/Server/Resources/Files/Pages/DownloadFiles.php
similarity index 95%
rename from app/Filament/Server/Resources/FileResource/Pages/DownloadFiles.php
rename to app/Filament/Server/Resources/Files/Pages/DownloadFiles.php
index 3a710f121..7a9b93bd0 100644
--- a/app/Filament/Server/Resources/FileResource/Pages/DownloadFiles.php
+++ b/app/Filament/Server/Resources/Files/Pages/DownloadFiles.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Server\Resources\FileResource\Pages;
+namespace App\Filament\Server\Resources\Files\Pages;
 
 use App\Facades\Activity;
-use App\Filament\Server\Resources\FileResource;
+use App\Filament\Server\Resources\Files\FileResource;
 use App\Models\Permission;
 use App\Models\Server;
 use App\Services\Nodes\NodeJWTService;
diff --git a/app/Filament/Server/Resources/FileResource/Pages/EditFiles.php b/app/Filament/Server/Resources/Files/Pages/EditFiles.php
similarity index 98%
rename from app/Filament/Server/Resources/FileResource/Pages/EditFiles.php
rename to app/Filament/Server/Resources/Files/Pages/EditFiles.php
index 47c0d72e7..8231b2017 100644
--- a/app/Filament/Server/Resources/FileResource/Pages/EditFiles.php
+++ b/app/Filament/Server/Resources/Files/Pages/EditFiles.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Filament\Server\Resources\FileResource\Pages;
+namespace App\Filament\Server\Resources\Files\Pages;
 
 use Throwable;
 use App\Enums\EditorLanguages;
 use App\Exceptions\Http\Server\FileSizeTooLargeException;
 use App\Exceptions\Repository\FileNotEditableException;
 use App\Facades\Activity;
-use App\Filament\Server\Resources\FileResource;
+use App\Filament\Server\Resources\Files\FileResource;
 use App\Livewire\AlertBanner;
 use App\Models\Permission;
 use App\Models\Server;
diff --git a/app/Filament/Server/Resources/FileResource/Pages/ListFiles.php b/app/Filament/Server/Resources/Files/Pages/ListFiles.php
similarity index 99%
rename from app/Filament/Server/Resources/FileResource/Pages/ListFiles.php
rename to app/Filament/Server/Resources/Files/Pages/ListFiles.php
index b217ce4fb..90c4c20ba 100644
--- a/app/Filament/Server/Resources/FileResource/Pages/ListFiles.php
+++ b/app/Filament/Server/Resources/Files/Pages/ListFiles.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Filament\Server\Resources\FileResource\Pages;
+namespace App\Filament\Server\Resources\Files\Pages;
 
 use App\Exceptions\Repository\FileExistsException;
 use App\Livewire\AlertBanner;
 use Exception;
 use App\Facades\Activity;
-use App\Filament\Server\Resources\FileResource;
+use App\Filament\Server\Resources\Files\FileResource;
 use App\Models\File;
 use App\Models\Permission;
 use App\Models\Server;
diff --git a/app/Filament/Server/Resources/FileResource/Pages/SearchFiles.php b/app/Filament/Server/Resources/Files/Pages/SearchFiles.php
similarity index 96%
rename from app/Filament/Server/Resources/FileResource/Pages/SearchFiles.php
rename to app/Filament/Server/Resources/Files/Pages/SearchFiles.php
index 2bb97c1b6..bcc01c4d7 100644
--- a/app/Filament/Server/Resources/FileResource/Pages/SearchFiles.php
+++ b/app/Filament/Server/Resources/Files/Pages/SearchFiles.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Server\Resources\FileResource\Pages;
+namespace App\Filament\Server\Resources\Files\Pages;
 
-use App\Filament\Server\Resources\FileResource;
+use App\Filament\Server\Resources\Files\FileResource;
 use App\Models\File;
 use App\Models\Server;
 use App\Filament\Components\Tables\Columns\BytesColumn;
diff --git a/app/Filament/Server/Resources/ScheduleResource/Pages/CreateSchedule.php b/app/Filament/Server/Resources/Schedules/Pages/CreateSchedule.php
similarity index 92%
rename from app/Filament/Server/Resources/ScheduleResource/Pages/CreateSchedule.php
rename to app/Filament/Server/Resources/Schedules/Pages/CreateSchedule.php
index ba3b60a9d..10f00e406 100644
--- a/app/Filament/Server/Resources/ScheduleResource/Pages/CreateSchedule.php
+++ b/app/Filament/Server/Resources/Schedules/Pages/CreateSchedule.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Server\Resources\ScheduleResource\Pages;
+namespace App\Filament\Server\Resources\Schedules\Pages;
 
 use App\Facades\Activity;
-use App\Filament\Server\Resources\ScheduleResource;
+use App\Filament\Server\Resources\Schedules\ScheduleResource;
 use App\Models\Schedule;
 use App\Models\Server;
 use App\Traits\Filament\CanCustomizeHeaderActions;
diff --git a/app/Filament/Server/Resources/ScheduleResource/Pages/EditSchedule.php b/app/Filament/Server/Resources/Schedules/Pages/EditSchedule.php
similarity index 95%
rename from app/Filament/Server/Resources/ScheduleResource/Pages/EditSchedule.php
rename to app/Filament/Server/Resources/Schedules/Pages/EditSchedule.php
index b2a29f5a7..125961ae5 100644
--- a/app/Filament/Server/Resources/ScheduleResource/Pages/EditSchedule.php
+++ b/app/Filament/Server/Resources/Schedules/Pages/EditSchedule.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Server\Resources\ScheduleResource\Pages;
+namespace App\Filament\Server\Resources\Schedules\Pages;
 
 use App\Facades\Activity;
 use App\Filament\Components\Actions\ExportScheduleAction;
-use App\Filament\Server\Resources\ScheduleResource;
+use App\Filament\Server\Resources\Schedules\ScheduleResource;
 use App\Models\Schedule;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
diff --git a/app/Filament/Server/Resources/ScheduleResource/Pages/ListSchedules.php b/app/Filament/Server/Resources/Schedules/Pages/ListSchedules.php
similarity index 85%
rename from app/Filament/Server/Resources/ScheduleResource/Pages/ListSchedules.php
rename to app/Filament/Server/Resources/Schedules/Pages/ListSchedules.php
index 5a6ee5a1d..32f48ef17 100644
--- a/app/Filament/Server/Resources/ScheduleResource/Pages/ListSchedules.php
+++ b/app/Filament/Server/Resources/Schedules/Pages/ListSchedules.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Server\Resources\ScheduleResource\Pages;
+namespace App\Filament\Server\Resources\Schedules\Pages;
 
-use App\Filament\Server\Resources\ScheduleResource;
+use App\Filament\Server\Resources\Schedules\ScheduleResource;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
diff --git a/app/Filament/Server/Resources/ScheduleResource/Pages/ViewSchedule.php b/app/Filament/Server/Resources/Schedules/Pages/ViewSchedule.php
similarity index 94%
rename from app/Filament/Server/Resources/ScheduleResource/Pages/ViewSchedule.php
rename to app/Filament/Server/Resources/Schedules/Pages/ViewSchedule.php
index 2bc12d3e6..bf1f6745b 100644
--- a/app/Filament/Server/Resources/ScheduleResource/Pages/ViewSchedule.php
+++ b/app/Filament/Server/Resources/Schedules/Pages/ViewSchedule.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Server\Resources\ScheduleResource\Pages;
+namespace App\Filament\Server\Resources\Schedules\Pages;
 
 use App\Facades\Activity;
-use App\Filament\Server\Resources\ScheduleResource;
+use App\Filament\Server\Resources\Schedules\ScheduleResource;
 use App\Models\Permission;
 use App\Models\Schedule;
 use App\Services\Schedules\ProcessScheduleService;
diff --git a/app/Filament/Server/Resources/ScheduleResource/RelationManagers/TasksRelationManager.php b/app/Filament/Server/Resources/Schedules/RelationManagers/TasksRelationManager.php
similarity index 99%
rename from app/Filament/Server/Resources/ScheduleResource/RelationManagers/TasksRelationManager.php
rename to app/Filament/Server/Resources/Schedules/RelationManagers/TasksRelationManager.php
index 1f85c687b..85a7e1813 100644
--- a/app/Filament/Server/Resources/ScheduleResource/RelationManagers/TasksRelationManager.php
+++ b/app/Filament/Server/Resources/Schedules/RelationManagers/TasksRelationManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Server\Resources\ScheduleResource\RelationManagers;
+namespace App\Filament\Server\Resources\Schedules\RelationManagers;
 
 use App\Facades\Activity;
 use App\Models\Schedule;
diff --git a/app/Filament/Server/Resources/ScheduleResource.php b/app/Filament/Server/Resources/Schedules/ScheduleResource.php
similarity index 98%
rename from app/Filament/Server/Resources/ScheduleResource.php
rename to app/Filament/Server/Resources/Schedules/ScheduleResource.php
index 10b453db1..40dcf2591 100644
--- a/app/Filament/Server/Resources/ScheduleResource.php
+++ b/app/Filament/Server/Resources/Schedules/ScheduleResource.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace App\Filament\Server\Resources;
+namespace App\Filament\Server\Resources\Schedules;
 
 use App\Filament\Components\Actions\ImportScheduleAction;
-use App\Filament\Server\Resources\ScheduleResource\Pages\ListSchedules;
-use App\Filament\Server\Resources\ScheduleResource\Pages\CreateSchedule;
-use App\Filament\Server\Resources\ScheduleResource\Pages\ViewSchedule;
-use App\Filament\Server\Resources\ScheduleResource\Pages\EditSchedule;
+use App\Filament\Server\Resources\Schedules\Pages\ListSchedules;
+use App\Filament\Server\Resources\Schedules\Pages\CreateSchedule;
+use App\Filament\Server\Resources\Schedules\Pages\ViewSchedule;
+use App\Filament\Server\Resources\Schedules\Pages\EditSchedule;
 use App\Facades\Activity;
 use App\Filament\Components\Forms\Actions\CronPresetAction;
 use App\Filament\Components\Tables\Columns\DateTimeColumn;
-use App\Filament\Server\Resources\ScheduleResource\RelationManagers\TasksRelationManager;
+use App\Filament\Server\Resources\Schedules\RelationManagers\TasksRelationManager;
 use App\Helpers\Utilities;
 use App\Models\Permission;
 use App\Models\Schedule;
diff --git a/app/Filament/Server/Resources/UserResource/Pages/ListUsers.php b/app/Filament/Server/Resources/Users/Pages/ListUsers.php
similarity index 87%
rename from app/Filament/Server/Resources/UserResource/Pages/ListUsers.php
rename to app/Filament/Server/Resources/Users/Pages/ListUsers.php
index 867dbb046..cd87af786 100644
--- a/app/Filament/Server/Resources/UserResource/Pages/ListUsers.php
+++ b/app/Filament/Server/Resources/Users/Pages/ListUsers.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Server\Resources\UserResource\Pages;
+namespace App\Filament\Server\Resources\Users\Pages;
 
-use App\Filament\Server\Resources\UserResource;
+use App\Filament\Server\Resources\Users\UserResource;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
diff --git a/app/Filament/Server/Resources/UserResource.php b/app/Filament/Server/Resources/Users/UserResource.php
similarity index 99%
rename from app/Filament/Server/Resources/UserResource.php
rename to app/Filament/Server/Resources/Users/UserResource.php
index e47a71d3c..807e9dc33 100644
--- a/app/Filament/Server/Resources/UserResource.php
+++ b/app/Filament/Server/Resources/Users/UserResource.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Server\Resources;
+namespace App\Filament\Server\Resources\Users;
 
 use App\Facades\Activity;
-use App\Filament\Server\Resources\UserResource\Pages\ListUsers;
+use App\Filament\Server\Resources\Users\Pages\ListUsers;
 use App\Models\Permission;
 use App\Models\Server;
 use App\Models\User;
diff --git a/app/Providers/Filament/ServerPanelProvider.php b/app/Providers/Filament/ServerPanelProvider.php
index 485ad3a69..11b4a7936 100644
--- a/app/Providers/Filament/ServerPanelProvider.php
+++ b/app/Providers/Filament/ServerPanelProvider.php
@@ -2,8 +2,8 @@
 
 namespace App\Providers\Filament;
 
-use App\Filament\App\Resources\ServerResource\Pages\ListServers;
-use App\Filament\Admin\Resources\ServerResource\Pages\EditServer;
+use App\Filament\App\Resources\Servers\Pages\ListServers;
+use App\Filament\Admin\Resources\Servers\Pages\EditServer;
 use App\Filament\Pages\Auth\EditProfile;
 use App\Http\Middleware\Activity\ServerSubject;
 use App\Models\Server;
diff --git a/composer.lock b/composer.lock
index d153869a2..8e2484c3a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d24999180b13ef2c2d168cf25454be1e",
+    "content-hash": "170a190d190be528fda9a4d7461443c7",
     "packages": [
         {
             "name": "amphp/amp",
@@ -16348,4 +16348,4 @@
         "php": "8.2"
     },
     "plugin-api-version": "2.6.0"
-}
\ No newline at end of file
+}
diff --git a/tests/Filament/Admin/ListEggsTest.php b/tests/Filament/Admin/ListEggsTest.php
index 0e34b22fa..595edcdbc 100644
--- a/tests/Filament/Admin/ListEggsTest.php
+++ b/tests/Filament/Admin/ListEggsTest.php
@@ -1,7 +1,7 @@
 <?php
 
 use App\Enums\RolePermissionModels;
-use App\Filament\Admin\Resources\EggResource\Pages\ListEggs;
+use App\Filament\Admin\Resources\Eggs\Pages\ListEggs;
 use App\Models\Egg;
 use App\Models\Permission;
 use App\Models\Role;
diff --git a/tests/Filament/Admin/ListNodesTest.php b/tests/Filament/Admin/ListNodesTest.php
index d5db43deb..07d98f2ad 100644
--- a/tests/Filament/Admin/ListNodesTest.php
+++ b/tests/Filament/Admin/ListNodesTest.php
@@ -1,7 +1,7 @@
 <?php
 
 use App\Enums\RolePermissionModels;
-use App\Filament\Admin\Resources\NodeResource\Pages\ListNodes;
+use App\Filament\Admin\Resources\Nodes\Pages\ListNodes;
 use App\Models\Node;
 use App\Models\Permission;
 use App\Models\Role;