diff --git a/app/Filament/Clusters/DynamicData/DynamicDataCluster.php b/app/Filament/Clusters/DynamicData/DynamicDataCluster.php
new file mode 100644
index 00000000..27f3f7d3
--- /dev/null
+++ b/app/Filament/Clusters/DynamicData/DynamicDataCluster.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Filament\Clusters\DynamicData;
+
+use BackedEnum;
+use Filament\Clusters\Cluster;
+
+class DynamicDataCluster extends Cluster
+{
+    protected static string|BackedEnum|null $navigationIcon = 'phosphor-atom';
+
+    protected static ?int $navigationSort = 4;
+}
diff --git a/app/Filament/Resources/CompetitionGroups/CompetitionGroupResource.php b/app/Filament/Clusters/DynamicData/Resources/CompetitionGroups/CompetitionGroupResource.php
similarity index 60%
rename from app/Filament/Resources/CompetitionGroups/CompetitionGroupResource.php
rename to app/Filament/Clusters/DynamicData/Resources/CompetitionGroups/CompetitionGroupResource.php
index d84cb6c6..a016e36b 100644
--- a/app/Filament/Resources/CompetitionGroups/CompetitionGroupResource.php
+++ b/app/Filament/Clusters/DynamicData/Resources/CompetitionGroups/CompetitionGroupResource.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Filament\Resources\CompetitionGroups;
+namespace App\Filament\Clusters\DynamicData\Resources\CompetitionGroups;
 
-use App\Filament\Clusters\Administrator\AdministratorCluster;
-use App\Filament\Resources\CompetitionGroups\Pages\ListCompetitionGroups;
-use App\Filament\Resources\CompetitionGroups\Schemas\CompetitionGroupForm;
-use App\Filament\Resources\CompetitionGroups\Tables\CompetitionGroupsTable;
+use App\Filament\Clusters\DynamicData\DynamicDataCluster;
+use App\Filament\Clusters\DynamicData\Resources\CompetitionGroups\Pages\ListCompetitionGroups;
+use App\Filament\Clusters\DynamicData\Resources\CompetitionGroups\Schemas\CompetitionGroupForm;
+use App\Filament\Clusters\DynamicData\Resources\CompetitionGroups\Tables\CompetitionGroupsTable;
 use App\Models\CompetitionGroup;
 use Filament\Resources\Resource;
 use Filament\Schemas\Schema;
@@ -20,9 +20,11 @@ class CompetitionGroupResource extends Resource
 
     protected static ?string $recordTitleAttribute = 'name';
 
-    protected static ?string $cluster = AdministratorCluster::class;
+    protected static ?string $cluster = DynamicDataCluster::class;
 
-    protected static string|UnitEnum|null $navigationGroup = 'Dynamic Data';
+    protected static string|UnitEnum|null $navigationGroup = 'TxOdds';
+
+    protected static ?string $navigationLabel = 'Groups';
 
     public static function form(Schema $schema): Schema
     {
diff --git a/app/Filament/Resources/CompetitionGroups/Pages/CreateCompetitionGroup.php b/app/Filament/Clusters/DynamicData/Resources/CompetitionGroups/Pages/CreateCompetitionGroup.php
similarity index 51%
rename from app/Filament/Resources/CompetitionGroups/Pages/CreateCompetitionGroup.php
rename to app/Filament/Clusters/DynamicData/Resources/CompetitionGroups/Pages/CreateCompetitionGroup.php
index 6f23694e..207ccf39 100644
--- a/app/Filament/Resources/CompetitionGroups/Pages/CreateCompetitionGroup.php
+++ b/app/Filament/Clusters/DynamicData/Resources/CompetitionGroups/Pages/CreateCompetitionGroup.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\CompetitionGroups\Pages;
+namespace App\Filament\Clusters\DynamicData\Resources\CompetitionGroups\Pages;
 
-use App\Filament\Resources\CompetitionGroups\CompetitionGroupResource;
+use App\Filament\Clusters\DynamicData\Resources\CompetitionGroups\CompetitionGroupResource;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateCompetitionGroup extends CreateRecord
diff --git a/app/Filament/Resources/CompetitionGroups/Pages/EditCompetitionGroup.php b/app/Filament/Clusters/DynamicData/Resources/CompetitionGroups/Pages/EditCompetitionGroup.php
similarity index 50%
rename from app/Filament/Resources/CompetitionGroups/Pages/EditCompetitionGroup.php
rename to app/Filament/Clusters/DynamicData/Resources/CompetitionGroups/Pages/EditCompetitionGroup.php
index 2ef5e416..54081797 100644
--- a/app/Filament/Resources/CompetitionGroups/Pages/EditCompetitionGroup.php
+++ b/app/Filament/Clusters/DynamicData/Resources/CompetitionGroups/Pages/EditCompetitionGroup.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\CompetitionGroups\Pages;
+namespace App\Filament\Clusters\DynamicData\Resources\CompetitionGroups\Pages;
 
-use App\Filament\Resources\CompetitionGroups\CompetitionGroupResource;
+use App\Filament\Clusters\DynamicData\Resources\CompetitionGroups\CompetitionGroupResource;
 use Filament\Resources\Pages\EditRecord;
 
 class EditCompetitionGroup extends EditRecord
diff --git a/app/Filament/Resources/CompetitionGroups/Pages/ListCompetitionGroups.php b/app/Filament/Clusters/DynamicData/Resources/CompetitionGroups/Pages/ListCompetitionGroups.php
similarity index 50%
rename from app/Filament/Resources/CompetitionGroups/Pages/ListCompetitionGroups.php
rename to app/Filament/Clusters/DynamicData/Resources/CompetitionGroups/Pages/ListCompetitionGroups.php
index b29070fc..7649c549 100644
--- a/app/Filament/Resources/CompetitionGroups/Pages/ListCompetitionGroups.php
+++ b/app/Filament/Clusters/DynamicData/Resources/CompetitionGroups/Pages/ListCompetitionGroups.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\CompetitionGroups\Pages;
+namespace App\Filament\Clusters\DynamicData\Resources\CompetitionGroups\Pages;
 
-use App\Filament\Resources\CompetitionGroups\CompetitionGroupResource;
+use App\Filament\Clusters\DynamicData\Resources\CompetitionGroups\CompetitionGroupResource;
 use Filament\Resources\Pages\ListRecords;
 
 class ListCompetitionGroups extends ListRecords
diff --git a/app/Filament/Resources/CompetitionGroups/Schemas/CompetitionGroupForm.php b/app/Filament/Clusters/DynamicData/Resources/CompetitionGroups/Schemas/CompetitionGroupForm.php
similarity index 79%
rename from app/Filament/Resources/CompetitionGroups/Schemas/CompetitionGroupForm.php
rename to app/Filament/Clusters/DynamicData/Resources/CompetitionGroups/Schemas/CompetitionGroupForm.php
index 3c8070fe..6663ab23 100644
--- a/app/Filament/Resources/CompetitionGroups/Schemas/CompetitionGroupForm.php
+++ b/app/Filament/Clusters/DynamicData/Resources/CompetitionGroups/Schemas/CompetitionGroupForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\CompetitionGroups\Schemas;
+namespace App\Filament\Clusters\DynamicData\Resources\CompetitionGroups\Schemas;
 
 use Filament\Forms\Components\TextInput;
 use Filament\Schemas\Schema;
diff --git a/app/Filament/Resources/CompetitionGroups/Tables/CompetitionGroupsTable.php b/app/Filament/Clusters/DynamicData/Resources/CompetitionGroups/Tables/CompetitionGroupsTable.php
similarity index 97%
rename from app/Filament/Resources/CompetitionGroups/Tables/CompetitionGroupsTable.php
rename to app/Filament/Clusters/DynamicData/Resources/CompetitionGroups/Tables/CompetitionGroupsTable.php
index ddc78b07..a3c2f5b2 100644
--- a/app/Filament/Resources/CompetitionGroups/Tables/CompetitionGroupsTable.php
+++ b/app/Filament/Clusters/DynamicData/Resources/CompetitionGroups/Tables/CompetitionGroupsTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\CompetitionGroups\Tables;
+namespace App\Filament\Clusters\DynamicData\Resources\CompetitionGroups\Tables;
 
 use App\Models\CompetitionGroupProvider;
 use App\Models\Country;
diff --git a/app/Filament/Resources/CompetitonGroupProviders/CompetitonGroupProviderResource.php b/app/Filament/Clusters/DynamicData/Resources/CompetitonGroupProviders/CompetitonGroupProviderResource.php
similarity index 58%
rename from app/Filament/Resources/CompetitonGroupProviders/CompetitonGroupProviderResource.php
rename to app/Filament/Clusters/DynamicData/Resources/CompetitonGroupProviders/CompetitonGroupProviderResource.php
index 3d5e1119..4f65ee7e 100644
--- a/app/Filament/Resources/CompetitonGroupProviders/CompetitonGroupProviderResource.php
+++ b/app/Filament/Clusters/DynamicData/Resources/CompetitonGroupProviders/CompetitonGroupProviderResource.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Filament\Resources\CompetitonGroupProviders;
+namespace App\Filament\Clusters\DynamicData\Resources\CompetitonGroupProviders;
 
-use App\Filament\Clusters\Administrator\AdministratorCluster;
-use App\Filament\Resources\CompetitonGroupProviders\Pages\ListCompetitonGroupProviders;
-use App\Filament\Resources\CompetitonGroupProviders\Schemas\CompetitonGroupProviderForm;
-use App\Filament\Resources\CompetitonGroupProviders\Tables\CompetitonGroupProvidersTable;
+use App\Filament\Clusters\DynamicData\DynamicDataCluster;
+use App\Filament\Clusters\DynamicData\Resources\CompetitonGroupProviders\Pages\ListCompetitonGroupProviders;
+use App\Filament\Clusters\DynamicData\Resources\CompetitonGroupProviders\Schemas\CompetitonGroupProviderForm;
+use App\Filament\Clusters\DynamicData\Resources\CompetitonGroupProviders\Tables\CompetitonGroupProvidersTable;
 use App\Models\CompetitionGroupProvider;
 use Filament\Resources\Resource;
 use Filament\Schemas\Schema;
@@ -20,9 +20,11 @@ class CompetitonGroupProviderResource extends Resource
 
     protected static ?string $recordTitleAttribute = 'name';
 
-    protected static ?string $cluster = AdministratorCluster::class;
+    protected static ?string $cluster = DynamicDataCluster::class;
 
-    protected static string|UnitEnum|null $navigationGroup = 'Dynamic Data';
+    protected static string|UnitEnum|null $navigationGroup = 'Provider Relations';
+
+    protected static ?string $navigationLabel = 'Groups';
 
     public static function form(Schema $schema): Schema
     {
diff --git a/app/Filament/Resources/CompetitonGroupProviders/Pages/CreateCompetitonGroupProvider.php b/app/Filament/Clusters/DynamicData/Resources/CompetitonGroupProviders/Pages/CreateCompetitonGroupProvider.php
similarity index 50%
rename from app/Filament/Resources/CompetitonGroupProviders/Pages/CreateCompetitonGroupProvider.php
rename to app/Filament/Clusters/DynamicData/Resources/CompetitonGroupProviders/Pages/CreateCompetitonGroupProvider.php
index c3042abd..87d8f1f0 100644
--- a/app/Filament/Resources/CompetitonGroupProviders/Pages/CreateCompetitonGroupProvider.php
+++ b/app/Filament/Clusters/DynamicData/Resources/CompetitonGroupProviders/Pages/CreateCompetitonGroupProvider.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\CompetitonGroupProviders\Pages;
+namespace App\Filament\Clusters\DynamicData\Resources\CompetitonGroupProviders\Pages;
 
-use App\Filament\Resources\CompetitonGroupProviders\CompetitonGroupProviderResource;
+use App\Filament\Clusters\DynamicData\Resources\CompetitonGroupProviders\CompetitonGroupProviderResource;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateCompetitonGroupProvider extends CreateRecord
diff --git a/app/Filament/Resources/CompetitonGroupProviders/Pages/EditCompetitonGroupProvider.php b/app/Filament/Clusters/DynamicData/Resources/CompetitonGroupProviders/Pages/EditCompetitonGroupProvider.php
similarity index 64%
rename from app/Filament/Resources/CompetitonGroupProviders/Pages/EditCompetitonGroupProvider.php
rename to app/Filament/Clusters/DynamicData/Resources/CompetitonGroupProviders/Pages/EditCompetitonGroupProvider.php
index 12fd525a..8429f08c 100644
--- a/app/Filament/Resources/CompetitonGroupProviders/Pages/EditCompetitonGroupProvider.php
+++ b/app/Filament/Clusters/DynamicData/Resources/CompetitonGroupProviders/Pages/EditCompetitonGroupProvider.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\CompetitonGroupProviders\Pages;
+namespace App\Filament\Clusters\DynamicData\Resources\CompetitonGroupProviders\Pages;
 
-use App\Filament\Resources\CompetitonGroupProviders\CompetitonGroupProviderResource;
+use App\Filament\Clusters\DynamicData\Resources\CompetitonGroupProviders\CompetitonGroupProviderResource;
 use Filament\Actions\DeleteAction;
 use Filament\Resources\Pages\EditRecord;
 
diff --git a/app/Filament/Clusters/DynamicData/Resources/CompetitonGroupProviders/Pages/ListCompetitonGroupProviders.php b/app/Filament/Clusters/DynamicData/Resources/CompetitonGroupProviders/Pages/ListCompetitonGroupProviders.php
new file mode 100644
index 00000000..b1223c97
--- /dev/null
+++ b/app/Filament/Clusters/DynamicData/Resources/CompetitonGroupProviders/Pages/ListCompetitonGroupProviders.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Filament\Clusters\DynamicData\Resources\CompetitonGroupProviders\Pages;
+
+use App\Filament\Clusters\DynamicData\Resources\CompetitonGroupProviders\CompetitonGroupProviderResource;
+use Filament\Resources\Pages\ListRecords;
+
+class ListCompetitonGroupProviders extends ListRecords
+{
+    protected static string $resource = CompetitonGroupProviderResource::class;
+}
diff --git a/app/Filament/Resources/CompetitonGroupProviders/Schemas/CompetitonGroupProviderForm.php b/app/Filament/Clusters/DynamicData/Resources/CompetitonGroupProviders/Schemas/CompetitonGroupProviderForm.php
similarity index 78%
rename from app/Filament/Resources/CompetitonGroupProviders/Schemas/CompetitonGroupProviderForm.php
rename to app/Filament/Clusters/DynamicData/Resources/CompetitonGroupProviders/Schemas/CompetitonGroupProviderForm.php
index 92250d52..7bcbcfa4 100644
--- a/app/Filament/Resources/CompetitonGroupProviders/Schemas/CompetitonGroupProviderForm.php
+++ b/app/Filament/Clusters/DynamicData/Resources/CompetitonGroupProviders/Schemas/CompetitonGroupProviderForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\CompetitonGroupProviders\Schemas;
+namespace App\Filament\Clusters\DynamicData\Resources\CompetitonGroupProviders\Schemas;
 
 use Filament\Forms\Components\TextInput;
 use Filament\Schemas\Schema;
diff --git a/app/Filament/Resources/CompetitonGroupProviders/Tables/CompetitonGroupProvidersTable.php b/app/Filament/Clusters/DynamicData/Resources/CompetitonGroupProviders/Tables/CompetitonGroupProvidersTable.php
similarity index 93%
rename from app/Filament/Resources/CompetitonGroupProviders/Tables/CompetitonGroupProvidersTable.php
rename to app/Filament/Clusters/DynamicData/Resources/CompetitonGroupProviders/Tables/CompetitonGroupProvidersTable.php
index 64da286e..2a50f9c4 100644
--- a/app/Filament/Resources/CompetitonGroupProviders/Tables/CompetitonGroupProvidersTable.php
+++ b/app/Filament/Clusters/DynamicData/Resources/CompetitonGroupProviders/Tables/CompetitonGroupProvidersTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\CompetitonGroupProviders\Tables;
+namespace App\Filament\Clusters\DynamicData\Resources\CompetitonGroupProviders\Tables;
 
 use App\Models\AddByMethod;
 use App\Models\Country;
@@ -40,7 +40,8 @@ class CompetitonGroupProvidersTable
                     ->icon(fn ($record) => $record->competition_group->country->icon),
                 TextColumn::make('competition_group.name')
                     ->searchable(),
-                TextColumn::make('provider_group_id'),
+                TextColumn::make('provider_group_id')->label('PrId')->alignCenter(),
+                TextColumn::make('id')->label('TxId')->alignCenter(),
                 TextColumn::make('name')
                     ->label('Group name')
                     ->searchable(),
diff --git a/app/Filament/Resources/ElementProviders/ElementProviderResource.php b/app/Filament/Clusters/DynamicData/Resources/ElementProviders/ElementProviderResource.php
similarity index 60%
rename from app/Filament/Resources/ElementProviders/ElementProviderResource.php
rename to app/Filament/Clusters/DynamicData/Resources/ElementProviders/ElementProviderResource.php
index e3759694..13118492 100644
--- a/app/Filament/Resources/ElementProviders/ElementProviderResource.php
+++ b/app/Filament/Clusters/DynamicData/Resources/ElementProviders/ElementProviderResource.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Filament\Resources\ElementProviders;
+namespace App\Filament\Clusters\DynamicData\Resources\ElementProviders;
 
-use App\Filament\Clusters\Administrator\AdministratorCluster;
-use App\Filament\Resources\ElementProviders\Pages\ListElementProviders;
-use App\Filament\Resources\ElementProviders\Schemas\ElementProviderForm;
-use App\Filament\Resources\ElementProviders\Tables\ElementProvidersTable;
+use App\Filament\Clusters\DynamicData\DynamicDataCluster;
+use App\Filament\Clusters\DynamicData\Resources\ElementProviders\Pages\ListElementProviders;
+use App\Filament\Clusters\DynamicData\Resources\ElementProviders\Schemas\ElementProviderForm;
+use App\Filament\Clusters\DynamicData\Resources\ElementProviders\Tables\ElementProvidersTable;
 use App\Models\ElementProvider;
 use Filament\Resources\Resource;
 use Filament\Schemas\Schema;
@@ -20,9 +20,11 @@ class ElementProviderResource extends Resource
 
     protected static ?string $recordTitleAttribute = 'name';
 
-    protected static ?string $cluster = AdministratorCluster::class;
+    protected static ?string $cluster = DynamicDataCluster::class;
 
-    protected static string|UnitEnum|null $navigationGroup = 'Dynamic Data';
+    protected static string|UnitEnum|null $navigationGroup = 'Provider Relations';
+
+    protected static ?string $navigationLabel = 'Elements';
 
     public static function form(Schema $schema): Schema
     {
diff --git a/app/Filament/Resources/ElementProviders/Pages/CreateElementProvider.php b/app/Filament/Clusters/DynamicData/Resources/ElementProviders/Pages/CreateElementProvider.php
similarity index 51%
rename from app/Filament/Resources/ElementProviders/Pages/CreateElementProvider.php
rename to app/Filament/Clusters/DynamicData/Resources/ElementProviders/Pages/CreateElementProvider.php
index 430e22a7..18a8e6fd 100644
--- a/app/Filament/Resources/ElementProviders/Pages/CreateElementProvider.php
+++ b/app/Filament/Clusters/DynamicData/Resources/ElementProviders/Pages/CreateElementProvider.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\ElementProviders\Pages;
+namespace App\Filament\Clusters\DynamicData\Resources\ElementProviders\Pages;
 
-use App\Filament\Resources\ElementProviders\ElementProviderResource;
+use App\Filament\Clusters\DynamicData\Resources\ElementProviders\ElementProviderResource;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateElementProvider extends CreateRecord
diff --git a/app/Filament/Resources/ElementProviders/Pages/EditElementProvider.php b/app/Filament/Clusters/DynamicData/Resources/ElementProviders/Pages/EditElementProvider.php
similarity index 66%
rename from app/Filament/Resources/ElementProviders/Pages/EditElementProvider.php
rename to app/Filament/Clusters/DynamicData/Resources/ElementProviders/Pages/EditElementProvider.php
index 513ec6e1..0bdf1c7a 100644
--- a/app/Filament/Resources/ElementProviders/Pages/EditElementProvider.php
+++ b/app/Filament/Clusters/DynamicData/Resources/ElementProviders/Pages/EditElementProvider.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\ElementProviders\Pages;
+namespace App\Filament\Clusters\DynamicData\Resources\ElementProviders\Pages;
 
-use App\Filament\Resources\ElementProviders\ElementProviderResource;
+use App\Filament\Clusters\DynamicData\Resources\ElementProviders\ElementProviderResource;
 use Filament\Actions\DeleteAction;
 use Filament\Resources\Pages\EditRecord;
 
diff --git a/app/Filament/Resources/ElementProviders/Pages/ListElementProviders.php b/app/Filament/Clusters/DynamicData/Resources/ElementProviders/Pages/ListElementProviders.php
similarity index 50%
rename from app/Filament/Resources/ElementProviders/Pages/ListElementProviders.php
rename to app/Filament/Clusters/DynamicData/Resources/ElementProviders/Pages/ListElementProviders.php
index c5a559e3..f6f71588 100644
--- a/app/Filament/Resources/ElementProviders/Pages/ListElementProviders.php
+++ b/app/Filament/Clusters/DynamicData/Resources/ElementProviders/Pages/ListElementProviders.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\ElementProviders\Pages;
+namespace App\Filament\Clusters\DynamicData\Resources\ElementProviders\Pages;
 
-use App\Filament\Resources\ElementProviders\ElementProviderResource;
+use App\Filament\Clusters\DynamicData\Resources\ElementProviders\ElementProviderResource;
 use Filament\Resources\Pages\ListRecords;
 
 class ListElementProviders extends ListRecords
diff --git a/app/Filament/Resources/ElementProviders/Schemas/ElementProviderForm.php b/app/Filament/Clusters/DynamicData/Resources/ElementProviders/Schemas/ElementProviderForm.php
similarity index 82%
rename from app/Filament/Resources/ElementProviders/Schemas/ElementProviderForm.php
rename to app/Filament/Clusters/DynamicData/Resources/ElementProviders/Schemas/ElementProviderForm.php
index ddb9ebdb..750eaf1d 100644
--- a/app/Filament/Resources/ElementProviders/Schemas/ElementProviderForm.php
+++ b/app/Filament/Clusters/DynamicData/Resources/ElementProviders/Schemas/ElementProviderForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\ElementProviders\Schemas;
+namespace App\Filament\Clusters\DynamicData\Resources\ElementProviders\Schemas;
 
 use Filament\Forms\Components\TextInput;
 use Filament\Schemas\Schema;
diff --git a/app/Filament/Resources/ElementProviders/Tables/ElementProvidersTable.php b/app/Filament/Clusters/DynamicData/Resources/ElementProviders/Tables/ElementProvidersTable.php
similarity index 88%
rename from app/Filament/Resources/ElementProviders/Tables/ElementProvidersTable.php
rename to app/Filament/Clusters/DynamicData/Resources/ElementProviders/Tables/ElementProvidersTable.php
index 3e3855c1..a20e06e3 100644
--- a/app/Filament/Resources/ElementProviders/Tables/ElementProvidersTable.php
+++ b/app/Filament/Clusters/DynamicData/Resources/ElementProviders/Tables/ElementProvidersTable.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\ElementProviders\Tables;
+namespace App\Filament\Clusters\DynamicData\Resources\ElementProviders\Tables;
 
 use App\Models\AddByMethod;
 use App\Models\Country;
+use App\Models\Provider;
 use App\Models\Sport;
 use Filament\Actions\BulkActionGroup;
 use Filament\Actions\DeleteAction;
@@ -36,7 +37,8 @@ class ElementProvidersTable
                     ->wrap()
                     ->color('gray')
                     ->icon(fn ($record) => $record->element->country->icon),
-                TextColumn::make('provider_element_id'),
+                TextColumn::make('id')->label('TxId')->alignCenter(),
+                TextColumn::make('provider_element_id')->label('PrId')->alignCenter(),
                 TextColumn::make('element_group.competition_group.name'),
                 TextColumn::make('element.name')->label('TXOdds Name'),
                 TextColumn::make('name')->label('Client Name'),
@@ -45,6 +47,9 @@ class ElementProvidersTable
                     ->icon(fn ($record) => $record->add_by_method->icon)
                     ->label('Add By'),
             ])->filters([
+                SelectFilter::make('provider_id')
+                    ->label('Provider')
+                    ->options(Provider::where('bookmaker_id', '>', 0)->pluck('name', 'id')),
                 SelectFilter::make('sport_id')
                     ->label('Sport')
                     ->options(Sport::where('is_active', 1)->pluck('name', 'id')),
diff --git a/app/Filament/Resources/Elements/ElementResource.php b/app/Filament/Clusters/DynamicData/Resources/Elements/ElementResource.php
similarity index 63%
rename from app/Filament/Resources/Elements/ElementResource.php
rename to app/Filament/Clusters/DynamicData/Resources/Elements/ElementResource.php
index 014b6f20..d593cc8e 100644
--- a/app/Filament/Resources/Elements/ElementResource.php
+++ b/app/Filament/Clusters/DynamicData/Resources/Elements/ElementResource.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Filament\Resources\Elements;
+namespace App\Filament\Clusters\DynamicData\Resources\Elements;
 
-use App\Filament\Clusters\Administrator\AdministratorCluster;
-use App\Filament\Resources\Elements\Pages\ListElements;
-use App\Filament\Resources\Elements\Schemas\ElementForm;
-use App\Filament\Resources\Elements\Tables\ElementsTable;
+use App\Filament\Clusters\DynamicData\DynamicDataCluster;
+use App\Filament\Clusters\DynamicData\Resources\Elements\Pages\ListElements;
+use App\Filament\Clusters\DynamicData\Resources\Elements\Schemas\ElementForm;
+use App\Filament\Clusters\DynamicData\Resources\Elements\Tables\ElementsTable;
 use App\Models\Element;
 use Filament\Resources\Resource;
 use Filament\Schemas\Schema;
@@ -20,9 +20,9 @@ class ElementResource extends Resource
 
     protected static ?string $recordTitleAttribute = 'name';
 
-    protected static ?string $cluster = AdministratorCluster::class;
+    protected static ?string $cluster = DynamicDataCluster::class;
 
-    protected static string|UnitEnum|null $navigationGroup = 'Dynamic Data';
+    protected static string|UnitEnum|null $navigationGroup = 'TxOdds';
 
     public static function form(Schema $schema): Schema
     {
diff --git a/app/Filament/Resources/Elements/Pages/CreateElement.php b/app/Filament/Clusters/DynamicData/Resources/Elements/Pages/CreateElement.php
similarity index 52%
rename from app/Filament/Resources/Elements/Pages/CreateElement.php
rename to app/Filament/Clusters/DynamicData/Resources/Elements/Pages/CreateElement.php
index 9d7a5280..4fe8c68a 100644
--- a/app/Filament/Resources/Elements/Pages/CreateElement.php
+++ b/app/Filament/Clusters/DynamicData/Resources/Elements/Pages/CreateElement.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\Elements\Pages;
+namespace App\Filament\Clusters\DynamicData\Resources\Elements\Pages;
 
-use App\Filament\Resources\Elements\ElementResource;
+use App\Filament\Clusters\DynamicData\Resources\Elements\ElementResource;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateElement extends CreateRecord
diff --git a/app/Filament/Resources/Elements/Pages/EditElement.php b/app/Filament/Clusters/DynamicData/Resources/Elements/Pages/EditElement.php
similarity index 68%
rename from app/Filament/Resources/Elements/Pages/EditElement.php
rename to app/Filament/Clusters/DynamicData/Resources/Elements/Pages/EditElement.php
index f7cc8d96..ef0249cd 100644
--- a/app/Filament/Resources/Elements/Pages/EditElement.php
+++ b/app/Filament/Clusters/DynamicData/Resources/Elements/Pages/EditElement.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\Elements\Pages;
+namespace App\Filament\Clusters\DynamicData\Resources\Elements\Pages;
 
-use App\Filament\Resources\Elements\ElementResource;
+use App\Filament\Clusters\DynamicData\Resources\Elements\ElementResource;
 use Filament\Actions\DeleteAction;
 use Filament\Resources\Pages\EditRecord;
 
diff --git a/app/Filament/Resources/Elements/Pages/ListElements.php b/app/Filament/Clusters/DynamicData/Resources/Elements/Pages/ListElements.php
similarity index 52%
rename from app/Filament/Resources/Elements/Pages/ListElements.php
rename to app/Filament/Clusters/DynamicData/Resources/Elements/Pages/ListElements.php
index 43a83e43..a36410f0 100644
--- a/app/Filament/Resources/Elements/Pages/ListElements.php
+++ b/app/Filament/Clusters/DynamicData/Resources/Elements/Pages/ListElements.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\Elements\Pages;
+namespace App\Filament\Clusters\DynamicData\Resources\Elements\Pages;
 
-use App\Filament\Resources\Elements\ElementResource;
+use App\Filament\Clusters\DynamicData\Resources\Elements\ElementResource;
 use Filament\Resources\Pages\ListRecords;
 
 class ListElements extends ListRecords
diff --git a/app/Filament/Resources/Elements/Schemas/ElementForm.php b/app/Filament/Clusters/DynamicData/Resources/Elements/Schemas/ElementForm.php
similarity index 81%
rename from app/Filament/Resources/Elements/Schemas/ElementForm.php
rename to app/Filament/Clusters/DynamicData/Resources/Elements/Schemas/ElementForm.php
index d1ee953c..9d7e8872 100644
--- a/app/Filament/Resources/Elements/Schemas/ElementForm.php
+++ b/app/Filament/Clusters/DynamicData/Resources/Elements/Schemas/ElementForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\Elements\Schemas;
+namespace App\Filament\Clusters\DynamicData\Resources\Elements\Schemas;
 
 use Filament\Forms\Components\TextInput;
 use Filament\Schemas\Schema;
diff --git a/app/Filament/Resources/Elements/Tables/ElementsTable.php b/app/Filament/Clusters/DynamicData/Resources/Elements/Tables/ElementsTable.php
similarity index 98%
rename from app/Filament/Resources/Elements/Tables/ElementsTable.php
rename to app/Filament/Clusters/DynamicData/Resources/Elements/Tables/ElementsTable.php
index 94caeedb..68117420 100644
--- a/app/Filament/Resources/Elements/Tables/ElementsTable.php
+++ b/app/Filament/Clusters/DynamicData/Resources/Elements/Tables/ElementsTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\Elements\Tables;
+namespace App\Filament\Clusters\DynamicData\Resources\Elements\Tables;
 
 use App\Models\CompetitionGroup;
 use App\Models\Country;
diff --git a/app/Filament/Clusters/Administrator/AdministratorCluster.php b/app/Filament/Clusters/Grapper/GrapperCluster.php
similarity index 67%
rename from app/Filament/Clusters/Administrator/AdministratorCluster.php
rename to app/Filament/Clusters/Grapper/GrapperCluster.php
index 1ab36dc6..70510d04 100644
--- a/app/Filament/Clusters/Administrator/AdministratorCluster.php
+++ b/app/Filament/Clusters/Grapper/GrapperCluster.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Filament\Clusters\Administrator;
+namespace App\Filament\Clusters\Grapper;
 
 use BackedEnum;
 use Filament\Clusters\Cluster;
 
-class AdministratorCluster extends Cluster
+class GrapperCluster extends Cluster
 {
     protected static string|BackedEnum|null $navigationIcon = 'phosphor-atom';
 
diff --git a/app/Filament/Resources/Bookmakers/BookmakerResource.php b/app/Filament/Clusters/Grapper/Resources/Bookmakers/BookmakerResource.php
similarity index 68%
rename from app/Filament/Resources/Bookmakers/BookmakerResource.php
rename to app/Filament/Clusters/Grapper/Resources/Bookmakers/BookmakerResource.php
index 6119bb61..3a1ece82 100644
--- a/app/Filament/Resources/Bookmakers/BookmakerResource.php
+++ b/app/Filament/Clusters/Grapper/Resources/Bookmakers/BookmakerResource.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Filament\Resources\Bookmakers;
+namespace App\Filament\Clusters\Grapper\Resources\Bookmakers;
 
-use App\Filament\Clusters\Administrator\AdministratorCluster;
-use App\Filament\Resources\Bookmakers\Pages\ListBookmakers;
-use App\Filament\Resources\Bookmakers\Schemas\BookmakerForm;
-use App\Filament\Resources\Bookmakers\Tables\BookmakersTable;
+use App\Filament\Clusters\Grapper\GrapperCluster;
+use App\Filament\Clusters\Grapper\Resources\Bookmakers\Pages\ListBookmakers;
+use App\Filament\Clusters\Grapper\Resources\Bookmakers\Schemas\BookmakerForm;
+use App\Filament\Clusters\Grapper\Resources\Bookmakers\Tables\BookmakersTable;
 use App\Models\Bookmaker;
 use Filament\Resources\Resource;
 use Filament\Schemas\Schema;
@@ -20,9 +20,9 @@ class BookmakerResource extends Resource
 
     protected static string|\BackedEnum|null $navigationIcon = 'phosphor-bookmarks-simple';
 
-    protected static ?string $cluster = AdministratorCluster::class;
+    protected static ?string $cluster = GrapperCluster::class;
 
-    protected static string|\UnitEnum|null $navigationGroup = 'Static Data';
+    protected static string|\UnitEnum|null $navigationGroup = 'Grapper';
 
     public static function form(Schema $schema): Schema
     {
diff --git a/app/Filament/Resources/Bookmakers/Pages/CreateBookmaker.php b/app/Filament/Clusters/Grapper/Resources/Bookmakers/Pages/CreateBookmaker.php
similarity index 53%
rename from app/Filament/Resources/Bookmakers/Pages/CreateBookmaker.php
rename to app/Filament/Clusters/Grapper/Resources/Bookmakers/Pages/CreateBookmaker.php
index dcc33c62..2a410306 100644
--- a/app/Filament/Resources/Bookmakers/Pages/CreateBookmaker.php
+++ b/app/Filament/Clusters/Grapper/Resources/Bookmakers/Pages/CreateBookmaker.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\Bookmakers\Pages;
+namespace App\Filament\Clusters\Grapper\Resources\Bookmakers\Pages;
 
-use App\Filament\Resources\Bookmakers\BookmakerResource;
+use App\Filament\Clusters\Grapper\Resources\Bookmakers\BookmakerResource;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateBookmaker extends CreateRecord
diff --git a/app/Filament/Resources/Bookmakers/Pages/EditBookmaker.php b/app/Filament/Clusters/Grapper/Resources/Bookmakers/Pages/EditBookmaker.php
similarity index 69%
rename from app/Filament/Resources/Bookmakers/Pages/EditBookmaker.php
rename to app/Filament/Clusters/Grapper/Resources/Bookmakers/Pages/EditBookmaker.php
index 1e0fbb36..7e5e7022 100644
--- a/app/Filament/Resources/Bookmakers/Pages/EditBookmaker.php
+++ b/app/Filament/Clusters/Grapper/Resources/Bookmakers/Pages/EditBookmaker.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\Bookmakers\Pages;
+namespace App\Filament\Clusters\Grapper\Resources\Bookmakers\Pages;
 
-use App\Filament\Resources\Bookmakers\BookmakerResource;
+use App\Filament\Clusters\Grapper\Resources\Bookmakers\BookmakerResource;
 use Filament\Actions\DeleteAction;
 use Filament\Resources\Pages\EditRecord;
 
diff --git a/app/Filament/Resources/Bookmakers/Pages/ListBookmakers.php b/app/Filament/Clusters/Grapper/Resources/Bookmakers/Pages/ListBookmakers.php
similarity index 69%
rename from app/Filament/Resources/Bookmakers/Pages/ListBookmakers.php
rename to app/Filament/Clusters/Grapper/Resources/Bookmakers/Pages/ListBookmakers.php
index 52aa4093..8350db31 100644
--- a/app/Filament/Resources/Bookmakers/Pages/ListBookmakers.php
+++ b/app/Filament/Clusters/Grapper/Resources/Bookmakers/Pages/ListBookmakers.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\Bookmakers\Pages;
+namespace App\Filament\Clusters\Grapper\Resources\Bookmakers\Pages;
 
-use App\Filament\Resources\Bookmakers\BookmakerResource;
+use App\Filament\Clusters\Grapper\Resources\Bookmakers\BookmakerResource;
 use Filament\Actions\CreateAction;
 use Filament\Resources\Pages\ListRecords;
 
diff --git a/app/Filament/Resources/Bookmakers/Schemas/BookmakerForm.php b/app/Filament/Clusters/Grapper/Resources/Bookmakers/Schemas/BookmakerForm.php
similarity index 87%
rename from app/Filament/Resources/Bookmakers/Schemas/BookmakerForm.php
rename to app/Filament/Clusters/Grapper/Resources/Bookmakers/Schemas/BookmakerForm.php
index bec86f76..596a9a5a 100644
--- a/app/Filament/Resources/Bookmakers/Schemas/BookmakerForm.php
+++ b/app/Filament/Clusters/Grapper/Resources/Bookmakers/Schemas/BookmakerForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\Bookmakers\Schemas;
+namespace App\Filament\Clusters\Grapper\Resources\Bookmakers\Schemas;
 
 use Filament\Forms\Components\TextInput;
 use Filament\Schemas\Schema;
diff --git a/app/Filament/Resources/Bookmakers/Tables/BookmakersTable.php b/app/Filament/Clusters/Grapper/Resources/Bookmakers/Tables/BookmakersTable.php
similarity index 96%
rename from app/Filament/Resources/Bookmakers/Tables/BookmakersTable.php
rename to app/Filament/Clusters/Grapper/Resources/Bookmakers/Tables/BookmakersTable.php
index 47f9ff3d..b2db05f2 100644
--- a/app/Filament/Resources/Bookmakers/Tables/BookmakersTable.php
+++ b/app/Filament/Clusters/Grapper/Resources/Bookmakers/Tables/BookmakersTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\Bookmakers\Tables;
+namespace App\Filament\Clusters\Grapper\Resources\Bookmakers\Tables;
 
 use App\Filament\Tables\Columns\BookmakerIcon;
 use Filament\Actions\EditAction;
diff --git a/app/Filament/Resources/Providers/Pages/CreateProvider.php b/app/Filament/Clusters/Grapper/Resources/Providers/Pages/CreateProvider.php
similarity index 53%
rename from app/Filament/Resources/Providers/Pages/CreateProvider.php
rename to app/Filament/Clusters/Grapper/Resources/Providers/Pages/CreateProvider.php
index 06a745d0..08f47853 100644
--- a/app/Filament/Resources/Providers/Pages/CreateProvider.php
+++ b/app/Filament/Clusters/Grapper/Resources/Providers/Pages/CreateProvider.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\Providers\Pages;
+namespace App\Filament\Clusters\Grapper\Resources\Providers\Pages;
 
-use App\Filament\Resources\Providers\ProviderResource;
+use App\Filament\Clusters\Grapper\Resources\Providers\ProviderResource;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateProvider extends CreateRecord
diff --git a/app/Filament/Resources/Providers/Pages/EditProvider.php b/app/Filament/Clusters/Grapper/Resources/Providers/Pages/EditProvider.php
similarity index 69%
rename from app/Filament/Resources/Providers/Pages/EditProvider.php
rename to app/Filament/Clusters/Grapper/Resources/Providers/Pages/EditProvider.php
index 0c42d64f..37823db9 100644
--- a/app/Filament/Resources/Providers/Pages/EditProvider.php
+++ b/app/Filament/Clusters/Grapper/Resources/Providers/Pages/EditProvider.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\Providers\Pages;
+namespace App\Filament\Clusters\Grapper\Resources\Providers\Pages;
 
-use App\Filament\Resources\Providers\ProviderResource;
+use App\Filament\Clusters\Grapper\Resources\Providers\ProviderResource;
 use Filament\Actions\DeleteAction;
 use Filament\Resources\Pages\EditRecord;
 
diff --git a/app/Filament/Resources/Providers/Pages/ListProviders.php b/app/Filament/Clusters/Grapper/Resources/Providers/Pages/ListProviders.php
similarity index 69%
rename from app/Filament/Resources/Providers/Pages/ListProviders.php
rename to app/Filament/Clusters/Grapper/Resources/Providers/Pages/ListProviders.php
index 9e4e8533..bbd2dc2e 100644
--- a/app/Filament/Resources/Providers/Pages/ListProviders.php
+++ b/app/Filament/Clusters/Grapper/Resources/Providers/Pages/ListProviders.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\Providers\Pages;
+namespace App\Filament\Clusters\Grapper\Resources\Providers\Pages;
 
-use App\Filament\Resources\Providers\ProviderResource;
+use App\Filament\Clusters\Grapper\Resources\Providers\ProviderResource;
 use Filament\Actions\CreateAction;
 use Filament\Resources\Pages\ListRecords;
 
diff --git a/app/Filament/Resources/Providers/ProviderResource.php b/app/Filament/Clusters/Grapper/Resources/Providers/ProviderResource.php
similarity index 66%
rename from app/Filament/Resources/Providers/ProviderResource.php
rename to app/Filament/Clusters/Grapper/Resources/Providers/ProviderResource.php
index b960ed52..6797e1ea 100644
--- a/app/Filament/Resources/Providers/ProviderResource.php
+++ b/app/Filament/Clusters/Grapper/Resources/Providers/ProviderResource.php
@@ -1,17 +1,16 @@
 <?php
 
-namespace App\Filament\Resources\Providers;
+namespace App\Filament\Clusters\Grapper\Resources\Providers;
 
-use App\Filament\Clusters\Administrator\AdministratorCluster;
-use App\Filament\Resources\Providers\Pages\ListProviders;
-use App\Filament\Resources\Providers\Schemas\ProviderForm;
-use App\Filament\Resources\Providers\Tables\ProvidersTable;
+use App\Filament\Clusters\Grapper\GrapperCluster;
+use App\Filament\Clusters\Grapper\Resources\Providers\Pages\ListProviders;
+use App\Filament\Clusters\Grapper\Resources\Providers\Schemas\ProviderForm;
+use App\Filament\Clusters\Grapper\Resources\Providers\Tables\ProvidersTable;
 use App\Models\Provider;
 use BackedEnum;
 use Filament\Resources\Resource;
 use Filament\Schemas\Schema;
 use Filament\Tables\Table;
-use UnitEnum;
 
 class ProviderResource extends Resource
 {
@@ -23,9 +22,9 @@ class ProviderResource extends Resource
 
     protected static ?string $recordTitleAttribute = 'name';
 
-    protected static ?string $cluster = AdministratorCluster::class;
+    protected static ?string $cluster = GrapperCluster::class;
 
-    protected static string|UnitEnum|null $navigationGroup = 'Grapper';
+    protected static string|\UnitEnum|null $navigationGroup = 'Grapper';
 
     public static function form(Schema $schema): Schema
     {
diff --git a/app/Filament/Resources/Providers/Schemas/ProviderForm.php b/app/Filament/Clusters/Grapper/Resources/Providers/Schemas/ProviderForm.php
similarity index 82%
rename from app/Filament/Resources/Providers/Schemas/ProviderForm.php
rename to app/Filament/Clusters/Grapper/Resources/Providers/Schemas/ProviderForm.php
index dddc57f9..047d60bf 100644
--- a/app/Filament/Resources/Providers/Schemas/ProviderForm.php
+++ b/app/Filament/Clusters/Grapper/Resources/Providers/Schemas/ProviderForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\Providers\Schemas;
+namespace App\Filament\Clusters\Grapper\Resources\Providers\Schemas;
 
 use Filament\Forms\Components\TextInput;
 use Filament\Schemas\Schema;
diff --git a/app/Filament/Resources/Providers/Tables/ProvidersTable.php b/app/Filament/Clusters/Grapper/Resources/Providers/Tables/ProvidersTable.php
similarity index 88%
rename from app/Filament/Resources/Providers/Tables/ProvidersTable.php
rename to app/Filament/Clusters/Grapper/Resources/Providers/Tables/ProvidersTable.php
index db012b3c..2e87a9d3 100644
--- a/app/Filament/Resources/Providers/Tables/ProvidersTable.php
+++ b/app/Filament/Clusters/Grapper/Resources/Providers/Tables/ProvidersTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\Providers\Tables;
+namespace App\Filament\Clusters\Grapper\Resources\Providers\Tables;
 
 use Filament\Actions\EditAction;
 use Filament\Tables\Columns\TextColumn;
diff --git a/app/Filament/Resources/Supervisors/Pages/CreateSupervisor.php b/app/Filament/Clusters/Grapper/Resources/Supervisors/Pages/CreateSupervisor.php
similarity index 53%
rename from app/Filament/Resources/Supervisors/Pages/CreateSupervisor.php
rename to app/Filament/Clusters/Grapper/Resources/Supervisors/Pages/CreateSupervisor.php
index 5cf25c03..808a2227 100644
--- a/app/Filament/Resources/Supervisors/Pages/CreateSupervisor.php
+++ b/app/Filament/Clusters/Grapper/Resources/Supervisors/Pages/CreateSupervisor.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\Supervisors\Pages;
+namespace App\Filament\Clusters\Grapper\Resources\Supervisors\Pages;
 
-use App\Filament\Resources\Supervisors\SupervisorResource;
+use App\Filament\Clusters\Grapper\Resources\Supervisors\SupervisorResource;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateSupervisor extends CreateRecord
diff --git a/app/Filament/Resources/Supervisors/Pages/EditSupervisor.php b/app/Filament/Clusters/Grapper/Resources/Supervisors/Pages/EditSupervisor.php
similarity index 68%
rename from app/Filament/Resources/Supervisors/Pages/EditSupervisor.php
rename to app/Filament/Clusters/Grapper/Resources/Supervisors/Pages/EditSupervisor.php
index 8d64037e..c94e027a 100644
--- a/app/Filament/Resources/Supervisors/Pages/EditSupervisor.php
+++ b/app/Filament/Clusters/Grapper/Resources/Supervisors/Pages/EditSupervisor.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\Supervisors\Pages;
+namespace App\Filament\Clusters\Grapper\Resources\Supervisors\Pages;
 
-use App\Filament\Resources\Supervisors\SupervisorResource;
+use App\Filament\Clusters\Grapper\Resources\Supervisors\SupervisorResource;
 use Filament\Actions\DeleteAction;
 use Filament\Resources\Pages\EditRecord;
 
diff --git a/app/Filament/Resources/Supervisors/Pages/ListSupervisors.php b/app/Filament/Clusters/Grapper/Resources/Supervisors/Pages/ListSupervisors.php
similarity index 83%
rename from app/Filament/Resources/Supervisors/Pages/ListSupervisors.php
rename to app/Filament/Clusters/Grapper/Resources/Supervisors/Pages/ListSupervisors.php
index ec8e6c16..3f86db1d 100644
--- a/app/Filament/Resources/Supervisors/Pages/ListSupervisors.php
+++ b/app/Filament/Clusters/Grapper/Resources/Supervisors/Pages/ListSupervisors.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Resources\Supervisors\Pages;
+namespace App\Filament\Clusters\Grapper\Resources\Supervisors\Pages;
 
 use App\Actions\SupervisorStatus;
-use App\Filament\Resources\Supervisors\SupervisorResource;
+use App\Filament\Clusters\Grapper\Resources\Supervisors\SupervisorResource;
 use Filament\Actions\Action;
 use Filament\Actions\CreateAction;
 use Filament\Resources\Pages\ListRecords;
diff --git a/app/Filament/Resources/Supervisors/Schemas/SupervisorForm.php b/app/Filament/Clusters/Grapper/Resources/Supervisors/Schemas/SupervisorForm.php
similarity index 89%
rename from app/Filament/Resources/Supervisors/Schemas/SupervisorForm.php
rename to app/Filament/Clusters/Grapper/Resources/Supervisors/Schemas/SupervisorForm.php
index 3e16df39..49695759 100644
--- a/app/Filament/Resources/Supervisors/Schemas/SupervisorForm.php
+++ b/app/Filament/Clusters/Grapper/Resources/Supervisors/Schemas/SupervisorForm.php
@@ -1,10 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\Supervisors\Schemas;
+namespace App\Filament\Clusters\Grapper\Resources\Supervisors\Schemas;
 
 use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
-use Filament\Schemas\Components\Section;
 use Filament\Schemas\Schema;
 
 class SupervisorForm
diff --git a/app/Filament/Resources/Supervisors/SupervisorResource.php b/app/Filament/Clusters/Grapper/Resources/Supervisors/SupervisorResource.php
similarity index 74%
rename from app/Filament/Resources/Supervisors/SupervisorResource.php
rename to app/Filament/Clusters/Grapper/Resources/Supervisors/SupervisorResource.php
index 6d030ff3..1a8d9d62 100644
--- a/app/Filament/Resources/Supervisors/SupervisorResource.php
+++ b/app/Filament/Clusters/Grapper/Resources/Supervisors/SupervisorResource.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Filament\Resources\Supervisors;
+namespace App\Filament\Clusters\Grapper\Resources\Supervisors;
 
-use App\Filament\Clusters\Administrator\AdministratorCluster;
-use App\Filament\Resources\Supervisors\Pages\ListSupervisors;
+use App\Filament\Clusters\Grapper\GrapperCluster;
+use App\Filament\Clusters\Grapper\Resources\Supervisors\Pages\ListSupervisors;
+use App\Filament\Clusters\Grapper\Resources\Supervisors\Tables\SupervisorsTable;
 use App\Filament\Resources\Supervisors\Schemas\SupervisorForm;
-use App\Filament\Resources\Supervisors\Tables\SupervisorsTable;
 use App\Models\Supervisor;
 use Filament\Resources\Resource;
 use Filament\Schemas\Schema;
@@ -17,7 +17,7 @@ class SupervisorResource extends Resource
 
     protected static string|\BackedEnum|null $navigationIcon = 'phosphor-network';
 
-    protected static ?string $cluster = AdministratorCluster::class;
+    protected static ?string $cluster = GrapperCluster::class;
 
     protected static ?int $navigationSort = 1;
 
diff --git a/app/Filament/Resources/Supervisors/Tables/SupervisorsTable.php b/app/Filament/Clusters/Grapper/Resources/Supervisors/Tables/SupervisorsTable.php
similarity index 98%
rename from app/Filament/Resources/Supervisors/Tables/SupervisorsTable.php
rename to app/Filament/Clusters/Grapper/Resources/Supervisors/Tables/SupervisorsTable.php
index edd303dc..8124ba4b 100644
--- a/app/Filament/Resources/Supervisors/Tables/SupervisorsTable.php
+++ b/app/Filament/Clusters/Grapper/Resources/Supervisors/Tables/SupervisorsTable.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\Supervisors\Tables;
+namespace App\Filament\Clusters\Grapper\Resources\Supervisors\Tables;
 
-use App\Filament\Resources\Supervisors\Pages\ListSupervisors;
+use App\Filament\Clusters\Grapper\Resources\Supervisors\Pages\ListSupervisors;
 use App\Models\Sport;
 use App\Models\Supervisor;
 use App\Models\TxoddsMarket;
diff --git a/app/Filament/Resources/Bettypes/BettypeResource.php b/app/Filament/Clusters/StaticData/Resources/Bettypes/BettypeResource.php
similarity index 58%
rename from app/Filament/Resources/Bettypes/BettypeResource.php
rename to app/Filament/Clusters/StaticData/Resources/Bettypes/BettypeResource.php
index bd3e19fd..371066ca 100644
--- a/app/Filament/Resources/Bettypes/BettypeResource.php
+++ b/app/Filament/Clusters/StaticData/Resources/Bettypes/BettypeResource.php
@@ -1,13 +1,12 @@
 <?php
 
-namespace App\Filament\Resources\Bettypes;
+namespace App\Filament\Clusters\StaticData\Resources\Bettypes;
 
-use App\Filament\Clusters\Administrator\AdministratorCluster;
-use App\Filament\Resources\Bettypes\Pages\ListBettypes;
-use App\Filament\Resources\Bettypes\Schemas\BettypeForm;
-use App\Filament\Resources\Bettypes\Tables\BettypesTable;
+use App\Filament\Clusters\StaticData\Resources\Bettypes\Pages\ListBettypes;
+use App\Filament\Clusters\StaticData\Resources\Bettypes\Schemas\BettypeForm;
+use App\Filament\Clusters\StaticData\Resources\Bettypes\Tables\BettypesTable;
+use App\Filament\Clusters\StaticData\StaticDataCluster;
 use App\Models\Bettype;
-use BackedEnum;
 use Filament\Resources\Resource;
 use Filament\Schemas\Schema;
 use Filament\Tables\Table;
@@ -16,9 +15,11 @@ class BettypeResource extends Resource
 {
     protected static ?string $model = Bettype::class;
 
-    protected static string|BackedEnum|null $navigationIcon = 'phosphor-sliders';
+    protected static string|\BackedEnum|null $navigationIcon = 'phosphor-storefront';
 
-    protected static ?string $cluster = AdministratorCluster::class;
+    protected static ?string $cluster = StaticDataCluster::class;
+
+    protected static ?string $navigationLabel = 'NuhOdds Markets';
 
     protected static string|\UnitEnum|null $navigationGroup = 'Static Data';
 
diff --git a/app/Filament/Resources/Bettypes/Pages/CreateBettype.php b/app/Filament/Clusters/StaticData/Resources/Bettypes/Pages/CreateBettype.php
similarity index 53%
rename from app/Filament/Resources/Bettypes/Pages/CreateBettype.php
rename to app/Filament/Clusters/StaticData/Resources/Bettypes/Pages/CreateBettype.php
index b07aeb1f..a9820193 100644
--- a/app/Filament/Resources/Bettypes/Pages/CreateBettype.php
+++ b/app/Filament/Clusters/StaticData/Resources/Bettypes/Pages/CreateBettype.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\Bettypes\Pages;
+namespace App\Filament\Clusters\StaticData\Resources\Bettypes\Pages;
 
-use App\Filament\Resources\Bettypes\BettypeResource;
+use App\Filament\Clusters\StaticData\Resources\Bettypes\BettypeResource;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateBettype extends CreateRecord
diff --git a/app/Filament/Resources/Bettypes/Pages/EditBettype.php b/app/Filament/Clusters/StaticData/Resources/Bettypes/Pages/EditBettype.php
similarity index 68%
rename from app/Filament/Resources/Bettypes/Pages/EditBettype.php
rename to app/Filament/Clusters/StaticData/Resources/Bettypes/Pages/EditBettype.php
index 316ec659..1a5c1f18 100644
--- a/app/Filament/Resources/Bettypes/Pages/EditBettype.php
+++ b/app/Filament/Clusters/StaticData/Resources/Bettypes/Pages/EditBettype.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\Bettypes\Pages;
+namespace App\Filament\Clusters\StaticData\Resources\Bettypes\Pages;
 
-use App\Filament\Resources\Bettypes\BettypeResource;
+use App\Filament\Clusters\StaticData\Resources\Bettypes\BettypeResource;
 use Filament\Actions\DeleteAction;
 use Filament\Resources\Pages\EditRecord;
 
diff --git a/app/Filament/Resources/Bettypes/Pages/ListBettypes.php b/app/Filament/Clusters/StaticData/Resources/Bettypes/Pages/ListBettypes.php
similarity index 69%
rename from app/Filament/Resources/Bettypes/Pages/ListBettypes.php
rename to app/Filament/Clusters/StaticData/Resources/Bettypes/Pages/ListBettypes.php
index dc6f6299..bb42bc59 100644
--- a/app/Filament/Resources/Bettypes/Pages/ListBettypes.php
+++ b/app/Filament/Clusters/StaticData/Resources/Bettypes/Pages/ListBettypes.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\Bettypes\Pages;
+namespace App\Filament\Clusters\StaticData\Resources\Bettypes\Pages;
 
-use App\Filament\Resources\Bettypes\BettypeResource;
+use App\Filament\Clusters\StaticData\Resources\Bettypes\BettypeResource;
 use Filament\Actions\CreateAction;
 use Filament\Resources\Pages\ListRecords;
 
diff --git a/app/Filament/Resources/Bettypes/Schemas/BettypeForm.php b/app/Filament/Clusters/StaticData/Resources/Bettypes/Schemas/BettypeForm.php
similarity index 75%
rename from app/Filament/Resources/Bettypes/Schemas/BettypeForm.php
rename to app/Filament/Clusters/StaticData/Resources/Bettypes/Schemas/BettypeForm.php
index 8a836d33..303cd9c6 100644
--- a/app/Filament/Resources/Bettypes/Schemas/BettypeForm.php
+++ b/app/Filament/Clusters/StaticData/Resources/Bettypes/Schemas/BettypeForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\Bettypes\Schemas;
+namespace App\Filament\Clusters\StaticData\Resources\Bettypes\Schemas;
 
 use Filament\Schemas\Schema;
 
diff --git a/app/Filament/Resources/Bettypes/Tables/BettypesTable.php b/app/Filament/Clusters/StaticData/Resources/Bettypes/Tables/BettypesTable.php
similarity index 97%
rename from app/Filament/Resources/Bettypes/Tables/BettypesTable.php
rename to app/Filament/Clusters/StaticData/Resources/Bettypes/Tables/BettypesTable.php
index 66ab9640..e3593dfa 100644
--- a/app/Filament/Resources/Bettypes/Tables/BettypesTable.php
+++ b/app/Filament/Clusters/StaticData/Resources/Bettypes/Tables/BettypesTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\Bettypes\Tables;
+namespace App\Filament\Clusters\StaticData\Resources\Bettypes\Tables;
 
 use App\Models\Sport;
 use Filament\Actions\EditAction;
diff --git a/app/Filament/Resources/Countries/CountryResource.php b/app/Filament/Clusters/StaticData/Resources/Countries/CountryResource.php
similarity index 92%
rename from app/Filament/Resources/Countries/CountryResource.php
rename to app/Filament/Clusters/StaticData/Resources/Countries/CountryResource.php
index 950be2f1..30b95a84 100644
--- a/app/Filament/Resources/Countries/CountryResource.php
+++ b/app/Filament/Clusters/StaticData/Resources/Countries/CountryResource.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Resources\Countries;
+namespace App\Filament\Clusters\StaticData\Resources\Countries;
 
-use App\Filament\Clusters\Administrator\AdministratorCluster;
-use App\Filament\Resources\Countries\Pages\ManageCountries;
+use App\Filament\Clusters\StaticData\Resources\Countries\Pages\ManageCountries;
+use App\Filament\Clusters\StaticData\StaticDataCluster;
 use App\Models\Country;
 use Filament\Actions\EditAction;
 use Filament\Forms\Components\TextInput;
@@ -26,7 +26,7 @@ class CountryResource extends Resource
 
     protected static string|\BackedEnum|null $navigationIcon = 'phosphor-flag';
 
-    protected static ?string $cluster = AdministratorCluster::class;
+    protected static ?string $cluster = StaticDataCluster::class;
 
     protected static string|\UnitEnum|null $navigationGroup = 'Static Data';
 
diff --git a/app/Filament/Clusters/StaticData/Resources/Countries/Pages/ManageCountries.php b/app/Filament/Clusters/StaticData/Resources/Countries/Pages/ManageCountries.php
new file mode 100644
index 00000000..01a9c9f7
--- /dev/null
+++ b/app/Filament/Clusters/StaticData/Resources/Countries/Pages/ManageCountries.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Filament\Clusters\StaticData\Resources\Countries\Pages;
+
+use App\Filament\Clusters\StaticData\Resources\Countries\CountryResource;
+use Filament\Resources\Pages\ManageRecords;
+
+class ManageCountries extends ManageRecords
+{
+    protected static string $resource = CountryResource::class;
+}
diff --git a/app/Filament/Clusters/StaticData/Resources/Sports/Pages/ManageSports.php b/app/Filament/Clusters/StaticData/Resources/Sports/Pages/ManageSports.php
new file mode 100644
index 00000000..9119963b
--- /dev/null
+++ b/app/Filament/Clusters/StaticData/Resources/Sports/Pages/ManageSports.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Filament\Clusters\StaticData\Resources\Sports\Pages;
+
+use App\Filament\Clusters\StaticData\Resources\Sports\SportResource;
+use Filament\Resources\Pages\ManageRecords;
+
+class ManageSports extends ManageRecords
+{
+    protected static string $resource = SportResource::class;
+}
diff --git a/app/Filament/Resources/Sports/SportResource.php b/app/Filament/Clusters/StaticData/Resources/Sports/SportResource.php
similarity index 88%
rename from app/Filament/Resources/Sports/SportResource.php
rename to app/Filament/Clusters/StaticData/Resources/Sports/SportResource.php
index 081e924c..3c6e543d 100644
--- a/app/Filament/Resources/Sports/SportResource.php
+++ b/app/Filament/Clusters/StaticData/Resources/Sports/SportResource.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Resources\Sports;
+namespace App\Filament\Clusters\StaticData\Resources\Sports;
 
-use App\Filament\Clusters\Administrator\AdministratorCluster;
-use App\Filament\Resources\Sports\Pages\ManageSports;
+use App\Filament\Clusters\StaticData\Resources\Sports\Pages\ManageSports;
+use App\Filament\Clusters\StaticData\StaticDataCluster;
 use App\Models\Sport;
 use Filament\Resources\Resource;
 use Filament\Support\Enums\IconSize;
@@ -23,7 +23,7 @@ class SportResource extends Resource
 
     protected static ?string $recordTitleAttribute = 'name';
 
-    protected static ?string $cluster = AdministratorCluster::class;
+    protected static ?string $cluster = StaticDataCluster::class;
 
     protected static string|\UnitEnum|null $navigationGroup = 'Static Data';
 
diff --git a/app/Filament/Resources/TxoddsMarkets/Pages/CreateTxoddsMarket.php b/app/Filament/Clusters/StaticData/Resources/TxoddsMarkets/Pages/CreateTxoddsMarket.php
similarity index 52%
rename from app/Filament/Resources/TxoddsMarkets/Pages/CreateTxoddsMarket.php
rename to app/Filament/Clusters/StaticData/Resources/TxoddsMarkets/Pages/CreateTxoddsMarket.php
index 64165ce4..1e0808c8 100644
--- a/app/Filament/Resources/TxoddsMarkets/Pages/CreateTxoddsMarket.php
+++ b/app/Filament/Clusters/StaticData/Resources/TxoddsMarkets/Pages/CreateTxoddsMarket.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\TxoddsMarkets\Pages;
+namespace App\Filament\Clusters\StaticData\Resources\TxoddsMarkets\Pages;
 
-use App\Filament\Resources\TxoddsMarkets\TxoddsMarketResource;
+use App\Filament\Clusters\StaticData\Resources\TxoddsMarkets\TxoddsMarketResource;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateTxoddsMarket extends CreateRecord
diff --git a/app/Filament/Resources/TxoddsMarkets/Pages/EditTxoddsMarket.php b/app/Filament/Clusters/StaticData/Resources/TxoddsMarkets/Pages/EditTxoddsMarket.php
similarity index 51%
rename from app/Filament/Resources/TxoddsMarkets/Pages/EditTxoddsMarket.php
rename to app/Filament/Clusters/StaticData/Resources/TxoddsMarkets/Pages/EditTxoddsMarket.php
index fca4777b..1e0ddd14 100644
--- a/app/Filament/Resources/TxoddsMarkets/Pages/EditTxoddsMarket.php
+++ b/app/Filament/Clusters/StaticData/Resources/TxoddsMarkets/Pages/EditTxoddsMarket.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\TxoddsMarkets\Pages;
+namespace App\Filament\Clusters\StaticData\Resources\TxoddsMarkets\Pages;
 
-use App\Filament\Resources\TxoddsMarkets\TxoddsMarketResource;
+use App\Filament\Clusters\StaticData\Resources\TxoddsMarkets\TxoddsMarketResource;
 use Filament\Resources\Pages\EditRecord;
 
 class EditTxoddsMarket extends EditRecord
diff --git a/app/Filament/Resources/TxoddsMarkets/Pages/ListTxoddsMarkets.php b/app/Filament/Clusters/StaticData/Resources/TxoddsMarkets/Pages/ListTxoddsMarkets.php
similarity index 51%
rename from app/Filament/Resources/TxoddsMarkets/Pages/ListTxoddsMarkets.php
rename to app/Filament/Clusters/StaticData/Resources/TxoddsMarkets/Pages/ListTxoddsMarkets.php
index 6a5839eb..b0079557 100644
--- a/app/Filament/Resources/TxoddsMarkets/Pages/ListTxoddsMarkets.php
+++ b/app/Filament/Clusters/StaticData/Resources/TxoddsMarkets/Pages/ListTxoddsMarkets.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\TxoddsMarkets\Pages;
+namespace App\Filament\Clusters\StaticData\Resources\TxoddsMarkets\Pages;
 
-use App\Filament\Resources\TxoddsMarkets\TxoddsMarketResource;
+use App\Filament\Clusters\StaticData\Resources\TxoddsMarkets\TxoddsMarketResource;
 use Filament\Resources\Pages\ListRecords;
 
 class ListTxoddsMarkets extends ListRecords
diff --git a/app/Filament/Resources/TxoddsMarkets/Schemas/TxoddsMarketForm.php b/app/Filament/Clusters/StaticData/Resources/TxoddsMarkets/Schemas/TxoddsMarketForm.php
similarity index 74%
rename from app/Filament/Resources/TxoddsMarkets/Schemas/TxoddsMarketForm.php
rename to app/Filament/Clusters/StaticData/Resources/TxoddsMarkets/Schemas/TxoddsMarketForm.php
index 80560fab..208895af 100644
--- a/app/Filament/Resources/TxoddsMarkets/Schemas/TxoddsMarketForm.php
+++ b/app/Filament/Clusters/StaticData/Resources/TxoddsMarkets/Schemas/TxoddsMarketForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\TxoddsMarkets\Schemas;
+namespace App\Filament\Clusters\StaticData\Resources\TxoddsMarkets\Schemas;
 
 use Filament\Schemas\Schema;
 
diff --git a/app/Filament/Resources/TxoddsMarkets/Tables/TxoddsMarketsTable.php b/app/Filament/Clusters/StaticData/Resources/TxoddsMarkets/Tables/TxoddsMarketsTable.php
similarity index 96%
rename from app/Filament/Resources/TxoddsMarkets/Tables/TxoddsMarketsTable.php
rename to app/Filament/Clusters/StaticData/Resources/TxoddsMarkets/Tables/TxoddsMarketsTable.php
index 44ab3d27..36b9db69 100644
--- a/app/Filament/Resources/TxoddsMarkets/Tables/TxoddsMarketsTable.php
+++ b/app/Filament/Clusters/StaticData/Resources/TxoddsMarkets/Tables/TxoddsMarketsTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\TxoddsMarkets\Tables;
+namespace App\Filament\Clusters\StaticData\Resources\TxoddsMarkets\Tables;
 
 use Filament\Forms\Components\Select;
 use Filament\Tables\Columns\TextColumn;
diff --git a/app/Filament/Resources/TxoddsMarkets/TxoddsMarketResource.php b/app/Filament/Clusters/StaticData/Resources/TxoddsMarkets/TxoddsMarketResource.php
similarity index 62%
rename from app/Filament/Resources/TxoddsMarkets/TxoddsMarketResource.php
rename to app/Filament/Clusters/StaticData/Resources/TxoddsMarkets/TxoddsMarketResource.php
index a811ca38..1f0b3496 100644
--- a/app/Filament/Resources/TxoddsMarkets/TxoddsMarketResource.php
+++ b/app/Filament/Clusters/StaticData/Resources/TxoddsMarkets/TxoddsMarketResource.php
@@ -1,16 +1,15 @@
 <?php
 
-namespace App\Filament\Resources\TxoddsMarkets;
+namespace App\Filament\Clusters\StaticData\Resources\TxoddsMarkets;
 
-use App\Filament\Clusters\Administrator\AdministratorCluster;
-use App\Filament\Resources\TxoddsMarkets\Pages\ListTxoddsMarkets;
-use App\Filament\Resources\TxoddsMarkets\Schemas\TxoddsMarketForm;
-use App\Filament\Resources\TxoddsMarkets\Tables\TxoddsMarketsTable;
+use App\Filament\Clusters\StaticData\Resources\TxoddsMarkets\Pages\ListTxoddsMarkets;
+use App\Filament\Clusters\StaticData\Resources\TxoddsMarkets\Schemas\TxoddsMarketForm;
+use App\Filament\Clusters\StaticData\Resources\TxoddsMarkets\Tables\TxoddsMarketsTable;
+use App\Filament\Clusters\StaticData\StaticDataCluster;
 use App\Models\TxoddsMarket;
 use Filament\Resources\Resource;
 use Filament\Schemas\Schema;
 use Filament\Tables\Table;
-use UnitEnum;
 
 class TxoddsMarketResource extends Resource
 {
@@ -18,11 +17,11 @@ class TxoddsMarketResource extends Resource
 
     protected static string|\BackedEnum|null $navigationIcon = 'phosphor-storefront';
 
-    protected static ?string $cluster = AdministratorCluster::class;
+    protected static ?string $cluster = StaticDataCluster::class;
 
     protected static ?int $navigationSort = 3;
 
-    protected static string|UnitEnum|null $navigationGroup = 'Grapper';
+    protected static string|\UnitEnum|null $navigationGroup = 'Static Data';
 
     public static function form(Schema $schema): Schema
     {
diff --git a/app/Filament/Clusters/StaticData/StaticDataCluster.php b/app/Filament/Clusters/StaticData/StaticDataCluster.php
new file mode 100644
index 00000000..0d9bc127
--- /dev/null
+++ b/app/Filament/Clusters/StaticData/StaticDataCluster.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Filament\Clusters\StaticData;
+
+use BackedEnum;
+use Filament\Clusters\Cluster;
+
+class StaticDataCluster extends Cluster
+{
+    protected static string|BackedEnum|null $navigationIcon = 'phosphor-atom';
+
+    protected static ?int $navigationSort = 6;
+}
diff --git a/app/Filament/Resources/Clients/ClientResource.php b/app/Filament/Clusters/User/Resources/Clients/ClientResource.php
similarity index 67%
rename from app/Filament/Resources/Clients/ClientResource.php
rename to app/Filament/Clusters/User/Resources/Clients/ClientResource.php
index 9b4cf871..11e0abfd 100644
--- a/app/Filament/Resources/Clients/ClientResource.php
+++ b/app/Filament/Clusters/User/Resources/Clients/ClientResource.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Filament\Resources\Clients;
+namespace App\Filament\Clusters\User\Resources\Clients;
 
-use App\Filament\Clusters\Administrator\AdministratorCluster;
-use App\Filament\Resources\Clients\Pages\ListClients;
-use App\Filament\Resources\Clients\Schemas\ClientForm;
-use App\Filament\Resources\Clients\Tables\ClientsTable;
+use App\Filament\Clusters\User\Resources\Clients\Pages\ListClients;
+use App\Filament\Clusters\User\Resources\Clients\Schemas\ClientForm;
+use App\Filament\Clusters\User\Resources\Clients\Tables\ClientsTable;
+use App\Filament\Clusters\User\UserCluster;
 use App\Models\Client;
 use Filament\Resources\Resource;
 use Filament\Schemas\Schema;
@@ -15,11 +15,11 @@ class ClientResource extends Resource
 {
     protected static ?string $model = Client::class;
 
-    protected static ?int $navigationSort = 33;
+    protected static ?int $navigationSort = 2;
 
     protected static string|\BackedEnum|null $navigationIcon = 'phosphor-baseball-helmet';
 
-    protected static ?string $cluster = AdministratorCluster::class;
+    protected static ?string $cluster = UserCluster::class;
 
     protected static string|\UnitEnum|null $navigationGroup = 'User';
 
diff --git a/app/Filament/Resources/Clients/Pages/CreateClient.php b/app/Filament/Clusters/User/Resources/Clients/Pages/CreateClient.php
similarity index 55%
rename from app/Filament/Resources/Clients/Pages/CreateClient.php
rename to app/Filament/Clusters/User/Resources/Clients/Pages/CreateClient.php
index 9c57f131..cc88595f 100644
--- a/app/Filament/Resources/Clients/Pages/CreateClient.php
+++ b/app/Filament/Clusters/User/Resources/Clients/Pages/CreateClient.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\Clients\Pages;
+namespace App\Filament\Clusters\User\Resources\Clients\Pages;
 
-use App\Filament\Resources\Clients\ClientResource;
+use App\Filament\Clusters\User\Resources\Clients\ClientResource;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateClient extends CreateRecord
diff --git a/app/Filament/Resources/Clients/Pages/EditClient.php b/app/Filament/Clusters/User/Resources/Clients/Pages/EditClient.php
similarity index 71%
rename from app/Filament/Resources/Clients/Pages/EditClient.php
rename to app/Filament/Clusters/User/Resources/Clients/Pages/EditClient.php
index e5942912..cd9b0020 100644
--- a/app/Filament/Resources/Clients/Pages/EditClient.php
+++ b/app/Filament/Clusters/User/Resources/Clients/Pages/EditClient.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\Clients\Pages;
+namespace App\Filament\Clusters\User\Resources\Clients\Pages;
 
-use App\Filament\Resources\Clients\ClientResource;
+use App\Filament\Clusters\User\Resources\Clients\ClientResource;
 use Filament\Actions\DeleteAction;
 use Filament\Resources\Pages\EditRecord;
 
diff --git a/app/Filament/Resources/Clients/Pages/ListClients.php b/app/Filament/Clusters/User/Resources/Clients/Pages/ListClients.php
similarity index 71%
rename from app/Filament/Resources/Clients/Pages/ListClients.php
rename to app/Filament/Clusters/User/Resources/Clients/Pages/ListClients.php
index 220fb61d..794628b3 100644
--- a/app/Filament/Resources/Clients/Pages/ListClients.php
+++ b/app/Filament/Clusters/User/Resources/Clients/Pages/ListClients.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\Clients\Pages;
+namespace App\Filament\Clusters\User\Resources\Clients\Pages;
 
-use App\Filament\Resources\Clients\ClientResource;
+use App\Filament\Clusters\User\Resources\Clients\ClientResource;
 use Filament\Actions\CreateAction;
 use Filament\Resources\Pages\ListRecords;
 
diff --git a/app/Filament/Resources/Clients/Schemas/ClientForm.php b/app/Filament/Clusters/User/Resources/Clients/Schemas/ClientForm.php
similarity index 94%
rename from app/Filament/Resources/Clients/Schemas/ClientForm.php
rename to app/Filament/Clusters/User/Resources/Clients/Schemas/ClientForm.php
index 6b8790ff..88564010 100644
--- a/app/Filament/Resources/Clients/Schemas/ClientForm.php
+++ b/app/Filament/Clusters/User/Resources/Clients/Schemas/ClientForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\Clients\Schemas;
+namespace App\Filament\Clusters\User\Resources\Clients\Schemas;
 
 use App\Models\Bookmaker;
 use App\Models\Provider;
diff --git a/app/Filament/Resources/Clients/Tables/ClientsTable.php b/app/Filament/Clusters/User/Resources/Clients/Tables/ClientsTable.php
similarity index 96%
rename from app/Filament/Resources/Clients/Tables/ClientsTable.php
rename to app/Filament/Clusters/User/Resources/Clients/Tables/ClientsTable.php
index 19dba78d..4ea92a5f 100644
--- a/app/Filament/Resources/Clients/Tables/ClientsTable.php
+++ b/app/Filament/Clusters/User/Resources/Clients/Tables/ClientsTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\Clients\Tables;
+namespace App\Filament\Clusters\User\Resources\Clients\Tables;
 
 use App\Actions\SettingGeneratorClient;
 use App\Models\Bookmaker;
diff --git a/app/Filament/Resources/MultilineSettings/MultilineSettingResource.php b/app/Filament/Clusters/User/Resources/MultilineSettings/MultilineSettingResource.php
similarity index 67%
rename from app/Filament/Resources/MultilineSettings/MultilineSettingResource.php
rename to app/Filament/Clusters/User/Resources/MultilineSettings/MultilineSettingResource.php
index b0b4ee4f..77bef69c 100644
--- a/app/Filament/Resources/MultilineSettings/MultilineSettingResource.php
+++ b/app/Filament/Clusters/User/Resources/MultilineSettings/MultilineSettingResource.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Filament\Resources\MultilineSettings;
+namespace App\Filament\Clusters\User\Resources\MultilineSettings;
 
-use App\Filament\Clusters\Administrator\AdministratorCluster;
-use App\Filament\Resources\MultilineSettings\Pages\ListMultilineSettings;
-use App\Filament\Resources\MultilineSettings\Schemas\MultilineSettingForm;
-use App\Filament\Resources\MultilineSettings\Tables\MultilineSettingsTable;
+use App\Filament\Clusters\User\Resources\MultilineSettings\Pages\ListMultilineSettings;
+use App\Filament\Clusters\User\Resources\MultilineSettings\Schemas\MultilineSettingForm;
+use App\Filament\Clusters\User\Resources\MultilineSettings\Tables\MultilineSettingsTable;
+use App\Filament\Clusters\User\UserCluster;
 use App\Models\MultilineSetting;
 use BackedEnum;
 use Filament\Resources\Resource;
@@ -19,9 +19,11 @@ class MultilineSettingResource extends Resource
 
     protected static string|BackedEnum|null $navigationIcon = Heroicon::Bars3;
 
-    protected static ?string $cluster = AdministratorCluster::class;
+    protected static ?string $cluster = UserCluster::class;
 
-    protected static string|\UnitEnum|null $navigationGroup = 'Static Data';
+    protected static string|\UnitEnum|null $navigationGroup = 'User';
+
+    protected static ?int $navigationSort = 30;
 
     protected static ?string $navigationLabel = 'Multiline';
 
diff --git a/app/Filament/Resources/MultilineSettings/Pages/CreateMultilineSetting.php b/app/Filament/Clusters/User/Resources/MultilineSettings/Pages/CreateMultilineSetting.php
similarity index 53%
rename from app/Filament/Resources/MultilineSettings/Pages/CreateMultilineSetting.php
rename to app/Filament/Clusters/User/Resources/MultilineSettings/Pages/CreateMultilineSetting.php
index 216cd569..a52ede81 100644
--- a/app/Filament/Resources/MultilineSettings/Pages/CreateMultilineSetting.php
+++ b/app/Filament/Clusters/User/Resources/MultilineSettings/Pages/CreateMultilineSetting.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\MultilineSettings\Pages;
+namespace App\Filament\Clusters\User\Resources\MultilineSettings\Pages;
 
-use App\Filament\Resources\MultilineSettings\MultilineSettingResource;
+use App\Filament\Clusters\User\Resources\MultilineSettings\MultilineSettingResource;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateMultilineSetting extends CreateRecord
diff --git a/app/Filament/Resources/MultilineSettings/Pages/EditMultilineSetting.php b/app/Filament/Clusters/User/Resources/MultilineSettings/Pages/EditMultilineSetting.php
similarity index 67%
rename from app/Filament/Resources/MultilineSettings/Pages/EditMultilineSetting.php
rename to app/Filament/Clusters/User/Resources/MultilineSettings/Pages/EditMultilineSetting.php
index 2ec7b923..0a311287 100644
--- a/app/Filament/Resources/MultilineSettings/Pages/EditMultilineSetting.php
+++ b/app/Filament/Clusters/User/Resources/MultilineSettings/Pages/EditMultilineSetting.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\MultilineSettings\Pages;
+namespace App\Filament\Clusters\User\Resources\MultilineSettings\Pages;
 
-use App\Filament\Resources\MultilineSettings\MultilineSettingResource;
+use App\Filament\Clusters\User\Resources\MultilineSettings\MultilineSettingResource;
 use Filament\Actions\DeleteAction;
 use Filament\Resources\Pages\EditRecord;
 
diff --git a/app/Filament/Resources/MultilineSettings/Pages/ListMultilineSettings.php b/app/Filament/Clusters/User/Resources/MultilineSettings/Pages/ListMultilineSettings.php
similarity index 52%
rename from app/Filament/Resources/MultilineSettings/Pages/ListMultilineSettings.php
rename to app/Filament/Clusters/User/Resources/MultilineSettings/Pages/ListMultilineSettings.php
index 5882e486..ed5bbfcd 100644
--- a/app/Filament/Resources/MultilineSettings/Pages/ListMultilineSettings.php
+++ b/app/Filament/Clusters/User/Resources/MultilineSettings/Pages/ListMultilineSettings.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\MultilineSettings\Pages;
+namespace App\Filament\Clusters\User\Resources\MultilineSettings\Pages;
 
-use App\Filament\Resources\MultilineSettings\MultilineSettingResource;
+use App\Filament\Clusters\User\Resources\MultilineSettings\MultilineSettingResource;
 use Filament\Resources\Pages\ListRecords;
 
 class ListMultilineSettings extends ListRecords
diff --git a/app/Filament/Resources/MultilineSettings/Schemas/MultilineSettingForm.php b/app/Filament/Clusters/User/Resources/MultilineSettings/Schemas/MultilineSettingForm.php
similarity index 90%
rename from app/Filament/Resources/MultilineSettings/Schemas/MultilineSettingForm.php
rename to app/Filament/Clusters/User/Resources/MultilineSettings/Schemas/MultilineSettingForm.php
index d85c9b42..0b206082 100644
--- a/app/Filament/Resources/MultilineSettings/Schemas/MultilineSettingForm.php
+++ b/app/Filament/Clusters/User/Resources/MultilineSettings/Schemas/MultilineSettingForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\MultilineSettings\Schemas;
+namespace App\Filament\Clusters\User\Resources\MultilineSettings\Schemas;
 
 use App\Models\Sport;
 use Filament\Forms\Components\Select;
diff --git a/app/Filament/Resources/MultilineSettings/Tables/MultilineSettingsTable.php b/app/Filament/Clusters/User/Resources/MultilineSettings/Tables/MultilineSettingsTable.php
similarity index 92%
rename from app/Filament/Resources/MultilineSettings/Tables/MultilineSettingsTable.php
rename to app/Filament/Clusters/User/Resources/MultilineSettings/Tables/MultilineSettingsTable.php
index 9c22a0eb..170ecdf8 100644
--- a/app/Filament/Resources/MultilineSettings/Tables/MultilineSettingsTable.php
+++ b/app/Filament/Clusters/User/Resources/MultilineSettings/Tables/MultilineSettingsTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\MultilineSettings\Tables;
+namespace App\Filament\Clusters\User\Resources\MultilineSettings\Tables;
 
 use Filament\Actions\BulkActionGroup;
 use Filament\Actions\DeleteBulkAction;
@@ -17,6 +17,7 @@ class MultilineSettingsTable
     public static function configure(Table $table): Table
     {
         return $table
+            ->description('Order of bettypes display in monitor')
             ->columns([
                 IconColumn::make('sport.icon')
                     ->label('')
diff --git a/app/Filament/Resources/UserActivities/Pages/CreateUserActivity.php b/app/Filament/Clusters/User/Resources/UserActivities/Pages/CreateUserActivity.php
similarity index 53%
rename from app/Filament/Resources/UserActivities/Pages/CreateUserActivity.php
rename to app/Filament/Clusters/User/Resources/UserActivities/Pages/CreateUserActivity.php
index 2f1b04f1..7de9a721 100644
--- a/app/Filament/Resources/UserActivities/Pages/CreateUserActivity.php
+++ b/app/Filament/Clusters/User/Resources/UserActivities/Pages/CreateUserActivity.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\UserActivities\Pages;
+namespace App\Filament\Clusters\User\Resources\UserActivities\Pages;
 
-use App\Filament\Resources\UserActivities\UserActivityResource;
+use App\Filament\Clusters\User\Resources\UserActivities\UserActivityResource;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateUserActivity extends CreateRecord
diff --git a/app/Filament/Resources/UserActivities/Pages/EditUserActivity.php b/app/Filament/Clusters/User/Resources/UserActivities/Pages/EditUserActivity.php
similarity index 68%
rename from app/Filament/Resources/UserActivities/Pages/EditUserActivity.php
rename to app/Filament/Clusters/User/Resources/UserActivities/Pages/EditUserActivity.php
index 2d342f9c..8ce52a84 100644
--- a/app/Filament/Resources/UserActivities/Pages/EditUserActivity.php
+++ b/app/Filament/Clusters/User/Resources/UserActivities/Pages/EditUserActivity.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\UserActivities\Pages;
+namespace App\Filament\Clusters\User\Resources\UserActivities\Pages;
 
-use App\Filament\Resources\UserActivities\UserActivityResource;
+use App\Filament\Clusters\User\Resources\UserActivities\UserActivityResource;
 use Filament\Actions\DeleteAction;
 use Filament\Resources\Pages\EditRecord;
 
diff --git a/app/Filament/Resources/UserActivities/Pages/ListUserActivities.php b/app/Filament/Clusters/User/Resources/UserActivities/Pages/ListUserActivities.php
similarity index 53%
rename from app/Filament/Resources/UserActivities/Pages/ListUserActivities.php
rename to app/Filament/Clusters/User/Resources/UserActivities/Pages/ListUserActivities.php
index 0d74f5d4..255f0b9f 100644
--- a/app/Filament/Resources/UserActivities/Pages/ListUserActivities.php
+++ b/app/Filament/Clusters/User/Resources/UserActivities/Pages/ListUserActivities.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\UserActivities\Pages;
+namespace App\Filament\Clusters\User\Resources\UserActivities\Pages;
 
-use App\Filament\Resources\UserActivities\UserActivityResource;
+use App\Filament\Clusters\User\Resources\UserActivities\UserActivityResource;
 use Filament\Resources\Pages\ListRecords;
 
 class ListUserActivities extends ListRecords
diff --git a/app/Filament/Resources/UserActivities/Schemas/UserActivityForm.php b/app/Filament/Clusters/User/Resources/UserActivities/Schemas/UserActivityForm.php
similarity index 75%
rename from app/Filament/Resources/UserActivities/Schemas/UserActivityForm.php
rename to app/Filament/Clusters/User/Resources/UserActivities/Schemas/UserActivityForm.php
index 78f3dae0..29b5da4b 100644
--- a/app/Filament/Resources/UserActivities/Schemas/UserActivityForm.php
+++ b/app/Filament/Clusters/User/Resources/UserActivities/Schemas/UserActivityForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\UserActivities\Schemas;
+namespace App\Filament\Clusters\User\Resources\UserActivities\Schemas;
 
 use Filament\Schemas\Schema;
 
diff --git a/app/Filament/Resources/UserActivities/Tables/UserActivitiesTable.php b/app/Filament/Clusters/User/Resources/UserActivities/Tables/UserActivitiesTable.php
similarity index 98%
rename from app/Filament/Resources/UserActivities/Tables/UserActivitiesTable.php
rename to app/Filament/Clusters/User/Resources/UserActivities/Tables/UserActivitiesTable.php
index 189d8f19..0dfef180 100644
--- a/app/Filament/Resources/UserActivities/Tables/UserActivitiesTable.php
+++ b/app/Filament/Clusters/User/Resources/UserActivities/Tables/UserActivitiesTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\UserActivities\Tables;
+namespace App\Filament\Clusters\User\Resources\UserActivities\Tables;
 
 use App\Models\User;
 use App\Models\UserActivity;
diff --git a/app/Filament/Resources/UserActivities/UserActivityResource.php b/app/Filament/Clusters/User/Resources/UserActivities/UserActivityResource.php
similarity index 69%
rename from app/Filament/Resources/UserActivities/UserActivityResource.php
rename to app/Filament/Clusters/User/Resources/UserActivities/UserActivityResource.php
index 971d2740..22f767fa 100644
--- a/app/Filament/Resources/UserActivities/UserActivityResource.php
+++ b/app/Filament/Clusters/User/Resources/UserActivities/UserActivityResource.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Filament\Resources\UserActivities;
+namespace App\Filament\Clusters\User\Resources\UserActivities;
 
-use App\Filament\Clusters\Administrator\AdministratorCluster;
-use App\Filament\Resources\UserActivities\Pages\ListUserActivities;
-use App\Filament\Resources\UserActivities\Schemas\UserActivityForm;
-use App\Filament\Resources\UserActivities\Tables\UserActivitiesTable;
+use App\Filament\Clusters\User\Resources\UserActivities\Pages\ListUserActivities;
+use App\Filament\Clusters\User\Resources\UserActivities\Schemas\UserActivityForm;
+use App\Filament\Clusters\User\Resources\UserActivities\Tables\UserActivitiesTable;
+use App\Filament\Clusters\User\UserCluster;
 use App\Models\UserActivity;
 use Filament\Resources\Resource;
 use Filament\Schemas\Schema;
@@ -15,9 +15,9 @@ class UserActivityResource extends Resource
 {
     protected static ?string $model = UserActivity::class;
 
-    protected static ?string $cluster = AdministratorCluster::class;
+    protected static ?string $cluster = UserCluster::class;
 
-    protected static ?int $navigationSort = 32;
+    protected static ?int $navigationSort = 20;
 
     protected static string|\UnitEnum|null $navigationGroup = 'User';
 
@@ -50,6 +50,6 @@ class UserActivityResource extends Resource
             ->select('user_id', \DB::raw('count(*) as total'))
             ->groupBy('user_id')
             ->pluck('user_id')
-            ->first() ?? '0';
+            ->first() ?? 0;
     }
 }
diff --git a/app/Filament/Resources/Users/Pages/CreateUser.php b/app/Filament/Clusters/User/Resources/Users/Pages/CreateUser.php
similarity index 56%
rename from app/Filament/Resources/Users/Pages/CreateUser.php
rename to app/Filament/Clusters/User/Resources/Users/Pages/CreateUser.php
index 125b3ff8..e9918c0a 100644
--- a/app/Filament/Resources/Users/Pages/CreateUser.php
+++ b/app/Filament/Clusters/User/Resources/Users/Pages/CreateUser.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\Users\Pages;
+namespace App\Filament\Clusters\User\Resources\Users\Pages;
 
-use App\Filament\Resources\Users\UserResource;
+use App\Filament\Clusters\User\Resources\Users\UserResource;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateUser extends CreateRecord
diff --git a/app/Filament/Resources/Users/Pages/EditUser.php b/app/Filament/Clusters/User/Resources/Users/Pages/EditUser.php
similarity index 71%
rename from app/Filament/Resources/Users/Pages/EditUser.php
rename to app/Filament/Clusters/User/Resources/Users/Pages/EditUser.php
index 4c7c1325..3e28d937 100644
--- a/app/Filament/Resources/Users/Pages/EditUser.php
+++ b/app/Filament/Clusters/User/Resources/Users/Pages/EditUser.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\Users\Pages;
+namespace App\Filament\Clusters\User\Resources\Users\Pages;
 
-use App\Filament\Resources\Users\UserResource;
+use App\Filament\Clusters\User\Resources\Users\UserResource;
 use Filament\Actions\DeleteAction;
 use Filament\Resources\Pages\EditRecord;
 
diff --git a/app/Filament/Resources/Users/Pages/ListUsers.php b/app/Filament/Clusters/User/Resources/Users/Pages/ListUsers.php
similarity index 71%
rename from app/Filament/Resources/Users/Pages/ListUsers.php
rename to app/Filament/Clusters/User/Resources/Users/Pages/ListUsers.php
index 6f0e73de..214bec2c 100644
--- a/app/Filament/Resources/Users/Pages/ListUsers.php
+++ b/app/Filament/Clusters/User/Resources/Users/Pages/ListUsers.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Resources\Users\Pages;
+namespace App\Filament\Clusters\User\Resources\Users\Pages;
 
-use App\Filament\Resources\Users\UserResource;
+use App\Filament\Clusters\User\Resources\Users\UserResource;
 use Filament\Actions\CreateAction;
 use Filament\Resources\Pages\ListRecords;
 
diff --git a/app/Filament/Resources/Users/Schemas/UserForm.php b/app/Filament/Clusters/User/Resources/Users/Schemas/UserForm.php
similarity index 98%
rename from app/Filament/Resources/Users/Schemas/UserForm.php
rename to app/Filament/Clusters/User/Resources/Users/Schemas/UserForm.php
index 021453e3..6931d9c0 100644
--- a/app/Filament/Resources/Users/Schemas/UserForm.php
+++ b/app/Filament/Clusters/User/Resources/Users/Schemas/UserForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\Users\Schemas;
+namespace App\Filament\Clusters\User\Resources\Users\Schemas;
 
 use App\Models\Bookmaker;
 use Filament\Forms\Components\Hidden;
diff --git a/app/Filament/Resources/Users/Tables/UsersTable.php b/app/Filament/Clusters/User/Resources/Users/Tables/UsersTable.php
similarity index 96%
rename from app/Filament/Resources/Users/Tables/UsersTable.php
rename to app/Filament/Clusters/User/Resources/Users/Tables/UsersTable.php
index c7f9cd8b..eb06c2ee 100644
--- a/app/Filament/Resources/Users/Tables/UsersTable.php
+++ b/app/Filament/Clusters/User/Resources/Users/Tables/UsersTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\Users\Tables;
+namespace App\Filament\Clusters\User\Resources\Users\Tables;
 
 use App\Actions\SettingGeneratorUser;
 use Filament\Actions\Action;
diff --git a/app/Filament/Resources/Users/UserResource.php b/app/Filament/Clusters/User/Resources/Users/UserResource.php
similarity index 71%
rename from app/Filament/Resources/Users/UserResource.php
rename to app/Filament/Clusters/User/Resources/Users/UserResource.php
index 2c882232..bb153444 100644
--- a/app/Filament/Resources/Users/UserResource.php
+++ b/app/Filament/Clusters/User/Resources/Users/UserResource.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Filament\Resources\Users;
+namespace App\Filament\Clusters\User\Resources\Users;
 
-use App\Filament\Clusters\Administrator\AdministratorCluster;
-use App\Filament\Resources\Users\Pages\ListUsers;
-use App\Filament\Resources\Users\Schemas\UserForm;
-use App\Filament\Resources\Users\Tables\UsersTable;
+use App\Filament\Clusters\User\Resources\Users\Pages\ListUsers;
+use App\Filament\Clusters\User\Resources\Users\Schemas\UserForm;
+use App\Filament\Clusters\User\Resources\Users\Tables\UsersTable;
+use App\Filament\Clusters\User\UserCluster;
 use App\Models\User;
 use Filament\Resources\Resource;
 use Filament\Schemas\Schema;
@@ -15,13 +15,13 @@ class UserResource extends Resource
 {
     protected static ?string $model = User::class;
 
-    protected static ?int $navigationSort = 31;
+    protected static ?int $navigationSort = 1;
 
     protected static string|\BackedEnum|null $navigationIcon = 'phosphor-user';
 
     protected static ?string $recordTitleAttribute = 'name';
 
-    protected static ?string $cluster = AdministratorCluster::class;
+    protected static ?string $cluster = UserCluster::class;
 
     protected static string|\UnitEnum|null $navigationGroup = 'User';
 
diff --git a/app/Filament/Clusters/User/UserCluster.php b/app/Filament/Clusters/User/UserCluster.php
new file mode 100644
index 00000000..6872c4c7
--- /dev/null
+++ b/app/Filament/Clusters/User/UserCluster.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Filament\Clusters\User;
+
+use BackedEnum;
+use Filament\Clusters\Cluster;
+
+class UserCluster extends Cluster
+{
+    protected static string|BackedEnum|null $navigationIcon = 'phosphor-atom';
+
+    protected static ?int $navigationSort = 2;
+}
diff --git a/app/Filament/Resources/CompetitonGroupProviders/Pages/ListCompetitonGroupProviders.php b/app/Filament/Resources/CompetitonGroupProviders/Pages/ListCompetitonGroupProviders.php
deleted file mode 100644
index f458c798..00000000
--- a/app/Filament/Resources/CompetitonGroupProviders/Pages/ListCompetitonGroupProviders.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\CompetitonGroupProviders\Pages;
-
-use App\Filament\Resources\CompetitonGroupProviders\CompetitonGroupProviderResource;
-use Filament\Resources\Pages\ListRecords;
-
-class ListCompetitonGroupProviders extends ListRecords
-{
-    protected static string $resource = CompetitonGroupProviderResource::class;
-}
diff --git a/app/Filament/Resources/Countries/Pages/ManageCountries.php b/app/Filament/Resources/Countries/Pages/ManageCountries.php
deleted file mode 100644
index 0a3f5fd3..00000000
--- a/app/Filament/Resources/Countries/Pages/ManageCountries.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\Countries\Pages;
-
-use App\Filament\Resources\Countries\CountryResource;
-use Filament\Actions\CreateAction;
-use Filament\Resources\Pages\ManageRecords;
-
-class ManageCountries extends ManageRecords
-{
-    protected static string $resource = CountryResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            // CreateAction::make(),
-        ];
-    }
-}
diff --git a/app/Filament/Resources/Sports/Pages/ManageSports.php b/app/Filament/Resources/Sports/Pages/ManageSports.php
deleted file mode 100644
index f21d344b..00000000
--- a/app/Filament/Resources/Sports/Pages/ManageSports.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\Sports\Pages;
-
-use App\Filament\Resources\Sports\SportResource;
-use Filament\Actions\CreateAction;
-use Filament\Resources\Pages\ManageRecords;
-
-class ManageSports extends ManageRecords
-{
-    protected static string $resource = SportResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            // CreateAction::make(),
-        ];
-    }
-}
diff --git a/app/Providers/Filament/AdminPanelProvider.php b/app/Providers/Filament/AdminPanelProvider.php
index cefa5156..8ecf5d54 100644
--- a/app/Providers/Filament/AdminPanelProvider.php
+++ b/app/Providers/Filament/AdminPanelProvider.php
@@ -102,7 +102,10 @@ class AdminPanelProvider extends PanelProvider
             ->authMiddleware([
                 Authenticate::class,
             ])->plugins([
-                FilamentShieldPlugin::make(),
+                FilamentShieldPlugin::make()
+                    ->navigationGroup('User')
+                    ->navigationSort(10)
+                    ->navigationBadge(5),
                 // HooksHelperPlugin::make(),
                 FilamentEditProfilePlugin::make()->shouldRegisterNavigation(false),
                 LightSwitchPlugin::make()->position(Alignment::BottomCenter),
diff --git a/config/filament-shield.php b/config/filament-shield.php
index 7d8a694b..da5ea0ed 100644
--- a/config/filament-shield.php
+++ b/config/filament-shield.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use App\Filament\Clusters\Administrator\AdministratorCluster;
+use App\Filament\Clusters\User\UserCluster;
 
 return [
 
@@ -20,7 +20,7 @@ return [
     'shield_resource' => [
         'slug' => 'shield/roles',
         'show_model_path' => true,
-        'cluster' => AdministratorCluster::class,
+        'cluster' => UserCluster::class,
         'tabs' => [
             'pages' => true,
             'widgets' => true,