diff --git a/app/Filament/Server/Resources/Users/Pages/ListUsers.php b/app/Filament/Server/Resources/Subusers/Pages/ListSubusers.php
similarity index 74%
rename from app/Filament/Server/Resources/Users/Pages/ListUsers.php
rename to app/Filament/Server/Resources/Subusers/Pages/ListSubusers.php
index cd87af786..7fef5a180 100644
--- a/app/Filament/Server/Resources/Users/Pages/ListUsers.php
+++ b/app/Filament/Server/Resources/Subusers/Pages/ListSubusers.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Server\Resources\Users\Pages;
+namespace App\Filament\Server\Resources\Subusers\Pages;
 
-use App\Filament\Server\Resources\Users\UserResource;
+use App\Filament\Server\Resources\Subusers\SubuserResource;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Filament\Actions\Action;
@@ -10,12 +10,12 @@ use Filament\Actions\ActionGroup;
 use Filament\Resources\Pages\ListRecords;
 use Illuminate\Contracts\Support\Htmlable;
 
-class ListUsers extends ListRecords
+class ListSubusers extends ListRecords
 {
     use CanCustomizeHeaderActions;
     use CanCustomizeHeaderWidgets;
 
-    protected static string $resource = UserResource::class;
+    protected static string $resource = SubuserResource::class;
 
     /** @return array<Action|ActionGroup> */
     protected function getDefaultHeaderActions(): array
diff --git a/app/Filament/Server/Resources/Users/UserResource.php b/app/Filament/Server/Resources/Subusers/SubuserResource.php
similarity index 88%
rename from app/Filament/Server/Resources/Users/UserResource.php
rename to app/Filament/Server/Resources/Subusers/SubuserResource.php
index 21218ce38..50d30cb0b 100644
--- a/app/Filament/Server/Resources/Users/UserResource.php
+++ b/app/Filament/Server/Resources/Subusers/SubuserResource.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Filament\Server\Resources\Users;
+namespace App\Filament\Server\Resources\Subusers;
 
 use App\Facades\Activity;
-use App\Filament\Server\Resources\Users\Pages\ListUsers;
+use App\Filament\Server\Resources\Subusers\Pages\ListSubusers;
 use App\Models\Permission;
 use App\Models\Server;
-use App\Models\User;
+use App\Models\Subuser;
 use App\Services\Subusers\SubuserCreationService;
 use App\Services\Subusers\SubuserDeletionService;
 use App\Services\Subusers\SubuserUpdateService;
@@ -38,7 +38,7 @@ use Filament\Tables\Columns\ImageColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 
-class UserResource extends Resource
+class SubuserResource extends Resource
 {
     use BlockAccessInConflict;
     use CanCustomizePages;
@@ -46,14 +46,12 @@ class UserResource extends Resource
     use CanModifyTable;
     use HasLimitBadge;
 
-    protected static ?string $model = User::class;
+    protected static ?string $model = Subuser::class;
 
     protected static ?int $navigationSort = 5;
 
     protected static string|\BackedEnum|null $navigationIcon = 'tabler-users';
 
-    protected static ?string $tenantOwnershipRelationshipName = 'subServers';
-
     protected static function getBadgeCount(): int
     {
         /** @var Server $server */
@@ -104,24 +102,23 @@ class UserResource extends Resource
                     ->visibleFrom('lg')
                     ->label('')
                     ->alignCenter()->circular()
-                    ->defaultImageUrl(fn (User $user) => Filament::getUserAvatarUrl($user)),
-                TextColumn::make('username')
+                    ->defaultImageUrl(fn (Subuser $subuser) => Filament::getUserAvatarUrl($subuser->user)),
+                TextColumn::make('user.username')
                     ->label(trans('server/user.username'))
                     ->searchable(),
-                TextColumn::make('email')
+                TextColumn::make('user.email')
                     ->label(trans('server/user.email'))
                     ->searchable(),
                 TextColumn::make('permissions')
                     ->label(trans('server/user.permissions.title'))
-                    ->state(fn (User $user) => count($server->subusers->where('user_id', $user->id)->first()->permissions)),
+                    ->state(fn (Subuser $subuser) => count($subuser->permissions) - 1),
             ])
             ->recordActions([
                 DeleteAction::make()
                     ->label(trans('server/user.delete'))
-                    ->hidden(fn (User $user) => user()?->id === $user->id)
+                    ->hidden(fn (Subuser $subuser) => user()?->id === $subuser->user->id)
                     ->successNotificationTitle(null)
-                    ->action(function (User $user, SubuserDeletionService $subuserDeletionService) use ($server) {
-                        $subuser = $server->subusers->where('user_id', $user->id)->first();
+                    ->action(function (Subuser $subuser, SubuserDeletionService $subuserDeletionService) use ($server) {
                         $subuserDeletionService->handle($subuser, $server);
 
                         Notification::make()
@@ -131,13 +128,11 @@ class UserResource extends Resource
                     }),
                 EditAction::make()
                     ->label(trans('server/user.edit'))
-                    ->hidden(fn (User $user) => user()?->id === $user->id)
+                    ->hidden(fn (Subuser $subuser) => user()?->id === $subuser->user->id)
                     ->authorize(fn () => user()?->can(Permission::ACTION_USER_UPDATE, $server))
-                    ->modalHeading(fn (User $user) => trans('server/user.editing', ['user' => $user->email]))
+                    ->modalHeading(fn (Subuser $subuser) => trans('server/user.editing', ['user' => $subuser->user->email]))
                     ->successNotificationTitle(null)
-                    ->action(function (array $data, SubuserUpdateService $subuserUpdateService, User $user) use ($server) {
-                        $subuser = $server->subusers->where('user_id', $user->id)->first();
-
+                    ->action(function (array $data, SubuserUpdateService $subuserUpdateService, Subuser $subuser) use ($server) {
                         $permissions = collect($data)
                             ->forget('email')
                             ->flatMap(fn ($permissions, $key) => collect($permissions)->map(fn ($permission) => "$key.$permission"))
@@ -172,7 +167,8 @@ class UserResource extends Resource
                                         'sm' => 1,
                                         'md' => 4,
                                         'lg' => 5,
-                                    ]),
+                                    ])
+                                    ->formatStateUsing(fn (Subuser $subuser) => $subuser->user->email),
                                 Actions::make([
                                     Action::make('assignAll')
                                         ->label(trans('server/user.assign_all'))
@@ -195,12 +191,10 @@ class UserResource extends Resource
                                     ->schema($tabs),
                             ]),
                     ])
-                    ->mutateRecordDataUsing(function ($data, User $user) use ($server) {
-                        $permissionsArray = $server->subusers->where('user_id', $user->id)->first()->permissions;
-
+                    ->mutateRecordDataUsing(function ($data, Subuser $subuser) {
                         $transformedPermissions = [];
 
-                        foreach ($permissionsArray as $permission) {
+                        foreach ($subuser->permissions as $permission) {
                             [$group, $action] = explode('.', $permission, 2);
                             $transformedPermissions[$group][] = $action;
                         }
@@ -312,7 +306,7 @@ class UserResource extends Resource
     public static function getDefaultPages(): array
     {
         return [
-            'index' => ListUsers::route('/'),
+            'index' => ListSubusers::route('/'),
         ];
     }
 
diff --git a/app/Policies/.gitkeep b/app/Policies/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/Policies/Server/ActivityLogPolicy.php b/app/Policies/ActivityLogPolicy.php
similarity index 93%
rename from app/Policies/Server/ActivityLogPolicy.php
rename to app/Policies/ActivityLogPolicy.php
index d479b43ff..2671ae415 100644
--- a/app/Policies/Server/ActivityLogPolicy.php
+++ b/app/Policies/ActivityLogPolicy.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Policies\Server;
+namespace App\Policies;
 
 use App\Models\Permission;
 use App\Models\User;
diff --git a/app/Policies/Admin/ServerPolicy.php b/app/Policies/Admin/ServerPolicy.php
deleted file mode 100644
index 43390fdf4..000000000
--- a/app/Policies/Admin/ServerPolicy.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Policies\Admin;
-
-class ServerPolicy
-{
-    use DefaultPolicies;
-
-    protected string $modelName = 'server';
-}
diff --git a/app/Policies/Server/AllocationPolicy.php b/app/Policies/AllocationPolicy.php
similarity index 96%
rename from app/Policies/Server/AllocationPolicy.php
rename to app/Policies/AllocationPolicy.php
index 83dd52644..beec3489f 100644
--- a/app/Policies/Server/AllocationPolicy.php
+++ b/app/Policies/AllocationPolicy.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Policies\Server;
+namespace App\Policies;
 
 use App\Models\Permission;
 use App\Models\User;
diff --git a/app/Policies/Admin/ApiKeyPolicy.php b/app/Policies/ApiKeyPolicy.php
similarity index 58%
rename from app/Policies/Admin/ApiKeyPolicy.php
rename to app/Policies/ApiKeyPolicy.php
index 435ae345c..848787c23 100644
--- a/app/Policies/Admin/ApiKeyPolicy.php
+++ b/app/Policies/ApiKeyPolicy.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Policies\Admin;
+namespace App\Policies;
 
 class ApiKeyPolicy
 {
-    use DefaultPolicies;
+    use DefaultAdminPolicies;
 
     protected string $modelName = 'apiKey';
 }
diff --git a/app/Policies/Server/BackupPolicy.php b/app/Policies/BackupPolicy.php
similarity index 95%
rename from app/Policies/Server/BackupPolicy.php
rename to app/Policies/BackupPolicy.php
index 6dc3d25ad..8e60c6918 100644
--- a/app/Policies/Server/BackupPolicy.php
+++ b/app/Policies/BackupPolicy.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Policies\Server;
+namespace App\Policies;
 
 use App\Models\Permission;
 use App\Models\User;
diff --git a/app/Policies/Admin/DatabaseHostPolicy.php b/app/Policies/DatabaseHostPolicy.php
similarity index 91%
rename from app/Policies/Admin/DatabaseHostPolicy.php
rename to app/Policies/DatabaseHostPolicy.php
index 809695a8b..00ae26dd5 100644
--- a/app/Policies/Admin/DatabaseHostPolicy.php
+++ b/app/Policies/DatabaseHostPolicy.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Policies\Admin;
+namespace App\Policies;
 
 use App\Models\DatabaseHost;
 use App\Models\User;
 
 class DatabaseHostPolicy
 {
-    use DefaultPolicies;
+    use DefaultAdminPolicies;
 
     protected string $modelName = 'databaseHost';
 
diff --git a/app/Policies/Server/DatabasePolicy.php b/app/Policies/DatabasePolicy.php
similarity index 96%
rename from app/Policies/Server/DatabasePolicy.php
rename to app/Policies/DatabasePolicy.php
index e3ad4548d..2cd9bd10c 100644
--- a/app/Policies/Server/DatabasePolicy.php
+++ b/app/Policies/DatabasePolicy.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Policies\Server;
+namespace App\Policies;
 
 use App\Models\Permission;
 use App\Models\User;
diff --git a/app/Policies/Admin/DefaultPolicies.php b/app/Policies/DefaultAdminPolicies.php
similarity index 94%
rename from app/Policies/Admin/DefaultPolicies.php
rename to app/Policies/DefaultAdminPolicies.php
index 59584f776..f5dd02942 100644
--- a/app/Policies/Admin/DefaultPolicies.php
+++ b/app/Policies/DefaultAdminPolicies.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Policies\Admin;
+namespace App\Policies;
 
 use App\Models\User;
 use Illuminate\Database\Eloquent\Model;
 
-trait DefaultPolicies
+trait DefaultAdminPolicies
 {
     public function viewAny(User $user): bool
     {
diff --git a/app/Policies/Admin/EggPolicy.php b/app/Policies/EggPolicy.php
similarity index 56%
rename from app/Policies/Admin/EggPolicy.php
rename to app/Policies/EggPolicy.php
index 9343f7a94..64d774983 100644
--- a/app/Policies/Admin/EggPolicy.php
+++ b/app/Policies/EggPolicy.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Policies\Admin;
+namespace App\Policies;
 
 class EggPolicy
 {
-    use DefaultPolicies;
+    use DefaultAdminPolicies;
 
     protected string $modelName = 'egg';
 }
diff --git a/app/Policies/Server/FilePolicy.php b/app/Policies/FilePolicy.php
similarity index 96%
rename from app/Policies/Server/FilePolicy.php
rename to app/Policies/FilePolicy.php
index e8f90de35..51d7113ef 100644
--- a/app/Policies/Server/FilePolicy.php
+++ b/app/Policies/FilePolicy.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Policies\Server;
+namespace App\Policies;
 
 use App\Models\Permission;
 use App\Models\User;
diff --git a/app/Policies/Admin/MountPolicy.php b/app/Policies/MountPolicy.php
similarity index 90%
rename from app/Policies/Admin/MountPolicy.php
rename to app/Policies/MountPolicy.php
index 3bc27db83..356ca4685 100644
--- a/app/Policies/Admin/MountPolicy.php
+++ b/app/Policies/MountPolicy.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Policies\Admin;
+namespace App\Policies;
 
 use App\Models\Mount;
 use App\Models\User;
 
 class MountPolicy
 {
-    use DefaultPolicies;
+    use DefaultAdminPolicies;
 
     protected string $modelName = 'mount';
 
diff --git a/app/Policies/Admin/NodePolicy.php b/app/Policies/NodePolicy.php
similarity index 88%
rename from app/Policies/Admin/NodePolicy.php
rename to app/Policies/NodePolicy.php
index 3a33fe19c..412dd0373 100644
--- a/app/Policies/Admin/NodePolicy.php
+++ b/app/Policies/NodePolicy.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Policies\Admin;
+namespace App\Policies;
 
 use App\Models\Node;
 use App\Models\User;
 
 class NodePolicy
 {
-    use DefaultPolicies;
+    use DefaultAdminPolicies;
 
     protected string $modelName = 'node';
 
diff --git a/app/Policies/Admin/RolePolicy.php b/app/Policies/RolePolicy.php
similarity index 56%
rename from app/Policies/Admin/RolePolicy.php
rename to app/Policies/RolePolicy.php
index 3ff909e89..861509299 100644
--- a/app/Policies/Admin/RolePolicy.php
+++ b/app/Policies/RolePolicy.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Policies\Admin;
+namespace App\Policies;
 
 class RolePolicy
 {
-    use DefaultPolicies;
+    use DefaultAdminPolicies;
 
     protected string $modelName = 'role';
 }
diff --git a/app/Policies/Server/SchedulePolicy.php b/app/Policies/SchedulePolicy.php
similarity index 96%
rename from app/Policies/Server/SchedulePolicy.php
rename to app/Policies/SchedulePolicy.php
index 4312c96ed..5d9724d0e 100644
--- a/app/Policies/Server/SchedulePolicy.php
+++ b/app/Policies/SchedulePolicy.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Policies\Server;
+namespace App\Policies;
 
 use App\Models\Permission;
 use App\Models\User;
diff --git a/app/Policies/Server/ServerPolicy.php b/app/Policies/ServerPolicy.php
similarity index 93%
rename from app/Policies/Server/ServerPolicy.php
rename to app/Policies/ServerPolicy.php
index 9b02967e2..a00b26b65 100644
--- a/app/Policies/Server/ServerPolicy.php
+++ b/app/Policies/ServerPolicy.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Policies\Server;
+namespace App\Policies;
 
 use App\Models\Permission;
 use App\Models\Server;
@@ -8,6 +8,10 @@ use App\Models\User;
 
 class ServerPolicy
 {
+    use DefaultAdminPolicies;
+
+    protected string $modelName = 'server';
+
     /**
      * Runs before any of the functions are called. Used to determine if the (sub-)user has permissions.
      */
diff --git a/app/Policies/Server/UserPolicy.php b/app/Policies/SubuserPolicy.php
similarity index 94%
rename from app/Policies/Server/UserPolicy.php
rename to app/Policies/SubuserPolicy.php
index 2d42a544d..3d646bba3 100644
--- a/app/Policies/Server/UserPolicy.php
+++ b/app/Policies/SubuserPolicy.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Policies\Server;
+namespace App\Policies;
 
 use App\Models\Permission;
 use App\Models\User;
 use Filament\Facades\Filament;
 use Illuminate\Database\Eloquent\Model;
 
-class UserPolicy
+class SubuserPolicy
 {
     public function viewAny(User $user): bool
     {
diff --git a/app/Policies/Admin/UserPolicy.php b/app/Policies/UserPolicy.php
similarity index 90%
rename from app/Policies/Admin/UserPolicy.php
rename to app/Policies/UserPolicy.php
index 43abdfa7b..14c15d359 100644
--- a/app/Policies/Admin/UserPolicy.php
+++ b/app/Policies/UserPolicy.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Policies\Admin;
+namespace App\Policies;
 
 use App\Models\User;
 use Illuminate\Database\Eloquent\Model;
 
 class UserPolicy
 {
-    use DefaultPolicies {
+    use DefaultAdminPolicies {
         update as defaultUpdate;
         delete as defaultDelete;
     }
diff --git a/app/Policies/Admin/WebhookConfigurationPolicy.php b/app/Policies/WebhookConfigurationPolicy.php
similarity index 62%
rename from app/Policies/Admin/WebhookConfigurationPolicy.php
rename to app/Policies/WebhookConfigurationPolicy.php
index 5f65d2d7d..3ce18aa15 100644
--- a/app/Policies/Admin/WebhookConfigurationPolicy.php
+++ b/app/Policies/WebhookConfigurationPolicy.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Policies\Admin;
+namespace App\Policies;
 
 class WebhookConfigurationPolicy
 {
-    use DefaultPolicies;
+    use DefaultAdminPolicies;
 
     protected string $modelName = 'webhook';
 }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index e398d1862..d74f3c918 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -26,7 +26,6 @@ use App\Services\Helpers\SoftwareVersionService;
 use Dedoc\Scramble\Scramble;
 use Dedoc\Scramble\Support\Generator\OpenApi;
 use Dedoc\Scramble\Support\Generator\SecurityScheme;
-use Filament\Facades\Filament;
 use Illuminate\Config\Repository;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Foundation\Application;
@@ -109,21 +108,6 @@ class AppServiceProvider extends ServiceProvider
 
         Gate::before(fn (User $user, $ability) => $user->isRootAdmin() ? true : null);
 
-        Gate::guessPolicyNamesUsing(function (string $modelClass) {
-            $panelId = mb_ucfirst(Filament::getCurrentOrDefaultPanel()->getId());
-
-            if ($panelId === 'App') {
-                return;
-            }
-
-            $modelName = class_basename($modelClass);
-            $class = "App\\Policies\\{$panelId}\\{$modelName}Policy";
-
-            if (class_exists($class)) {
-                return $class;
-            }
-        });
-
         AboutCommand::add('Pelican', [
             'Panel Version' => $versionService->currentPanelVersion(),
             'Latest Version' => $versionService->latestPanelVersion(),