diff --git a/app/Http/Controllers/Setup/LoginController.php b/app/Http/Controllers/Setup/LoginController.php
index 474929f0..6935a56d 100644
--- a/app/Http/Controllers/Setup/LoginController.php
+++ b/app/Http/Controllers/Setup/LoginController.php
@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Setup;
 
 use App\Http\Controllers\Controller;
 use App\Models\User;
-use App\Support\InstallWizardAuth;
+use App\Support\Setup\InstallWizardAuth;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
diff --git a/app/Http/Middleware/UseInstallWizardTokenAuth.php b/app/Http/Middleware/UseInstallWizardTokenAuth.php
index 1b1891dc..8d07e83d 100644
--- a/app/Http/Middleware/UseInstallWizardTokenAuth.php
+++ b/app/Http/Middleware/UseInstallWizardTokenAuth.php
@@ -3,8 +3,8 @@
 namespace App\Http\Middleware;
 
 use App\Models\Setting;
-use App\Support\InstallWizardAuth;
 use App\Support\Setup\InstallUtils;
+use App\Support\Setup\InstallWizardAuth;
 use Closure;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 911653ee..0af526e7 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -18,9 +18,9 @@ use App\Policies\ReportPolicy;
 use App\Policies\RolePolicy;
 use App\Policies\SettingsPolicy;
 use App\Policies\UserPolicy;
-use App\Support\BouncerDefaultScope;
-use App\Support\InstallWizardAuth;
+use App\Support\Bouncer\BouncerDefaultScope;
 use App\Support\Setup\InstallUtils;
+use App\Support\Setup\InstallWizardAuth;
 use Gate;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Broadcast;
diff --git a/app/Support/BouncerDefaultScope.php b/app/Support/Bouncer/BouncerDefaultScope.php
similarity index 96%
rename from app/Support/BouncerDefaultScope.php
rename to app/Support/Bouncer/BouncerDefaultScope.php
index 828c12ce..438a7f0b 100644
--- a/app/Support/BouncerDefaultScope.php
+++ b/app/Support/Bouncer/BouncerDefaultScope.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support;
+namespace App\Support\Bouncer;
 
 use Silber\Bouncer\Database\Scope\Scope;
 
diff --git a/app/Support/CustomPathGenerator.php b/app/Support/Media/CustomPathGenerator.php
similarity index 97%
rename from app/Support/CustomPathGenerator.php
rename to app/Support/Media/CustomPathGenerator.php
index 9abb6bfb..b9b3394f 100644
--- a/app/Support/CustomPathGenerator.php
+++ b/app/Support/Media/CustomPathGenerator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support;
+namespace App\Support\Media;
 
 use App\Models\Estimate;
 use App\Models\Invoice;
diff --git a/app/Support/InstallWizardAuth.php b/app/Support/Setup/InstallWizardAuth.php
similarity index 93%
rename from app/Support/InstallWizardAuth.php
rename to app/Support/Setup/InstallWizardAuth.php
index 973c23fb..0a60ba7a 100644
--- a/app/Support/InstallWizardAuth.php
+++ b/app/Support/Setup/InstallWizardAuth.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support;
+namespace App\Support\Setup;
 
 use Illuminate\Http\Request;
 
diff --git a/config/media-library.php b/config/media-library.php
index 78a81237..42250217 100644
--- a/config/media-library.php
+++ b/config/media-library.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Support\CustomPathGenerator;
+use App\Support\Media\CustomPathGenerator;
 use Spatie\ImageOptimizer\Optimizers\Avifenc;
 use Spatie\ImageOptimizer\Optimizers\Cwebp;
 use Spatie\ImageOptimizer\Optimizers\Gifsicle;