diff --git a/app/Http/Mail/SendSupportForm.php b/app/Http/Mail/SendSupportForm.php
index 889f8a9b..74d593a3 100644
--- a/app/Http/Mail/SendSupportForm.php
+++ b/app/Http/Mail/SendSupportForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Mail;
+namespace App\Http\Mail;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/app/Http/Notifications/ConfirmPayment.php b/app/Http/Notifications/ConfirmPayment.php
index cd1be734..7435ef6c 100644
--- a/app/Http/Notifications/ConfirmPayment.php
+++ b/app/Http/Notifications/ConfirmPayment.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Notifications;
+namespace App\Http\Notifications;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/tests/Feature/Accounts/AdminTest.php b/tests/Feature/Accounts/AdminTest.php
index 7da4a717..c9d8615c 100644
--- a/tests/Feature/Accounts/AdminTest.php
+++ b/tests/Feature/Accounts/AdminTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Accounts;
 
 use App\Models\File;
 use App\Models\Folder;
diff --git a/tests/Feature/Accounts/AuthTest.php b/tests/Feature/Accounts/AuthTest.php
index 5704996d..567cd429 100644
--- a/tests/Feature/Accounts/AuthTest.php
+++ b/tests/Feature/Accounts/AuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Accounts;
 
 use App\Models\User;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
diff --git a/tests/Feature/Accounts/UserAccountTest.php b/tests/Feature/Accounts/UserAccountTest.php
index 1a175478..6eae01ed 100644
--- a/tests/Feature/Accounts/UserAccountTest.php
+++ b/tests/Feature/Accounts/UserAccountTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Accounts;
 
 use App\Models\User;
 use App\Services\SetupService;
diff --git a/tests/Feature/App/SchedulerTest.php b/tests/Feature/App/SchedulerTest.php
index 12172efa..ccf36305 100644
--- a/tests/Feature/App/SchedulerTest.php
+++ b/tests/Feature/App/SchedulerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\App;
 
 use App\Models\File;
 use App\Models\Share;
diff --git a/tests/Feature/External/SubscriptionTest.php b/tests/Feature/External/SubscriptionTest.php
index 560ea73b..44a8518c 100644
--- a/tests/Feature/External/SubscriptionTest.php
+++ b/tests/Feature/External/SubscriptionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\External;
 
 use App\Models\User;
 use Carbon\Carbon;
diff --git a/tests/Feature/FileManager/BrowseTest.php b/tests/Feature/FileManager/BrowseTest.php
index 93efbf26..d1bafedb 100644
--- a/tests/Feature/FileManager/BrowseTest.php
+++ b/tests/Feature/FileManager/BrowseTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\FileManager;
 
 use App\Models\File;
 use App\Models\Folder;
diff --git a/tests/Feature/FileManager/ContentAccessTest.php b/tests/Feature/FileManager/ContentAccessTest.php
index 735568de..0078c73a 100644
--- a/tests/Feature/FileManager/ContentAccessTest.php
+++ b/tests/Feature/FileManager/ContentAccessTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\FileManager;
 
 use App\Models\File;
 use App\Models\Folder;
diff --git a/tests/Feature/FileManager/FileTest.php b/tests/Feature/FileManager/FileTest.php
index de766b99..0faa47fb 100644
--- a/tests/Feature/FileManager/FileTest.php
+++ b/tests/Feature/FileManager/FileTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\FileManager;
 
 use App\Models\File;
 use App\Models\Folder;
diff --git a/tests/Feature/FileManager/FolderTest.php b/tests/Feature/FileManager/FolderTest.php
index 396c87e6..40179058 100644
--- a/tests/Feature/FileManager/FolderTest.php
+++ b/tests/Feature/FileManager/FolderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\FileManager;
 
 use App\Models\File;
 use App\Models\Folder;
diff --git a/tests/Feature/FileManager/TrashTest.php b/tests/Feature/FileManager/TrashTest.php
index 89c261d9..73dd4b7d 100644
--- a/tests/Feature/FileManager/TrashTest.php
+++ b/tests/Feature/FileManager/TrashTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\FileManager;
 
 use App\Models\File;
 use App\Models\Folder;
diff --git a/tests/Feature/Setup/SetupServiceTest.php b/tests/Feature/Setup/SetupServiceTest.php
index 62798782..c17a7b7d 100644
--- a/tests/Feature/Setup/SetupServiceTest.php
+++ b/tests/Feature/Setup/SetupServiceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Setup;
 
 use App\Services\SetupService;
 use Illuminate\Foundation\Testing\RefreshDatabase;
diff --git a/tests/Feature/Setup/SetupWizardTest.php b/tests/Feature/Setup/SetupWizardTest.php
index f241d45a..de53dced 100644
--- a/tests/Feature/Setup/SetupWizardTest.php
+++ b/tests/Feature/Setup/SetupWizardTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Setup;
 
 use App\Models\Setting;
 use App\Models\User;
diff --git a/tests/Feature/Share/ShareContentAccessTest.php b/tests/Feature/Share/ShareContentAccessTest.php
index a356acea..688932d9 100644
--- a/tests/Feature/Share/ShareContentAccessTest.php
+++ b/tests/Feature/Share/ShareContentAccessTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Share;
 
 use App\Models\File;
 use App\Models\Share;
diff --git a/tests/Feature/Share/ShareTest.php b/tests/Feature/Share/ShareTest.php
index e21d708d..3913951a 100644
--- a/tests/Feature/Share/ShareTest.php
+++ b/tests/Feature/Share/ShareTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Share;
 
 use App\Models\File;
 use App\Models\Folder;