diff --git a/composer.json b/composer.json
index 7427576..f4cfc9d 100755
--- a/composer.json
+++ b/composer.json
@@ -13,6 +13,7 @@
         "aws/aws-sdk-php": "^3.356",
         "bezhansalleh/filament-language-switch": "^3.1",
         "bezhansalleh/filament-shield": "^3.3",
+        "coolsam/modules": "^4.2",
         "filament/filament": "^3.3",
         "guzzlehttp/guzzle": "^7.10",
         "honeystone/laravel-seo": "^2.0",
@@ -123,4 +124,4 @@
     },
     "minimum-stability": "stable",
     "prefer-stable": true
-}
\ No newline at end of file
+}
diff --git a/composer.lock b/composer.lock
index a967635..821eb73 100755
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "898c7af4e415c97ef44c8bdb50b17e45",
+    "content-hash": "79a82df066235bc578efb1a8890e720c",
     "packages": [
         {
             "name": "amphp/amp",
@@ -1603,6 +1603,84 @@
             ],
             "time": "2025-08-20T19:15:30+00:00"
         },
+        {
+            "name": "coolsam/modules",
+            "version": "v4.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/savannabits/filament-modules.git",
+                "reference": "fb40e63c8aa5920613e4db06002045167d03ee25"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/savannabits/filament-modules/zipball/fb40e63c8aa5920613e4db06002045167d03ee25",
+                "reference": "fb40e63c8aa5920613e4db06002045167d03ee25",
+                "shasum": ""
+            },
+            "require": {
+                "filament/filament": "^3.0",
+                "nwidart/laravel-modules": "^11.0|^12.0",
+                "php": "^8.2",
+                "spatie/laravel-package-tools": "^1.15.0"
+            },
+            "require-dev": {
+                "barryvdh/laravel-ide-helper": "^3.5",
+                "laravel/pint": "^1.0",
+                "nunomaduro/larastan": "^3.1.0",
+                "orchestra/testbench": "^9.12",
+                "pestphp/pest-plugin-laravel": "^3.1",
+                "pestphp/pest-plugin-livewire": "^3.0",
+                "phpstan/extension-installer": "^1.4.3",
+                "spatie/laravel-ray": "^1.39"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "aliases": {
+                        "FilamentModules": "FilamentModules"
+                    },
+                    "providers": [
+                        "Coolsam\\Modules\\ModulesServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Coolsam\\Modules\\": "src/",
+                    "Coolsam\\Modules\\Database\\Factories\\": "database/factories/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Sam Maosa",
+                    "email": "maosa.sam@gmail.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Organize your Filament Code into modules using nwidart/laravel-modules",
+            "homepage": "https://github.com/savannabits/filament-modules",
+            "keywords": [
+                "FilamentModules",
+                "coolsam",
+                "filament",
+                "laravel"
+            ],
+            "support": {
+                "issues": "https://github.com/savannabits/filament-modules/issues",
+                "source": "https://github.com/savannabits/filament-modules"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/coolsam",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-09-03T10:49:06+00:00"
+        },
         {
             "name": "danharrin/date-format-converter",
             "version": "v0.3.1",
diff --git a/config/filament-activitylog.php b/config/filament-activitylog.php
index 78b577d..d446398 100644
--- a/config/filament-activitylog.php
+++ b/config/filament-activitylog.php
@@ -16,7 +16,7 @@
         'default_sort_column' => 'id',
         'default_sort_direction' => 'desc',
         'navigation_count_badge' => false,
-        'resource' => App\Filament\Pages\ActivityLog::class,
+        'resource' => Modules\Admin\Filament\Pages\ActivityLog::class,
     ],
     'date_format' => 'd/m/Y',
     'datetime_format' => 'd/m/Y H:i:s',
diff --git a/config/filament-modules.php b/config/filament-modules.php
new file mode 100644
index 0000000..008c279
--- /dev/null
+++ b/config/filament-modules.php
@@ -0,0 +1,10 @@
+<?php
+
+// config for Coolsam/Modules
+return [
+    'auto-register-plugins' => true, // whether to auto-register plugins from various modules in the Panel
+    'clusters' => [
+        'enabled' => true, // whether to enable the clusters feature which allows you to group each module's filament resources and pages into a cluster
+        'use-top-navigation' => true, // display the main cluster menu in the top navigation and the sub-navigation in the side menu, which improves the UI
+    ],
+];
diff --git a/modules/Admin/app/Filament/AdminPlugin.php b/modules/Admin/app/Filament/AdminPlugin.php
new file mode 100644
index 0000000..7a72a7e
--- /dev/null
+++ b/modules/Admin/app/Filament/AdminPlugin.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Modules\Admin\Filament;
+
+use Coolsam\Modules\Concerns\ModuleFilamentPlugin;
+use Filament\Contracts\Plugin;
+use Filament\Panel;
+
+class AdminPlugin implements Plugin
+{
+    use ModuleFilamentPlugin;
+
+    public function getModuleName(): string
+    {
+        return 'Admin';
+    }
+
+    public function getId(): string
+    {
+        return 'admin';
+    }
+
+    public function boot(Panel $panel): void
+    {
+        // Implement boot() method.
+    }
+}
diff --git a/modules/Admin/app/Filament/Clusters/Admin.php b/modules/Admin/app/Filament/Clusters/Admin.php
new file mode 100644
index 0000000..dd751a2
--- /dev/null
+++ b/modules/Admin/app/Filament/Clusters/Admin.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\Admin\Filament\Clusters;
+
+use Filament\Clusters\Cluster;
+use Nwidart\Modules\Facades\Module;
+
+class Admin extends Cluster
+{
+    public static function getModuleName(): string
+    {
+        return 'Admin';
+    }
+
+    public static function getModule(): \Nwidart\Modules\Module
+    {
+        return Module::findOrFail(static::getModuleName());
+    }
+
+    public static function getNavigationLabel(): string
+    {
+        return __('Admin');
+    }
+
+    public static function getNavigationIcon(): ?string
+    {
+        return 'heroicon-o-squares-2x2';
+    }
+}
diff --git a/app/Forms/Components/SpatieMediaLibraryFileUpload.php b/modules/Admin/app/Filament/Components/SpatieMediaLibraryFileUpload.php
similarity index 97%
rename from app/Forms/Components/SpatieMediaLibraryFileUpload.php
rename to modules/Admin/app/Filament/Components/SpatieMediaLibraryFileUpload.php
index c2d95b0..5cdcfbb 100644
--- a/app/Forms/Components/SpatieMediaLibraryFileUpload.php
+++ b/modules/Admin/app/Filament/Components/SpatieMediaLibraryFileUpload.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Forms\Components;
+namespace Modules\Admin\Filament\Components;
 
 use Filament\Forms\Components\FileUpload;
 use Filament\Notifications\Notification;
diff --git a/app/Forms/Components/SpatieMediaLibraryMarkdownEditor.php b/modules/Admin/app/Filament/Components/SpatieMediaLibraryMarkdownEditor.php
similarity index 96%
rename from app/Forms/Components/SpatieMediaLibraryMarkdownEditor.php
rename to modules/Admin/app/Filament/Components/SpatieMediaLibraryMarkdownEditor.php
index 08a523f..7800ad8 100644
--- a/app/Forms/Components/SpatieMediaLibraryMarkdownEditor.php
+++ b/modules/Admin/app/Filament/Components/SpatieMediaLibraryMarkdownEditor.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Forms\Components;
+namespace Modules\Admin\Filament\Components;
 
 use Filament\Forms\Components\MarkdownEditor;
 use Filament\Notifications\Notification;
diff --git a/app/Filament/Pages/ActivityLog.php b/modules/Admin/app/Filament/Pages/ActivityLog.php
similarity index 84%
rename from app/Filament/Pages/ActivityLog.php
rename to modules/Admin/app/Filament/Pages/ActivityLog.php
index 292da9a..3a2d1b7 100644
--- a/app/Filament/Pages/ActivityLog.php
+++ b/modules/Admin/app/Filament/Pages/ActivityLog.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Pages;
+namespace Modules\Admin\Filament\Pages;
 
 use BezhanSalleh\FilamentShield\Traits\HasPanelShield;
 use Rmsramos\Activitylog\Resources\ActivitylogResource as BaseActivityLogPage;
diff --git a/app/Filament/Pages/Auth/EmailVerification.php b/modules/Admin/app/Filament/Pages/Auth/EmailVerification.php
similarity index 97%
rename from app/Filament/Pages/Auth/EmailVerification.php
rename to modules/Admin/app/Filament/Pages/Auth/EmailVerification.php
index 0f839e4..33d99e5 100755
--- a/app/Filament/Pages/Auth/EmailVerification.php
+++ b/modules/Admin/app/Filament/Pages/Auth/EmailVerification.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Pages\Auth;
+namespace Modules\Admin\Filament\Pages\Auth;
 
 use App\Services\SettingsService;
 use DanHarrin\LivewireRateLimiting\Exceptions\TooManyRequestsException;
diff --git a/app/Filament/Pages/Auth/Login.php b/modules/Admin/app/Filament/Pages/Auth/Login.php
similarity index 97%
rename from app/Filament/Pages/Auth/Login.php
rename to modules/Admin/app/Filament/Pages/Auth/Login.php
index a655415..24a59a4 100755
--- a/app/Filament/Pages/Auth/Login.php
+++ b/modules/Admin/app/Filament/Pages/Auth/Login.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Pages\Auth;
+namespace Modules\Admin\Filament\Pages\Auth;
 
 use App\Services\SettingsService;
 use App\Settings\SecuritySettings;
diff --git a/app/Filament/Pages/Auth/Register.php b/modules/Admin/app/Filament/Pages/Auth/Register.php
similarity index 98%
rename from app/Filament/Pages/Auth/Register.php
rename to modules/Admin/app/Filament/Pages/Auth/Register.php
index a41491a..3d2f71f 100755
--- a/app/Filament/Pages/Auth/Register.php
+++ b/modules/Admin/app/Filament/Pages/Auth/Register.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Pages\Auth;
+namespace Modules\Admin\Filament\Pages\Auth;
 
 use App\Services\SettingsService;
 use App\Settings\SecuritySettings;
diff --git a/app/Filament/Pages/Auth/ResetPassword.php b/modules/Admin/app/Filament/Pages/Auth/ResetPassword.php
similarity index 97%
rename from app/Filament/Pages/Auth/ResetPassword.php
rename to modules/Admin/app/Filament/Pages/Auth/ResetPassword.php
index 480742c..1afd728 100755
--- a/app/Filament/Pages/Auth/ResetPassword.php
+++ b/modules/Admin/app/Filament/Pages/Auth/ResetPassword.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Pages\Auth;
+namespace Modules\Admin\Filament\Pages\Auth;
 
 use App\Models\User;
 use App\Services\SettingsService;
diff --git a/app/Filament/Pages/Dashboard.php b/modules/Admin/app/Filament/Pages/Dashboard.php
similarity index 82%
rename from app/Filament/Pages/Dashboard.php
rename to modules/Admin/app/Filament/Pages/Dashboard.php
index 4b70156..10d0bfb 100644
--- a/app/Filament/Pages/Dashboard.php
+++ b/modules/Admin/app/Filament/Pages/Dashboard.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Pages;
+namespace Modules\Admin\Filament\Pages;
 
 use Filament\Pages\Dashboard as BaseDashboard;
 
diff --git a/app/Filament/Pages/MyProfile.php b/modules/Admin/app/Filament/Pages/MyProfile.php
similarity index 83%
rename from app/Filament/Pages/MyProfile.php
rename to modules/Admin/app/Filament/Pages/MyProfile.php
index 152987c..e8c309d 100755
--- a/app/Filament/Pages/MyProfile.php
+++ b/modules/Admin/app/Filament/Pages/MyProfile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Pages;
+namespace Modules\Admin\Filament\Pages;
 
 use BezhanSalleh\FilamentShield\Traits\HasPageShield;
 use Jeffgreco13\FilamentBreezy\Pages\MyProfilePage as BaseMyProfilePage;
diff --git a/app/Filament/Pages/Settings.php b/modules/Admin/app/Filament/Pages/Settings.php
similarity index 97%
rename from app/Filament/Pages/Settings.php
rename to modules/Admin/app/Filament/Pages/Settings.php
index fc6e523..bde97f7 100755
--- a/app/Filament/Pages/Settings.php
+++ b/modules/Admin/app/Filament/Pages/Settings.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace App\Filament\Pages;
+namespace Modules\Admin\Filament\Pages;
 
-use App\Filament\Pages\Settings as PartSettings;
 use App\Jobs\GenerateSitemapJob;
 use App\Services\SettingsService;
 use App\Settings as BaseSettings;
@@ -15,8 +14,8 @@
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Storage;
+use Modules\Admin\Filament\Pages\Settings as PartSettings;
 
 /**
  * @property Forms\Form $form
@@ -136,11 +135,6 @@ public function clearCache(): void
     {
         Artisan::call('optimize:clear');
         Artisan::call('filament:optimize-clear');
-        Cache::forget('widget-image-models');
-        Cache::forget('chat-settings');
-        Cache::forget('image-settings');
-        Cache::forget('file-manager-settings');
-        Cache::forget('chat-models');
 
         Notification::make()
             ->title(__('Cache successfully cleared'))
diff --git a/app/Filament/Pages/Settings/SecuritySettings.php b/modules/Admin/app/Filament/Pages/Settings/SecuritySettings.php
similarity index 99%
rename from app/Filament/Pages/Settings/SecuritySettings.php
rename to modules/Admin/app/Filament/Pages/Settings/SecuritySettings.php
index a996bf2..8ad55b1 100755
--- a/app/Filament/Pages/Settings/SecuritySettings.php
+++ b/modules/Admin/app/Filament/Pages/Settings/SecuritySettings.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Pages\Settings;
+namespace Modules\Admin\Filament\Pages\Settings;
 
 use Filament\Forms;
 
diff --git a/app/Filament/Pages/Settings/SeoSettings.php b/modules/Admin/app/Filament/Pages/Settings/SeoSettings.php
similarity index 99%
rename from app/Filament/Pages/Settings/SeoSettings.php
rename to modules/Admin/app/Filament/Pages/Settings/SeoSettings.php
index 9986bdd..b8dacd8 100755
--- a/app/Filament/Pages/Settings/SeoSettings.php
+++ b/modules/Admin/app/Filament/Pages/Settings/SeoSettings.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Pages\Settings;
+namespace Modules\Admin\Filament\Pages\Settings;
 
 use Filament\Forms;
 
diff --git a/app/Filament/Pages/Settings/SiteSettings.php b/modules/Admin/app/Filament/Pages/Settings/SiteSettings.php
similarity index 99%
rename from app/Filament/Pages/Settings/SiteSettings.php
rename to modules/Admin/app/Filament/Pages/Settings/SiteSettings.php
index e577e6a..8d217bd 100755
--- a/app/Filament/Pages/Settings/SiteSettings.php
+++ b/modules/Admin/app/Filament/Pages/Settings/SiteSettings.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Pages\Settings;
+namespace Modules\Admin\Filament\Pages\Settings;
 
 use Filament\Forms;
 use Modules\Page\Models\Page;
diff --git a/app/Providers/Filament/AdminPanelProvider.php b/modules/Admin/app/Providers/AdminPanelProvider.php
similarity index 81%
rename from app/Providers/Filament/AdminPanelProvider.php
rename to modules/Admin/app/Providers/AdminPanelProvider.php
index b29062a..d93532e 100755
--- a/app/Providers/Filament/AdminPanelProvider.php
+++ b/modules/Admin/app/Providers/AdminPanelProvider.php
@@ -1,24 +1,14 @@
 <?php
 
-namespace App\Providers\Filament;
+namespace Modules\Admin\Providers;
 
-use App\Filament\Pages\Auth\EmailVerification;
-use App\Filament\Pages\Auth\Login;
-use App\Filament\Pages\Auth\Register;
-use App\Filament\Pages\Auth\ResetPassword;
-use App\Filament\Pages\MyProfile;
-use App\Filament\Resources\ArticleResource\Widgets\ArticleStatsOverview;
-use App\Filament\Resources\ArticleResource\Widgets\RecentArticles;
-use App\Filament\Resources\CommentResource\Widgets\CommentStatsOverview;
-use App\Filament\Resources\EntryResource\Widgets\EntryStatsOverview;
-use App\Filament\Resources\EntryResource\Widgets\RecentEntries;
-use App\Forms\Components\SpatieMediaLibraryFileUpload;
 use App\Services\SettingsService;
 use App\Settings\SecuritySettings;
 use App\Settings\SeoSettings;
 use App\Settings\SiteSettings;
 use BezhanSalleh\FilamentLanguageSwitch\LanguageSwitch;
 use BezhanSalleh\FilamentShield\FilamentShieldPlugin;
+use Coolsam\Modules\ModulesPlugin;
 use Filament\Contracts\Plugin;
 use Filament\Enums\ThemeMode;
 use Filament\Http\Middleware\Authenticate;
@@ -37,6 +27,12 @@
 use Illuminate\View\Middleware\ShareErrorsFromSession;
 use Jeffgreco13\FilamentBreezy\BreezyCore;
 use MarcoGermani87\FilamentCookieConsent\FilamentCookieConsent;
+use Modules\Admin\Filament\Components\SpatieMediaLibraryFileUpload;
+use Modules\Admin\Filament\Pages\Auth\EmailVerification;
+use Modules\Admin\Filament\Pages\Auth\Login;
+use Modules\Admin\Filament\Pages\Auth\Register;
+use Modules\Admin\Filament\Pages\Auth\ResetPassword;
+use Modules\Admin\Filament\Pages\MyProfile;
 use Rmsramos\Activitylog\ActivitylogPlugin;
 
 class AdminPanelProvider extends PanelProvider
@@ -97,17 +93,6 @@ public function panel(Panel $panel): Panel
                     ($this->siteSettings->theme_mode ?? $this->siteSettings->theme_mode === 'light' ? ThemeMode::Light : ThemeMode::System))
                 ->darkMode($this->siteSettings->dark_mode_enabled ?? true)
 
-                ->discoverResources(in: app_path('Filament/Resources'), for: 'App\\Filament\\Resources')
-                ->discoverPages(in: app_path('Filament/Pages'), for: 'App\\Filament\\Pages')
-                ->pages([])
-                ->discoverWidgets(in: app_path('Filament/Widgets'), for: 'App\\Filament\\Widgets')
-                ->widgets([
-                    ArticleStatsOverview::class,
-                    EntryStatsOverview::class,
-                    CommentStatsOverview::class,
-                    RecentArticles::class,
-                    RecentEntries::class,
-                ])
                 ->middleware([
                     EncryptCookies::class,
                     AddQueuedCookiesToResponse::class,
@@ -148,6 +133,7 @@ protected function getPlugins(): array
             FilamentCookieConsent::make(),
             FilamentShieldPlugin::make(),
             ActivitylogPlugin::make(),
+            ModulesPlugin::make(),
         ];
     }
 }
diff --git a/modules/Admin/app/Providers/AdminServiceProvider.php b/modules/Admin/app/Providers/AdminServiceProvider.php
new file mode 100644
index 0000000..b91b6e2
--- /dev/null
+++ b/modules/Admin/app/Providers/AdminServiceProvider.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Modules\Admin\Providers;
+
+use Illuminate\Support\ServiceProvider;
+use Nwidart\Modules\Traits\PathNamespace;
+
+class AdminServiceProvider extends ServiceProvider
+{
+    use PathNamespace;
+
+    protected string $name = 'Admin';
+
+    protected string $nameLower = 'admin';
+
+    /**
+     * Boot the application events.
+     */
+    public function boot(): void
+    {
+    }
+}
diff --git a/modules/Admin/composer.json b/modules/Admin/composer.json
new file mode 100644
index 0000000..67c801e
--- /dev/null
+++ b/modules/Admin/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "4byte/admin",
+    "description": "Admin module for 4Byte",
+    "authors": [
+        {
+            "name": "4Byte",
+            "email": "info@4byte.dev"
+        }
+    ],
+    "extra": {
+        "laravel": {
+            "providers": [],
+            "aliases": {}
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "Modules\\Admin\\": "app/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Modules\\Admin\\Tests\\": "tests/"
+        }
+    }
+}
\ No newline at end of file
diff --git a/modules/Admin/module.json b/modules/Admin/module.json
new file mode 100644
index 0000000..f42e603
--- /dev/null
+++ b/modules/Admin/module.json
@@ -0,0 +1,15 @@
+{
+    "name": "Admin",
+    "alias": "admin",
+    "description": "Admin module for 4Byte",
+    "keywords": [
+        "4Byte",
+        "Admin"
+    ],
+    "priority": 0,
+    "providers": [
+        "Modules\\Admin\\Providers\\AdminServiceProvider",
+        "Modules\\Admin\\Providers\\AdminPanelProvider"
+    ],
+    "files": []
+}
\ No newline at end of file
diff --git a/modules/Admin/package.json b/modules/Admin/package.json
new file mode 100644
index 0000000..d6fbfc8
--- /dev/null
+++ b/modules/Admin/package.json
@@ -0,0 +1,15 @@
+{
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build"
+  },
+  "devDependencies": {
+    "axios": "^1.1.2",
+    "laravel-vite-plugin": "^0.7.5",
+    "sass": "^1.69.5",
+    "postcss": "^8.3.7",
+    "vite": "^4.0.0"
+  }
+}
diff --git a/modules/Admin/vite.config.js b/modules/Admin/vite.config.js
new file mode 100644
index 0000000..6e32a4b
--- /dev/null
+++ b/modules/Admin/vite.config.js
@@ -0,0 +1,57 @@
+import { defineConfig } from 'vite';
+import laravel from 'laravel-vite-plugin';
+import { readdirSync, statSync } from 'fs';
+import { join,relative,dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+export default defineConfig({
+    build: {
+        outDir: '../../public/build-admin',
+        emptyOutDir: true,
+        manifest: true,
+    },
+    plugins: [
+        laravel({
+            publicDirectory: '../../public',
+            buildDirectory: 'build-admin',
+            input: [
+                __dirname + '/resources/assets/sass/app.scss',
+                __dirname + '/resources/assets/js/app.js'
+            ],
+            refresh: true,
+        }),
+    ],
+});
+// Scen all resources for assets file. Return array
+//function getFilePaths(dir) {
+//    const filePaths = [];
+//
+//    function walkDirectory(currentPath) {
+//        const files = readdirSync(currentPath);
+//        for (const file of files) {
+//            const filePath = join(currentPath, file);
+//            const stats = statSync(filePath);
+//            if (stats.isFile() && !file.startsWith('.')) {
+//                const relativePath = 'Modules/Admin/'+relative(__dirname, filePath);
+//                filePaths.push(relativePath);
+//            } else if (stats.isDirectory()) {
+//                walkDirectory(filePath);
+//            }
+//        }
+//    }
+//
+//    walkDirectory(dir);
+//    return filePaths;
+//}
+
+//const __filename = fileURLToPath(import.meta.url);
+//const __dirname = dirname(__filename);
+
+//const assetsDir = join(__dirname, 'resources/assets');
+//export const paths = getFilePaths(assetsDir);
+
+
+//export const paths = [
+//    'Modules/Admin/resources/assets/sass/app.scss',
+//    'Modules/Admin/resources/assets/js/app.js',
+//];
diff --git a/modules/Article/app/Filament/ArticlePlugin.php b/modules/Article/app/Filament/ArticlePlugin.php
new file mode 100644
index 0000000..1763848
--- /dev/null
+++ b/modules/Article/app/Filament/ArticlePlugin.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Modules\Article\Filament;
+
+use Coolsam\Modules\Concerns\ModuleFilamentPlugin;
+use Filament\Contracts\Plugin;
+use Filament\Panel;
+
+class ArticlePlugin implements Plugin
+{
+    use ModuleFilamentPlugin;
+
+    public function getModuleName(): string
+    {
+        return 'Article';
+    }
+
+    public function getId(): string
+    {
+        return 'article';
+    }
+
+    public function boot(Panel $panel): void
+    {
+        // Implement boot() method.
+    }
+}
diff --git a/modules/Article/app/Filament/Clusters/Article.php b/modules/Article/app/Filament/Clusters/Article.php
new file mode 100644
index 0000000..55b5751
--- /dev/null
+++ b/modules/Article/app/Filament/Clusters/Article.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\Article\Filament\Clusters;
+
+use Filament\Clusters\Cluster;
+use Nwidart\Modules\Facades\Module;
+
+class Article extends Cluster
+{
+    public static function getModuleName(): string
+    {
+        return 'Article';
+    }
+
+    public static function getModule(): \Nwidart\Modules\Module
+    {
+        return Module::findOrFail(static::getModuleName());
+    }
+
+    public static function getNavigationLabel(): string
+    {
+        return __('Article');
+    }
+
+    public static function getNavigationIcon(): ?string
+    {
+        return 'heroicon-o-squares-2x2';
+    }
+}
diff --git a/app/Filament/Resources/ArticleResource.php b/modules/Article/app/Filament/Resources/ArticleResource.php
similarity index 97%
rename from app/Filament/Resources/ArticleResource.php
rename to modules/Article/app/Filament/Resources/ArticleResource.php
index c4c728a..8af4585 100755
--- a/app/Filament/Resources/ArticleResource.php
+++ b/modules/Article/app/Filament/Resources/ArticleResource.php
@@ -1,10 +1,7 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace Modules\Article\Filament\Resources;
 
-use App\Filament\Resources\ArticleResource\Pages;
-use App\Forms\Components\SpatieMediaLibraryFileUpload;
-use App\Forms\Components\SpatieMediaLibraryMarkdownEditor;
 use BezhanSalleh\FilamentShield\Traits\HasPanelShield;
 use Filament\Forms;
 use Filament\Forms\Form;
@@ -13,6 +10,9 @@
 use Filament\Tables;
 use Filament\Tables\Table;
 use Illuminate\Support\Carbon;
+use Modules\Admin\Filament\Components\SpatieMediaLibraryFileUpload;
+use Modules\Admin\Filament\Components\SpatieMediaLibraryMarkdownEditor;
+use Modules\Article\Filament\Resources\ArticleResource\Pages;
 use Modules\Article\Models\Article;
 use Rmsramos\Activitylog\RelationManagers\ActivitylogRelationManager;
 
diff --git a/app/Filament/Resources/ArticleResource/Pages/CreateArticle.php b/modules/Article/app/Filament/Resources/ArticleResource/Pages/CreateArticle.php
similarity index 56%
rename from app/Filament/Resources/ArticleResource/Pages/CreateArticle.php
rename to modules/Article/app/Filament/Resources/ArticleResource/Pages/CreateArticle.php
index 85c9ad8..e8fb5e3 100755
--- a/app/Filament/Resources/ArticleResource/Pages/CreateArticle.php
+++ b/modules/Article/app/Filament/Resources/ArticleResource/Pages/CreateArticle.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Resources\ArticleResource\Pages;
+namespace Modules\Article\Filament\Resources\ArticleResource\Pages;
 
-use App\Filament\Resources\ArticleResource;
 use Filament\Resources\Pages\CreateRecord;
+use Modules\Article\Filament\Resources\ArticleResource;
 
 class CreateArticle extends CreateRecord
 {
diff --git a/app/Filament/Resources/ArticleResource/Pages/EditArticle.php b/modules/Article/app/Filament/Resources/ArticleResource/Pages/EditArticle.php
similarity index 71%
rename from app/Filament/Resources/ArticleResource/Pages/EditArticle.php
rename to modules/Article/app/Filament/Resources/ArticleResource/Pages/EditArticle.php
index 2484e4b..863c4e0 100755
--- a/app/Filament/Resources/ArticleResource/Pages/EditArticle.php
+++ b/modules/Article/app/Filament/Resources/ArticleResource/Pages/EditArticle.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\ArticleResource\Pages;
+namespace Modules\Article\Filament\Resources\ArticleResource\Pages;
 
-use App\Filament\Resources\ArticleResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
+use Modules\Article\Filament\Resources\ArticleResource;
 
 class EditArticle extends EditRecord
 {
diff --git a/app/Filament/Resources/ArticleResource/Pages/ListArticles.php b/modules/Article/app/Filament/Resources/ArticleResource/Pages/ListArticles.php
similarity index 71%
rename from app/Filament/Resources/ArticleResource/Pages/ListArticles.php
rename to modules/Article/app/Filament/Resources/ArticleResource/Pages/ListArticles.php
index 6cfc2e8..96c9494 100755
--- a/app/Filament/Resources/ArticleResource/Pages/ListArticles.php
+++ b/modules/Article/app/Filament/Resources/ArticleResource/Pages/ListArticles.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\ArticleResource\Pages;
+namespace Modules\Article\Filament\Resources\ArticleResource\Pages;
 
-use App\Filament\Resources\ArticleResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
+use Modules\Article\Filament\Resources\ArticleResource;
 
 class ListArticles extends ListRecords
 {
diff --git a/app/Filament/Resources/ArticleResource/Widgets/ArticleStatsOverview.php b/modules/Article/app/Filament/Widgets/ArticleStatsOverview.php
similarity index 88%
rename from app/Filament/Resources/ArticleResource/Widgets/ArticleStatsOverview.php
rename to modules/Article/app/Filament/Widgets/ArticleStatsOverview.php
index d696d4a..3392a1d 100644
--- a/app/Filament/Resources/ArticleResource/Widgets/ArticleStatsOverview.php
+++ b/modules/Article/app/Filament/Widgets/ArticleStatsOverview.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\ArticleResource\Widgets;
+namespace Modules\Article\Filament\Widgets;
 
 use BezhanSalleh\FilamentShield\Traits\HasWidgetShield;
 use Filament\Widgets\StatsOverviewWidget as BaseWidget;
@@ -11,6 +11,8 @@ class ArticleStatsOverview extends BaseWidget
 {
     use HasWidgetShield;
 
+    protected static ?int $sort = 12;
+
     protected int | string | array $columnSpan = 4;
 
     protected function getColumns(): int
diff --git a/app/Filament/Resources/ArticleResource/Widgets/RecentArticles.php b/modules/Article/app/Filament/Widgets/RecentArticles.php
similarity index 96%
rename from app/Filament/Resources/ArticleResource/Widgets/RecentArticles.php
rename to modules/Article/app/Filament/Widgets/RecentArticles.php
index cf9c483..f27c4c7 100644
--- a/app/Filament/Resources/ArticleResource/Widgets/RecentArticles.php
+++ b/modules/Article/app/Filament/Widgets/RecentArticles.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\ArticleResource\Widgets;
+namespace Modules\Article\Filament\Widgets;
 
 use BezhanSalleh\FilamentShield\Traits\HasWidgetShield;
 use Filament\Tables;
@@ -13,6 +13,8 @@ class RecentArticles extends BaseWidget
 {
     use HasWidgetShield;
 
+    protected static ?int $sort = 24;
+
     protected int|string|array $columnSpan = 6;
 
     /** @var int|array<int>|null */
diff --git a/modules/Category/app/Filament/CategoryPlugin.php b/modules/Category/app/Filament/CategoryPlugin.php
new file mode 100644
index 0000000..ab831b6
--- /dev/null
+++ b/modules/Category/app/Filament/CategoryPlugin.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Modules\Category\Filament;
+
+use Coolsam\Modules\Concerns\ModuleFilamentPlugin;
+use Filament\Contracts\Plugin;
+use Filament\Panel;
+
+class CategoryPlugin implements Plugin
+{
+    use ModuleFilamentPlugin;
+
+    public function getModuleName(): string
+    {
+        return 'Category';
+    }
+
+    public function getId(): string
+    {
+        return 'category';
+    }
+
+    public function boot(Panel $panel): void
+    {
+        // Implement boot() method.
+    }
+}
diff --git a/modules/Category/app/Filament/Clusters/Category.php b/modules/Category/app/Filament/Clusters/Category.php
new file mode 100644
index 0000000..3a6e580
--- /dev/null
+++ b/modules/Category/app/Filament/Clusters/Category.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\Category\Filament\Clusters;
+
+use Filament\Clusters\Cluster;
+use Nwidart\Modules\Facades\Module;
+
+class Category extends Cluster
+{
+    public static function getModuleName(): string
+    {
+        return 'Category';
+    }
+
+    public static function getModule(): \Nwidart\Modules\Module
+    {
+        return Module::findOrFail(static::getModuleName());
+    }
+
+    public static function getNavigationLabel(): string
+    {
+        return __('Category');
+    }
+
+    public static function getNavigationIcon(): ?string
+    {
+        return 'heroicon-o-squares-2x2';
+    }
+}
diff --git a/app/Filament/Resources/CategoryResource.php b/modules/Category/app/Filament/Resources/CategoryResource.php
similarity index 96%
rename from app/Filament/Resources/CategoryResource.php
rename to modules/Category/app/Filament/Resources/CategoryResource.php
index 9c8461c..aeac28b 100755
--- a/app/Filament/Resources/CategoryResource.php
+++ b/modules/Category/app/Filament/Resources/CategoryResource.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace Modules\Category\Filament\Resources;
 
-use App\Filament\Resources\CategoryResource\Pages;
 use BezhanSalleh\FilamentShield\Traits\HasPanelShield;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
+use Modules\Category\Filament\Resources\CategoryResource\Pages;
 use Modules\Category\Models\Category;
 use Rmsramos\Activitylog\RelationManagers\ActivitylogRelationManager;
 
diff --git a/app/Filament/Resources/CategoryResource/Pages/CreateCategory.php b/modules/Category/app/Filament/Resources/CategoryResource/Pages/CreateCategory.php
similarity index 56%
rename from app/Filament/Resources/CategoryResource/Pages/CreateCategory.php
rename to modules/Category/app/Filament/Resources/CategoryResource/Pages/CreateCategory.php
index 3fb9bb4..ce636a5 100755
--- a/app/Filament/Resources/CategoryResource/Pages/CreateCategory.php
+++ b/modules/Category/app/Filament/Resources/CategoryResource/Pages/CreateCategory.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Resources\CategoryResource\Pages;
+namespace Modules\Category\Filament\Resources\CategoryResource\Pages;
 
-use App\Filament\Resources\CategoryResource;
 use Filament\Resources\Pages\CreateRecord;
+use Modules\Category\Filament\Resources\CategoryResource;
 
 class CreateCategory extends CreateRecord
 {
diff --git a/app/Filament/Resources/CategoryResource/Pages/EditCategory.php b/modules/Category/app/Filament/Resources/CategoryResource/Pages/EditCategory.php
similarity index 70%
rename from app/Filament/Resources/CategoryResource/Pages/EditCategory.php
rename to modules/Category/app/Filament/Resources/CategoryResource/Pages/EditCategory.php
index ee23708..c2b5264 100755
--- a/app/Filament/Resources/CategoryResource/Pages/EditCategory.php
+++ b/modules/Category/app/Filament/Resources/CategoryResource/Pages/EditCategory.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\CategoryResource\Pages;
+namespace Modules\Category\Filament\Resources\CategoryResource\Pages;
 
-use App\Filament\Resources\CategoryResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
+use Modules\Category\Filament\Resources\CategoryResource;
 
 class EditCategory extends EditRecord
 {
diff --git a/app/Filament/Resources/CategoryResource/Pages/ListCategories.php b/modules/Category/app/Filament/Resources/CategoryResource/Pages/ListCategories.php
similarity index 71%
rename from app/Filament/Resources/CategoryResource/Pages/ListCategories.php
rename to modules/Category/app/Filament/Resources/CategoryResource/Pages/ListCategories.php
index 1837f5d..d8f8102 100755
--- a/app/Filament/Resources/CategoryResource/Pages/ListCategories.php
+++ b/modules/Category/app/Filament/Resources/CategoryResource/Pages/ListCategories.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\CategoryResource\Pages;
+namespace Modules\Category\Filament\Resources\CategoryResource\Pages;
 
-use App\Filament\Resources\CategoryResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
+use Modules\Category\Filament\Resources\CategoryResource;
 
 class ListCategories extends ListRecords
 {
diff --git a/modules/Course/app/Filament/Clusters/Course.php b/modules/Course/app/Filament/Clusters/Course.php
new file mode 100644
index 0000000..ba86ba2
--- /dev/null
+++ b/modules/Course/app/Filament/Clusters/Course.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\Course\Filament\Clusters;
+
+use Filament\Clusters\Cluster;
+use Nwidart\Modules\Facades\Module;
+
+class Course extends Cluster
+{
+    public static function getModuleName(): string
+    {
+        return 'Course';
+    }
+
+    public static function getModule(): \Nwidart\Modules\Module
+    {
+        return Module::findOrFail(static::getModuleName());
+    }
+
+    public static function getNavigationLabel(): string
+    {
+        return __('Course');
+    }
+
+    public static function getNavigationIcon(): ?string
+    {
+        return 'heroicon-o-squares-2x2';
+    }
+}
diff --git a/modules/Course/app/Filament/CoursePlugin.php b/modules/Course/app/Filament/CoursePlugin.php
new file mode 100644
index 0000000..47260f6
--- /dev/null
+++ b/modules/Course/app/Filament/CoursePlugin.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Modules\Course\Filament;
+
+use Coolsam\Modules\Concerns\ModuleFilamentPlugin;
+use Filament\Contracts\Plugin;
+use Filament\Panel;
+
+class CoursePlugin implements Plugin
+{
+    use ModuleFilamentPlugin;
+
+    public function getModuleName(): string
+    {
+        return 'Course';
+    }
+
+    public function getId(): string
+    {
+        return 'course';
+    }
+
+    public function boot(Panel $panel): void
+    {
+        // Implement boot() method.
+    }
+}
diff --git a/app/Filament/Resources/CourseChapterResource.php b/modules/Course/app/Filament/Resources/CourseChapterResource.php
similarity index 91%
rename from app/Filament/Resources/CourseChapterResource.php
rename to modules/Course/app/Filament/Resources/CourseChapterResource.php
index c8e2a54..521daad 100644
--- a/app/Filament/Resources/CourseChapterResource.php
+++ b/modules/Course/app/Filament/Resources/CourseChapterResource.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace Modules\Course\Filament\Resources;
 
-use App\Filament\Resources\CourseChapterResource\Pages;
-use App\Filament\Resources\CourseChapterResource\RelationManagers\LessonsRelationManager;
 use BezhanSalleh\FilamentShield\Traits\HasPanelShield;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
+use Modules\Course\Filament\Resources\CourseChapterResource\Pages;
+use Modules\Course\Filament\Resources\CourseChapterResource\RelationManagers\LessonsRelationManager;
 use Modules\Course\Models\CourseChapter;
 
 class CourseChapterResource extends Resource
diff --git a/app/Filament/Resources/CourseChapterResource/Pages/CreateCourseChapter.php b/modules/Course/app/Filament/Resources/CourseChapterResource/Pages/CreateCourseChapter.php
similarity index 56%
rename from app/Filament/Resources/CourseChapterResource/Pages/CreateCourseChapter.php
rename to modules/Course/app/Filament/Resources/CourseChapterResource/Pages/CreateCourseChapter.php
index 3128b1e..b8b939a 100644
--- a/app/Filament/Resources/CourseChapterResource/Pages/CreateCourseChapter.php
+++ b/modules/Course/app/Filament/Resources/CourseChapterResource/Pages/CreateCourseChapter.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Resources\CourseChapterResource\Pages;
+namespace Modules\Course\Filament\Resources\CourseChapterResource\Pages;
 
-use App\Filament\Resources\CourseChapterResource;
 use Filament\Resources\Pages\CreateRecord;
+use Modules\Course\Filament\Resources\CourseChapterResource;
 
 class CreateCourseChapter extends CreateRecord
 {
diff --git a/app/Filament/Resources/CourseChapterResource/Pages/EditCourseChapter.php b/modules/Course/app/Filament/Resources/CourseChapterResource/Pages/EditCourseChapter.php
similarity index 70%
rename from app/Filament/Resources/CourseChapterResource/Pages/EditCourseChapter.php
rename to modules/Course/app/Filament/Resources/CourseChapterResource/Pages/EditCourseChapter.php
index f6e2f42..40c6f1e 100644
--- a/app/Filament/Resources/CourseChapterResource/Pages/EditCourseChapter.php
+++ b/modules/Course/app/Filament/Resources/CourseChapterResource/Pages/EditCourseChapter.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\CourseChapterResource\Pages;
+namespace Modules\Course\Filament\Resources\CourseChapterResource\Pages;
 
-use App\Filament\Resources\CourseChapterResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
+use Modules\Course\Filament\Resources\CourseChapterResource;
 
 class EditCourseChapter extends EditRecord
 {
diff --git a/app/Filament/Resources/CourseChapterResource/Pages/ListCourseChapters.php b/modules/Course/app/Filament/Resources/CourseChapterResource/Pages/ListCourseChapters.php
similarity index 70%
rename from app/Filament/Resources/CourseChapterResource/Pages/ListCourseChapters.php
rename to modules/Course/app/Filament/Resources/CourseChapterResource/Pages/ListCourseChapters.php
index eb59d76..053fd9b 100644
--- a/app/Filament/Resources/CourseChapterResource/Pages/ListCourseChapters.php
+++ b/modules/Course/app/Filament/Resources/CourseChapterResource/Pages/ListCourseChapters.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\CourseChapterResource\Pages;
+namespace Modules\Course\Filament\Resources\CourseChapterResource\Pages;
 
-use App\Filament\Resources\CourseChapterResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
+use Modules\Course\Filament\Resources\CourseChapterResource;
 
 class ListCourseChapters extends ListRecords
 {
diff --git a/app/Filament/Resources/CourseChapterResource/RelationManagers/LessonsRelationManager.php b/modules/Course/app/Filament/Resources/CourseChapterResource/RelationManagers/LessonsRelationManager.php
similarity index 93%
rename from app/Filament/Resources/CourseChapterResource/RelationManagers/LessonsRelationManager.php
rename to modules/Course/app/Filament/Resources/CourseChapterResource/RelationManagers/LessonsRelationManager.php
index 1902b4e..2504470 100644
--- a/app/Filament/Resources/CourseChapterResource/RelationManagers/LessonsRelationManager.php
+++ b/modules/Course/app/Filament/Resources/CourseChapterResource/RelationManagers/LessonsRelationManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\CourseChapterResource\RelationManagers;
+namespace Modules\Course\Filament\Resources\CourseChapterResource\RelationManagers;
 
 use Filament\Forms;
 use Filament\Forms\Form;
diff --git a/app/Filament/Resources/CourseLessonResource.php b/modules/Course/app/Filament/Resources/CourseLessonResource.php
similarity index 97%
rename from app/Filament/Resources/CourseLessonResource.php
rename to modules/Course/app/Filament/Resources/CourseLessonResource.php
index 68d234f..5692586 100644
--- a/app/Filament/Resources/CourseLessonResource.php
+++ b/modules/Course/app/Filament/Resources/CourseLessonResource.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace Modules\Course\Filament\Resources;
 
-use App\Filament\Resources\CourseLessonResource\Pages;
-use App\Forms\Components\SpatieMediaLibraryMarkdownEditor;
 use Carbon\Carbon;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
+use Modules\Admin\Filament\Components\SpatieMediaLibraryMarkdownEditor;
+use Modules\Course\Filament\Resources\CourseLessonResource\Pages;
 use Modules\Course\Models\CourseLesson;
 
 class CourseLessonResource extends Resource
diff --git a/app/Filament/Resources/CourseLessonResource/Pages/CreateCourseLesson.php b/modules/Course/app/Filament/Resources/CourseLessonResource/Pages/CreateCourseLesson.php
similarity index 56%
rename from app/Filament/Resources/CourseLessonResource/Pages/CreateCourseLesson.php
rename to modules/Course/app/Filament/Resources/CourseLessonResource/Pages/CreateCourseLesson.php
index 404456e..c963cb2 100644
--- a/app/Filament/Resources/CourseLessonResource/Pages/CreateCourseLesson.php
+++ b/modules/Course/app/Filament/Resources/CourseLessonResource/Pages/CreateCourseLesson.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Resources\CourseLessonResource\Pages;
+namespace Modules\Course\Filament\Resources\CourseLessonResource\Pages;
 
-use App\Filament\Resources\CourseLessonResource;
 use Filament\Resources\Pages\CreateRecord;
+use Modules\Course\Filament\Resources\CourseLessonResource;
 
 class CreateCourseLesson extends CreateRecord
 {
diff --git a/app/Filament/Resources/CourseLessonResource/Pages/EditCourseLesson.php b/modules/Course/app/Filament/Resources/CourseLessonResource/Pages/EditCourseLesson.php
similarity index 70%
rename from app/Filament/Resources/CourseLessonResource/Pages/EditCourseLesson.php
rename to modules/Course/app/Filament/Resources/CourseLessonResource/Pages/EditCourseLesson.php
index be12678..3f642c9 100644
--- a/app/Filament/Resources/CourseLessonResource/Pages/EditCourseLesson.php
+++ b/modules/Course/app/Filament/Resources/CourseLessonResource/Pages/EditCourseLesson.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\CourseLessonResource\Pages;
+namespace Modules\Course\Filament\Resources\CourseLessonResource\Pages;
 
-use App\Filament\Resources\CourseLessonResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
+use Modules\Course\Filament\Resources\CourseLessonResource;
 
 class EditCourseLesson extends EditRecord
 {
diff --git a/app/Filament/Resources/CourseLessonResource/Pages/ListCourseLessons.php b/modules/Course/app/Filament/Resources/CourseLessonResource/Pages/ListCourseLessons.php
similarity index 70%
rename from app/Filament/Resources/CourseLessonResource/Pages/ListCourseLessons.php
rename to modules/Course/app/Filament/Resources/CourseLessonResource/Pages/ListCourseLessons.php
index c66b573..ca7267a 100644
--- a/app/Filament/Resources/CourseLessonResource/Pages/ListCourseLessons.php
+++ b/modules/Course/app/Filament/Resources/CourseLessonResource/Pages/ListCourseLessons.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\CourseLessonResource\Pages;
+namespace Modules\Course\Filament\Resources\CourseLessonResource\Pages;
 
-use App\Filament\Resources\CourseLessonResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
+use Modules\Course\Filament\Resources\CourseLessonResource;
 
 class ListCourseLessons extends ListRecords
 {
diff --git a/app/Filament/Resources/CourseResource.php b/modules/Course/app/Filament/Resources/CourseResource.php
similarity index 96%
rename from app/Filament/Resources/CourseResource.php
rename to modules/Course/app/Filament/Resources/CourseResource.php
index d766b0f..c7b0f6c 100644
--- a/app/Filament/Resources/CourseResource.php
+++ b/modules/Course/app/Filament/Resources/CourseResource.php
@@ -1,11 +1,7 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace Modules\Course\Filament\Resources;
 
-use App\Filament\Resources\CourseResource\Pages;
-use App\Filament\Resources\CourseResource\RelationManagers\ChaptersRelationManager;
-use App\Forms\Components\SpatieMediaLibraryFileUpload;
-use App\Forms\Components\SpatieMediaLibraryMarkdownEditor;
 use BezhanSalleh\FilamentShield\Traits\HasPanelShield;
 use Carbon\Carbon;
 use Filament\Forms;
@@ -14,6 +10,10 @@
 use Filament\Support\Enums\FontWeight;
 use Filament\Tables;
 use Filament\Tables\Table;
+use Modules\Admin\Filament\Components\SpatieMediaLibraryFileUpload;
+use Modules\Admin\Filament\Components\SpatieMediaLibraryMarkdownEditor;
+use Modules\Course\Filament\Resources\CourseResource\Pages;
+use Modules\Course\Filament\Resources\CourseResource\RelationManagers\ChaptersRelationManager;
 use Modules\Course\Models\Course;
 
 class CourseResource extends Resource
diff --git a/app/Filament/Resources/CourseResource/Pages/CreateCourse.php b/modules/Course/app/Filament/Resources/CourseResource/Pages/CreateCourse.php
similarity index 56%
rename from app/Filament/Resources/CourseResource/Pages/CreateCourse.php
rename to modules/Course/app/Filament/Resources/CourseResource/Pages/CreateCourse.php
index bd2127b..73072ae 100644
--- a/app/Filament/Resources/CourseResource/Pages/CreateCourse.php
+++ b/modules/Course/app/Filament/Resources/CourseResource/Pages/CreateCourse.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Resources\CourseResource\Pages;
+namespace Modules\Course\Filament\Resources\CourseResource\Pages;
 
-use App\Filament\Resources\CourseResource;
 use Filament\Resources\Pages\CreateRecord;
+use Modules\Course\Filament\Resources\CourseResource;
 
 class CreateCourse extends CreateRecord
 {
diff --git a/app/Filament/Resources/CourseResource/Pages/EditCourse.php b/modules/Course/app/Filament/Resources/CourseResource/Pages/EditCourse.php
similarity index 71%
rename from app/Filament/Resources/CourseResource/Pages/EditCourse.php
rename to modules/Course/app/Filament/Resources/CourseResource/Pages/EditCourse.php
index 4e75f8f..b3b2649 100644
--- a/app/Filament/Resources/CourseResource/Pages/EditCourse.php
+++ b/modules/Course/app/Filament/Resources/CourseResource/Pages/EditCourse.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\CourseResource\Pages;
+namespace Modules\Course\Filament\Resources\CourseResource\Pages;
 
-use App\Filament\Resources\CourseResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
+use Modules\Course\Filament\Resources\CourseResource;
 
 class EditCourse extends EditRecord
 {
diff --git a/app/Filament/Resources/CourseResource/Pages/ListCourses.php b/modules/Course/app/Filament/Resources/CourseResource/Pages/ListCourses.php
similarity index 72%
rename from app/Filament/Resources/CourseResource/Pages/ListCourses.php
rename to modules/Course/app/Filament/Resources/CourseResource/Pages/ListCourses.php
index 077911e..b29e0c0 100644
--- a/app/Filament/Resources/CourseResource/Pages/ListCourses.php
+++ b/modules/Course/app/Filament/Resources/CourseResource/Pages/ListCourses.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\CourseResource\Pages;
+namespace Modules\Course\Filament\Resources\CourseResource\Pages;
 
-use App\Filament\Resources\CourseResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
+use Modules\Course\Filament\Resources\CourseResource;
 
 class ListCourses extends ListRecords
 {
diff --git a/app/Filament/Resources/CourseResource/RelationManagers/ChaptersRelationManager.php b/modules/Course/app/Filament/Resources/CourseResource/RelationManagers/ChaptersRelationManager.php
similarity index 94%
rename from app/Filament/Resources/CourseResource/RelationManagers/ChaptersRelationManager.php
rename to modules/Course/app/Filament/Resources/CourseResource/RelationManagers/ChaptersRelationManager.php
index 6b6b3bc..5fa0ba6 100644
--- a/app/Filament/Resources/CourseResource/RelationManagers/ChaptersRelationManager.php
+++ b/modules/Course/app/Filament/Resources/CourseResource/RelationManagers/ChaptersRelationManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\CourseResource\RelationManagers;
+namespace Modules\Course\Filament\Resources\CourseResource\RelationManagers;
 
 use Filament\Forms;
 use Filament\Forms\Form;
diff --git a/modules/Entry/app/Filament/Clusters/Entry.php b/modules/Entry/app/Filament/Clusters/Entry.php
new file mode 100644
index 0000000..c76717e
--- /dev/null
+++ b/modules/Entry/app/Filament/Clusters/Entry.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\Entry\Filament\Clusters;
+
+use Filament\Clusters\Cluster;
+use Nwidart\Modules\Facades\Module;
+
+class Entry extends Cluster
+{
+    public static function getModuleName(): string
+    {
+        return 'Entry';
+    }
+
+    public static function getModule(): \Nwidart\Modules\Module
+    {
+        return Module::findOrFail(static::getModuleName());
+    }
+
+    public static function getNavigationLabel(): string
+    {
+        return __('Entry');
+    }
+
+    public static function getNavigationIcon(): ?string
+    {
+        return 'heroicon-o-squares-2x2';
+    }
+}
diff --git a/modules/Entry/app/Filament/EntryPlugin.php b/modules/Entry/app/Filament/EntryPlugin.php
new file mode 100644
index 0000000..febce44
--- /dev/null
+++ b/modules/Entry/app/Filament/EntryPlugin.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Modules\Entry\Filament;
+
+use Coolsam\Modules\Concerns\ModuleFilamentPlugin;
+use Filament\Contracts\Plugin;
+use Filament\Panel;
+
+class EntryPlugin implements Plugin
+{
+    use ModuleFilamentPlugin;
+
+    public function getModuleName(): string
+    {
+        return 'Entry';
+    }
+
+    public function getId(): string
+    {
+        return 'entry';
+    }
+
+    public function boot(Panel $panel): void
+    {
+        // Implement boot() method.
+    }
+}
diff --git a/app/Filament/Resources/EntryResource.php b/modules/Entry/app/Filament/Resources/EntryResource.php
similarity index 93%
rename from app/Filament/Resources/EntryResource.php
rename to modules/Entry/app/Filament/Resources/EntryResource.php
index 3f91507..643d4f7 100644
--- a/app/Filament/Resources/EntryResource.php
+++ b/modules/Entry/app/Filament/Resources/EntryResource.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace Modules\Entry\Filament\Resources;
 
-use App\Filament\Resources\EntryResource\Pages;
-use App\Forms\Components\SpatieMediaLibraryFileUpload;
-use App\Forms\Components\SpatieMediaLibraryMarkdownEditor;
 use BezhanSalleh\FilamentShield\Traits\HasPanelShield;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
+use Modules\Admin\Filament\Components\SpatieMediaLibraryFileUpload;
+use Modules\Admin\Filament\Components\SpatieMediaLibraryMarkdownEditor;
+use Modules\Entry\Filament\Resources\EntryResource\Pages;
 use Modules\Entry\Models\Entry;
 use Rmsramos\Activitylog\RelationManagers\ActivitylogRelationManager;
 
diff --git a/app/Filament/Resources/EntryResource/Pages/CreateEntry.php b/modules/Entry/app/Filament/Resources/EntryResource/Pages/CreateEntry.php
similarity index 73%
rename from app/Filament/Resources/EntryResource/Pages/CreateEntry.php
rename to modules/Entry/app/Filament/Resources/EntryResource/Pages/CreateEntry.php
index abe527a..e923e81 100644
--- a/app/Filament/Resources/EntryResource/Pages/CreateEntry.php
+++ b/modules/Entry/app/Filament/Resources/EntryResource/Pages/CreateEntry.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\EntryResource\Pages;
+namespace Modules\Entry\Filament\Resources\EntryResource\Pages;
 
-use App\Filament\Resources\EntryResource;
 use Filament\Resources\Pages\CreateRecord;
 use Illuminate\Support\Str;
+use Modules\Entry\Filament\Resources\EntryResource;
 
 class CreateEntry extends CreateRecord
 {
diff --git a/app/Filament/Resources/EntryResource/Pages/EditEntry.php b/modules/Entry/app/Filament/Resources/EntryResource/Pages/EditEntry.php
similarity index 72%
rename from app/Filament/Resources/EntryResource/Pages/EditEntry.php
rename to modules/Entry/app/Filament/Resources/EntryResource/Pages/EditEntry.php
index 00d8d49..1866d9e 100644
--- a/app/Filament/Resources/EntryResource/Pages/EditEntry.php
+++ b/modules/Entry/app/Filament/Resources/EntryResource/Pages/EditEntry.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\EntryResource\Pages;
+namespace Modules\Entry\Filament\Resources\EntryResource\Pages;
 
-use App\Filament\Resources\EntryResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
+use Modules\Entry\Filament\Resources\EntryResource;
 
 class EditEntry extends EditRecord
 {
diff --git a/app/Filament/Resources/EntryResource/Pages/ListEntries.php b/modules/Entry/app/Filament/Resources/EntryResource/Pages/ListEntries.php
similarity index 72%
rename from app/Filament/Resources/EntryResource/Pages/ListEntries.php
rename to modules/Entry/app/Filament/Resources/EntryResource/Pages/ListEntries.php
index 2c24aa3..3ec94d8 100644
--- a/app/Filament/Resources/EntryResource/Pages/ListEntries.php
+++ b/modules/Entry/app/Filament/Resources/EntryResource/Pages/ListEntries.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\EntryResource\Pages;
+namespace Modules\Entry\Filament\Resources\EntryResource\Pages;
 
-use App\Filament\Resources\EntryResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
+use Modules\Entry\Filament\Resources\EntryResource;
 
 class ListEntries extends ListRecords
 {
diff --git a/app/Filament/Resources/EntryResource/Widgets/EntryStatsOverview.php b/modules/Entry/app/Filament/Widgets/EntryStatsOverview.php
similarity index 88%
rename from app/Filament/Resources/EntryResource/Widgets/EntryStatsOverview.php
rename to modules/Entry/app/Filament/Widgets/EntryStatsOverview.php
index a2f1611..82b6b6a 100644
--- a/app/Filament/Resources/EntryResource/Widgets/EntryStatsOverview.php
+++ b/modules/Entry/app/Filament/Widgets/EntryStatsOverview.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\EntryResource\Widgets;
+namespace Modules\Entry\Filament\Widgets;
 
 use BezhanSalleh\FilamentShield\Traits\HasWidgetShield;
 use Filament\Widgets\StatsOverviewWidget as BaseWidget;
@@ -11,6 +11,8 @@ class EntryStatsOverview extends BaseWidget
 {
     use HasWidgetShield;
 
+    protected static ?int $sort = 16;
+
     protected int | string | array $columnSpan = 4;
 
     protected function getColumns(): int
diff --git a/app/Filament/Resources/EntryResource/Widgets/RecentEntries.php b/modules/Entry/app/Filament/Widgets/RecentEntries.php
similarity index 95%
rename from app/Filament/Resources/EntryResource/Widgets/RecentEntries.php
rename to modules/Entry/app/Filament/Widgets/RecentEntries.php
index a51b2e6..2af6ab2 100644
--- a/app/Filament/Resources/EntryResource/Widgets/RecentEntries.php
+++ b/modules/Entry/app/Filament/Widgets/RecentEntries.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\EntryResource\Widgets;
+namespace Modules\Entry\Filament\Widgets;
 
 use BezhanSalleh\FilamentShield\Traits\HasWidgetShield;
 use Filament\Tables;
@@ -13,6 +13,8 @@ class RecentEntries extends BaseWidget
 {
     use HasWidgetShield;
 
+    protected static ?int $sort = 28;
+
     protected int|string|array $columnSpan = 6;
 
     /** @var int|array<int>|null */
diff --git a/modules/News/app/Filament/Clusters/News.php b/modules/News/app/Filament/Clusters/News.php
new file mode 100644
index 0000000..b6ffdf6
--- /dev/null
+++ b/modules/News/app/Filament/Clusters/News.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\News\Filament\Clusters;
+
+use Filament\Clusters\Cluster;
+use Nwidart\Modules\Facades\Module;
+
+class News extends Cluster
+{
+    public static function getModuleName(): string
+    {
+        return 'News';
+    }
+
+    public static function getModule(): \Nwidart\Modules\Module
+    {
+        return Module::findOrFail(static::getModuleName());
+    }
+
+    public static function getNavigationLabel(): string
+    {
+        return __('News');
+    }
+
+    public static function getNavigationIcon(): ?string
+    {
+        return 'heroicon-o-squares-2x2';
+    }
+}
diff --git a/modules/News/app/Filament/NewsPlugin.php b/modules/News/app/Filament/NewsPlugin.php
new file mode 100644
index 0000000..d5f5e7e
--- /dev/null
+++ b/modules/News/app/Filament/NewsPlugin.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Modules\News\Filament;
+
+use Coolsam\Modules\Concerns\ModuleFilamentPlugin;
+use Filament\Contracts\Plugin;
+use Filament\Panel;
+
+class NewsPlugin implements Plugin
+{
+    use ModuleFilamentPlugin;
+
+    public function getModuleName(): string
+    {
+        return 'News';
+    }
+
+    public function getId(): string
+    {
+        return 'news';
+    }
+
+    public function boot(Panel $panel): void
+    {
+        // Implement boot() method.
+    }
+}
diff --git a/app/Filament/Resources/NewsResource.php b/modules/News/app/Filament/Resources/NewsResource.php
similarity index 97%
rename from app/Filament/Resources/NewsResource.php
rename to modules/News/app/Filament/Resources/NewsResource.php
index 91be406..d6d48d4 100755
--- a/app/Filament/Resources/NewsResource.php
+++ b/modules/News/app/Filament/Resources/NewsResource.php
@@ -1,10 +1,7 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace Modules\News\Filament\Resources;
 
-use App\Filament\Resources\NewsResource\Pages;
-use App\Forms\Components\SpatieMediaLibraryFileUpload;
-use App\Forms\Components\SpatieMediaLibraryMarkdownEditor;
 use BezhanSalleh\FilamentShield\Traits\HasPanelShield;
 use Filament\Forms;
 use Filament\Forms\Form;
@@ -13,6 +10,9 @@
 use Filament\Tables;
 use Filament\Tables\Table;
 use Illuminate\Support\Carbon;
+use Modules\Admin\Filament\Components\SpatieMediaLibraryFileUpload;
+use Modules\Admin\Filament\Components\SpatieMediaLibraryMarkdownEditor;
+use Modules\News\Filament\Resources\NewsResource\Pages;
 use Modules\News\Models\News;
 use Rmsramos\Activitylog\RelationManagers\ActivitylogRelationManager;
 
diff --git a/app/Filament/Resources/NewsResource/Pages/CreateNews.php b/modules/News/app/Filament/Resources/NewsResource/Pages/CreateNews.php
similarity index 58%
rename from app/Filament/Resources/NewsResource/Pages/CreateNews.php
rename to modules/News/app/Filament/Resources/NewsResource/Pages/CreateNews.php
index 0cee03f..5bbfb18 100755
--- a/app/Filament/Resources/NewsResource/Pages/CreateNews.php
+++ b/modules/News/app/Filament/Resources/NewsResource/Pages/CreateNews.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Resources\NewsResource\Pages;
+namespace Modules\News\Filament\Resources\NewsResource\Pages;
 
-use App\Filament\Resources\NewsResource;
 use Filament\Resources\Pages\CreateRecord;
+use Modules\News\Filament\Resources\NewsResource;
 
 class CreateNews extends CreateRecord
 {
diff --git a/app/Filament/Resources/NewsResource/Pages/EditNews.php b/modules/News/app/Filament/Resources/NewsResource/Pages/EditNews.php
similarity index 73%
rename from app/Filament/Resources/NewsResource/Pages/EditNews.php
rename to modules/News/app/Filament/Resources/NewsResource/Pages/EditNews.php
index 1e1f0bf..83739ae 100755
--- a/app/Filament/Resources/NewsResource/Pages/EditNews.php
+++ b/modules/News/app/Filament/Resources/NewsResource/Pages/EditNews.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\NewsResource\Pages;
+namespace Modules\News\Filament\Resources\NewsResource\Pages;
 
-use App\Filament\Resources\NewsResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
+use Modules\News\Filament\Resources\NewsResource;
 
 class EditNews extends EditRecord
 {
diff --git a/app/Filament/Resources/NewsResource/Pages/ListNews.php b/modules/News/app/Filament/Resources/NewsResource/Pages/ListNews.php
similarity index 73%
rename from app/Filament/Resources/NewsResource/Pages/ListNews.php
rename to modules/News/app/Filament/Resources/NewsResource/Pages/ListNews.php
index fc7a5e5..abaf946 100755
--- a/app/Filament/Resources/NewsResource/Pages/ListNews.php
+++ b/modules/News/app/Filament/Resources/NewsResource/Pages/ListNews.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\NewsResource\Pages;
+namespace Modules\News\Filament\Resources\NewsResource\Pages;
 
-use App\Filament\Resources\NewsResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
+use Modules\News\Filament\Resources\NewsResource;
 
 class ListNews extends ListRecords
 {
diff --git a/modules/Page/app/Filament/Clusters/Page.php b/modules/Page/app/Filament/Clusters/Page.php
new file mode 100644
index 0000000..143a059
--- /dev/null
+++ b/modules/Page/app/Filament/Clusters/Page.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\Page\Filament\Clusters;
+
+use Filament\Clusters\Cluster;
+use Nwidart\Modules\Facades\Module;
+
+class Page extends Cluster
+{
+    public static function getModuleName(): string
+    {
+        return 'Page';
+    }
+
+    public static function getModule(): \Nwidart\Modules\Module
+    {
+        return Module::findOrFail(static::getModuleName());
+    }
+
+    public static function getNavigationLabel(): string
+    {
+        return __('Page');
+    }
+
+    public static function getNavigationIcon(): ?string
+    {
+        return 'heroicon-o-squares-2x2';
+    }
+}
diff --git a/modules/Page/app/Filament/PagePlugin.php b/modules/Page/app/Filament/PagePlugin.php
new file mode 100644
index 0000000..359d0e7
--- /dev/null
+++ b/modules/Page/app/Filament/PagePlugin.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Modules\Page\Filament;
+
+use Coolsam\Modules\Concerns\ModuleFilamentPlugin;
+use Filament\Contracts\Plugin;
+use Filament\Panel;
+
+class PagePlugin implements Plugin
+{
+    use ModuleFilamentPlugin;
+
+    public function getModuleName(): string
+    {
+        return 'Page';
+    }
+
+    public function getId(): string
+    {
+        return 'page';
+    }
+
+    public function boot(Panel $panel): void
+    {
+        // Implement boot() method.
+    }
+}
diff --git a/app/Filament/Resources/PageResource.php b/modules/Page/app/Filament/Resources/PageResource.php
similarity index 97%
rename from app/Filament/Resources/PageResource.php
rename to modules/Page/app/Filament/Resources/PageResource.php
index c5c56ed..8381f04 100755
--- a/app/Filament/Resources/PageResource.php
+++ b/modules/Page/app/Filament/Resources/PageResource.php
@@ -1,10 +1,7 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace Modules\Page\Filament\Resources;
 
-use App\Filament\Resources\PageResource\Pages;
-use App\Forms\Components\SpatieMediaLibraryFileUpload;
-use App\Forms\Components\SpatieMediaLibraryMarkdownEditor;
 use BezhanSalleh\FilamentShield\Traits\HasPanelShield;
 use Filament\Forms;
 use Filament\Forms\Form;
@@ -13,6 +10,9 @@
 use Filament\Tables;
 use Filament\Tables\Table;
 use Illuminate\Support\Carbon;
+use Modules\Admin\Filament\Components\SpatieMediaLibraryFileUpload;
+use Modules\Admin\Filament\Components\SpatieMediaLibraryMarkdownEditor;
+use Modules\Page\Filament\Resources\PageResource\Pages;
 use Modules\Page\Models\Page;
 use Rmsramos\Activitylog\RelationManagers\ActivitylogRelationManager;
 
diff --git a/app/Filament/Resources/PageResource/Pages/CreatePage.php b/modules/Page/app/Filament/Resources/PageResource/Pages/CreatePage.php
similarity index 58%
rename from app/Filament/Resources/PageResource/Pages/CreatePage.php
rename to modules/Page/app/Filament/Resources/PageResource/Pages/CreatePage.php
index 570f4be..ac7586f 100755
--- a/app/Filament/Resources/PageResource/Pages/CreatePage.php
+++ b/modules/Page/app/Filament/Resources/PageResource/Pages/CreatePage.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Resources\PageResource\Pages;
+namespace Modules\Page\Filament\Resources\PageResource\Pages;
 
-use App\Filament\Resources\PageResource;
 use Filament\Resources\Pages\CreateRecord;
+use Modules\Page\Filament\Resources\PageResource;
 
 class CreatePage extends CreateRecord
 {
diff --git a/app/Filament/Resources/PageResource/Pages/EditPage.php b/modules/Page/app/Filament/Resources/PageResource/Pages/EditPage.php
similarity index 73%
rename from app/Filament/Resources/PageResource/Pages/EditPage.php
rename to modules/Page/app/Filament/Resources/PageResource/Pages/EditPage.php
index 981a91c..edff553 100755
--- a/app/Filament/Resources/PageResource/Pages/EditPage.php
+++ b/modules/Page/app/Filament/Resources/PageResource/Pages/EditPage.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\PageResource\Pages;
+namespace Modules\Page\Filament\Resources\PageResource\Pages;
 
-use App\Filament\Resources\PageResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
+use Modules\Page\Filament\Resources\PageResource;
 
 class EditPage extends EditRecord
 {
diff --git a/app/Filament/Resources/PageResource/Pages/ListPages.php b/modules/Page/app/Filament/Resources/PageResource/Pages/ListPages.php
similarity index 73%
rename from app/Filament/Resources/PageResource/Pages/ListPages.php
rename to modules/Page/app/Filament/Resources/PageResource/Pages/ListPages.php
index ad90981..632cc9d 100755
--- a/app/Filament/Resources/PageResource/Pages/ListPages.php
+++ b/modules/Page/app/Filament/Resources/PageResource/Pages/ListPages.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\PageResource\Pages;
+namespace Modules\Page\Filament\Resources\PageResource\Pages;
 
-use App\Filament\Resources\PageResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
+use Modules\Page\Filament\Resources\PageResource;
 
 class ListPages extends ListRecords
 {
diff --git a/modules/React/app/Filament/Clusters/React.php b/modules/React/app/Filament/Clusters/React.php
new file mode 100644
index 0000000..7aa66da
--- /dev/null
+++ b/modules/React/app/Filament/Clusters/React.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\React\Filament\Clusters;
+
+use Filament\Clusters\Cluster;
+use Nwidart\Modules\Facades\Module;
+
+class React extends Cluster
+{
+    public static function getModuleName(): string
+    {
+        return 'React';
+    }
+
+    public static function getModule(): \Nwidart\Modules\Module
+    {
+        return Module::findOrFail(static::getModuleName());
+    }
+
+    public static function getNavigationLabel(): string
+    {
+        return __('React');
+    }
+
+    public static function getNavigationIcon(): ?string
+    {
+        return 'heroicon-o-squares-2x2';
+    }
+}
diff --git a/modules/React/app/Filament/ReactPlugin.php b/modules/React/app/Filament/ReactPlugin.php
new file mode 100644
index 0000000..6564e2f
--- /dev/null
+++ b/modules/React/app/Filament/ReactPlugin.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Modules\React\Filament;
+
+use Coolsam\Modules\Concerns\ModuleFilamentPlugin;
+use Filament\Contracts\Plugin;
+use Filament\Panel;
+
+class ReactPlugin implements Plugin
+{
+    use ModuleFilamentPlugin;
+
+    public function getModuleName(): string
+    {
+        return 'React';
+    }
+
+    public function getId(): string
+    {
+        return 'react';
+    }
+
+    public function boot(Panel $panel): void
+    {
+        // Implement boot() method.
+    }
+}
diff --git a/app/Filament/Resources/CommentResource.php b/modules/React/app/Filament/Resources/CommentResource.php
similarity index 97%
rename from app/Filament/Resources/CommentResource.php
rename to modules/React/app/Filament/Resources/CommentResource.php
index 21b8af3..2297d59 100644
--- a/app/Filament/Resources/CommentResource.php
+++ b/modules/React/app/Filament/Resources/CommentResource.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace Modules\React\Filament\Resources;
 
-use App\Filament\Resources\CommentResource\Pages;
 use BezhanSalleh\FilamentShield\Traits\HasPanelShield;
 use Filament\Forms;
 use Filament\Forms\Components\MarkdownEditor;
@@ -10,6 +9,7 @@
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
+use Modules\React\Filament\Resources\CommentResource\Pages;
 use Modules\React\Models\Comment;
 use Rmsramos\Activitylog\RelationManagers\ActivitylogRelationManager;
 
diff --git a/app/Filament/Resources/CommentResource/Pages/CreateComment.php b/modules/React/app/Filament/Resources/CommentResource/Pages/CreateComment.php
similarity index 73%
rename from app/Filament/Resources/CommentResource/Pages/CreateComment.php
rename to modules/React/app/Filament/Resources/CommentResource/Pages/CreateComment.php
index 68faff8..f59b402 100644
--- a/app/Filament/Resources/CommentResource/Pages/CreateComment.php
+++ b/modules/React/app/Filament/Resources/CommentResource/Pages/CreateComment.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\CommentResource\Pages;
+namespace Modules\React\Filament\Resources\CommentResource\Pages;
 
-use App\Filament\Resources\CommentResource;
 use Filament\Resources\Pages\CreateRecord;
 use Illuminate\Support\Str;
+use Modules\React\Filament\Resources\CommentResource;
 
 class CreateComment extends CreateRecord
 {
diff --git a/app/Filament/Resources/CommentResource/Pages/EditComment.php b/modules/React/app/Filament/Resources/CommentResource/Pages/EditComment.php
similarity index 72%
rename from app/Filament/Resources/CommentResource/Pages/EditComment.php
rename to modules/React/app/Filament/Resources/CommentResource/Pages/EditComment.php
index 619a8d3..6e571b8 100644
--- a/app/Filament/Resources/CommentResource/Pages/EditComment.php
+++ b/modules/React/app/Filament/Resources/CommentResource/Pages/EditComment.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\CommentResource\Pages;
+namespace Modules\React\Filament\Resources\CommentResource\Pages;
 
-use App\Filament\Resources\CommentResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
+use Modules\React\Filament\Resources\CommentResource;
 
 class EditComment extends EditRecord
 {
diff --git a/app/Filament/Resources/CommentResource/Pages/ListComments.php b/modules/React/app/Filament/Resources/CommentResource/Pages/ListComments.php
similarity index 72%
rename from app/Filament/Resources/CommentResource/Pages/ListComments.php
rename to modules/React/app/Filament/Resources/CommentResource/Pages/ListComments.php
index 015aeb7..e56c2da 100644
--- a/app/Filament/Resources/CommentResource/Pages/ListComments.php
+++ b/modules/React/app/Filament/Resources/CommentResource/Pages/ListComments.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\CommentResource\Pages;
+namespace Modules\React\Filament\Resources\CommentResource\Pages;
 
-use App\Filament\Resources\CommentResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
+use Modules\React\Filament\Resources\CommentResource;
 
 class ListComments extends ListRecords
 {
diff --git a/app/Filament/Resources/DislikeResource.php b/modules/React/app/Filament/Resources/DislikeResource.php
similarity index 87%
rename from app/Filament/Resources/DislikeResource.php
rename to modules/React/app/Filament/Resources/DislikeResource.php
index e57bfdd..c68701b 100644
--- a/app/Filament/Resources/DislikeResource.php
+++ b/modules/React/app/Filament/Resources/DislikeResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace Modules\React\Filament\Resources;
 
 use BezhanSalleh\FilamentShield\Traits\HasPanelShield;
 use Filament\Resources\Resource;
diff --git a/app/Filament/Resources/FollowResource.php b/modules/React/app/Filament/Resources/FollowResource.php
similarity index 87%
rename from app/Filament/Resources/FollowResource.php
rename to modules/React/app/Filament/Resources/FollowResource.php
index 23c3eb9..95ba420 100644
--- a/app/Filament/Resources/FollowResource.php
+++ b/modules/React/app/Filament/Resources/FollowResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace Modules\React\Filament\Resources;
 
 use BezhanSalleh\FilamentShield\Traits\HasPanelShield;
 use Filament\Resources\Resource;
diff --git a/app/Filament/Resources/LikeResource.php b/modules/React/app/Filament/Resources/LikeResource.php
similarity index 87%
rename from app/Filament/Resources/LikeResource.php
rename to modules/React/app/Filament/Resources/LikeResource.php
index 0c2ac70..55e5ed7 100644
--- a/app/Filament/Resources/LikeResource.php
+++ b/modules/React/app/Filament/Resources/LikeResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace Modules\React\Filament\Resources;
 
 use BezhanSalleh\FilamentShield\Traits\HasPanelShield;
 use Filament\Resources\Resource;
diff --git a/app/Filament/Resources/SaveResource.php b/modules/React/app/Filament/Resources/SaveResource.php
similarity index 87%
rename from app/Filament/Resources/SaveResource.php
rename to modules/React/app/Filament/Resources/SaveResource.php
index 7c5609d..a93e142 100644
--- a/app/Filament/Resources/SaveResource.php
+++ b/modules/React/app/Filament/Resources/SaveResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace Modules\React\Filament\Resources;
 
 use BezhanSalleh\FilamentShield\Traits\HasPanelShield;
 use Filament\Resources\Resource;
diff --git a/app/Filament/Resources/CommentResource/Widgets/CommentStatsOverview.php b/modules/React/app/Filament/Widgets/CommentStatsOverview.php
similarity index 88%
rename from app/Filament/Resources/CommentResource/Widgets/CommentStatsOverview.php
rename to modules/React/app/Filament/Widgets/CommentStatsOverview.php
index 16383a3..772ae20 100644
--- a/app/Filament/Resources/CommentResource/Widgets/CommentStatsOverview.php
+++ b/modules/React/app/Filament/Widgets/CommentStatsOverview.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Resources\CommentResource\Widgets;
+namespace Modules\React\Filament\Widgets;
 
 use BezhanSalleh\FilamentShield\Traits\HasWidgetShield;
 use Filament\Widgets\StatsOverviewWidget as BaseWidget;
@@ -11,6 +11,8 @@ class CommentStatsOverview extends BaseWidget
 {
     use HasWidgetShield;
 
+    protected static ?int $sort = 20;
+
     protected int | string | array $columnSpan = 4;
 
     protected function getColumns(): int
diff --git a/modules/Tag/app/Filament/Clusters/Tag.php b/modules/Tag/app/Filament/Clusters/Tag.php
new file mode 100644
index 0000000..5fc1b60
--- /dev/null
+++ b/modules/Tag/app/Filament/Clusters/Tag.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\Tag\Filament\Clusters;
+
+use Filament\Clusters\Cluster;
+use Nwidart\Modules\Facades\Module;
+
+class Tag extends Cluster
+{
+    public static function getModuleName(): string
+    {
+        return 'Tag';
+    }
+
+    public static function getModule(): \Nwidart\Modules\Module
+    {
+        return Module::findOrFail(static::getModuleName());
+    }
+
+    public static function getNavigationLabel(): string
+    {
+        return __('Tag');
+    }
+
+    public static function getNavigationIcon(): ?string
+    {
+        return 'heroicon-o-squares-2x2';
+    }
+}
diff --git a/app/Filament/Resources/TagResource.php b/modules/Tag/app/Filament/Resources/TagResource.php
similarity index 97%
rename from app/Filament/Resources/TagResource.php
rename to modules/Tag/app/Filament/Resources/TagResource.php
index 4721a8b..05cd7dc 100755
--- a/app/Filament/Resources/TagResource.php
+++ b/modules/Tag/app/Filament/Resources/TagResource.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace Modules\Tag\Filament\Resources;
 
-use App\Filament\Resources\TagResource\Pages;
 use BezhanSalleh\FilamentShield\Traits\HasPanelShield;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
+use Modules\Tag\Filament\Resources\TagResource\Pages;
 use Modules\Tag\Models\Tag;
 use Rmsramos\Activitylog\RelationManagers\ActivitylogRelationManager;
 
diff --git a/app/Filament/Resources/TagResource/Pages/CreateTag.php b/modules/Tag/app/Filament/Resources/TagResource/Pages/CreateTag.php
similarity index 58%
rename from app/Filament/Resources/TagResource/Pages/CreateTag.php
rename to modules/Tag/app/Filament/Resources/TagResource/Pages/CreateTag.php
index d1f4dd9..87160f5 100755
--- a/app/Filament/Resources/TagResource/Pages/CreateTag.php
+++ b/modules/Tag/app/Filament/Resources/TagResource/Pages/CreateTag.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Resources\TagResource\Pages;
+namespace Modules\Tag\Filament\Resources\TagResource\Pages;
 
-use App\Filament\Resources\TagResource;
 use Filament\Resources\Pages\CreateRecord;
+use Modules\Tag\Filament\Resources\TagResource;
 
 class CreateTag extends CreateRecord
 {
diff --git a/app/Filament/Resources/TagResource/Pages/EditTag.php b/modules/Tag/app/Filament/Resources/TagResource/Pages/EditTag.php
similarity index 73%
rename from app/Filament/Resources/TagResource/Pages/EditTag.php
rename to modules/Tag/app/Filament/Resources/TagResource/Pages/EditTag.php
index 19e9cbe..de72d53 100755
--- a/app/Filament/Resources/TagResource/Pages/EditTag.php
+++ b/modules/Tag/app/Filament/Resources/TagResource/Pages/EditTag.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\TagResource\Pages;
+namespace Modules\Tag\Filament\Resources\TagResource\Pages;
 
-use App\Filament\Resources\TagResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
+use Modules\Tag\Filament\Resources\TagResource;
 
 class EditTag extends EditRecord
 {
diff --git a/app/Filament/Resources/TagResource/Pages/ListTags.php b/modules/Tag/app/Filament/Resources/TagResource/Pages/ListTags.php
similarity index 73%
rename from app/Filament/Resources/TagResource/Pages/ListTags.php
rename to modules/Tag/app/Filament/Resources/TagResource/Pages/ListTags.php
index 5a14fe3..a069c2e 100755
--- a/app/Filament/Resources/TagResource/Pages/ListTags.php
+++ b/modules/Tag/app/Filament/Resources/TagResource/Pages/ListTags.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\TagResource\Pages;
+namespace Modules\Tag\Filament\Resources\TagResource\Pages;
 
-use App\Filament\Resources\TagResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
+use Modules\Tag\Filament\Resources\TagResource;
 
 class ListTags extends ListRecords
 {
diff --git a/modules/Tag/app/Filament/TagPlugin.php b/modules/Tag/app/Filament/TagPlugin.php
new file mode 100644
index 0000000..769f399
--- /dev/null
+++ b/modules/Tag/app/Filament/TagPlugin.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Modules\Tag\Filament;
+
+use Coolsam\Modules\Concerns\ModuleFilamentPlugin;
+use Filament\Contracts\Plugin;
+use Filament\Panel;
+
+class TagPlugin implements Plugin
+{
+    use ModuleFilamentPlugin;
+
+    public function getModuleName(): string
+    {
+        return 'Tag';
+    }
+
+    public function getId(): string
+    {
+        return 'tag';
+    }
+
+    public function boot(Panel $panel): void
+    {
+        // Implement boot() method.
+    }
+}
diff --git a/modules/User/app/Filament/Clusters/User.php b/modules/User/app/Filament/Clusters/User.php
new file mode 100644
index 0000000..c4bdd11
--- /dev/null
+++ b/modules/User/app/Filament/Clusters/User.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\User\Filament\Clusters;
+
+use Filament\Clusters\Cluster;
+use Nwidart\Modules\Facades\Module;
+
+class User extends Cluster
+{
+    public static function getModuleName(): string
+    {
+        return 'User';
+    }
+
+    public static function getModule(): \Nwidart\Modules\Module
+    {
+        return Module::findOrFail(static::getModuleName());
+    }
+
+    public static function getNavigationLabel(): string
+    {
+        return __('User');
+    }
+
+    public static function getNavigationIcon(): ?string
+    {
+        return 'heroicon-o-squares-2x2';
+    }
+}
diff --git a/app/Filament/Exports/UserExporter.php b/modules/User/app/Filament/Exports/UserExporter.php
similarity index 96%
rename from app/Filament/Exports/UserExporter.php
rename to modules/User/app/Filament/Exports/UserExporter.php
index 97151df..1151ed7 100755
--- a/app/Filament/Exports/UserExporter.php
+++ b/modules/User/app/Filament/Exports/UserExporter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Exports;
+namespace Modules\User\Filament\Exports;
 
 use App\Models\User;
 use Filament\Actions\Exports\ExportColumn;
diff --git a/app/Filament/Imports/UserImporter.php b/modules/User/app/Filament/Imports/UserImporter.php
similarity index 97%
rename from app/Filament/Imports/UserImporter.php
rename to modules/User/app/Filament/Imports/UserImporter.php
index 0cb8c05..584d0ed 100755
--- a/app/Filament/Imports/UserImporter.php
+++ b/modules/User/app/Filament/Imports/UserImporter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Imports;
+namespace Modules\User\Filament\Imports;
 
 use App\Models\User;
 use Filament\Actions\Imports\ImportColumn;
diff --git a/app/Filament/Resources/RoleResource.php b/modules/User/app/Filament/Resources/RoleResource.php
similarity index 98%
rename from app/Filament/Resources/RoleResource.php
rename to modules/User/app/Filament/Resources/RoleResource.php
index cae0b8b..2dd0916 100644
--- a/app/Filament/Resources/RoleResource.php
+++ b/modules/User/app/Filament/Resources/RoleResource.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace Modules\User\Filament\Resources;
 
-use App\Filament\Resources\RoleResource\Pages;
 use BezhanSalleh\FilamentShield\Contracts\HasShieldPermissions;
 use BezhanSalleh\FilamentShield\Forms\ShieldSelectAllToggle;
 use BezhanSalleh\FilamentShield\Support\Utils;
@@ -18,6 +17,7 @@
 use Illuminate\Support\HtmlString;
 use Illuminate\Support\Str;
 use Illuminate\Validation\Rules\Unique;
+use Modules\User\Filament\Resources\RoleResource\Pages;
 
 class RoleResource extends Resource implements HasShieldPermissions
 {
diff --git a/app/Filament/Resources/RoleResource/Pages/CreateRole.php b/modules/User/app/Filament/Resources/RoleResource/Pages/CreateRole.php
similarity index 92%
rename from app/Filament/Resources/RoleResource/Pages/CreateRole.php
rename to modules/User/app/Filament/Resources/RoleResource/Pages/CreateRole.php
index 53def44..b0c971c 100644
--- a/app/Filament/Resources/RoleResource/Pages/CreateRole.php
+++ b/modules/User/app/Filament/Resources/RoleResource/Pages/CreateRole.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Filament\Resources\RoleResource\Pages;
+namespace Modules\User\Filament\Resources\RoleResource\Pages;
 
-use App\Filament\Resources\RoleResource;
 use BezhanSalleh\FilamentShield\Support\Utils;
 use Filament\Resources\Pages\CreateRecord;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
+use Modules\User\Filament\Resources\RoleResource;
 
 class CreateRole extends CreateRecord
 {
diff --git a/app/Filament/Resources/RoleResource/Pages/EditRole.php b/modules/User/app/Filament/Resources/RoleResource/Pages/EditRole.php
similarity index 93%
rename from app/Filament/Resources/RoleResource/Pages/EditRole.php
rename to modules/User/app/Filament/Resources/RoleResource/Pages/EditRole.php
index f95e8e1..c180483 100644
--- a/app/Filament/Resources/RoleResource/Pages/EditRole.php
+++ b/modules/User/app/Filament/Resources/RoleResource/Pages/EditRole.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Filament\Resources\RoleResource\Pages;
+namespace Modules\User\Filament\Resources\RoleResource\Pages;
 
-use App\Filament\Resources\RoleResource;
 use BezhanSalleh\FilamentShield\Support\Utils;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
+use Modules\User\Filament\Resources\RoleResource;
 
 class EditRole extends EditRecord
 {
diff --git a/app/Filament/Resources/RoleResource/Pages/ListRoles.php b/modules/User/app/Filament/Resources/RoleResource/Pages/ListRoles.php
similarity index 72%
rename from app/Filament/Resources/RoleResource/Pages/ListRoles.php
rename to modules/User/app/Filament/Resources/RoleResource/Pages/ListRoles.php
index 65314a0..193a43d 100644
--- a/app/Filament/Resources/RoleResource/Pages/ListRoles.php
+++ b/modules/User/app/Filament/Resources/RoleResource/Pages/ListRoles.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\RoleResource\Pages;
+namespace Modules\User\Filament\Resources\RoleResource\Pages;
 
-use App\Filament\Resources\RoleResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
+use Modules\User\Filament\Resources\RoleResource;
 
 class ListRoles extends ListRecords
 {
diff --git a/app/Filament/Resources/RoleResource/Pages/ViewRole.php b/modules/User/app/Filament/Resources/RoleResource/Pages/ViewRole.php
similarity index 72%
rename from app/Filament/Resources/RoleResource/Pages/ViewRole.php
rename to modules/User/app/Filament/Resources/RoleResource/Pages/ViewRole.php
index 30d4ff2..c24e9df 100644
--- a/app/Filament/Resources/RoleResource/Pages/ViewRole.php
+++ b/modules/User/app/Filament/Resources/RoleResource/Pages/ViewRole.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\RoleResource\Pages;
+namespace Modules\User\Filament\Resources\RoleResource\Pages;
 
-use App\Filament\Resources\RoleResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ViewRecord;
+use Modules\User\Filament\Resources\RoleResource;
 
 class ViewRole extends ViewRecord
 {
diff --git a/app/Filament/Resources/UserResource.php b/modules/User/app/Filament/Resources/UserResource.php
similarity index 96%
rename from app/Filament/Resources/UserResource.php
rename to modules/User/app/Filament/Resources/UserResource.php
index 9109756..391e5fe 100755
--- a/app/Filament/Resources/UserResource.php
+++ b/modules/User/app/Filament/Resources/UserResource.php
@@ -1,11 +1,7 @@
 <?php
 
-namespace App\Filament\Resources;
+namespace Modules\User\Filament\Resources;
 
-use App\Filament\Exports\UserExporter;
-use App\Filament\Imports\UserImporter;
-use App\Filament\Resources\UserResource\Pages;
-use App\Forms\Components\SpatieMediaLibraryFileUpload;
 use App\Models\User;
 use BezhanSalleh\FilamentShield\Traits\HasPanelShield;
 use Filament\Forms;
@@ -16,6 +12,10 @@
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\SoftDeletingScope;
+use Modules\Admin\Filament\Components\SpatieMediaLibraryFileUpload;
+use Modules\User\Filament\Exports\UserExporter;
+use Modules\User\Filament\Imports\UserImporter;
+use Modules\User\Filament\Resources\UserResource\Pages;
 use Rmsramos\Activitylog\RelationManagers\ActivitylogRelationManager;
 use STS\FilamentImpersonate\Tables\Actions\Impersonate;
 
diff --git a/app/Filament/Resources/UserResource/Pages/CreateUser.php b/modules/User/app/Filament/Resources/UserResource/Pages/CreateUser.php
similarity index 58%
rename from app/Filament/Resources/UserResource/Pages/CreateUser.php
rename to modules/User/app/Filament/Resources/UserResource/Pages/CreateUser.php
index 78a3894..fcfab1b 100755
--- a/app/Filament/Resources/UserResource/Pages/CreateUser.php
+++ b/modules/User/app/Filament/Resources/UserResource/Pages/CreateUser.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Filament\Resources\UserResource\Pages;
+namespace Modules\User\Filament\Resources\UserResource\Pages;
 
-use App\Filament\Resources\UserResource;
 use Filament\Resources\Pages\CreateRecord;
+use Modules\User\Filament\Resources\UserResource;
 
 class CreateUser extends CreateRecord
 {
diff --git a/app/Filament/Resources/UserResource/Pages/EditUser.php b/modules/User/app/Filament/Resources/UserResource/Pages/EditUser.php
similarity index 77%
rename from app/Filament/Resources/UserResource/Pages/EditUser.php
rename to modules/User/app/Filament/Resources/UserResource/Pages/EditUser.php
index aa9a68a..36adf66 100755
--- a/app/Filament/Resources/UserResource/Pages/EditUser.php
+++ b/modules/User/app/Filament/Resources/UserResource/Pages/EditUser.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\UserResource\Pages;
+namespace Modules\User\Filament\Resources\UserResource\Pages;
 
-use App\Filament\Resources\UserResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
+use Modules\User\Filament\Resources\UserResource;
 
 class EditUser extends EditRecord
 {
diff --git a/app/Filament/Resources/UserResource/Pages/ListUsers.php b/modules/User/app/Filament/Resources/UserResource/Pages/ListUsers.php
similarity index 73%
rename from app/Filament/Resources/UserResource/Pages/ListUsers.php
rename to modules/User/app/Filament/Resources/UserResource/Pages/ListUsers.php
index 0766ffe..d2c22cc 100755
--- a/app/Filament/Resources/UserResource/Pages/ListUsers.php
+++ b/modules/User/app/Filament/Resources/UserResource/Pages/ListUsers.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Filament\Resources\UserResource\Pages;
+namespace Modules\User\Filament\Resources\UserResource\Pages;
 
-use App\Filament\Resources\UserResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
+use Modules\User\Filament\Resources\UserResource;
 
 class ListUsers extends ListRecords
 {
diff --git a/modules/User/app/Filament/UserPlugin.php b/modules/User/app/Filament/UserPlugin.php
new file mode 100644
index 0000000..921b981
--- /dev/null
+++ b/modules/User/app/Filament/UserPlugin.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Modules\User\Filament;
+
+use Coolsam\Modules\Concerns\ModuleFilamentPlugin;
+use Filament\Contracts\Plugin;
+use Filament\Panel;
+
+class UserPlugin implements Plugin
+{
+    use ModuleFilamentPlugin;
+
+    public function getModuleName(): string
+    {
+        return 'User';
+    }
+
+    public function getId(): string
+    {
+        return 'user';
+    }
+
+    public function boot(Panel $panel): void
+    {
+        // Implement boot() method.
+    }
+}
diff --git a/modules_statuses.json b/modules_statuses.json
index 6ac07c6..53bfcdb 100644
--- a/modules_statuses.json
+++ b/modules_statuses.json
@@ -9,5 +9,6 @@
     "Recommend": true,
     "Search": true,
     "Tag": true,
-    "User": true
+    "User": true,
+    "Admin": true
 }
\ No newline at end of file