diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 318f96f83..cbe68c6f4 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -192,7 +192,7 @@ jobs:
           args: |
             -Dsonar.projectKey=monicahq_chandler
             -Dsonar.organization=monicahq
-            -Dsonar.sources=app,bootstrap,config,database,domains,public,resources,routes
+            -Dsonar.sources=app,bootstrap,config,database,public,resources,routes
             -Dsonar.exclusions=bootstrap/cache/*,public/vendor/**,resources/lang/**
             -Dsonar.tests=tests
             -Dsonar.coverage.exclusions=routes/*.php,config/**/*.php,bootstrap/**,resources/**/*.php,database/**/*.php,public/*.php,resources/**/*.vue,resources/**/*.js
diff --git a/app/Actions/Fortify/CreateNewUser.php b/app/Actions/Fortify/CreateNewUser.php
index 84ec462be..5311330d9 100644
--- a/app/Actions/Fortify/CreateNewUser.php
+++ b/app/Actions/Fortify/CreateNewUser.php
@@ -2,7 +2,7 @@
 
 namespace App\Actions\Fortify;
 
-use App\Settings\CreateAccount\Services\CreateAccount;
+use App\Domains\Settings\CreateAccount\Services\CreateAccount;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
 use Laravel\Fortify\Contracts\CreatesNewUsers;
diff --git a/app/Actions/Jetstream/DeleteUser.php b/app/Actions/Jetstream/DeleteUser.php
index a39cdd230..8aa5dd260 100644
--- a/app/Actions/Jetstream/DeleteUser.php
+++ b/app/Actions/Jetstream/DeleteUser.php
@@ -2,7 +2,7 @@
 
 namespace App\Actions\Jetstream;
 
-use App\Settings\ManageUsers\Services\DestroyUser;
+use App\Domains\Settings\ManageUsers\Services\DestroyUser;
 use Illuminate\Support\Facades\Auth;
 use Laravel\Jetstream\Contracts\DeletesUsers;
 
diff --git a/app/Actions/Jetstream/UserProfile.php b/app/Actions/Jetstream/UserProfile.php
index 97f36d450..c7c832eea 100644
--- a/app/Actions/Jetstream/UserProfile.php
+++ b/app/Actions/Jetstream/UserProfile.php
@@ -2,7 +2,7 @@
 
 namespace App\Actions\Jetstream;
 
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 
 class UserProfile
diff --git a/app/Console/Commands/SetupDummyAccount.php b/app/Console/Commands/SetupDummyAccount.php
index bbed0dceb..613eecc6c 100644
--- a/app/Console/Commands/SetupDummyAccount.php
+++ b/app/Console/Commands/SetupDummyAccount.php
@@ -2,12 +2,16 @@
 
 namespace App\Console\Commands;
 
-use App\Contact\ManageContact\Services\CreateContact;
-use App\Contact\ManageContactImportantDates\Services\CreateContactImportantDate;
-use App\Contact\ManageGoals\Services\CreateGoal;
-use App\Contact\ManageGoals\Services\ToggleStreak;
-use App\Contact\ManageNotes\Services\CreateNote;
-use App\Contact\ManageTasks\Services\CreateContactTask;
+use App\Domains\Contact\ManageContact\Services\CreateContact;
+use App\Domains\Contact\ManageContactImportantDates\Services\CreateContactImportantDate;
+use App\Domains\Contact\ManageGoals\Services\CreateGoal;
+use App\Domains\Contact\ManageGoals\Services\ToggleStreak;
+use App\Domains\Contact\ManageNotes\Services\CreateNote;
+use App\Domains\Contact\ManageTasks\Services\CreateContactTask;
+use App\Domains\Settings\CreateAccount\Services\CreateAccount;
+use App\Domains\Vault\ManageJournals\Services\CreateJournal;
+use App\Domains\Vault\ManageJournals\Services\CreatePost;
+use App\Domains\Vault\ManageVault\Services\CreateVault;
 use App\Exceptions\EntryAlreadyExistException;
 use App\Models\Contact;
 use App\Models\ContactImportantDate;
@@ -16,10 +20,6 @@ use App\Models\Note;
 use App\Models\PostTemplate;
 use App\Models\User;
 use App\Models\Vault;
-use App\Settings\CreateAccount\Services\CreateAccount;
-use App\Vault\ManageJournals\Services\CreateJournal;
-use App\Vault\ManageJournals\Services\CreatePost;
-use App\Vault\ManageVault\Services\CreateVault;
 use Carbon\Carbon;
 use Faker\Factory as Faker;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/TestReminders.php b/app/Console/Commands/TestReminders.php
index 829fc615b..4a79a4f56 100644
--- a/app/Console/Commands/TestReminders.php
+++ b/app/Console/Commands/TestReminders.php
@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Contact\ManageReminders\Services\RescheduleContactReminderForChannel;
+use App\Domains\Contact\ManageReminders\Services\RescheduleContactReminderForChannel;
 use App\Helpers\NameHelper;
 use App\Models\ContactReminder;
 use App\Models\UserNotificationChannel;
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 6616bef65..4d1999e51 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -2,7 +2,7 @@
 
 namespace App\Console;
 
-use App\Contact\ManageReminders\Jobs\ProcessScheduledContactReminders;
+use App\Domains\Contact\ManageReminders\Jobs\ProcessScheduledContactReminders;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
diff --git a/domains/Contact/ManageAvatar/Services/DestroyAvatar.php b/app/Domains/Contact/ManageAvatar/Services/DestroyAvatar.php
similarity index 97%
rename from domains/Contact/ManageAvatar/Services/DestroyAvatar.php
rename to app/Domains/Contact/ManageAvatar/Services/DestroyAvatar.php
index b2854b888..fb3993e96 100644
--- a/domains/Contact/ManageAvatar/Services/DestroyAvatar.php
+++ b/app/Domains/Contact/ManageAvatar/Services/DestroyAvatar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageAvatar\Services;
+namespace App\Domains\Contact\ManageAvatar\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Contact;
diff --git a/domains/Contact/ManageAvatar/Services/UpdatePhotoAsAvatar.php b/app/Domains/Contact/ManageAvatar/Services/UpdatePhotoAsAvatar.php
similarity index 97%
rename from domains/Contact/ManageAvatar/Services/UpdatePhotoAsAvatar.php
rename to app/Domains/Contact/ManageAvatar/Services/UpdatePhotoAsAvatar.php
index ccee8b765..d90f7a731 100644
--- a/domains/Contact/ManageAvatar/Services/UpdatePhotoAsAvatar.php
+++ b/app/Domains/Contact/ManageAvatar/Services/UpdatePhotoAsAvatar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageAvatar\Services;
+namespace App\Domains\Contact\ManageAvatar\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Contact;
diff --git a/domains/Contact/ManageAvatar/Web/Controllers/ModuleAvatarController.php b/app/Domains/Contact/ManageAvatar/Web/Controllers/ModuleAvatarController.php
similarity index 88%
rename from domains/Contact/ManageAvatar/Web/Controllers/ModuleAvatarController.php
rename to app/Domains/Contact/ManageAvatar/Web/Controllers/ModuleAvatarController.php
index 1c9cba5b8..5bc00e89a 100644
--- a/domains/Contact/ManageAvatar/Web/Controllers/ModuleAvatarController.php
+++ b/app/Domains/Contact/ManageAvatar/Web/Controllers/ModuleAvatarController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Contact\ManageAvatar\Web\Controllers;
+namespace App\Domains\Contact\ManageAvatar\Web\Controllers;
 
-use App\Contact\ManageAvatar\Services\DestroyAvatar;
-use App\Contact\ManageAvatar\Services\UpdatePhotoAsAvatar;
-use App\Contact\ManageDocuments\Services\UploadFile;
+use App\Domains\Contact\ManageAvatar\Services\DestroyAvatar;
+use App\Domains\Contact\ManageAvatar\Services\UpdatePhotoAsAvatar;
+use App\Domains\Contact\ManageDocuments\Services\UploadFile;
 use App\Http\Controllers\Controller;
 use App\Models\File;
 use Illuminate\Http\Request;
diff --git a/domains/Contact/ManageAvatar/Web/ViewHelpers/ModuleAvatarViewHelper.php b/app/Domains/Contact/ManageAvatar/Web/ViewHelpers/ModuleAvatarViewHelper.php
similarity index 77%
rename from domains/Contact/ManageAvatar/Web/ViewHelpers/ModuleAvatarViewHelper.php
rename to app/Domains/Contact/ManageAvatar/Web/ViewHelpers/ModuleAvatarViewHelper.php
index 5c496b69c..aba2e0cf3 100644
--- a/domains/Contact/ManageAvatar/Web/ViewHelpers/ModuleAvatarViewHelper.php
+++ b/app/Domains/Contact/ManageAvatar/Web/ViewHelpers/ModuleAvatarViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageAvatar\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageAvatar\Web\ViewHelpers;
 
 use App\Models\Contact;
 
diff --git a/domains/Contact/ManageCalls/Services/CreateCall.php b/app/Domains/Contact/ManageCalls/Services/CreateCall.php
similarity index 98%
rename from domains/Contact/ManageCalls/Services/CreateCall.php
rename to app/Domains/Contact/ManageCalls/Services/CreateCall.php
index 9ee0eb0db..109e0fb94 100644
--- a/domains/Contact/ManageCalls/Services/CreateCall.php
+++ b/app/Domains/Contact/ManageCalls/Services/CreateCall.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageCalls\Services;
+namespace App\Domains\Contact\ManageCalls\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Call;
diff --git a/domains/Contact/ManageCalls/Services/DestroyCall.php b/app/Domains/Contact/ManageCalls/Services/DestroyCall.php
similarity index 96%
rename from domains/Contact/ManageCalls/Services/DestroyCall.php
rename to app/Domains/Contact/ManageCalls/Services/DestroyCall.php
index 0e9a5f562..6a7bb9887 100644
--- a/domains/Contact/ManageCalls/Services/DestroyCall.php
+++ b/app/Domains/Contact/ManageCalls/Services/DestroyCall.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageCalls\Services;
+namespace App\Domains\Contact\ManageCalls\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Call;
diff --git a/domains/Contact/ManageCalls/Services/UpdateCall.php b/app/Domains/Contact/ManageCalls/Services/UpdateCall.php
similarity index 98%
rename from domains/Contact/ManageCalls/Services/UpdateCall.php
rename to app/Domains/Contact/ManageCalls/Services/UpdateCall.php
index fada63bea..941d953b2 100644
--- a/domains/Contact/ManageCalls/Services/UpdateCall.php
+++ b/app/Domains/Contact/ManageCalls/Services/UpdateCall.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageCalls\Services;
+namespace App\Domains\Contact\ManageCalls\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Call;
diff --git a/domains/Contact/ManageCalls/Web/Controllers/ContactModuleCallController.php b/app/Domains/Contact/ManageCalls/Web/Controllers/ContactModuleCallController.php
similarity index 93%
rename from domains/Contact/ManageCalls/Web/Controllers/ContactModuleCallController.php
rename to app/Domains/Contact/ManageCalls/Web/Controllers/ContactModuleCallController.php
index efab74941..f186218dd 100644
--- a/domains/Contact/ManageCalls/Web/Controllers/ContactModuleCallController.php
+++ b/app/Domains/Contact/ManageCalls/Web/Controllers/ContactModuleCallController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Contact\ManageCalls\Web\Controllers;
+namespace App\Domains\Contact\ManageCalls\Web\Controllers;
 
-use App\Contact\ManageCalls\Services\CreateCall;
-use App\Contact\ManageCalls\Services\DestroyCall;
-use App\Contact\ManageCalls\Services\UpdateCall;
-use App\Contact\ManageCalls\Web\ViewHelpers\ModuleCallsViewHelper;
+use App\Domains\Contact\ManageCalls\Services\CreateCall;
+use App\Domains\Contact\ManageCalls\Services\DestroyCall;
+use App\Domains\Contact\ManageCalls\Services\UpdateCall;
+use App\Domains\Contact\ManageCalls\Web\ViewHelpers\ModuleCallsViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use Carbon\Carbon;
diff --git a/domains/Contact/ManageCalls/Web/ViewHelpers/ModuleCallsViewHelper.php b/app/Domains/Contact/ManageCalls/Web/ViewHelpers/ModuleCallsViewHelper.php
similarity index 98%
rename from domains/Contact/ManageCalls/Web/ViewHelpers/ModuleCallsViewHelper.php
rename to app/Domains/Contact/ManageCalls/Web/ViewHelpers/ModuleCallsViewHelper.php
index 1923e34a4..dcc0c55f0 100644
--- a/domains/Contact/ManageCalls/Web/ViewHelpers/ModuleCallsViewHelper.php
+++ b/app/Domains/Contact/ManageCalls/Web/ViewHelpers/ModuleCallsViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageCalls\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageCalls\Web\ViewHelpers;
 
 use App\Helpers\DateHelper;
 use App\Models\Call;
diff --git a/domains/Contact/ManageContact/Services/CopyContactToAnotherVault.php b/app/Domains/Contact/ManageContact/Services/CopyContactToAnotherVault.php
similarity index 97%
rename from domains/Contact/ManageContact/Services/CopyContactToAnotherVault.php
rename to app/Domains/Contact/ManageContact/Services/CopyContactToAnotherVault.php
index 0663f5425..199a6f8a7 100644
--- a/domains/Contact/ManageContact/Services/CopyContactToAnotherVault.php
+++ b/app/Domains/Contact/ManageContact/Services/CopyContactToAnotherVault.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContact\Services;
+namespace App\Domains\Contact\ManageContact\Services;
 
 use App\Exceptions\NotEnoughPermissionException;
 use App\Interfaces\ServiceInterface;
diff --git a/domains/Contact/ManageContact/Services/CreateContact.php b/app/Domains/Contact/ManageContact/Services/CreateContact.php
similarity index 98%
rename from domains/Contact/ManageContact/Services/CreateContact.php
rename to app/Domains/Contact/ManageContact/Services/CreateContact.php
index 869234ce6..d3a6920d5 100644
--- a/domains/Contact/ManageContact/Services/CreateContact.php
+++ b/app/Domains/Contact/ManageContact/Services/CreateContact.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContact\Services;
+namespace App\Domains\Contact\ManageContact\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Contact;
diff --git a/domains/Contact/ManageContact/Services/DestroyContact.php b/app/Domains/Contact/ManageContact/Services/DestroyContact.php
similarity index 96%
rename from domains/Contact/ManageContact/Services/DestroyContact.php
rename to app/Domains/Contact/ManageContact/Services/DestroyContact.php
index 3ec7280b6..d8814dd65 100644
--- a/domains/Contact/ManageContact/Services/DestroyContact.php
+++ b/app/Domains/Contact/ManageContact/Services/DestroyContact.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContact\Services;
+namespace App\Domains\Contact\ManageContact\Services;
 
 use App\Exceptions\CantBeDeletedException;
 use App\Interfaces\ServiceInterface;
diff --git a/domains/Contact/ManageContact/Services/MoveContactToAnotherVault.php b/app/Domains/Contact/ManageContact/Services/MoveContactToAnotherVault.php
similarity index 97%
rename from domains/Contact/ManageContact/Services/MoveContactToAnotherVault.php
rename to app/Domains/Contact/ManageContact/Services/MoveContactToAnotherVault.php
index 37f239bcb..db495bfc8 100644
--- a/domains/Contact/ManageContact/Services/MoveContactToAnotherVault.php
+++ b/app/Domains/Contact/ManageContact/Services/MoveContactToAnotherVault.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContact\Services;
+namespace App\Domains\Contact\ManageContact\Services;
 
 use App\Exceptions\NotEnoughPermissionException;
 use App\Interfaces\ServiceInterface;
diff --git a/domains/Contact/ManageContact/Services/ToggleArchiveContact.php b/app/Domains/Contact/ManageContact/Services/ToggleArchiveContact.php
similarity index 97%
rename from domains/Contact/ManageContact/Services/ToggleArchiveContact.php
rename to app/Domains/Contact/ManageContact/Services/ToggleArchiveContact.php
index 7c15e2ac7..8d3ff6f47 100644
--- a/domains/Contact/ManageContact/Services/ToggleArchiveContact.php
+++ b/app/Domains/Contact/ManageContact/Services/ToggleArchiveContact.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContact\Services;
+namespace App\Domains\Contact\ManageContact\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Contact;
diff --git a/domains/Contact/ManageContact/Services/ToggleFavoriteContact.php b/app/Domains/Contact/ManageContact/Services/ToggleFavoriteContact.php
similarity index 98%
rename from domains/Contact/ManageContact/Services/ToggleFavoriteContact.php
rename to app/Domains/Contact/ManageContact/Services/ToggleFavoriteContact.php
index 9956d6b8c..70096c6b8 100644
--- a/domains/Contact/ManageContact/Services/ToggleFavoriteContact.php
+++ b/app/Domains/Contact/ManageContact/Services/ToggleFavoriteContact.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContact\Services;
+namespace App\Domains\Contact\ManageContact\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Contact;
diff --git a/domains/Contact/ManageContact/Services/UpdateContact.php b/app/Domains/Contact/ManageContact/Services/UpdateContact.php
similarity index 98%
rename from domains/Contact/ManageContact/Services/UpdateContact.php
rename to app/Domains/Contact/ManageContact/Services/UpdateContact.php
index cb50a5651..097ae6055 100644
--- a/domains/Contact/ManageContact/Services/UpdateContact.php
+++ b/app/Domains/Contact/ManageContact/Services/UpdateContact.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContact\Services;
+namespace App\Domains\Contact\ManageContact\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Contact;
diff --git a/domains/Contact/ManageContact/Services/UpdateContactTemplate.php b/app/Domains/Contact/ManageContact/Services/UpdateContactTemplate.php
similarity index 97%
rename from domains/Contact/ManageContact/Services/UpdateContactTemplate.php
rename to app/Domains/Contact/ManageContact/Services/UpdateContactTemplate.php
index dc32fd975..9962d9243 100644
--- a/domains/Contact/ManageContact/Services/UpdateContactTemplate.php
+++ b/app/Domains/Contact/ManageContact/Services/UpdateContactTemplate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContact\Services;
+namespace App\Domains\Contact\ManageContact\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Contact;
diff --git a/domains/Contact/ManageContact/Services/UpdateContactView.php b/app/Domains/Contact/ManageContact/Services/UpdateContactView.php
similarity index 97%
rename from domains/Contact/ManageContact/Services/UpdateContactView.php
rename to app/Domains/Contact/ManageContact/Services/UpdateContactView.php
index 8d2db2fa0..1f0d43d63 100644
--- a/domains/Contact/ManageContact/Services/UpdateContactView.php
+++ b/app/Domains/Contact/ManageContact/Services/UpdateContactView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContact\Services;
+namespace App\Domains\Contact\ManageContact\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\User;
diff --git a/domains/Contact/ManageContact/Web/Controllers/ContactArchiveController.php b/app/Domains/Contact/ManageContact/Web/Controllers/ContactArchiveController.php
similarity index 84%
rename from domains/Contact/ManageContact/Web/Controllers/ContactArchiveController.php
rename to app/Domains/Contact/ManageContact/Web/Controllers/ContactArchiveController.php
index 61e8730be..1828049e7 100644
--- a/domains/Contact/ManageContact/Web/Controllers/ContactArchiveController.php
+++ b/app/Domains/Contact/ManageContact/Web/Controllers/ContactArchiveController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Contact\ManageContact\Web\Controllers;
+namespace App\Domains\Contact\ManageContact\Web\Controllers;
 
-use App\Contact\ManageContact\Services\ToggleArchiveContact;
+use App\Domains\Contact\ManageContact\Services\ToggleArchiveContact;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
diff --git a/domains/Contact/ManageContact/Web/Controllers/ContactController.php b/app/Domains/Contact/ManageContact/Web/Controllers/ContactController.php
similarity index 87%
rename from domains/Contact/ManageContact/Web/Controllers/ContactController.php
rename to app/Domains/Contact/ManageContact/Web/Controllers/ContactController.php
index 4a5a561b8..2fd5506a2 100644
--- a/domains/Contact/ManageContact/Web/Controllers/ContactController.php
+++ b/app/Domains/Contact/ManageContact/Web/Controllers/ContactController.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace App\Contact\ManageContact\Web\Controllers;
+namespace App\Domains\Contact\ManageContact\Web\Controllers;
 
-use App\Contact\ManageContact\Services\CreateContact;
-use App\Contact\ManageContact\Services\DestroyContact;
-use App\Contact\ManageContact\Services\UpdateContact;
-use App\Contact\ManageContact\Services\UpdateContactView;
-use App\Contact\ManageContact\Web\ViewHelpers\ContactCreateViewHelper;
-use App\Contact\ManageContact\Web\ViewHelpers\ContactEditViewHelper;
-use App\Contact\ManageContact\Web\ViewHelpers\ContactIndexViewHelper;
-use App\Contact\ManageContact\Web\ViewHelpers\ContactShowViewHelper;
+use App\Domains\Contact\ManageContact\Services\CreateContact;
+use App\Domains\Contact\ManageContact\Services\DestroyContact;
+use App\Domains\Contact\ManageContact\Services\UpdateContact;
+use App\Domains\Contact\ManageContact\Services\UpdateContactView;
+use App\Domains\Contact\ManageContact\Web\ViewHelpers\ContactCreateViewHelper;
+use App\Domains\Contact\ManageContact\Web\ViewHelpers\ContactEditViewHelper;
+use App\Domains\Contact\ManageContact\Web\ViewHelpers\ContactIndexViewHelper;
+use App\Domains\Contact\ManageContact\Web\ViewHelpers\ContactShowViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Helpers\PaginatorHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use App\Models\Vault;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Contact/ManageContact/Web/Controllers/ContactFavoriteController.php b/app/Domains/Contact/ManageContact/Web/Controllers/ContactFavoriteController.php
similarity index 76%
rename from domains/Contact/ManageContact/Web/Controllers/ContactFavoriteController.php
rename to app/Domains/Contact/ManageContact/Web/Controllers/ContactFavoriteController.php
index 334549de6..84978317e 100644
--- a/domains/Contact/ManageContact/Web/Controllers/ContactFavoriteController.php
+++ b/app/Domains/Contact/ManageContact/Web/Controllers/ContactFavoriteController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Contact\ManageContact\Web\Controllers;
+namespace App\Domains\Contact\ManageContact\Web\Controllers;
 
-use App\Contact\ManageContact\Services\ToggleFavoriteContact;
-use App\Contact\ManageContactName\Web\ViewHelpers\ModuleContactNameViewHelper;
+use App\Domains\Contact\ManageContact\Services\ToggleFavoriteContact;
+use App\Domains\Contact\ManageContactName\Web\ViewHelpers\ModuleContactNameViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use Illuminate\Http\Request;
diff --git a/domains/Contact/ManageContact/Web/Controllers/ContactLabelController.php b/app/Domains/Contact/ManageContact/Web/Controllers/ContactLabelController.php
similarity index 81%
rename from domains/Contact/ManageContact/Web/Controllers/ContactLabelController.php
rename to app/Domains/Contact/ManageContact/Web/Controllers/ContactLabelController.php
index cbbda77a2..37daaf7b1 100644
--- a/domains/Contact/ManageContact/Web/Controllers/ContactLabelController.php
+++ b/app/Domains/Contact/ManageContact/Web/Controllers/ContactLabelController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Contact\ManageContact\Web\Controllers;
+namespace App\Domains\Contact\ManageContact\Web\Controllers;
 
-use App\Contact\ManageContact\Web\ViewHelpers\ContactIndexViewHelper;
+use App\Domains\Contact\ManageContact\Web\ViewHelpers\ContactIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Helpers\PaginatorHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Label;
 use App\Models\Vault;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Inertia\Inertia;
 
diff --git a/domains/Contact/ManageContact/Web/Controllers/ContactNoTemplateController.php b/app/Domains/Contact/ManageContact/Web/Controllers/ContactNoTemplateController.php
similarity index 73%
rename from domains/Contact/ManageContact/Web/Controllers/ContactNoTemplateController.php
rename to app/Domains/Contact/ManageContact/Web/Controllers/ContactNoTemplateController.php
index 6e367af95..8aa6da72c 100644
--- a/domains/Contact/ManageContact/Web/Controllers/ContactNoTemplateController.php
+++ b/app/Domains/Contact/ManageContact/Web/Controllers/ContactNoTemplateController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Contact\ManageContact\Web\Controllers;
+namespace App\Domains\Contact\ManageContact\Web\Controllers;
 
-use App\Contact\ManageContact\Web\ViewHelpers\ContactShowBlankViewHelper;
+use App\Domains\Contact\ManageContact\Web\ViewHelpers\ContactShowBlankViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use App\Models\Vault;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Inertia\Inertia;
 
diff --git a/domains/Contact/ManageContact/Web/Controllers/ContactPageController.php b/app/Domains/Contact/ManageContact/Web/Controllers/ContactPageController.php
similarity index 83%
rename from domains/Contact/ManageContact/Web/Controllers/ContactPageController.php
rename to app/Domains/Contact/ManageContact/Web/Controllers/ContactPageController.php
index 260ec97ea..ca7671ac1 100644
--- a/domains/Contact/ManageContact/Web/Controllers/ContactPageController.php
+++ b/app/Domains/Contact/ManageContact/Web/Controllers/ContactPageController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Contact\ManageContact\Web\Controllers;
+namespace App\Domains\Contact\ManageContact\Web\Controllers;
 
-use App\Contact\ManageContact\Services\UpdateContactView;
-use App\Contact\ManageContact\Web\ViewHelpers\ContactShowViewHelper;
+use App\Domains\Contact\ManageContact\Services\UpdateContactView;
+use App\Domains\Contact\ManageContact\Web\ViewHelpers\ContactShowViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use App\Models\TemplatePage;
 use App\Models\Vault;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Contact/ManageContact/Web/Controllers/ContactTemplateController.php b/app/Domains/Contact/ManageContact/Web/Controllers/ContactTemplateController.php
similarity index 85%
rename from domains/Contact/ManageContact/Web/Controllers/ContactTemplateController.php
rename to app/Domains/Contact/ManageContact/Web/Controllers/ContactTemplateController.php
index ea4223791..95571f098 100644
--- a/domains/Contact/ManageContact/Web/Controllers/ContactTemplateController.php
+++ b/app/Domains/Contact/ManageContact/Web/Controllers/ContactTemplateController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Contact\ManageContact\Web\Controllers;
+namespace App\Domains\Contact\ManageContact\Web\Controllers;
 
-use App\Contact\ManageContact\Services\UpdateContactTemplate;
+use App\Domains\Contact\ManageContact\Services\UpdateContactTemplate;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
diff --git a/domains/Contact/ManageContact/Web/ViewHelpers/ContactCreateViewHelper.php b/app/Domains/Contact/ManageContact/Web/ViewHelpers/ContactCreateViewHelper.php
similarity index 95%
rename from domains/Contact/ManageContact/Web/ViewHelpers/ContactCreateViewHelper.php
rename to app/Domains/Contact/ManageContact/Web/ViewHelpers/ContactCreateViewHelper.php
index ada325ede..ef8bb2dd9 100644
--- a/domains/Contact/ManageContact/Web/ViewHelpers/ContactCreateViewHelper.php
+++ b/app/Domains/Contact/ManageContact/Web/ViewHelpers/ContactCreateViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContact\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageContact\Web\ViewHelpers;
 
 use App\Models\Vault;
 
diff --git a/domains/Contact/ManageContact/Web/ViewHelpers/ContactEditViewHelper.php b/app/Domains/Contact/ManageContact/Web/ViewHelpers/ContactEditViewHelper.php
similarity index 96%
rename from domains/Contact/ManageContact/Web/ViewHelpers/ContactEditViewHelper.php
rename to app/Domains/Contact/ManageContact/Web/ViewHelpers/ContactEditViewHelper.php
index 11fa6e2c4..5d0f5b675 100644
--- a/domains/Contact/ManageContact/Web/ViewHelpers/ContactEditViewHelper.php
+++ b/app/Domains/Contact/ManageContact/Web/ViewHelpers/ContactEditViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContact\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageContact\Web\ViewHelpers;
 
 use App\Models\Contact;
 use App\Models\User;
diff --git a/domains/Contact/ManageContact/Web/ViewHelpers/ContactIndexViewHelper.php b/app/Domains/Contact/ManageContact/Web/ViewHelpers/ContactIndexViewHelper.php
similarity index 96%
rename from domains/Contact/ManageContact/Web/ViewHelpers/ContactIndexViewHelper.php
rename to app/Domains/Contact/ManageContact/Web/ViewHelpers/ContactIndexViewHelper.php
index 1227ed85a..95cf2cd82 100644
--- a/domains/Contact/ManageContact/Web/ViewHelpers/ContactIndexViewHelper.php
+++ b/app/Domains/Contact/ManageContact/Web/ViewHelpers/ContactIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContact\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageContact\Web\ViewHelpers;
 
 use App\Models\Vault;
 
diff --git a/domains/Contact/ManageContact/Web/ViewHelpers/ContactShowBlankViewHelper.php b/app/Domains/Contact/ManageContact/Web/ViewHelpers/ContactShowBlankViewHelper.php
similarity index 92%
rename from domains/Contact/ManageContact/Web/ViewHelpers/ContactShowBlankViewHelper.php
rename to app/Domains/Contact/ManageContact/Web/ViewHelpers/ContactShowBlankViewHelper.php
index 0691c0475..ce649d444 100644
--- a/domains/Contact/ManageContact/Web/ViewHelpers/ContactShowBlankViewHelper.php
+++ b/app/Domains/Contact/ManageContact/Web/ViewHelpers/ContactShowBlankViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContact\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageContact\Web\ViewHelpers;
 
 use App\Models\Contact;
 
diff --git a/domains/Contact/ManageContact/Web/ViewHelpers/ContactShowViewHelper.php b/app/Domains/Contact/ManageContact/Web/ViewHelpers/ContactShowViewHelper.php
similarity index 85%
rename from domains/Contact/ManageContact/Web/ViewHelpers/ContactShowViewHelper.php
rename to app/Domains/Contact/ManageContact/Web/ViewHelpers/ContactShowViewHelper.php
index bfee904e7..b3e83fa72 100644
--- a/domains/Contact/ManageContact/Web/ViewHelpers/ContactShowViewHelper.php
+++ b/app/Domains/Contact/ManageContact/Web/ViewHelpers/ContactShowViewHelper.php
@@ -1,28 +1,28 @@
 <?php
 
-namespace App\Contact\ManageContact\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageContact\Web\ViewHelpers;
 
-use App\Contact\ManageAvatar\Web\ViewHelpers\ModuleAvatarViewHelper;
-use App\Contact\ManageCalls\Web\ViewHelpers\ModuleCallsViewHelper;
-use App\Contact\ManageContactAddresses\Web\ViewHelpers\ModuleContactAddressesViewHelper;
-use App\Contact\ManageContactImportantDates\Web\ViewHelpers\ModuleImportantDatesViewHelper;
-use App\Contact\ManageContactInformation\Web\ViewHelpers\ModuleContactInformationViewHelper;
-use App\Contact\ManageContactName\Web\ViewHelpers\ModuleContactNameViewHelper;
-use App\Contact\ManageDocuments\Web\ViewHelpers\ModuleDocumentsViewHelper;
-use App\Contact\ManageGoals\Web\ViewHelpers\ModuleGoalsViewHelper;
-use App\Contact\ManageGroups\Web\ViewHelpers\GroupsViewHelper;
-use App\Contact\ManageGroups\Web\ViewHelpers\ModuleGroupsViewHelper;
-use App\Contact\ManageJobInformation\Web\ViewHelpers\ModuleCompanyViewHelper;
-use App\Contact\ManageLabels\Web\ViewHelpers\ModuleLabelViewHelper;
-use App\Contact\ManageLoans\Web\ViewHelpers\ModuleLoanViewHelper;
-use App\Contact\ManageNotes\Web\ViewHelpers\ModuleNotesViewHelper;
-use App\Contact\ManagePets\Web\ViewHelpers\ModulePetsViewHelper;
-use App\Contact\ManagePhotos\Web\ViewHelpers\ModulePhotosViewHelper;
-use App\Contact\ManagePronouns\Web\ViewHelpers\ModuleGenderPronounViewHelper;
-use App\Contact\ManageRelationships\Web\ViewHelpers\ModuleFamilySummaryViewHelper;
-use App\Contact\ManageRelationships\Web\ViewHelpers\ModuleRelationshipViewHelper;
-use App\Contact\ManageReminders\Web\ViewHelpers\ModuleRemindersViewHelper;
-use App\Contact\ManageTasks\Web\ViewHelpers\ModuleContactTasksViewHelper;
+use App\Domains\Contact\ManageAvatar\Web\ViewHelpers\ModuleAvatarViewHelper;
+use App\Domains\Contact\ManageCalls\Web\ViewHelpers\ModuleCallsViewHelper;
+use App\Domains\Contact\ManageContactAddresses\Web\ViewHelpers\ModuleContactAddressesViewHelper;
+use App\Domains\Contact\ManageContactImportantDates\Web\ViewHelpers\ModuleImportantDatesViewHelper;
+use App\Domains\Contact\ManageContactInformation\Web\ViewHelpers\ModuleContactInformationViewHelper;
+use App\Domains\Contact\ManageContactName\Web\ViewHelpers\ModuleContactNameViewHelper;
+use App\Domains\Contact\ManageDocuments\Web\ViewHelpers\ModuleDocumentsViewHelper;
+use App\Domains\Contact\ManageGoals\Web\ViewHelpers\ModuleGoalsViewHelper;
+use App\Domains\Contact\ManageGroups\Web\ViewHelpers\GroupsViewHelper;
+use App\Domains\Contact\ManageGroups\Web\ViewHelpers\ModuleGroupsViewHelper;
+use App\Domains\Contact\ManageJobInformation\Web\ViewHelpers\ModuleCompanyViewHelper;
+use App\Domains\Contact\ManageLabels\Web\ViewHelpers\ModuleLabelViewHelper;
+use App\Domains\Contact\ManageLoans\Web\ViewHelpers\ModuleLoanViewHelper;
+use App\Domains\Contact\ManageNotes\Web\ViewHelpers\ModuleNotesViewHelper;
+use App\Domains\Contact\ManagePets\Web\ViewHelpers\ModulePetsViewHelper;
+use App\Domains\Contact\ManagePhotos\Web\ViewHelpers\ModulePhotosViewHelper;
+use App\Domains\Contact\ManagePronouns\Web\ViewHelpers\ModuleGenderPronounViewHelper;
+use App\Domains\Contact\ManageRelationships\Web\ViewHelpers\ModuleFamilySummaryViewHelper;
+use App\Domains\Contact\ManageRelationships\Web\ViewHelpers\ModuleRelationshipViewHelper;
+use App\Domains\Contact\ManageReminders\Web\ViewHelpers\ModuleRemindersViewHelper;
+use App\Domains\Contact\ManageTasks\Web\ViewHelpers\ModuleContactTasksViewHelper;
 use App\Helpers\StorageHelper;
 use App\Models\Contact;
 use App\Models\Module;
diff --git a/domains/Contact/ManageContactAddresses/Jobs/FetchAddressGeocoding.php b/app/Domains/Contact/ManageContactAddresses/Jobs/FetchAddressGeocoding.php
similarity index 86%
rename from domains/Contact/ManageContactAddresses/Jobs/FetchAddressGeocoding.php
rename to app/Domains/Contact/ManageContactAddresses/Jobs/FetchAddressGeocoding.php
index e6eb0544d..6e4b27d86 100644
--- a/domains/Contact/ManageContactAddresses/Jobs/FetchAddressGeocoding.php
+++ b/app/Domains/Contact/ManageContactAddresses/Jobs/FetchAddressGeocoding.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Contact\ManageContactAddresses\Jobs;
+namespace App\Domains\Contact\ManageContactAddresses\Jobs;
 
-use App\Contact\ManageContactAddresses\Services\GetGPSCoordinate;
+use App\Domains\Contact\ManageContactAddresses\Services\GetGPSCoordinate;
 use App\Models\Address;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/domains/Contact/ManageContactAddresses/Services/CreateContactAddress.php b/app/Domains/Contact/ManageContactAddresses/Services/CreateContactAddress.php
similarity index 96%
rename from domains/Contact/ManageContactAddresses/Services/CreateContactAddress.php
rename to app/Domains/Contact/ManageContactAddresses/Services/CreateContactAddress.php
index 84912b3f7..8d91e5abb 100644
--- a/domains/Contact/ManageContactAddresses/Services/CreateContactAddress.php
+++ b/app/Domains/Contact/ManageContactAddresses/Services/CreateContactAddress.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Contact\ManageContactAddresses\Services;
+namespace App\Domains\Contact\ManageContactAddresses\Services;
 
-use App\Contact\ManageContactAddresses\Jobs\FetchAddressGeocoding;
+use App\Domains\Contact\ManageContactAddresses\Jobs\FetchAddressGeocoding;
 use App\Helpers\MapHelper;
 use App\Interfaces\ServiceInterface;
 use App\Models\Address;
diff --git a/domains/Contact/ManageContactAddresses/Services/DestroyContactAddress.php b/app/Domains/Contact/ManageContactAddresses/Services/DestroyContactAddress.php
similarity index 96%
rename from domains/Contact/ManageContactAddresses/Services/DestroyContactAddress.php
rename to app/Domains/Contact/ManageContactAddresses/Services/DestroyContactAddress.php
index 8a76dc681..a5486e792 100644
--- a/domains/Contact/ManageContactAddresses/Services/DestroyContactAddress.php
+++ b/app/Domains/Contact/ManageContactAddresses/Services/DestroyContactAddress.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContactAddresses\Services;
+namespace App\Domains\Contact\ManageContactAddresses\Services;
 
 use App\Helpers\MapHelper;
 use App\Interfaces\ServiceInterface;
diff --git a/domains/Contact/ManageContactAddresses/Services/GetGPSCoordinate.php b/app/Domains/Contact/ManageContactAddresses/Services/GetGPSCoordinate.php
similarity index 97%
rename from domains/Contact/ManageContactAddresses/Services/GetGPSCoordinate.php
rename to app/Domains/Contact/ManageContactAddresses/Services/GetGPSCoordinate.php
index 085c2e33e..3e61e2ccb 100644
--- a/domains/Contact/ManageContactAddresses/Services/GetGPSCoordinate.php
+++ b/app/Domains/Contact/ManageContactAddresses/Services/GetGPSCoordinate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContactAddresses\Services;
+namespace App\Domains\Contact\ManageContactAddresses\Services;
 
 use App\Exceptions\EnvVariablesNotSetException;
 use App\Helpers\MapHelper;
diff --git a/domains/Contact/ManageContactAddresses/Services/UpdateContactAddress.php b/app/Domains/Contact/ManageContactAddresses/Services/UpdateContactAddress.php
similarity index 96%
rename from domains/Contact/ManageContactAddresses/Services/UpdateContactAddress.php
rename to app/Domains/Contact/ManageContactAddresses/Services/UpdateContactAddress.php
index 7092e6d92..ba1a70228 100644
--- a/domains/Contact/ManageContactAddresses/Services/UpdateContactAddress.php
+++ b/app/Domains/Contact/ManageContactAddresses/Services/UpdateContactAddress.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Contact\ManageContactAddresses\Services;
+namespace App\Domains\Contact\ManageContactAddresses\Services;
 
-use App\Contact\ManageContactAddresses\Jobs\FetchAddressGeocoding;
+use App\Domains\Contact\ManageContactAddresses\Jobs\FetchAddressGeocoding;
 use App\Helpers\MapHelper;
 use App\Interfaces\ServiceInterface;
 use App\Models\Address;
diff --git a/domains/Contact/ManageContactAddresses/Web/Controllers/ContactModuleAddressController.php b/app/Domains/Contact/ManageContactAddresses/Web/Controllers/ContactModuleAddressController.php
similarity index 88%
rename from domains/Contact/ManageContactAddresses/Web/Controllers/ContactModuleAddressController.php
rename to app/Domains/Contact/ManageContactAddresses/Web/Controllers/ContactModuleAddressController.php
index 74b2f7260..239f544aa 100644
--- a/domains/Contact/ManageContactAddresses/Web/Controllers/ContactModuleAddressController.php
+++ b/app/Domains/Contact/ManageContactAddresses/Web/Controllers/ContactModuleAddressController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Contact\ManageContactAddresses\Web\Controllers;
+namespace App\Domains\Contact\ManageContactAddresses\Web\Controllers;
 
-use App\Contact\ManageContactAddresses\Services\CreateContactAddress;
-use App\Contact\ManageContactAddresses\Services\DestroyContactAddress;
-use App\Contact\ManageContactAddresses\Services\UpdateContactAddress;
-use App\Contact\ManageContactAddresses\Web\ViewHelpers\ModuleContactAddressesViewHelper;
+use App\Domains\Contact\ManageContactAddresses\Services\CreateContactAddress;
+use App\Domains\Contact\ManageContactAddresses\Services\DestroyContactAddress;
+use App\Domains\Contact\ManageContactAddresses\Services\UpdateContactAddress;
+use App\Domains\Contact\ManageContactAddresses\Web\ViewHelpers\ModuleContactAddressesViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use Illuminate\Http\Request;
diff --git a/domains/Contact/ManageContactAddresses/Web/Controllers/ContactModuleAddressImageController.php b/app/Domains/Contact/ManageContactAddresses/Web/Controllers/ContactModuleAddressImageController.php
similarity index 93%
rename from domains/Contact/ManageContactAddresses/Web/Controllers/ContactModuleAddressImageController.php
rename to app/Domains/Contact/ManageContactAddresses/Web/Controllers/ContactModuleAddressImageController.php
index 0c299d5d6..bce3ab157 100644
--- a/domains/Contact/ManageContactAddresses/Web/Controllers/ContactModuleAddressImageController.php
+++ b/app/Domains/Contact/ManageContactAddresses/Web/Controllers/ContactModuleAddressImageController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContactAddresses\Web\Controllers;
+namespace App\Domains\Contact\ManageContactAddresses\Web\Controllers;
 
 use App\Helpers\MapHelper;
 use App\Http\Controllers\Controller;
diff --git a/domains/Contact/ManageContactAddresses/Web/ViewHelpers/ModuleContactAddressesViewHelper.php b/app/Domains/Contact/ManageContactAddresses/Web/ViewHelpers/ModuleContactAddressesViewHelper.php
similarity index 97%
rename from domains/Contact/ManageContactAddresses/Web/ViewHelpers/ModuleContactAddressesViewHelper.php
rename to app/Domains/Contact/ManageContactAddresses/Web/ViewHelpers/ModuleContactAddressesViewHelper.php
index a80e30cd0..7a88373d9 100644
--- a/domains/Contact/ManageContactAddresses/Web/ViewHelpers/ModuleContactAddressesViewHelper.php
+++ b/app/Domains/Contact/ManageContactAddresses/Web/ViewHelpers/ModuleContactAddressesViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContactAddresses\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageContactAddresses\Web\ViewHelpers;
 
 use App\Helpers\MapHelper;
 use App\Models\Address;
diff --git a/domains/Contact/ManageContactFeed/Web/Controllers/ContactFeedController.php b/app/Domains/Contact/ManageContactFeed/Web/Controllers/ContactFeedController.php
similarity index 85%
rename from domains/Contact/ManageContactFeed/Web/Controllers/ContactFeedController.php
rename to app/Domains/Contact/ManageContactFeed/Web/Controllers/ContactFeedController.php
index 07b46e75b..410ee85df 100644
--- a/domains/Contact/ManageContactFeed/Web/Controllers/ContactFeedController.php
+++ b/app/Domains/Contact/ManageContactFeed/Web/Controllers/ContactFeedController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Contact\ManageContactFeed\Web\Controllers;
+namespace App\Domains\Contact\ManageContactFeed\Web\Controllers;
 
-use App\Contact\ManageContactFeed\Web\ViewHelpers\ModuleFeedViewHelper;
+use App\Domains\Contact\ManageContactFeed\Web\ViewHelpers\ModuleFeedViewHelper;
 use App\Helpers\PaginatorHelper;
 use App\Http\Controllers\Controller;
 use App\Models\ContactFeedItem;
diff --git a/domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedAddress.php b/app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedAddress.php
similarity index 96%
rename from domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedAddress.php
rename to app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedAddress.php
index 355e96ff3..0271a5d3a 100644
--- a/domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedAddress.php
+++ b/app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedAddress.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContactFeed\Web\ViewHelpers\Actions;
+namespace App\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions;
 
 use App\Helpers\MapHelper;
 use App\Models\ContactFeedItem;
diff --git a/domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedContactInformation.php b/app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedContactInformation.php
similarity index 94%
rename from domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedContactInformation.php
rename to app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedContactInformation.php
index a4dc46acd..0031c72e4 100644
--- a/domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedContactInformation.php
+++ b/app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedContactInformation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContactFeed\Web\ViewHelpers\Actions;
+namespace App\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions;
 
 use App\Models\ContactFeedItem;
 
diff --git a/domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedGenericContactInformation.php b/app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedGenericContactInformation.php
similarity index 87%
rename from domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedGenericContactInformation.php
rename to app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedGenericContactInformation.php
index ae8a436b9..3cdefd676 100644
--- a/domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedGenericContactInformation.php
+++ b/app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedGenericContactInformation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContactFeed\Web\ViewHelpers\Actions;
+namespace App\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions;
 
 use App\Models\ContactFeedItem;
 
diff --git a/domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedGoal.php b/app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedGoal.php
similarity index 92%
rename from domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedGoal.php
rename to app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedGoal.php
index 59ff96372..6e36c2012 100644
--- a/domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedGoal.php
+++ b/app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedGoal.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContactFeed\Web\ViewHelpers\Actions;
+namespace App\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions;
 
 use App\Models\ContactFeedItem;
 
diff --git a/domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedLabelAssigned.php b/app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedLabelAssigned.php
similarity index 94%
rename from domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedLabelAssigned.php
rename to app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedLabelAssigned.php
index 8078eaddc..e1a3efae5 100644
--- a/domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedLabelAssigned.php
+++ b/app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedLabelAssigned.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContactFeed\Web\ViewHelpers\Actions;
+namespace App\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions;
 
 use App\Models\ContactFeedItem;
 
diff --git a/domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedPet.php b/app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedPet.php
similarity index 93%
rename from domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedPet.php
rename to app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedPet.php
index f38c9388b..d1efa168a 100644
--- a/domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedPet.php
+++ b/app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedPet.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContactFeed\Web\ViewHelpers\Actions;
+namespace App\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions;
 
 use App\Models\ContactFeedItem;
 
diff --git a/domains/Contact/ManageContactFeed/Web/ViewHelpers/ModuleFeedViewHelper.php b/app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/ModuleFeedViewHelper.php
similarity index 89%
rename from domains/Contact/ManageContactFeed/Web/ViewHelpers/ModuleFeedViewHelper.php
rename to app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/ModuleFeedViewHelper.php
index f61af4763..ffa36b6e4 100644
--- a/domains/Contact/ManageContactFeed/Web/ViewHelpers/ModuleFeedViewHelper.php
+++ b/app/Domains/Contact/ManageContactFeed/Web/ViewHelpers/ModuleFeedViewHelper.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Contact\ManageContactFeed\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageContactFeed\Web\ViewHelpers;
 
-use App\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedAddress;
-use App\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedContactInformation;
-use App\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedGenericContactInformation;
-use App\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedGoal;
-use App\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedLabelAssigned;
-use App\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedPet;
+use App\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedAddress;
+use App\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedContactInformation;
+use App\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedGenericContactInformation;
+use App\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedGoal;
+use App\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedLabelAssigned;
+use App\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedPet;
 use App\Helpers\DateHelper;
 use App\Helpers\UserHelper;
 use App\Models\ContactFeedItem;
diff --git a/domains/Contact/ManageContactImportantDates/Services/CreateContactImportantDate.php b/app/Domains/Contact/ManageContactImportantDates/Services/CreateContactImportantDate.php
similarity index 97%
rename from domains/Contact/ManageContactImportantDates/Services/CreateContactImportantDate.php
rename to app/Domains/Contact/ManageContactImportantDates/Services/CreateContactImportantDate.php
index 55c4ee9e9..c5020a7b3 100644
--- a/domains/Contact/ManageContactImportantDates/Services/CreateContactImportantDate.php
+++ b/app/Domains/Contact/ManageContactImportantDates/Services/CreateContactImportantDate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContactImportantDates\Services;
+namespace App\Domains\Contact\ManageContactImportantDates\Services;
 
 use App\Helpers\ImportantDateHelper;
 use App\Interfaces\ServiceInterface;
diff --git a/domains/Contact/ManageContactImportantDates/Services/DestroyContactImportantDate.php b/app/Domains/Contact/ManageContactImportantDates/Services/DestroyContactImportantDate.php
similarity index 96%
rename from domains/Contact/ManageContactImportantDates/Services/DestroyContactImportantDate.php
rename to app/Domains/Contact/ManageContactImportantDates/Services/DestroyContactImportantDate.php
index b70f77155..0144a8539 100644
--- a/domains/Contact/ManageContactImportantDates/Services/DestroyContactImportantDate.php
+++ b/app/Domains/Contact/ManageContactImportantDates/Services/DestroyContactImportantDate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContactImportantDates\Services;
+namespace App\Domains\Contact\ManageContactImportantDates\Services;
 
 use App\Helpers\ImportantDateHelper;
 use App\Interfaces\ServiceInterface;
diff --git a/domains/Contact/ManageContactImportantDates/Services/UpdateContactImportantDate.php b/app/Domains/Contact/ManageContactImportantDates/Services/UpdateContactImportantDate.php
similarity index 98%
rename from domains/Contact/ManageContactImportantDates/Services/UpdateContactImportantDate.php
rename to app/Domains/Contact/ManageContactImportantDates/Services/UpdateContactImportantDate.php
index 1d8026b65..433680f1f 100644
--- a/domains/Contact/ManageContactImportantDates/Services/UpdateContactImportantDate.php
+++ b/app/Domains/Contact/ManageContactImportantDates/Services/UpdateContactImportantDate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContactImportantDates\Services;
+namespace App\Domains\Contact\ManageContactImportantDates\Services;
 
 use App\Helpers\ImportantDateHelper;
 use App\Interfaces\ServiceInterface;
diff --git a/domains/Contact/ManageContactImportantDates/Web/Controllers/ContactImportantDatesController.php b/app/Domains/Contact/ManageContactImportantDates/Web/Controllers/ContactImportantDatesController.php
similarity index 89%
rename from domains/Contact/ManageContactImportantDates/Web/Controllers/ContactImportantDatesController.php
rename to app/Domains/Contact/ManageContactImportantDates/Web/Controllers/ContactImportantDatesController.php
index f82b3e773..262d63bde 100644
--- a/domains/Contact/ManageContactImportantDates/Web/Controllers/ContactImportantDatesController.php
+++ b/app/Domains/Contact/ManageContactImportantDates/Web/Controllers/ContactImportantDatesController.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Contact\ManageContactImportantDates\Web\Controllers;
+namespace App\Domains\Contact\ManageContactImportantDates\Web\Controllers;
 
-use App\Contact\ManageContactImportantDates\Services\CreateContactImportantDate;
-use App\Contact\ManageContactImportantDates\Services\DestroyContactImportantDate;
-use App\Contact\ManageContactImportantDates\Services\UpdateContactImportantDate;
-use App\Contact\ManageContactImportantDates\Web\ViewHelpers\ContactImportantDatesViewHelper;
-use App\Contact\ManageReminders\Services\CreateContactReminder;
+use App\Domains\Contact\ManageContactImportantDates\Services\CreateContactImportantDate;
+use App\Domains\Contact\ManageContactImportantDates\Services\DestroyContactImportantDate;
+use App\Domains\Contact\ManageContactImportantDates\Services\UpdateContactImportantDate;
+use App\Domains\Contact\ManageContactImportantDates\Web\ViewHelpers\ContactImportantDatesViewHelper;
+use App\Domains\Contact\ManageReminders\Services\CreateContactReminder;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use App\Models\ContactImportantDate;
 use App\Models\Vault;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
diff --git a/domains/Contact/ManageContactImportantDates/Web/ViewHelpers/ContactImportantDatesViewHelper.php b/app/Domains/Contact/ManageContactImportantDates/Web/ViewHelpers/ContactImportantDatesViewHelper.php
similarity index 97%
rename from domains/Contact/ManageContactImportantDates/Web/ViewHelpers/ContactImportantDatesViewHelper.php
rename to app/Domains/Contact/ManageContactImportantDates/Web/ViewHelpers/ContactImportantDatesViewHelper.php
index 6991daf10..1ef8bb1ab 100644
--- a/domains/Contact/ManageContactImportantDates/Web/ViewHelpers/ContactImportantDatesViewHelper.php
+++ b/app/Domains/Contact/ManageContactImportantDates/Web/ViewHelpers/ContactImportantDatesViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContactImportantDates\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageContactImportantDates\Web\ViewHelpers;
 
 use App\Helpers\DateHelper;
 use App\Helpers\ImportantDateHelper;
diff --git a/domains/Contact/ManageContactImportantDates/Web/ViewHelpers/ModuleImportantDatesViewHelper.php b/app/Domains/Contact/ManageContactImportantDates/Web/ViewHelpers/ModuleImportantDatesViewHelper.php
similarity index 92%
rename from domains/Contact/ManageContactImportantDates/Web/ViewHelpers/ModuleImportantDatesViewHelper.php
rename to app/Domains/Contact/ManageContactImportantDates/Web/ViewHelpers/ModuleImportantDatesViewHelper.php
index 39961256b..f3701a9ec 100644
--- a/domains/Contact/ManageContactImportantDates/Web/ViewHelpers/ModuleImportantDatesViewHelper.php
+++ b/app/Domains/Contact/ManageContactImportantDates/Web/ViewHelpers/ModuleImportantDatesViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContactImportantDates\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageContactImportantDates\Web\ViewHelpers;
 
 use App\Helpers\ImportantDateHelper;
 use App\Models\Contact;
diff --git a/domains/Contact/ManageContactInformation/Services/CreateContactInformation.php b/app/Domains/Contact/ManageContactInformation/Services/CreateContactInformation.php
similarity index 97%
rename from domains/Contact/ManageContactInformation/Services/CreateContactInformation.php
rename to app/Domains/Contact/ManageContactInformation/Services/CreateContactInformation.php
index 2e623300d..2a9c42836 100644
--- a/domains/Contact/ManageContactInformation/Services/CreateContactInformation.php
+++ b/app/Domains/Contact/ManageContactInformation/Services/CreateContactInformation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContactInformation\Services;
+namespace App\Domains\Contact\ManageContactInformation\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactFeedItem;
diff --git a/domains/Contact/ManageContactInformation/Services/DestroyContactInformation.php b/app/Domains/Contact/ManageContactInformation/Services/DestroyContactInformation.php
similarity index 97%
rename from domains/Contact/ManageContactInformation/Services/DestroyContactInformation.php
rename to app/Domains/Contact/ManageContactInformation/Services/DestroyContactInformation.php
index a94a92efa..aba5bc0f1 100644
--- a/domains/Contact/ManageContactInformation/Services/DestroyContactInformation.php
+++ b/app/Domains/Contact/ManageContactInformation/Services/DestroyContactInformation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContactInformation\Services;
+namespace App\Domains\Contact\ManageContactInformation\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactFeedItem;
diff --git a/domains/Contact/ManageContactInformation/Services/UpdateContactInformation.php b/app/Domains/Contact/ManageContactInformation/Services/UpdateContactInformation.php
similarity index 97%
rename from domains/Contact/ManageContactInformation/Services/UpdateContactInformation.php
rename to app/Domains/Contact/ManageContactInformation/Services/UpdateContactInformation.php
index 167f76fc0..d4b60cd81 100644
--- a/domains/Contact/ManageContactInformation/Services/UpdateContactInformation.php
+++ b/app/Domains/Contact/ManageContactInformation/Services/UpdateContactInformation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContactInformation\Services;
+namespace App\Domains\Contact\ManageContactInformation\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactFeedItem;
diff --git a/domains/Contact/ManageContactInformation/Web/Controllers/ContactInformationController.php b/app/Domains/Contact/ManageContactInformation/Web/Controllers/ContactInformationController.php
similarity index 83%
rename from domains/Contact/ManageContactInformation/Web/Controllers/ContactInformationController.php
rename to app/Domains/Contact/ManageContactInformation/Web/Controllers/ContactInformationController.php
index 4e6766522..66b778ef7 100644
--- a/domains/Contact/ManageContactInformation/Web/Controllers/ContactInformationController.php
+++ b/app/Domains/Contact/ManageContactInformation/Web/Controllers/ContactInformationController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Contact\ManageContactInformation\Web\Controllers;
+namespace App\Domains\Contact\ManageContactInformation\Web\Controllers;
 
-use App\Contact\ManageContactInformation\Services\CreateContactInformation;
-use App\Contact\ManageContactInformation\Services\DestroyContactInformation;
-use App\Contact\ManageContactInformation\Services\UpdateContactInformation;
-use App\Contact\ManageContactInformation\Web\ViewHelpers\ModuleContactInformationViewHelper;
+use App\Domains\Contact\ManageContactInformation\Services\CreateContactInformation;
+use App\Domains\Contact\ManageContactInformation\Services\DestroyContactInformation;
+use App\Domains\Contact\ManageContactInformation\Services\UpdateContactInformation;
+use App\Domains\Contact\ManageContactInformation\Web\ViewHelpers\ModuleContactInformationViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use Illuminate\Http\Request;
diff --git a/domains/Contact/ManageContactInformation/Web/ViewHelpers/ModuleContactInformationViewHelper.php b/app/Domains/Contact/ManageContactInformation/Web/ViewHelpers/ModuleContactInformationViewHelper.php
similarity index 96%
rename from domains/Contact/ManageContactInformation/Web/ViewHelpers/ModuleContactInformationViewHelper.php
rename to app/Domains/Contact/ManageContactInformation/Web/ViewHelpers/ModuleContactInformationViewHelper.php
index a2165ac26..5e6b551cd 100644
--- a/domains/Contact/ManageContactInformation/Web/ViewHelpers/ModuleContactInformationViewHelper.php
+++ b/app/Domains/Contact/ManageContactInformation/Web/ViewHelpers/ModuleContactInformationViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContactInformation\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageContactInformation\Web\ViewHelpers;
 
 use App\Models\Contact;
 use App\Models\ContactInformation;
diff --git a/domains/Contact/ManageContactName/Web/ViewHelpers/ModuleContactNameViewHelper.php b/app/Domains/Contact/ManageContactName/Web/ViewHelpers/ModuleContactNameViewHelper.php
similarity index 92%
rename from domains/Contact/ManageContactName/Web/ViewHelpers/ModuleContactNameViewHelper.php
rename to app/Domains/Contact/ManageContactName/Web/ViewHelpers/ModuleContactNameViewHelper.php
index 53a17d4b9..82aa086d9 100644
--- a/domains/Contact/ManageContactName/Web/ViewHelpers/ModuleContactNameViewHelper.php
+++ b/app/Domains/Contact/ManageContactName/Web/ViewHelpers/ModuleContactNameViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageContactName\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageContactName\Web\ViewHelpers;
 
 use App\Models\Contact;
 use App\Models\User;
diff --git a/domains/Contact/ManageDocuments/Events/FileDeleted.php b/app/Domains/Contact/ManageDocuments/Events/FileDeleted.php
similarity index 88%
rename from domains/Contact/ManageDocuments/Events/FileDeleted.php
rename to app/Domains/Contact/ManageDocuments/Events/FileDeleted.php
index cb6c21599..d4db4abbc 100644
--- a/domains/Contact/ManageDocuments/Events/FileDeleted.php
+++ b/app/Domains/Contact/ManageDocuments/Events/FileDeleted.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageDocuments\Events;
+namespace App\Domains\Contact\ManageDocuments\Events;
 
 use App\Models\File;
 use Illuminate\Broadcasting\InteractsWithSockets;
diff --git a/domains/Contact/ManageDocuments/Listeners/DeleteFileInStorage.php b/app/Domains/Contact/ManageDocuments/Listeners/DeleteFileInStorage.php
similarity index 94%
rename from domains/Contact/ManageDocuments/Listeners/DeleteFileInStorage.php
rename to app/Domains/Contact/ManageDocuments/Listeners/DeleteFileInStorage.php
index e2e5c988a..a5830e288 100644
--- a/domains/Contact/ManageDocuments/Listeners/DeleteFileInStorage.php
+++ b/app/Domains/Contact/ManageDocuments/Listeners/DeleteFileInStorage.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Contact\ManageDocuments\Listeners;
+namespace App\Domains\Contact\ManageDocuments\Listeners;
 
-use App\Contact\ManageDocuments\Events\FileDeleted;
+use App\Domains\Contact\ManageDocuments\Events\FileDeleted;
 use App\Exceptions\EnvVariablesNotSetException;
 use App\Models\File;
 use Http\Client\Exception\HttpException;
diff --git a/domains/Contact/ManageDocuments/Services/DestroyDocument.php b/app/Domains/Contact/ManageDocuments/Services/DestroyDocument.php
similarity index 96%
rename from domains/Contact/ManageDocuments/Services/DestroyDocument.php
rename to app/Domains/Contact/ManageDocuments/Services/DestroyDocument.php
index e5f864c2d..538f01d92 100644
--- a/domains/Contact/ManageDocuments/Services/DestroyDocument.php
+++ b/app/Domains/Contact/ManageDocuments/Services/DestroyDocument.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageDocuments\Services;
+namespace App\Domains\Contact\ManageDocuments\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\File;
diff --git a/domains/Contact/ManageDocuments/Services/UploadFile.php b/app/Domains/Contact/ManageDocuments/Services/UploadFile.php
similarity index 98%
rename from domains/Contact/ManageDocuments/Services/UploadFile.php
rename to app/Domains/Contact/ManageDocuments/Services/UploadFile.php
index 4d529c020..42ef65ecd 100644
--- a/domains/Contact/ManageDocuments/Services/UploadFile.php
+++ b/app/Domains/Contact/ManageDocuments/Services/UploadFile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageDocuments\Services;
+namespace App\Domains\Contact\ManageDocuments\Services;
 
 use App\Exceptions\EnvVariablesNotSetException;
 use App\Models\File;
diff --git a/domains/Contact/ManageDocuments/Web/Controllers/ContactModuleDocumentController.php b/app/Domains/Contact/ManageDocuments/Web/Controllers/ContactModuleDocumentController.php
similarity index 85%
rename from domains/Contact/ManageDocuments/Web/Controllers/ContactModuleDocumentController.php
rename to app/Domains/Contact/ManageDocuments/Web/Controllers/ContactModuleDocumentController.php
index 245f7652a..c26f5dde3 100644
--- a/domains/Contact/ManageDocuments/Web/Controllers/ContactModuleDocumentController.php
+++ b/app/Domains/Contact/ManageDocuments/Web/Controllers/ContactModuleDocumentController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Contact\ManageDocuments\Web\Controllers;
+namespace App\Domains\Contact\ManageDocuments\Web\Controllers;
 
-use App\Contact\ManageDocuments\Services\DestroyDocument;
-use App\Contact\ManageDocuments\Services\UploadFile;
-use App\Contact\ManageDocuments\Web\ViewHelpers\ModuleDocumentsViewHelper;
+use App\Domains\Contact\ManageDocuments\Services\DestroyDocument;
+use App\Domains\Contact\ManageDocuments\Services\UploadFile;
+use App\Domains\Contact\ManageDocuments\Web\ViewHelpers\ModuleDocumentsViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use App\Models\File;
diff --git a/domains/Contact/ManageDocuments/Web/ViewHelpers/ModuleDocumentsViewHelper.php b/app/Domains/Contact/ManageDocuments/Web/ViewHelpers/ModuleDocumentsViewHelper.php
similarity index 96%
rename from domains/Contact/ManageDocuments/Web/ViewHelpers/ModuleDocumentsViewHelper.php
rename to app/Domains/Contact/ManageDocuments/Web/ViewHelpers/ModuleDocumentsViewHelper.php
index 7a390be21..8f129eb18 100644
--- a/domains/Contact/ManageDocuments/Web/ViewHelpers/ModuleDocumentsViewHelper.php
+++ b/app/Domains/Contact/ManageDocuments/Web/ViewHelpers/ModuleDocumentsViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageDocuments\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageDocuments\Web\ViewHelpers;
 
 use App\Helpers\FileHelper;
 use App\Helpers\StorageHelper;
diff --git a/domains/Contact/ManageGoals/Services/CreateGoal.php b/app/Domains/Contact/ManageGoals/Services/CreateGoal.php
similarity index 97%
rename from domains/Contact/ManageGoals/Services/CreateGoal.php
rename to app/Domains/Contact/ManageGoals/Services/CreateGoal.php
index eb062b606..b6556572f 100644
--- a/domains/Contact/ManageGoals/Services/CreateGoal.php
+++ b/app/Domains/Contact/ManageGoals/Services/CreateGoal.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageGoals\Services;
+namespace App\Domains\Contact\ManageGoals\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactFeedItem;
diff --git a/domains/Contact/ManageGoals/Services/DestroyGoal.php b/app/Domains/Contact/ManageGoals/Services/DestroyGoal.php
similarity index 97%
rename from domains/Contact/ManageGoals/Services/DestroyGoal.php
rename to app/Domains/Contact/ManageGoals/Services/DestroyGoal.php
index 397417727..648a42600 100644
--- a/domains/Contact/ManageGoals/Services/DestroyGoal.php
+++ b/app/Domains/Contact/ManageGoals/Services/DestroyGoal.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageGoals\Services;
+namespace App\Domains\Contact\ManageGoals\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactFeedItem;
diff --git a/domains/Contact/ManageGoals/Services/ToggleStreak.php b/app/Domains/Contact/ManageGoals/Services/ToggleStreak.php
similarity index 97%
rename from domains/Contact/ManageGoals/Services/ToggleStreak.php
rename to app/Domains/Contact/ManageGoals/Services/ToggleStreak.php
index 566a8baeb..532b41127 100644
--- a/domains/Contact/ManageGoals/Services/ToggleStreak.php
+++ b/app/Domains/Contact/ManageGoals/Services/ToggleStreak.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageGoals\Services;
+namespace App\Domains\Contact\ManageGoals\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Goal;
diff --git a/domains/Contact/ManageGoals/Services/UpdateGoal.php b/app/Domains/Contact/ManageGoals/Services/UpdateGoal.php
similarity index 97%
rename from domains/Contact/ManageGoals/Services/UpdateGoal.php
rename to app/Domains/Contact/ManageGoals/Services/UpdateGoal.php
index ed764d4ea..c2663a216 100644
--- a/domains/Contact/ManageGoals/Services/UpdateGoal.php
+++ b/app/Domains/Contact/ManageGoals/Services/UpdateGoal.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageGoals\Services;
+namespace App\Domains\Contact\ManageGoals\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactFeedItem;
diff --git a/domains/Contact/ManageGoals/Web/Controllers/ContactGoalController.php b/app/Domains/Contact/ManageGoals/Web/Controllers/ContactGoalController.php
similarity index 87%
rename from domains/Contact/ManageGoals/Web/Controllers/ContactGoalController.php
rename to app/Domains/Contact/ManageGoals/Web/Controllers/ContactGoalController.php
index abe96d08d..131e934b4 100644
--- a/domains/Contact/ManageGoals/Web/Controllers/ContactGoalController.php
+++ b/app/Domains/Contact/ManageGoals/Web/Controllers/ContactGoalController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Contact\ManageGoals\Web\Controllers;
+namespace App\Domains\Contact\ManageGoals\Web\Controllers;
 
-use App\Contact\ManageGoals\Services\DestroyGoal;
-use App\Contact\ManageGoals\Services\UpdateGoal;
-use App\Contact\ManageGoals\Web\ViewHelpers\GoalShowViewHelper;
+use App\Domains\Contact\ManageGoals\Services\DestroyGoal;
+use App\Domains\Contact\ManageGoals\Services\UpdateGoal;
+use App\Domains\Contact\ManageGoals\Web\ViewHelpers\GoalShowViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use App\Models\Goal;
 use App\Models\Vault;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Contact/ManageGoals/Web/Controllers/ContactModuleGoalController.php b/app/Domains/Contact/ManageGoals/Web/Controllers/ContactModuleGoalController.php
similarity index 79%
rename from domains/Contact/ManageGoals/Web/Controllers/ContactModuleGoalController.php
rename to app/Domains/Contact/ManageGoals/Web/Controllers/ContactModuleGoalController.php
index 0f2dc907d..4197e4753 100644
--- a/domains/Contact/ManageGoals/Web/Controllers/ContactModuleGoalController.php
+++ b/app/Domains/Contact/ManageGoals/Web/Controllers/ContactModuleGoalController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Contact\ManageGoals\Web\Controllers;
+namespace App\Domains\Contact\ManageGoals\Web\Controllers;
 
-use App\Contact\ManageGoals\Services\CreateGoal;
-use App\Contact\ManageGoals\Web\ViewHelpers\ModuleGoalsViewHelper;
+use App\Domains\Contact\ManageGoals\Services\CreateGoal;
+use App\Domains\Contact\ManageGoals\Web\ViewHelpers\ModuleGoalsViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use Illuminate\Http\Request;
diff --git a/domains/Contact/ManageGoals/Web/Controllers/ContactModuleStreakController.php b/app/Domains/Contact/ManageGoals/Web/Controllers/ContactModuleStreakController.php
similarity index 81%
rename from domains/Contact/ManageGoals/Web/Controllers/ContactModuleStreakController.php
rename to app/Domains/Contact/ManageGoals/Web/Controllers/ContactModuleStreakController.php
index 68abde2bf..f609c0aff 100644
--- a/domains/Contact/ManageGoals/Web/Controllers/ContactModuleStreakController.php
+++ b/app/Domains/Contact/ManageGoals/Web/Controllers/ContactModuleStreakController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Contact\ManageGoals\Web\Controllers;
+namespace App\Domains\Contact\ManageGoals\Web\Controllers;
 
-use App\Contact\ManageGoals\Services\ToggleStreak;
-use App\Contact\ManageGoals\Web\ViewHelpers\ModuleGoalsViewHelper;
+use App\Domains\Contact\ManageGoals\Services\ToggleStreak;
+use App\Domains\Contact\ManageGoals\Web\ViewHelpers\ModuleGoalsViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use App\Models\Goal;
diff --git a/domains/Contact/ManageGoals/Web/ViewHelpers/GoalShowViewHelper.php b/app/Domains/Contact/ManageGoals/Web/ViewHelpers/GoalShowViewHelper.php
similarity index 97%
rename from domains/Contact/ManageGoals/Web/ViewHelpers/GoalShowViewHelper.php
rename to app/Domains/Contact/ManageGoals/Web/ViewHelpers/GoalShowViewHelper.php
index 0924e4a1f..e363762f7 100644
--- a/domains/Contact/ManageGoals/Web/ViewHelpers/GoalShowViewHelper.php
+++ b/app/Domains/Contact/ManageGoals/Web/ViewHelpers/GoalShowViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageGoals\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageGoals\Web\ViewHelpers;
 
 use App\Helpers\DateHelper;
 use App\Helpers\GoalHelper;
diff --git a/domains/Contact/ManageGoals/Web/ViewHelpers/ModuleGoalsViewHelper.php b/app/Domains/Contact/ManageGoals/Web/ViewHelpers/ModuleGoalsViewHelper.php
similarity index 98%
rename from domains/Contact/ManageGoals/Web/ViewHelpers/ModuleGoalsViewHelper.php
rename to app/Domains/Contact/ManageGoals/Web/ViewHelpers/ModuleGoalsViewHelper.php
index d1a92d2a8..6e66a6787 100644
--- a/domains/Contact/ManageGoals/Web/ViewHelpers/ModuleGoalsViewHelper.php
+++ b/app/Domains/Contact/ManageGoals/Web/ViewHelpers/ModuleGoalsViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageGoals\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageGoals\Web\ViewHelpers;
 
 use App\Helpers\DateHelper;
 use App\Helpers\GoalHelper;
diff --git a/domains/Contact/ManageGroups/Services/AddContactToGroup.php b/app/Domains/Contact/ManageGroups/Services/AddContactToGroup.php
similarity index 98%
rename from domains/Contact/ManageGroups/Services/AddContactToGroup.php
rename to app/Domains/Contact/ManageGroups/Services/AddContactToGroup.php
index 571ef2c1c..4b84d08a3 100644
--- a/domains/Contact/ManageGroups/Services/AddContactToGroup.php
+++ b/app/Domains/Contact/ManageGroups/Services/AddContactToGroup.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageGroups\Services;
+namespace App\Domains\Contact\ManageGroups\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Contact;
diff --git a/domains/Contact/ManageGroups/Services/CreateGroup.php b/app/Domains/Contact/ManageGroups/Services/CreateGroup.php
similarity index 97%
rename from domains/Contact/ManageGroups/Services/CreateGroup.php
rename to app/Domains/Contact/ManageGroups/Services/CreateGroup.php
index 2d4e1a813..9632b460d 100644
--- a/domains/Contact/ManageGroups/Services/CreateGroup.php
+++ b/app/Domains/Contact/ManageGroups/Services/CreateGroup.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageGroups\Services;
+namespace App\Domains\Contact\ManageGroups\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Group;
diff --git a/domains/Contact/ManageGroups/Services/DestroyGroup.php b/app/Domains/Contact/ManageGroups/Services/DestroyGroup.php
similarity index 95%
rename from domains/Contact/ManageGroups/Services/DestroyGroup.php
rename to app/Domains/Contact/ManageGroups/Services/DestroyGroup.php
index 0110fd98c..cf788eb54 100644
--- a/domains/Contact/ManageGroups/Services/DestroyGroup.php
+++ b/app/Domains/Contact/ManageGroups/Services/DestroyGroup.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageGroups\Services;
+namespace App\Domains\Contact\ManageGroups\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Group;
diff --git a/domains/Contact/ManageGroups/Services/RemoveContactFromGroup.php b/app/Domains/Contact/ManageGroups/Services/RemoveContactFromGroup.php
similarity index 97%
rename from domains/Contact/ManageGroups/Services/RemoveContactFromGroup.php
rename to app/Domains/Contact/ManageGroups/Services/RemoveContactFromGroup.php
index 5d65fe1c4..c82eb845d 100644
--- a/domains/Contact/ManageGroups/Services/RemoveContactFromGroup.php
+++ b/app/Domains/Contact/ManageGroups/Services/RemoveContactFromGroup.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageGroups\Services;
+namespace App\Domains\Contact\ManageGroups\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Contact;
diff --git a/domains/Contact/ManageGroups/Services/UpdateGroup.php b/app/Domains/Contact/ManageGroups/Services/UpdateGroup.php
similarity index 97%
rename from domains/Contact/ManageGroups/Services/UpdateGroup.php
rename to app/Domains/Contact/ManageGroups/Services/UpdateGroup.php
index b521fac0d..6c5f846c9 100644
--- a/domains/Contact/ManageGroups/Services/UpdateGroup.php
+++ b/app/Domains/Contact/ManageGroups/Services/UpdateGroup.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageGroups\Services;
+namespace App\Domains\Contact\ManageGroups\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Group;
diff --git a/domains/Contact/ManageGroups/Web/Controllers/ContactModuleGroupController.php b/app/Domains/Contact/ManageGroups/Web/Controllers/ContactModuleGroupController.php
similarity index 88%
rename from domains/Contact/ManageGroups/Web/Controllers/ContactModuleGroupController.php
rename to app/Domains/Contact/ManageGroups/Web/Controllers/ContactModuleGroupController.php
index e0e408066..633b5a298 100644
--- a/domains/Contact/ManageGroups/Web/Controllers/ContactModuleGroupController.php
+++ b/app/Domains/Contact/ManageGroups/Web/Controllers/ContactModuleGroupController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Contact\ManageGroups\Web\Controllers;
+namespace App\Domains\Contact\ManageGroups\Web\Controllers;
 
-use App\Contact\ManageGroups\Services\AddContactToGroup;
-use App\Contact\ManageGroups\Services\CreateGroup;
-use App\Contact\ManageGroups\Services\RemoveContactFromGroup;
-use App\Contact\ManageGroups\Web\ViewHelpers\ModuleGroupsViewHelper;
+use App\Domains\Contact\ManageGroups\Services\AddContactToGroup;
+use App\Domains\Contact\ManageGroups\Services\CreateGroup;
+use App\Domains\Contact\ManageGroups\Services\RemoveContactFromGroup;
+use App\Domains\Contact\ManageGroups\Web\ViewHelpers\ModuleGroupsViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use Illuminate\Http\JsonResponse;
diff --git a/domains/Contact/ManageGroups/Web/Controllers/GroupController.php b/app/Domains/Contact/ManageGroups/Web/Controllers/GroupController.php
similarity index 77%
rename from domains/Contact/ManageGroups/Web/Controllers/GroupController.php
rename to app/Domains/Contact/ManageGroups/Web/Controllers/GroupController.php
index 835e6ca35..4ee133d68 100644
--- a/domains/Contact/ManageGroups/Web/Controllers/GroupController.php
+++ b/app/Domains/Contact/ManageGroups/Web/Controllers/GroupController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Contact\ManageGroups\Web\Controllers;
+namespace App\Domains\Contact\ManageGroups\Web\Controllers;
 
-use App\Contact\ManageGroups\Web\ViewHelpers\GroupIndexViewHelper;
-use App\Contact\ManageGroups\Web\ViewHelpers\GroupShowViewHelper;
+use App\Domains\Contact\ManageGroups\Web\ViewHelpers\GroupIndexViewHelper;
+use App\Domains\Contact\ManageGroups\Web\ViewHelpers\GroupShowViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Group;
 use App\Models\Vault;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Contact/ManageGroups/Web/ViewHelpers/GroupIndexViewHelper.php b/app/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupIndexViewHelper.php
similarity index 96%
rename from domains/Contact/ManageGroups/Web/ViewHelpers/GroupIndexViewHelper.php
rename to app/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupIndexViewHelper.php
index ad4197537..23f0aa2e8 100644
--- a/domains/Contact/ManageGroups/Web/ViewHelpers/GroupIndexViewHelper.php
+++ b/app/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageGroups\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageGroups\Web\ViewHelpers;
 
 use App\Models\Contact;
 use App\Models\Group;
diff --git a/domains/Contact/ManageGroups/Web/ViewHelpers/GroupShowViewHelper.php b/app/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupShowViewHelper.php
similarity index 97%
rename from domains/Contact/ManageGroups/Web/ViewHelpers/GroupShowViewHelper.php
rename to app/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupShowViewHelper.php
index 730ffdab5..c137ee8ac 100644
--- a/domains/Contact/ManageGroups/Web/ViewHelpers/GroupShowViewHelper.php
+++ b/app/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupShowViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageGroups\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageGroups\Web\ViewHelpers;
 
 use App\Models\Contact;
 use App\Models\Group;
diff --git a/domains/Contact/ManageGroups/Web/ViewHelpers/GroupsViewHelper.php b/app/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupsViewHelper.php
similarity index 93%
rename from domains/Contact/ManageGroups/Web/ViewHelpers/GroupsViewHelper.php
rename to app/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupsViewHelper.php
index 56b3761fe..40062c1e4 100644
--- a/domains/Contact/ManageGroups/Web/ViewHelpers/GroupsViewHelper.php
+++ b/app/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupsViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageGroups\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageGroups\Web\ViewHelpers;
 
 use App\Models\Contact;
 use Illuminate\Support\Collection;
diff --git a/domains/Contact/ManageGroups/Web/ViewHelpers/ModuleGroupsViewHelper.php b/app/Domains/Contact/ManageGroups/Web/ViewHelpers/ModuleGroupsViewHelper.php
similarity index 98%
rename from domains/Contact/ManageGroups/Web/ViewHelpers/ModuleGroupsViewHelper.php
rename to app/Domains/Contact/ManageGroups/Web/ViewHelpers/ModuleGroupsViewHelper.php
index aac3825ee..5503c429a 100644
--- a/domains/Contact/ManageGroups/Web/ViewHelpers/ModuleGroupsViewHelper.php
+++ b/app/Domains/Contact/ManageGroups/Web/ViewHelpers/ModuleGroupsViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageGroups\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageGroups\Web\ViewHelpers;
 
 use App\Models\Contact;
 use App\Models\Group;
diff --git a/domains/Contact/ManageJobInformation/Services/UpdateJobInformation.php b/app/Domains/Contact/ManageJobInformation/Services/UpdateJobInformation.php
similarity index 97%
rename from domains/Contact/ManageJobInformation/Services/UpdateJobInformation.php
rename to app/Domains/Contact/ManageJobInformation/Services/UpdateJobInformation.php
index bdf53fb68..5952dc808 100644
--- a/domains/Contact/ManageJobInformation/Services/UpdateJobInformation.php
+++ b/app/Domains/Contact/ManageJobInformation/Services/UpdateJobInformation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageJobInformation\Services;
+namespace App\Domains\Contact\ManageJobInformation\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Company;
diff --git a/domains/Contact/ManageJobInformation/Web/Controllers/ContactModuleJobInformationController.php b/app/Domains/Contact/ManageJobInformation/Web/Controllers/ContactModuleJobInformationController.php
similarity index 86%
rename from domains/Contact/ManageJobInformation/Web/Controllers/ContactModuleJobInformationController.php
rename to app/Domains/Contact/ManageJobInformation/Web/Controllers/ContactModuleJobInformationController.php
index fd0763f1d..e85550e4c 100644
--- a/domains/Contact/ManageJobInformation/Web/Controllers/ContactModuleJobInformationController.php
+++ b/app/Domains/Contact/ManageJobInformation/Web/Controllers/ContactModuleJobInformationController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Contact\ManageJobInformation\Web\Controllers;
+namespace App\Domains\Contact\ManageJobInformation\Web\Controllers;
 
-use App\Contact\ManageJobInformation\Services\UpdateJobInformation;
-use App\Contact\ManageJobInformation\Web\ViewHelpers\ModuleCompanyViewHelper;
+use App\Domains\Contact\ManageJobInformation\Services\UpdateJobInformation;
+use App\Domains\Contact\ManageJobInformation\Web\ViewHelpers\ModuleCompanyViewHelper;
+use App\Domains\Vault\ManageCompanies\Services\CreateCompany;
 use App\Http\Controllers\Controller;
 use App\Models\Company;
 use App\Models\Contact;
 use App\Models\Vault;
-use App\Vault\ManageCompanies\Services\CreateCompany;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
diff --git a/domains/Contact/ManageJobInformation/Web/ViewHelpers/ModuleCompanyViewHelper.php b/app/Domains/Contact/ManageJobInformation/Web/ViewHelpers/ModuleCompanyViewHelper.php
similarity index 95%
rename from domains/Contact/ManageJobInformation/Web/ViewHelpers/ModuleCompanyViewHelper.php
rename to app/Domains/Contact/ManageJobInformation/Web/ViewHelpers/ModuleCompanyViewHelper.php
index 7de295715..b2eb951d2 100644
--- a/domains/Contact/ManageJobInformation/Web/ViewHelpers/ModuleCompanyViewHelper.php
+++ b/app/Domains/Contact/ManageJobInformation/Web/ViewHelpers/ModuleCompanyViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageJobInformation\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageJobInformation\Web\ViewHelpers;
 
 use App\Models\Company;
 use App\Models\Contact;
diff --git a/domains/Contact/ManageLabels/Services/AssignLabel.php b/app/Domains/Contact/ManageLabels/Services/AssignLabel.php
similarity index 97%
rename from domains/Contact/ManageLabels/Services/AssignLabel.php
rename to app/Domains/Contact/ManageLabels/Services/AssignLabel.php
index 0c4db6b3a..010d75969 100644
--- a/domains/Contact/ManageLabels/Services/AssignLabel.php
+++ b/app/Domains/Contact/ManageLabels/Services/AssignLabel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageLabels\Services;
+namespace App\Domains\Contact\ManageLabels\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactFeedItem;
diff --git a/domains/Contact/ManageLabels/Services/RemoveLabel.php b/app/Domains/Contact/ManageLabels/Services/RemoveLabel.php
similarity index 97%
rename from domains/Contact/ManageLabels/Services/RemoveLabel.php
rename to app/Domains/Contact/ManageLabels/Services/RemoveLabel.php
index 95bf54f45..c58462303 100644
--- a/domains/Contact/ManageLabels/Services/RemoveLabel.php
+++ b/app/Domains/Contact/ManageLabels/Services/RemoveLabel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageLabels\Services;
+namespace App\Domains\Contact\ManageLabels\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactFeedItem;
diff --git a/domains/Contact/ManageLabels/Web/Controllers/ContactModuleLabelController.php b/app/Domains/Contact/ManageLabels/Web/Controllers/ContactModuleLabelController.php
similarity index 87%
rename from domains/Contact/ManageLabels/Web/Controllers/ContactModuleLabelController.php
rename to app/Domains/Contact/ManageLabels/Web/Controllers/ContactModuleLabelController.php
index eae113800..c9db557bb 100644
--- a/domains/Contact/ManageLabels/Web/Controllers/ContactModuleLabelController.php
+++ b/app/Domains/Contact/ManageLabels/Web/Controllers/ContactModuleLabelController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Contact\ManageLabels\Web\Controllers;
+namespace App\Domains\Contact\ManageLabels\Web\Controllers;
 
-use App\Contact\ManageLabels\Services\AssignLabel;
-use App\Contact\ManageLabels\Services\RemoveLabel;
-use App\Contact\ManageLabels\Web\ViewHelpers\ModuleLabelViewHelper;
+use App\Domains\Contact\ManageLabels\Services\AssignLabel;
+use App\Domains\Contact\ManageLabels\Services\RemoveLabel;
+use App\Domains\Contact\ManageLabels\Web\ViewHelpers\ModuleLabelViewHelper;
+use App\Domains\Vault\ManageVaultSettings\Services\CreateLabel;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
-use App\Vault\ManageVaultSettings\Services\CreateLabel;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Contact/ManageLabels/Web/ViewHelpers/ModuleLabelViewHelper.php b/app/Domains/Contact/ManageLabels/Web/ViewHelpers/ModuleLabelViewHelper.php
similarity index 97%
rename from domains/Contact/ManageLabels/Web/ViewHelpers/ModuleLabelViewHelper.php
rename to app/Domains/Contact/ManageLabels/Web/ViewHelpers/ModuleLabelViewHelper.php
index a8d2f8ebd..3daa39017 100644
--- a/domains/Contact/ManageLabels/Web/ViewHelpers/ModuleLabelViewHelper.php
+++ b/app/Domains/Contact/ManageLabels/Web/ViewHelpers/ModuleLabelViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageLabels\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageLabels\Web\ViewHelpers;
 
 use App\Models\Contact;
 use App\Models\Label;
diff --git a/domains/Contact/ManageLifeContactEvents/Services/CreateContactLifeEvent.php b/app/Domains/Contact/ManageLifeContactEvents/Services/CreateContactLifeEvent.php
similarity index 97%
rename from domains/Contact/ManageLifeContactEvents/Services/CreateContactLifeEvent.php
rename to app/Domains/Contact/ManageLifeContactEvents/Services/CreateContactLifeEvent.php
index a493b99f9..c5138051f 100644
--- a/domains/Contact/ManageLifeContactEvents/Services/CreateContactLifeEvent.php
+++ b/app/Domains/Contact/ManageLifeContactEvents/Services/CreateContactLifeEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageLifeContactEvents\Services;
+namespace App\Domains\Contact\ManageLifeContactEvents\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Contact;
diff --git a/domains/Contact/ManageLifeContactEvents/Services/DestroyContactLifeEvent.php b/app/Domains/Contact/ManageLifeContactEvents/Services/DestroyContactLifeEvent.php
similarity index 96%
rename from domains/Contact/ManageLifeContactEvents/Services/DestroyContactLifeEvent.php
rename to app/Domains/Contact/ManageLifeContactEvents/Services/DestroyContactLifeEvent.php
index d988b0c14..44844f8bf 100644
--- a/domains/Contact/ManageLifeContactEvents/Services/DestroyContactLifeEvent.php
+++ b/app/Domains/Contact/ManageLifeContactEvents/Services/DestroyContactLifeEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageLifeContactEvents\Services;
+namespace App\Domains\Contact\ManageLifeContactEvents\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactLifeEvent;
diff --git a/domains/Contact/ManageLifeContactEvents/Services/UpdateContactLifeEvent.php b/app/Domains/Contact/ManageLifeContactEvents/Services/UpdateContactLifeEvent.php
similarity index 97%
rename from domains/Contact/ManageLifeContactEvents/Services/UpdateContactLifeEvent.php
rename to app/Domains/Contact/ManageLifeContactEvents/Services/UpdateContactLifeEvent.php
index 57ce1a456..d4b35f933 100644
--- a/domains/Contact/ManageLifeContactEvents/Services/UpdateContactLifeEvent.php
+++ b/app/Domains/Contact/ManageLifeContactEvents/Services/UpdateContactLifeEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageLifeContactEvents\Services;
+namespace App\Domains\Contact\ManageLifeContactEvents\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactLifeEvent;
diff --git a/domains/Contact/ManageLoans/Services/CreateLoan.php b/app/Domains/Contact/ManageLoans/Services/CreateLoan.php
similarity index 98%
rename from domains/Contact/ManageLoans/Services/CreateLoan.php
rename to app/Domains/Contact/ManageLoans/Services/CreateLoan.php
index 97199251b..74f0cbce5 100644
--- a/domains/Contact/ManageLoans/Services/CreateLoan.php
+++ b/app/Domains/Contact/ManageLoans/Services/CreateLoan.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageLoans\Services;
+namespace App\Domains\Contact\ManageLoans\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Contact;
diff --git a/domains/Contact/ManageLoans/Services/DestroyLoan.php b/app/Domains/Contact/ManageLoans/Services/DestroyLoan.php
similarity index 96%
rename from domains/Contact/ManageLoans/Services/DestroyLoan.php
rename to app/Domains/Contact/ManageLoans/Services/DestroyLoan.php
index d5038e36c..ab3c0f48c 100644
--- a/domains/Contact/ManageLoans/Services/DestroyLoan.php
+++ b/app/Domains/Contact/ManageLoans/Services/DestroyLoan.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageLoans\Services;
+namespace App\Domains\Contact\ManageLoans\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Loan;
diff --git a/domains/Contact/ManageLoans/Services/ToggleLoan.php b/app/Domains/Contact/ManageLoans/Services/ToggleLoan.php
similarity index 97%
rename from domains/Contact/ManageLoans/Services/ToggleLoan.php
rename to app/Domains/Contact/ManageLoans/Services/ToggleLoan.php
index da47881ad..a5fb478dd 100644
--- a/domains/Contact/ManageLoans/Services/ToggleLoan.php
+++ b/app/Domains/Contact/ManageLoans/Services/ToggleLoan.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageLoans\Services;
+namespace App\Domains\Contact\ManageLoans\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Loan;
diff --git a/domains/Contact/ManageLoans/Services/UpdateLoan.php b/app/Domains/Contact/ManageLoans/Services/UpdateLoan.php
similarity index 98%
rename from domains/Contact/ManageLoans/Services/UpdateLoan.php
rename to app/Domains/Contact/ManageLoans/Services/UpdateLoan.php
index b26ce07eb..ccb2cefd9 100644
--- a/domains/Contact/ManageLoans/Services/UpdateLoan.php
+++ b/app/Domains/Contact/ManageLoans/Services/UpdateLoan.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageLoans\Services;
+namespace App\Domains\Contact\ManageLoans\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Contact;
diff --git a/domains/Contact/ManageLoans/Web/Controllers/ContactModuleLoanController.php b/app/Domains/Contact/ManageLoans/Web/Controllers/ContactModuleLoanController.php
similarity index 90%
rename from domains/Contact/ManageLoans/Web/Controllers/ContactModuleLoanController.php
rename to app/Domains/Contact/ManageLoans/Web/Controllers/ContactModuleLoanController.php
index fef73718a..25aeec638 100644
--- a/domains/Contact/ManageLoans/Web/Controllers/ContactModuleLoanController.php
+++ b/app/Domains/Contact/ManageLoans/Web/Controllers/ContactModuleLoanController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Contact\ManageLoans\Web\Controllers;
+namespace App\Domains\Contact\ManageLoans\Web\Controllers;
 
-use App\Contact\ManageLoans\Services\CreateLoan;
-use App\Contact\ManageLoans\Services\DestroyLoan;
-use App\Contact\ManageLoans\Services\UpdateLoan;
-use App\Contact\ManageLoans\Web\ViewHelpers\ModuleLoanViewHelper;
+use App\Domains\Contact\ManageLoans\Services\CreateLoan;
+use App\Domains\Contact\ManageLoans\Services\DestroyLoan;
+use App\Domains\Contact\ManageLoans\Services\UpdateLoan;
+use App\Domains\Contact\ManageLoans\Web\ViewHelpers\ModuleLoanViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use Illuminate\Http\Request;
diff --git a/domains/Contact/ManageLoans/Web/Controllers/ContactModuleToggleLoanController.php b/app/Domains/Contact/ManageLoans/Web/Controllers/ContactModuleToggleLoanController.php
similarity index 80%
rename from domains/Contact/ManageLoans/Web/Controllers/ContactModuleToggleLoanController.php
rename to app/Domains/Contact/ManageLoans/Web/Controllers/ContactModuleToggleLoanController.php
index 7b55cd690..4418a72f3 100644
--- a/domains/Contact/ManageLoans/Web/Controllers/ContactModuleToggleLoanController.php
+++ b/app/Domains/Contact/ManageLoans/Web/Controllers/ContactModuleToggleLoanController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Contact\ManageLoans\Web\Controllers;
+namespace App\Domains\Contact\ManageLoans\Web\Controllers;
 
-use App\Contact\ManageLoans\Services\ToggleLoan;
-use App\Contact\ManageLoans\Web\ViewHelpers\ModuleLoanViewHelper;
+use App\Domains\Contact\ManageLoans\Services\ToggleLoan;
+use App\Domains\Contact\ManageLoans\Web\ViewHelpers\ModuleLoanViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use Illuminate\Http\Request;
diff --git a/domains/Contact/ManageLoans/Web/ViewHelpers/ModuleLoanViewHelper.php b/app/Domains/Contact/ManageLoans/Web/ViewHelpers/ModuleLoanViewHelper.php
similarity index 98%
rename from domains/Contact/ManageLoans/Web/ViewHelpers/ModuleLoanViewHelper.php
rename to app/Domains/Contact/ManageLoans/Web/ViewHelpers/ModuleLoanViewHelper.php
index 6bdda9a2c..edd19aa2b 100644
--- a/domains/Contact/ManageLoans/Web/ViewHelpers/ModuleLoanViewHelper.php
+++ b/app/Domains/Contact/ManageLoans/Web/ViewHelpers/ModuleLoanViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageLoans\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageLoans\Web\ViewHelpers;
 
 use App\Helpers\ContactCardHelper;
 use App\Helpers\DateHelper;
diff --git a/domains/Contact/ManageNotes/Services/CreateNote.php b/app/Domains/Contact/ManageNotes/Services/CreateNote.php
similarity index 98%
rename from domains/Contact/ManageNotes/Services/CreateNote.php
rename to app/Domains/Contact/ManageNotes/Services/CreateNote.php
index 4c6253f7e..bdbc225fa 100644
--- a/domains/Contact/ManageNotes/Services/CreateNote.php
+++ b/app/Domains/Contact/ManageNotes/Services/CreateNote.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageNotes\Services;
+namespace App\Domains\Contact\ManageNotes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactFeedItem;
diff --git a/domains/Contact/ManageNotes/Services/DestroyNote.php b/app/Domains/Contact/ManageNotes/Services/DestroyNote.php
similarity index 97%
rename from domains/Contact/ManageNotes/Services/DestroyNote.php
rename to app/Domains/Contact/ManageNotes/Services/DestroyNote.php
index f439b725d..e3b59609c 100644
--- a/domains/Contact/ManageNotes/Services/DestroyNote.php
+++ b/app/Domains/Contact/ManageNotes/Services/DestroyNote.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageNotes\Services;
+namespace App\Domains\Contact\ManageNotes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactFeedItem;
diff --git a/domains/Contact/ManageNotes/Services/UpdateNote.php b/app/Domains/Contact/ManageNotes/Services/UpdateNote.php
similarity index 98%
rename from domains/Contact/ManageNotes/Services/UpdateNote.php
rename to app/Domains/Contact/ManageNotes/Services/UpdateNote.php
index 1ed1067d1..345d0bcc1 100644
--- a/domains/Contact/ManageNotes/Services/UpdateNote.php
+++ b/app/Domains/Contact/ManageNotes/Services/UpdateNote.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageNotes\Services;
+namespace App\Domains\Contact\ManageNotes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactFeedItem;
diff --git a/domains/Contact/ManageNotes/Web/Controllers/ContactModuleNoteController.php b/app/Domains/Contact/ManageNotes/Web/Controllers/ContactModuleNoteController.php
similarity index 87%
rename from domains/Contact/ManageNotes/Web/Controllers/ContactModuleNoteController.php
rename to app/Domains/Contact/ManageNotes/Web/Controllers/ContactModuleNoteController.php
index b4570880c..ca2c6d024 100644
--- a/domains/Contact/ManageNotes/Web/Controllers/ContactModuleNoteController.php
+++ b/app/Domains/Contact/ManageNotes/Web/Controllers/ContactModuleNoteController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Contact\ManageNotes\Web\Controllers;
+namespace App\Domains\Contact\ManageNotes\Web\Controllers;
 
-use App\Contact\ManageNotes\Services\CreateNote;
-use App\Contact\ManageNotes\Services\DestroyNote;
-use App\Contact\ManageNotes\Services\UpdateNote;
-use App\Contact\ManageNotes\Web\ViewHelpers\ModuleNotesViewHelper;
+use App\Domains\Contact\ManageNotes\Services\CreateNote;
+use App\Domains\Contact\ManageNotes\Services\DestroyNote;
+use App\Domains\Contact\ManageNotes\Services\UpdateNote;
+use App\Domains\Contact\ManageNotes\Web\ViewHelpers\ModuleNotesViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use Illuminate\Http\Request;
diff --git a/domains/Contact/ManageNotes/Web/Controllers/ContactNotesController.php b/app/Domains/Contact/ManageNotes/Web/Controllers/ContactNotesController.php
similarity index 79%
rename from domains/Contact/ManageNotes/Web/Controllers/ContactNotesController.php
rename to app/Domains/Contact/ManageNotes/Web/Controllers/ContactNotesController.php
index bb927c32a..fb822a8e9 100644
--- a/domains/Contact/ManageNotes/Web/Controllers/ContactNotesController.php
+++ b/app/Domains/Contact/ManageNotes/Web/Controllers/ContactNotesController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Contact\ManageNotes\Web\Controllers;
+namespace App\Domains\Contact\ManageNotes\Web\Controllers;
 
-use App\Contact\ManageNotes\Web\ViewHelpers\NotesIndexViewHelper;
+use App\Domains\Contact\ManageNotes\Web\ViewHelpers\NotesIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Helpers\PaginatorHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use App\Models\Vault;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Contact/ManageNotes/Web/ViewHelpers/ModuleNotesViewHelper.php b/app/Domains/Contact/ManageNotes/Web/ViewHelpers/ModuleNotesViewHelper.php
similarity index 97%
rename from domains/Contact/ManageNotes/Web/ViewHelpers/ModuleNotesViewHelper.php
rename to app/Domains/Contact/ManageNotes/Web/ViewHelpers/ModuleNotesViewHelper.php
index 26d50e756..a4a8a4929 100644
--- a/domains/Contact/ManageNotes/Web/ViewHelpers/ModuleNotesViewHelper.php
+++ b/app/Domains/Contact/ManageNotes/Web/ViewHelpers/ModuleNotesViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageNotes\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageNotes\Web\ViewHelpers;
 
 use App\Helpers\DateHelper;
 use App\Helpers\UserHelper;
diff --git a/domains/Contact/ManageNotes/Web/ViewHelpers/NotesIndexViewHelper.php b/app/Domains/Contact/ManageNotes/Web/ViewHelpers/NotesIndexViewHelper.php
similarity index 97%
rename from domains/Contact/ManageNotes/Web/ViewHelpers/NotesIndexViewHelper.php
rename to app/Domains/Contact/ManageNotes/Web/ViewHelpers/NotesIndexViewHelper.php
index f8b8654d3..a175047a2 100644
--- a/domains/Contact/ManageNotes/Web/ViewHelpers/NotesIndexViewHelper.php
+++ b/app/Domains/Contact/ManageNotes/Web/ViewHelpers/NotesIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageNotes\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageNotes\Web\ViewHelpers;
 
 use App\Helpers\DateHelper;
 use App\Helpers\UserHelper;
diff --git a/domains/Contact/ManagePets/Services/CreatePet.php b/app/Domains/Contact/ManagePets/Services/CreatePet.php
similarity index 97%
rename from domains/Contact/ManagePets/Services/CreatePet.php
rename to app/Domains/Contact/ManagePets/Services/CreatePet.php
index 1a41706b7..010866eeb 100644
--- a/domains/Contact/ManagePets/Services/CreatePet.php
+++ b/app/Domains/Contact/ManagePets/Services/CreatePet.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManagePets\Services;
+namespace App\Domains\Contact\ManagePets\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactFeedItem;
diff --git a/domains/Contact/ManagePets/Services/DestroyPet.php b/app/Domains/Contact/ManagePets/Services/DestroyPet.php
similarity index 97%
rename from domains/Contact/ManagePets/Services/DestroyPet.php
rename to app/Domains/Contact/ManagePets/Services/DestroyPet.php
index 1b23d8aff..49993103a 100644
--- a/domains/Contact/ManagePets/Services/DestroyPet.php
+++ b/app/Domains/Contact/ManagePets/Services/DestroyPet.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManagePets\Services;
+namespace App\Domains\Contact\ManagePets\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactFeedItem;
diff --git a/domains/Contact/ManagePets/Services/UpdatePet.php b/app/Domains/Contact/ManagePets/Services/UpdatePet.php
similarity index 97%
rename from domains/Contact/ManagePets/Services/UpdatePet.php
rename to app/Domains/Contact/ManagePets/Services/UpdatePet.php
index 693f26a39..cceb5933b 100644
--- a/domains/Contact/ManagePets/Services/UpdatePet.php
+++ b/app/Domains/Contact/ManagePets/Services/UpdatePet.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManagePets\Services;
+namespace App\Domains\Contact\ManagePets\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactFeedItem;
diff --git a/domains/Contact/ManagePets/Web/Controllers/ContactModulePetController.php b/app/Domains/Contact/ManagePets/Web/Controllers/ContactModulePetController.php
similarity index 86%
rename from domains/Contact/ManagePets/Web/Controllers/ContactModulePetController.php
rename to app/Domains/Contact/ManagePets/Web/Controllers/ContactModulePetController.php
index 43db8025f..bb14b17a5 100644
--- a/domains/Contact/ManagePets/Web/Controllers/ContactModulePetController.php
+++ b/app/Domains/Contact/ManagePets/Web/Controllers/ContactModulePetController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Contact\ManagePets\Web\Controllers;
+namespace App\Domains\Contact\ManagePets\Web\Controllers;
 
-use App\Contact\ManagePets\Services\CreatePet;
-use App\Contact\ManagePets\Services\DestroyPet;
-use App\Contact\ManagePets\Services\UpdatePet;
-use App\Contact\ManagePets\Web\ViewHelpers\ModulePetsViewHelper;
+use App\Domains\Contact\ManagePets\Services\CreatePet;
+use App\Domains\Contact\ManagePets\Services\DestroyPet;
+use App\Domains\Contact\ManagePets\Services\UpdatePet;
+use App\Domains\Contact\ManagePets\Web\ViewHelpers\ModulePetsViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use Illuminate\Http\Request;
diff --git a/domains/Contact/ManagePets/Web/ViewHelpers/ModulePetsViewHelper.php b/app/Domains/Contact/ManagePets/Web/ViewHelpers/ModulePetsViewHelper.php
similarity index 96%
rename from domains/Contact/ManagePets/Web/ViewHelpers/ModulePetsViewHelper.php
rename to app/Domains/Contact/ManagePets/Web/ViewHelpers/ModulePetsViewHelper.php
index 599f3fd19..34fc00432 100644
--- a/domains/Contact/ManagePets/Web/ViewHelpers/ModulePetsViewHelper.php
+++ b/app/Domains/Contact/ManagePets/Web/ViewHelpers/ModulePetsViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManagePets\Web\ViewHelpers;
+namespace App\Domains\Contact\ManagePets\Web\ViewHelpers;
 
 use App\Models\Contact;
 use App\Models\Pet;
diff --git a/domains/Contact/ManagePhotos/Services/DestroyPhoto.php b/app/Domains/Contact/ManagePhotos/Services/DestroyPhoto.php
similarity index 97%
rename from domains/Contact/ManagePhotos/Services/DestroyPhoto.php
rename to app/Domains/Contact/ManagePhotos/Services/DestroyPhoto.php
index b16440979..126a81250 100644
--- a/domains/Contact/ManagePhotos/Services/DestroyPhoto.php
+++ b/app/Domains/Contact/ManagePhotos/Services/DestroyPhoto.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManagePhotos\Services;
+namespace App\Domains\Contact\ManagePhotos\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\File;
diff --git a/domains/Contact/ManagePhotos/Web/Controllers/ContactModulePhotoController.php b/app/Domains/Contact/ManagePhotos/Web/Controllers/ContactModulePhotoController.php
similarity index 86%
rename from domains/Contact/ManagePhotos/Web/Controllers/ContactModulePhotoController.php
rename to app/Domains/Contact/ManagePhotos/Web/Controllers/ContactModulePhotoController.php
index 8d5e0f4d2..f48c58eeb 100644
--- a/domains/Contact/ManagePhotos/Web/Controllers/ContactModulePhotoController.php
+++ b/app/Domains/Contact/ManagePhotos/Web/Controllers/ContactModulePhotoController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Contact\ManagePhotos\Web\Controllers;
+namespace App\Domains\Contact\ManagePhotos\Web\Controllers;
 
-use App\Contact\ManageDocuments\Services\UploadFile;
-use App\Contact\ManagePhotos\Services\DestroyPhoto;
-use App\Contact\ManagePhotos\Web\ViewHelpers\ModulePhotosViewHelper;
+use App\Domains\Contact\ManageDocuments\Services\UploadFile;
+use App\Domains\Contact\ManagePhotos\Services\DestroyPhoto;
+use App\Domains\Contact\ManagePhotos\Web\ViewHelpers\ModulePhotosViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use App\Models\File;
diff --git a/domains/Contact/ManagePhotos/Web/Controllers/ContactPhotoController.php b/app/Domains/Contact/ManagePhotos/Web/Controllers/ContactPhotoController.php
similarity index 82%
rename from domains/Contact/ManagePhotos/Web/Controllers/ContactPhotoController.php
rename to app/Domains/Contact/ManagePhotos/Web/Controllers/ContactPhotoController.php
index dff5d1548..8dd6c14e9 100644
--- a/domains/Contact/ManagePhotos/Web/Controllers/ContactPhotoController.php
+++ b/app/Domains/Contact/ManagePhotos/Web/Controllers/ContactPhotoController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Contact\ManagePhotos\Web\Controllers;
+namespace App\Domains\Contact\ManagePhotos\Web\Controllers;
 
-use App\Contact\ManagePhotos\Web\ViewHelpers\ContactPhotosIndexViewHelper;
-use App\Contact\ManagePhotos\Web\ViewHelpers\ContactPhotosShowViewHelper;
+use App\Domains\Contact\ManagePhotos\Web\ViewHelpers\ContactPhotosIndexViewHelper;
+use App\Domains\Contact\ManagePhotos\Web\ViewHelpers\ContactPhotosShowViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Helpers\PaginatorHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use App\Models\File;
 use App\Models\Vault;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Inertia\Inertia;
 
diff --git a/domains/Contact/ManagePhotos/Web/ViewHelpers/ContactPhotosIndexViewHelper.php b/app/Domains/Contact/ManagePhotos/Web/ViewHelpers/ContactPhotosIndexViewHelper.php
similarity index 97%
rename from domains/Contact/ManagePhotos/Web/ViewHelpers/ContactPhotosIndexViewHelper.php
rename to app/Domains/Contact/ManagePhotos/Web/ViewHelpers/ContactPhotosIndexViewHelper.php
index 70c8b8b7f..3c6b500e0 100644
--- a/domains/Contact/ManagePhotos/Web/ViewHelpers/ContactPhotosIndexViewHelper.php
+++ b/app/Domains/Contact/ManagePhotos/Web/ViewHelpers/ContactPhotosIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManagePhotos\Web\ViewHelpers;
+namespace App\Domains\Contact\ManagePhotos\Web\ViewHelpers;
 
 use App\Helpers\FileHelper;
 use App\Helpers\StorageHelper;
diff --git a/domains/Contact/ManagePhotos/Web/ViewHelpers/ContactPhotosShowViewHelper.php b/app/Domains/Contact/ManagePhotos/Web/ViewHelpers/ContactPhotosShowViewHelper.php
similarity index 95%
rename from domains/Contact/ManagePhotos/Web/ViewHelpers/ContactPhotosShowViewHelper.php
rename to app/Domains/Contact/ManagePhotos/Web/ViewHelpers/ContactPhotosShowViewHelper.php
index d872c6c60..89ad94396 100644
--- a/domains/Contact/ManagePhotos/Web/ViewHelpers/ContactPhotosShowViewHelper.php
+++ b/app/Domains/Contact/ManagePhotos/Web/ViewHelpers/ContactPhotosShowViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManagePhotos\Web\ViewHelpers;
+namespace App\Domains\Contact\ManagePhotos\Web\ViewHelpers;
 
 use App\Helpers\FileHelper;
 use App\Models\Contact;
diff --git a/domains/Contact/ManagePhotos/Web/ViewHelpers/ModulePhotosViewHelper.php b/app/Domains/Contact/ManagePhotos/Web/ViewHelpers/ModulePhotosViewHelper.php
similarity index 97%
rename from domains/Contact/ManagePhotos/Web/ViewHelpers/ModulePhotosViewHelper.php
rename to app/Domains/Contact/ManagePhotos/Web/ViewHelpers/ModulePhotosViewHelper.php
index 13df5c4a2..d9f909b7f 100644
--- a/domains/Contact/ManagePhotos/Web/ViewHelpers/ModulePhotosViewHelper.php
+++ b/app/Domains/Contact/ManagePhotos/Web/ViewHelpers/ModulePhotosViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManagePhotos\Web\ViewHelpers;
+namespace App\Domains\Contact\ManagePhotos\Web\ViewHelpers;
 
 use App\Helpers\FileHelper;
 use App\Helpers\StorageHelper;
diff --git a/domains/Contact/ManagePronouns/Services/RemovePronoun.php b/app/Domains/Contact/ManagePronouns/Services/RemovePronoun.php
similarity index 96%
rename from domains/Contact/ManagePronouns/Services/RemovePronoun.php
rename to app/Domains/Contact/ManagePronouns/Services/RemovePronoun.php
index bbe9deb42..af2b13c8b 100644
--- a/domains/Contact/ManagePronouns/Services/RemovePronoun.php
+++ b/app/Domains/Contact/ManagePronouns/Services/RemovePronoun.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManagePronouns\Services;
+namespace App\Domains\Contact\ManagePronouns\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Pronoun;
diff --git a/domains/Contact/ManagePronouns/Services/SetPronoun.php b/app/Domains/Contact/ManagePronouns/Services/SetPronoun.php
similarity index 96%
rename from domains/Contact/ManagePronouns/Services/SetPronoun.php
rename to app/Domains/Contact/ManagePronouns/Services/SetPronoun.php
index 37f1aba65..21f4eb138 100644
--- a/domains/Contact/ManagePronouns/Services/SetPronoun.php
+++ b/app/Domains/Contact/ManagePronouns/Services/SetPronoun.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManagePronouns\Services;
+namespace App\Domains\Contact\ManagePronouns\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Pronoun;
diff --git a/domains/Contact/ManagePronouns/Web/ViewHelpers/ModuleGenderPronounViewHelper.php b/app/Domains/Contact/ManagePronouns/Web/ViewHelpers/ModuleGenderPronounViewHelper.php
similarity index 89%
rename from domains/Contact/ManagePronouns/Web/ViewHelpers/ModuleGenderPronounViewHelper.php
rename to app/Domains/Contact/ManagePronouns/Web/ViewHelpers/ModuleGenderPronounViewHelper.php
index 396236685..1cc251f38 100644
--- a/domains/Contact/ManagePronouns/Web/ViewHelpers/ModuleGenderPronounViewHelper.php
+++ b/app/Domains/Contact/ManagePronouns/Web/ViewHelpers/ModuleGenderPronounViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManagePronouns\Web\ViewHelpers;
+namespace App\Domains\Contact\ManagePronouns\Web\ViewHelpers;
 
 use App\Models\Contact;
 
diff --git a/domains/Contact/ManageRelationships/Services/SetRelationship.php b/app/Domains/Contact/ManageRelationships/Services/SetRelationship.php
similarity index 97%
rename from domains/Contact/ManageRelationships/Services/SetRelationship.php
rename to app/Domains/Contact/ManageRelationships/Services/SetRelationship.php
index 8e06d3466..a9112c86f 100644
--- a/domains/Contact/ManageRelationships/Services/SetRelationship.php
+++ b/app/Domains/Contact/ManageRelationships/Services/SetRelationship.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageRelationships\Services;
+namespace App\Domains\Contact\ManageRelationships\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Contact;
diff --git a/domains/Contact/ManageRelationships/Services/UnsetRelationship.php b/app/Domains/Contact/ManageRelationships/Services/UnsetRelationship.php
similarity index 97%
rename from domains/Contact/ManageRelationships/Services/UnsetRelationship.php
rename to app/Domains/Contact/ManageRelationships/Services/UnsetRelationship.php
index 1e9af2a34..331a4539c 100644
--- a/domains/Contact/ManageRelationships/Services/UnsetRelationship.php
+++ b/app/Domains/Contact/ManageRelationships/Services/UnsetRelationship.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageRelationships\Services;
+namespace App\Domains\Contact\ManageRelationships\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Contact;
diff --git a/domains/Contact/ManageRelationships/Web/Controllers/ContactRelationshipsController.php b/app/Domains/Contact/ManageRelationships/Web/Controllers/ContactRelationshipsController.php
similarity index 88%
rename from domains/Contact/ManageRelationships/Web/Controllers/ContactRelationshipsController.php
rename to app/Domains/Contact/ManageRelationships/Web/Controllers/ContactRelationshipsController.php
index f7f682feb..f8b8beca2 100644
--- a/domains/Contact/ManageRelationships/Web/Controllers/ContactRelationshipsController.php
+++ b/app/Domains/Contact/ManageRelationships/Web/Controllers/ContactRelationshipsController.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace App\Contact\ManageRelationships\Web\Controllers;
+namespace App\Domains\Contact\ManageRelationships\Web\Controllers;
 
-use App\Contact\ManageContact\Services\CreateContact;
-use App\Contact\ManageRelationships\Services\SetRelationship;
-use App\Contact\ManageRelationships\Services\UnsetRelationship;
-use App\Contact\ManageRelationships\Web\ViewHelpers\ContactRelationshipsCreateViewHelper;
-use App\Contact\ManageRelationships\Web\ViewHelpers\ModuleRelationshipViewHelper;
+use App\Domains\Contact\ManageContact\Services\CreateContact;
+use App\Domains\Contact\ManageRelationships\Services\SetRelationship;
+use App\Domains\Contact\ManageRelationships\Services\UnsetRelationship;
+use App\Domains\Contact\ManageRelationships\Web\ViewHelpers\ContactRelationshipsCreateViewHelper;
+use App\Domains\Contact\ManageRelationships\Web\ViewHelpers\ModuleRelationshipViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use App\Models\Vault;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Database\Eloquent\Factories\Relationship;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
diff --git a/domains/Contact/ManageRelationships/Web/ViewHelpers/ContactRelationshipsCreateViewHelper.php b/app/Domains/Contact/ManageRelationships/Web/ViewHelpers/ContactRelationshipsCreateViewHelper.php
similarity index 97%
rename from domains/Contact/ManageRelationships/Web/ViewHelpers/ContactRelationshipsCreateViewHelper.php
rename to app/Domains/Contact/ManageRelationships/Web/ViewHelpers/ContactRelationshipsCreateViewHelper.php
index a19be9dd9..d7b3c72ef 100644
--- a/domains/Contact/ManageRelationships/Web/ViewHelpers/ContactRelationshipsCreateViewHelper.php
+++ b/app/Domains/Contact/ManageRelationships/Web/ViewHelpers/ContactRelationshipsCreateViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageRelationships\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageRelationships\Web\ViewHelpers;
 
 use App\Models\Contact;
 use App\Models\RelationshipType;
diff --git a/domains/Contact/ManageRelationships/Web/ViewHelpers/ModuleFamilySummaryViewHelper.php b/app/Domains/Contact/ManageRelationships/Web/ViewHelpers/ModuleFamilySummaryViewHelper.php
similarity index 98%
rename from domains/Contact/ManageRelationships/Web/ViewHelpers/ModuleFamilySummaryViewHelper.php
rename to app/Domains/Contact/ManageRelationships/Web/ViewHelpers/ModuleFamilySummaryViewHelper.php
index 4c7c11849..58636b041 100644
--- a/domains/Contact/ManageRelationships/Web/ViewHelpers/ModuleFamilySummaryViewHelper.php
+++ b/app/Domains/Contact/ManageRelationships/Web/ViewHelpers/ModuleFamilySummaryViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageRelationships\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageRelationships\Web\ViewHelpers;
 
 use App\Models\Contact;
 use App\Models\RelationshipGroupType;
diff --git a/domains/Contact/ManageRelationships/Web/ViewHelpers/ModuleRelationshipViewHelper.php b/app/Domains/Contact/ManageRelationships/Web/ViewHelpers/ModuleRelationshipViewHelper.php
similarity index 98%
rename from domains/Contact/ManageRelationships/Web/ViewHelpers/ModuleRelationshipViewHelper.php
rename to app/Domains/Contact/ManageRelationships/Web/ViewHelpers/ModuleRelationshipViewHelper.php
index a91e11fbd..3fa255db1 100644
--- a/domains/Contact/ManageRelationships/Web/ViewHelpers/ModuleRelationshipViewHelper.php
+++ b/app/Domains/Contact/ManageRelationships/Web/ViewHelpers/ModuleRelationshipViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageRelationships\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageRelationships\Web\ViewHelpers;
 
 use App\Models\Contact;
 use App\Models\User;
diff --git a/domains/Contact/ManageReminders/Jobs/ProcessScheduledContactReminders.php b/app/Domains/Contact/ManageReminders/Jobs/ProcessScheduledContactReminders.php
similarity index 95%
rename from domains/Contact/ManageReminders/Jobs/ProcessScheduledContactReminders.php
rename to app/Domains/Contact/ManageReminders/Jobs/ProcessScheduledContactReminders.php
index d94bbaa6d..ee04b534e 100644
--- a/domains/Contact/ManageReminders/Jobs/ProcessScheduledContactReminders.php
+++ b/app/Domains/Contact/ManageReminders/Jobs/ProcessScheduledContactReminders.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Contact\ManageReminders\Jobs;
+namespace App\Domains\Contact\ManageReminders\Jobs;
 
-use App\Contact\ManageReminders\Services\RescheduleContactReminderForChannel;
+use App\Domains\Contact\ManageReminders\Services\RescheduleContactReminderForChannel;
 use App\Helpers\NameHelper;
 use App\Models\ContactReminder;
 use App\Models\UserNotificationChannel;
diff --git a/domains/Contact/ManageReminders/Services/CreateContactReminder.php b/app/Domains/Contact/ManageReminders/Services/CreateContactReminder.php
similarity index 98%
rename from domains/Contact/ManageReminders/Services/CreateContactReminder.php
rename to app/Domains/Contact/ManageReminders/Services/CreateContactReminder.php
index 1afdf458b..7a2b7491b 100644
--- a/domains/Contact/ManageReminders/Services/CreateContactReminder.php
+++ b/app/Domains/Contact/ManageReminders/Services/CreateContactReminder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageReminders\Services;
+namespace App\Domains\Contact\ManageReminders\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactReminder;
diff --git a/domains/Contact/ManageReminders/Services/DestroyReminder.php b/app/Domains/Contact/ManageReminders/Services/DestroyReminder.php
similarity index 96%
rename from domains/Contact/ManageReminders/Services/DestroyReminder.php
rename to app/Domains/Contact/ManageReminders/Services/DestroyReminder.php
index 62e170c1c..7a1da3c4b 100644
--- a/domains/Contact/ManageReminders/Services/DestroyReminder.php
+++ b/app/Domains/Contact/ManageReminders/Services/DestroyReminder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageReminders\Services;
+namespace App\Domains\Contact\ManageReminders\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactReminder;
diff --git a/domains/Contact/ManageReminders/Services/RescheduleContactReminderForChannel.php b/app/Domains/Contact/ManageReminders/Services/RescheduleContactReminderForChannel.php
similarity index 98%
rename from domains/Contact/ManageReminders/Services/RescheduleContactReminderForChannel.php
rename to app/Domains/Contact/ManageReminders/Services/RescheduleContactReminderForChannel.php
index 10955f240..68c9a5d0e 100644
--- a/domains/Contact/ManageReminders/Services/RescheduleContactReminderForChannel.php
+++ b/app/Domains/Contact/ManageReminders/Services/RescheduleContactReminderForChannel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageReminders\Services;
+namespace App\Domains\Contact\ManageReminders\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactReminder;
diff --git a/domains/Contact/ManageReminders/Services/ScheduleContactReminderForUser.php b/app/Domains/Contact/ManageReminders/Services/ScheduleContactReminderForUser.php
similarity index 98%
rename from domains/Contact/ManageReminders/Services/ScheduleContactReminderForUser.php
rename to app/Domains/Contact/ManageReminders/Services/ScheduleContactReminderForUser.php
index d18870a77..978b056fc 100644
--- a/domains/Contact/ManageReminders/Services/ScheduleContactReminderForUser.php
+++ b/app/Domains/Contact/ManageReminders/Services/ScheduleContactReminderForUser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageReminders\Services;
+namespace App\Domains\Contact\ManageReminders\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactReminder;
diff --git a/domains/Contact/ManageReminders/Services/UpdateContactReminder.php b/app/Domains/Contact/ManageReminders/Services/UpdateContactReminder.php
similarity index 98%
rename from domains/Contact/ManageReminders/Services/UpdateContactReminder.php
rename to app/Domains/Contact/ManageReminders/Services/UpdateContactReminder.php
index 41d839c96..e73b3da83 100644
--- a/domains/Contact/ManageReminders/Services/UpdateContactReminder.php
+++ b/app/Domains/Contact/ManageReminders/Services/UpdateContactReminder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageReminders\Services;
+namespace App\Domains\Contact\ManageReminders\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactReminder;
diff --git a/domains/Contact/ManageReminders/Web/Controllers/ContactModuleReminderController.php b/app/Domains/Contact/ManageReminders/Web/Controllers/ContactModuleReminderController.php
similarity index 91%
rename from domains/Contact/ManageReminders/Web/Controllers/ContactModuleReminderController.php
rename to app/Domains/Contact/ManageReminders/Web/Controllers/ContactModuleReminderController.php
index da61b026a..6f950132b 100644
--- a/domains/Contact/ManageReminders/Web/Controllers/ContactModuleReminderController.php
+++ b/app/Domains/Contact/ManageReminders/Web/Controllers/ContactModuleReminderController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Contact\ManageReminders\Web\Controllers;
+namespace App\Domains\Contact\ManageReminders\Web\Controllers;
 
-use App\Contact\ManageReminders\Services\CreateContactReminder;
-use App\Contact\ManageReminders\Services\DestroyReminder;
-use App\Contact\ManageReminders\Services\UpdateContactReminder;
-use App\Contact\ManageReminders\Web\ViewHelpers\ModuleRemindersViewHelper;
+use App\Domains\Contact\ManageReminders\Services\CreateContactReminder;
+use App\Domains\Contact\ManageReminders\Services\DestroyReminder;
+use App\Domains\Contact\ManageReminders\Services\UpdateContactReminder;
+use App\Domains\Contact\ManageReminders\Web\ViewHelpers\ModuleRemindersViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use App\Models\ContactReminder;
diff --git a/domains/Contact/ManageReminders/Web/ViewHelpers/ModuleRemindersViewHelper.php b/app/Domains/Contact/ManageReminders/Web/ViewHelpers/ModuleRemindersViewHelper.php
similarity index 97%
rename from domains/Contact/ManageReminders/Web/ViewHelpers/ModuleRemindersViewHelper.php
rename to app/Domains/Contact/ManageReminders/Web/ViewHelpers/ModuleRemindersViewHelper.php
index c7446f713..7b4d27ad8 100644
--- a/domains/Contact/ManageReminders/Web/ViewHelpers/ModuleRemindersViewHelper.php
+++ b/app/Domains/Contact/ManageReminders/Web/ViewHelpers/ModuleRemindersViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageReminders\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageReminders\Web\ViewHelpers;
 
 use App\Helpers\ContactReminderHelper;
 use App\Helpers\DateHelper;
diff --git a/domains/Contact/ManageTasks/Services/CreateContactTask.php b/app/Domains/Contact/ManageTasks/Services/CreateContactTask.php
similarity index 97%
rename from domains/Contact/ManageTasks/Services/CreateContactTask.php
rename to app/Domains/Contact/ManageTasks/Services/CreateContactTask.php
index 6d4beec43..0fb0e220b 100644
--- a/domains/Contact/ManageTasks/Services/CreateContactTask.php
+++ b/app/Domains/Contact/ManageTasks/Services/CreateContactTask.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageTasks\Services;
+namespace App\Domains\Contact\ManageTasks\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactTask;
diff --git a/domains/Contact/ManageTasks/Services/DestroyContactTask.php b/app/Domains/Contact/ManageTasks/Services/DestroyContactTask.php
similarity index 96%
rename from domains/Contact/ManageTasks/Services/DestroyContactTask.php
rename to app/Domains/Contact/ManageTasks/Services/DestroyContactTask.php
index 2e5a647fd..63a1f7ad1 100644
--- a/domains/Contact/ManageTasks/Services/DestroyContactTask.php
+++ b/app/Domains/Contact/ManageTasks/Services/DestroyContactTask.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageTasks\Services;
+namespace App\Domains\Contact\ManageTasks\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactTask;
diff --git a/domains/Contact/ManageTasks/Services/ToggleContactTask.php b/app/Domains/Contact/ManageTasks/Services/ToggleContactTask.php
similarity index 97%
rename from domains/Contact/ManageTasks/Services/ToggleContactTask.php
rename to app/Domains/Contact/ManageTasks/Services/ToggleContactTask.php
index 67e3e8e0e..c1b1246ea 100644
--- a/domains/Contact/ManageTasks/Services/ToggleContactTask.php
+++ b/app/Domains/Contact/ManageTasks/Services/ToggleContactTask.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageTasks\Services;
+namespace App\Domains\Contact\ManageTasks\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactTask;
diff --git a/domains/Contact/ManageTasks/Services/UpdateContactTask.php b/app/Domains/Contact/ManageTasks/Services/UpdateContactTask.php
similarity index 97%
rename from domains/Contact/ManageTasks/Services/UpdateContactTask.php
rename to app/Domains/Contact/ManageTasks/Services/UpdateContactTask.php
index 28c41036e..9361b08a0 100644
--- a/domains/Contact/ManageTasks/Services/UpdateContactTask.php
+++ b/app/Domains/Contact/ManageTasks/Services/UpdateContactTask.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageTasks\Services;
+namespace App\Domains\Contact\ManageTasks\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactTask;
diff --git a/domains/Contact/ManageTasks/Web/Controllers/ContactModuleTaskController.php b/app/Domains/Contact/ManageTasks/Web/Controllers/ContactModuleTaskController.php
similarity index 89%
rename from domains/Contact/ManageTasks/Web/Controllers/ContactModuleTaskController.php
rename to app/Domains/Contact/ManageTasks/Web/Controllers/ContactModuleTaskController.php
index ad788db32..f61aa5efe 100644
--- a/domains/Contact/ManageTasks/Web/Controllers/ContactModuleTaskController.php
+++ b/app/Domains/Contact/ManageTasks/Web/Controllers/ContactModuleTaskController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Contact\ManageTasks\Web\Controllers;
+namespace App\Domains\Contact\ManageTasks\Web\Controllers;
 
-use App\Contact\ManageTasks\Services\CreateContactTask;
-use App\Contact\ManageTasks\Services\DestroyContactTask;
-use App\Contact\ManageTasks\Services\ToggleContactTask;
-use App\Contact\ManageTasks\Services\UpdateContactTask;
-use App\Contact\ManageTasks\Web\ViewHelpers\ModuleContactTasksViewHelper;
+use App\Domains\Contact\ManageTasks\Services\CreateContactTask;
+use App\Domains\Contact\ManageTasks\Services\DestroyContactTask;
+use App\Domains\Contact\ManageTasks\Services\ToggleContactTask;
+use App\Domains\Contact\ManageTasks\Services\UpdateContactTask;
+use App\Domains\Contact\ManageTasks\Web\ViewHelpers\ModuleContactTasksViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use Carbon\Carbon;
diff --git a/domains/Contact/ManageTasks/Web/ViewHelpers/ModuleContactTasksViewHelper.php b/app/Domains/Contact/ManageTasks/Web/ViewHelpers/ModuleContactTasksViewHelper.php
similarity index 97%
rename from domains/Contact/ManageTasks/Web/ViewHelpers/ModuleContactTasksViewHelper.php
rename to app/Domains/Contact/ManageTasks/Web/ViewHelpers/ModuleContactTasksViewHelper.php
index 1742aeaba..d2b460d29 100644
--- a/domains/Contact/ManageTasks/Web/ViewHelpers/ModuleContactTasksViewHelper.php
+++ b/app/Domains/Contact/ManageTasks/Web/ViewHelpers/ModuleContactTasksViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Contact\ManageTasks\Web\ViewHelpers;
+namespace App\Domains\Contact\ManageTasks\Web\ViewHelpers;
 
 use App\Helpers\DateHelper;
 use App\Models\Contact;
diff --git a/domains/Settings/CancelAccount/Services/CancelAccount.php b/app/Domains/Settings/CancelAccount/Services/CancelAccount.php
similarity index 96%
rename from domains/Settings/CancelAccount/Services/CancelAccount.php
rename to app/Domains/Settings/CancelAccount/Services/CancelAccount.php
index 563653211..8bb355654 100644
--- a/domains/Settings/CancelAccount/Services/CancelAccount.php
+++ b/app/Domains/Settings/CancelAccount/Services/CancelAccount.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\CancelAccount\Services;
+namespace App\Domains\Settings\CancelAccount\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Account;
diff --git a/domains/Settings/CancelAccount/Web/Controllers/CancelAccountController.php b/app/Domains/Settings/CancelAccount/Web/Controllers/CancelAccountController.php
similarity index 79%
rename from domains/Settings/CancelAccount/Web/Controllers/CancelAccountController.php
rename to app/Domains/Settings/CancelAccount/Web/Controllers/CancelAccountController.php
index 4de2b21c2..6d27144b0 100644
--- a/domains/Settings/CancelAccount/Web/Controllers/CancelAccountController.php
+++ b/app/Domains/Settings/CancelAccount/Web/Controllers/CancelAccountController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Settings\CancelAccount\Web\Controllers;
+namespace App\Domains\Settings\CancelAccount\Web\Controllers;
 
+use App\Domains\Settings\CancelAccount\Services\CancelAccount;
+use App\Domains\Settings\CancelAccount\Web\ViewHelpers\CancelAccountViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\CancelAccount\Services\CancelAccount;
-use App\Settings\CancelAccount\Web\ViewHelpers\CancelAccountViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
diff --git a/domains/Settings/CancelAccount/Web/ViewHelpers/CancelAccountViewHelper.php b/app/Domains/Settings/CancelAccount/Web/ViewHelpers/CancelAccountViewHelper.php
similarity index 84%
rename from domains/Settings/CancelAccount/Web/ViewHelpers/CancelAccountViewHelper.php
rename to app/Domains/Settings/CancelAccount/Web/ViewHelpers/CancelAccountViewHelper.php
index f27fac5d5..73f0d151a 100644
--- a/domains/Settings/CancelAccount/Web/ViewHelpers/CancelAccountViewHelper.php
+++ b/app/Domains/Settings/CancelAccount/Web/ViewHelpers/CancelAccountViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\CancelAccount\Web\ViewHelpers;
+namespace App\Domains\Settings\CancelAccount\Web\ViewHelpers;
 
 class CancelAccountViewHelper
 {
diff --git a/domains/Settings/CreateAccount/Services/CreateAccount.php b/app/Domains/Settings/CreateAccount/Services/CreateAccount.php
similarity index 96%
rename from domains/Settings/CreateAccount/Services/CreateAccount.php
rename to app/Domains/Settings/CreateAccount/Services/CreateAccount.php
index 7bca4f3b4..2d03b6b7d 100644
--- a/domains/Settings/CreateAccount/Services/CreateAccount.php
+++ b/app/Domains/Settings/CreateAccount/Services/CreateAccount.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\CreateAccount\Services;
+namespace App\Domains\Settings\CreateAccount\Services;
 
 use App\Actions\Fortify\PasswordValidationRules;
 use App\Interfaces\ServiceInterface;
diff --git a/domains/Settings/ManageActivityTypes/Services/CreateActivity.php b/app/Domains/Settings/ManageActivityTypes/Services/CreateActivity.php
similarity index 95%
rename from domains/Settings/ManageActivityTypes/Services/CreateActivity.php
rename to app/Domains/Settings/ManageActivityTypes/Services/CreateActivity.php
index 4567dd242..88af140b5 100644
--- a/domains/Settings/ManageActivityTypes/Services/CreateActivity.php
+++ b/app/Domains/Settings/ManageActivityTypes/Services/CreateActivity.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageActivityTypes\Services;
+namespace App\Domains\Settings\ManageActivityTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Activity;
diff --git a/domains/Settings/ManageActivityTypes/Services/CreateActivityType.php b/app/Domains/Settings/ManageActivityTypes/Services/CreateActivityType.php
similarity index 95%
rename from domains/Settings/ManageActivityTypes/Services/CreateActivityType.php
rename to app/Domains/Settings/ManageActivityTypes/Services/CreateActivityType.php
index 745f4cdd5..757b362fc 100644
--- a/domains/Settings/ManageActivityTypes/Services/CreateActivityType.php
+++ b/app/Domains/Settings/ManageActivityTypes/Services/CreateActivityType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageActivityTypes\Services;
+namespace App\Domains\Settings\ManageActivityTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ActivityType;
diff --git a/domains/Settings/ManageActivityTypes/Services/DestroyActivity.php b/app/Domains/Settings/ManageActivityTypes/Services/DestroyActivity.php
similarity index 95%
rename from domains/Settings/ManageActivityTypes/Services/DestroyActivity.php
rename to app/Domains/Settings/ManageActivityTypes/Services/DestroyActivity.php
index d8d025a1f..812fa9a56 100644
--- a/domains/Settings/ManageActivityTypes/Services/DestroyActivity.php
+++ b/app/Domains/Settings/ManageActivityTypes/Services/DestroyActivity.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageActivityTypes\Services;
+namespace App\Domains\Settings\ManageActivityTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Activity;
diff --git a/domains/Settings/ManageActivityTypes/Services/DestroyActivityType.php b/app/Domains/Settings/ManageActivityTypes/Services/DestroyActivityType.php
similarity index 95%
rename from domains/Settings/ManageActivityTypes/Services/DestroyActivityType.php
rename to app/Domains/Settings/ManageActivityTypes/Services/DestroyActivityType.php
index 9e7caa802..d665e327e 100644
--- a/domains/Settings/ManageActivityTypes/Services/DestroyActivityType.php
+++ b/app/Domains/Settings/ManageActivityTypes/Services/DestroyActivityType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageActivityTypes\Services;
+namespace App\Domains\Settings\ManageActivityTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ActivityType;
diff --git a/domains/Settings/ManageActivityTypes/Services/UpdateActivity.php b/app/Domains/Settings/ManageActivityTypes/Services/UpdateActivity.php
similarity index 96%
rename from domains/Settings/ManageActivityTypes/Services/UpdateActivity.php
rename to app/Domains/Settings/ManageActivityTypes/Services/UpdateActivity.php
index ef04c0c52..e6b598496 100644
--- a/domains/Settings/ManageActivityTypes/Services/UpdateActivity.php
+++ b/app/Domains/Settings/ManageActivityTypes/Services/UpdateActivity.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageActivityTypes\Services;
+namespace App\Domains\Settings\ManageActivityTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Activity;
diff --git a/domains/Settings/ManageActivityTypes/Services/UpdateActivityType.php b/app/Domains/Settings/ManageActivityTypes/Services/UpdateActivityType.php
similarity index 95%
rename from domains/Settings/ManageActivityTypes/Services/UpdateActivityType.php
rename to app/Domains/Settings/ManageActivityTypes/Services/UpdateActivityType.php
index 2cbbb58bb..af125ef72 100644
--- a/domains/Settings/ManageActivityTypes/Services/UpdateActivityType.php
+++ b/app/Domains/Settings/ManageActivityTypes/Services/UpdateActivityType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageActivityTypes\Services;
+namespace App\Domains\Settings\ManageActivityTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Activity;
diff --git a/domains/Settings/ManageActivityTypes/Web/Controllers/PersonalizeActivitiesController.php b/app/Domains/Settings/ManageActivityTypes/Web/Controllers/PersonalizeActivitiesController.php
similarity index 82%
rename from domains/Settings/ManageActivityTypes/Web/Controllers/PersonalizeActivitiesController.php
rename to app/Domains/Settings/ManageActivityTypes/Web/Controllers/PersonalizeActivitiesController.php
index 34f458faa..bb1e5a978 100644
--- a/domains/Settings/ManageActivityTypes/Web/Controllers/PersonalizeActivitiesController.php
+++ b/app/Domains/Settings/ManageActivityTypes/Web/Controllers/PersonalizeActivitiesController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Settings\ManageActivityTypes\Web\Controllers;
+namespace App\Domains\Settings\ManageActivityTypes\Web\Controllers;
 
+use App\Domains\Settings\ManageActivityTypes\Services\CreateActivity;
+use App\Domains\Settings\ManageActivityTypes\Services\DestroyActivity;
+use App\Domains\Settings\ManageActivityTypes\Services\UpdateActivity;
+use App\Domains\Settings\ManageActivityTypes\Web\ViewHelpers\PersonalizeActivityTypesIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageActivityTypes\Services\CreateActivity;
-use App\Settings\ManageActivityTypes\Services\DestroyActivity;
-use App\Settings\ManageActivityTypes\Services\UpdateActivity;
-use App\Settings\ManageActivityTypes\Web\ViewHelpers\PersonalizeActivityTypesIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageActivityTypes/Web/Controllers/PersonalizeActivityTypesController.php b/app/Domains/Settings/ManageActivityTypes/Web/Controllers/PersonalizeActivityTypesController.php
similarity index 80%
rename from domains/Settings/ManageActivityTypes/Web/Controllers/PersonalizeActivityTypesController.php
rename to app/Domains/Settings/ManageActivityTypes/Web/Controllers/PersonalizeActivityTypesController.php
index 9f751510f..198322957 100644
--- a/domains/Settings/ManageActivityTypes/Web/Controllers/PersonalizeActivityTypesController.php
+++ b/app/Domains/Settings/ManageActivityTypes/Web/Controllers/PersonalizeActivityTypesController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Settings\ManageActivityTypes\Web\Controllers;
+namespace App\Domains\Settings\ManageActivityTypes\Web\Controllers;
 
+use App\Domains\Settings\ManageActivityTypes\Services\CreateActivityType;
+use App\Domains\Settings\ManageActivityTypes\Services\DestroyActivityType;
+use App\Domains\Settings\ManageActivityTypes\Services\UpdateActivityType;
+use App\Domains\Settings\ManageActivityTypes\Web\ViewHelpers\PersonalizeActivityTypesIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageActivityTypes\Services\CreateActivityType;
-use App\Settings\ManageActivityTypes\Services\DestroyActivityType;
-use App\Settings\ManageActivityTypes\Services\UpdateActivityType;
-use App\Settings\ManageActivityTypes\Web\ViewHelpers\PersonalizeActivityTypesIndexViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Settings/ManageActivityTypes/Web/ViewHelpers/PersonalizeActivityTypesIndexViewHelper.php b/app/Domains/Settings/ManageActivityTypes/Web/ViewHelpers/PersonalizeActivityTypesIndexViewHelper.php
similarity index 97%
rename from domains/Settings/ManageActivityTypes/Web/ViewHelpers/PersonalizeActivityTypesIndexViewHelper.php
rename to app/Domains/Settings/ManageActivityTypes/Web/ViewHelpers/PersonalizeActivityTypesIndexViewHelper.php
index becace2a3..d86394ab4 100644
--- a/domains/Settings/ManageActivityTypes/Web/ViewHelpers/PersonalizeActivityTypesIndexViewHelper.php
+++ b/app/Domains/Settings/ManageActivityTypes/Web/ViewHelpers/PersonalizeActivityTypesIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageActivityTypes\Web\ViewHelpers;
+namespace App\Domains\Settings\ManageActivityTypes\Web\ViewHelpers;
 
 use App\Models\Account;
 use App\Models\Activity;
diff --git a/domains/Settings/ManageAddressTypes/Services/CreateAddressType.php b/app/Domains/Settings/ManageAddressTypes/Services/CreateAddressType.php
similarity index 95%
rename from domains/Settings/ManageAddressTypes/Services/CreateAddressType.php
rename to app/Domains/Settings/ManageAddressTypes/Services/CreateAddressType.php
index 890ccc94c..555d4b8c3 100644
--- a/domains/Settings/ManageAddressTypes/Services/CreateAddressType.php
+++ b/app/Domains/Settings/ManageAddressTypes/Services/CreateAddressType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageAddressTypes\Services;
+namespace App\Domains\Settings\ManageAddressTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\AddressType;
diff --git a/domains/Settings/ManageAddressTypes/Services/DestroyAddressType.php b/app/Domains/Settings/ManageAddressTypes/Services/DestroyAddressType.php
similarity index 95%
rename from domains/Settings/ManageAddressTypes/Services/DestroyAddressType.php
rename to app/Domains/Settings/ManageAddressTypes/Services/DestroyAddressType.php
index cbd3d100e..8eba06ba7 100644
--- a/domains/Settings/ManageAddressTypes/Services/DestroyAddressType.php
+++ b/app/Domains/Settings/ManageAddressTypes/Services/DestroyAddressType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageAddressTypes\Services;
+namespace App\Domains\Settings\ManageAddressTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\AddressType;
diff --git a/domains/Settings/ManageAddressTypes/Services/UpdateAddressType.php b/app/Domains/Settings/ManageAddressTypes/Services/UpdateAddressType.php
similarity index 95%
rename from domains/Settings/ManageAddressTypes/Services/UpdateAddressType.php
rename to app/Domains/Settings/ManageAddressTypes/Services/UpdateAddressType.php
index b3fd3a882..b18baeb46 100644
--- a/domains/Settings/ManageAddressTypes/Services/UpdateAddressType.php
+++ b/app/Domains/Settings/ManageAddressTypes/Services/UpdateAddressType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageAddressTypes\Services;
+namespace App\Domains\Settings\ManageAddressTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\AddressType;
diff --git a/domains/Settings/ManageAddressTypes/Web/Controllers/PersonalizeAddressTypeController.php b/app/Domains/Settings/ManageAddressTypes/Web/Controllers/PersonalizeAddressTypeController.php
similarity index 80%
rename from domains/Settings/ManageAddressTypes/Web/Controllers/PersonalizeAddressTypeController.php
rename to app/Domains/Settings/ManageAddressTypes/Web/Controllers/PersonalizeAddressTypeController.php
index 07aec76d6..8704b256c 100644
--- a/domains/Settings/ManageAddressTypes/Web/Controllers/PersonalizeAddressTypeController.php
+++ b/app/Domains/Settings/ManageAddressTypes/Web/Controllers/PersonalizeAddressTypeController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Settings\ManageAddressTypes\Web\Controllers;
+namespace App\Domains\Settings\ManageAddressTypes\Web\Controllers;
 
+use App\Domains\Settings\ManageAddressTypes\Services\CreateAddressType;
+use App\Domains\Settings\ManageAddressTypes\Services\UpdateAddressType;
+use App\Domains\Settings\ManageAddressTypes\Web\ViewHelpers\PersonalizeAddressTypeIndexViewHelper;
+use App\Domains\Settings\ManagePronouns\Services\DestroyPronoun;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageAddressTypes\Services\CreateAddressType;
-use App\Settings\ManageAddressTypes\Services\UpdateAddressType;
-use App\Settings\ManageAddressTypes\Web\ViewHelpers\PersonalizeAddressTypeIndexViewHelper;
-use App\Settings\ManagePronouns\Services\DestroyPronoun;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Settings/ManageAddressTypes/Web/ViewHelpers/PersonalizeAddressTypeIndexViewHelper.php b/app/Domains/Settings/ManageAddressTypes/Web/ViewHelpers/PersonalizeAddressTypeIndexViewHelper.php
similarity index 95%
rename from domains/Settings/ManageAddressTypes/Web/ViewHelpers/PersonalizeAddressTypeIndexViewHelper.php
rename to app/Domains/Settings/ManageAddressTypes/Web/ViewHelpers/PersonalizeAddressTypeIndexViewHelper.php
index 729c0418a..ad77ee6bb 100644
--- a/domains/Settings/ManageAddressTypes/Web/ViewHelpers/PersonalizeAddressTypeIndexViewHelper.php
+++ b/app/Domains/Settings/ManageAddressTypes/Web/ViewHelpers/PersonalizeAddressTypeIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageAddressTypes\Web\ViewHelpers;
+namespace App\Domains\Settings\ManageAddressTypes\Web\ViewHelpers;
 
 use App\Models\Account;
 use App\Models\AddressType;
diff --git a/domains/Settings/ManageCallReasons/Services/CreateCallReason.php b/app/Domains/Settings/ManageCallReasons/Services/CreateCallReason.php
similarity index 96%
rename from domains/Settings/ManageCallReasons/Services/CreateCallReason.php
rename to app/Domains/Settings/ManageCallReasons/Services/CreateCallReason.php
index 69fae6095..7092fa171 100644
--- a/domains/Settings/ManageCallReasons/Services/CreateCallReason.php
+++ b/app/Domains/Settings/ManageCallReasons/Services/CreateCallReason.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageCallReasons\Services;
+namespace App\Domains\Settings\ManageCallReasons\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\CallReason;
diff --git a/domains/Settings/ManageCallReasons/Services/CreateCallReasonType.php b/app/Domains/Settings/ManageCallReasons/Services/CreateCallReasonType.php
similarity index 95%
rename from domains/Settings/ManageCallReasons/Services/CreateCallReasonType.php
rename to app/Domains/Settings/ManageCallReasons/Services/CreateCallReasonType.php
index 06439b67c..c4336d0c9 100644
--- a/domains/Settings/ManageCallReasons/Services/CreateCallReasonType.php
+++ b/app/Domains/Settings/ManageCallReasons/Services/CreateCallReasonType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageCallReasons\Services;
+namespace App\Domains\Settings\ManageCallReasons\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\CallReasonType;
diff --git a/domains/Settings/ManageCallReasons/Services/DestroyCallReason.php b/app/Domains/Settings/ManageCallReasons/Services/DestroyCallReason.php
similarity index 96%
rename from domains/Settings/ManageCallReasons/Services/DestroyCallReason.php
rename to app/Domains/Settings/ManageCallReasons/Services/DestroyCallReason.php
index 730ebe903..523c03415 100644
--- a/domains/Settings/ManageCallReasons/Services/DestroyCallReason.php
+++ b/app/Domains/Settings/ManageCallReasons/Services/DestroyCallReason.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageCallReasons\Services;
+namespace App\Domains\Settings\ManageCallReasons\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\CallReason;
diff --git a/domains/Settings/ManageCallReasons/Services/DestroyCallReasonType.php b/app/Domains/Settings/ManageCallReasons/Services/DestroyCallReasonType.php
similarity index 95%
rename from domains/Settings/ManageCallReasons/Services/DestroyCallReasonType.php
rename to app/Domains/Settings/ManageCallReasons/Services/DestroyCallReasonType.php
index 797fc3db5..9679dc32f 100644
--- a/domains/Settings/ManageCallReasons/Services/DestroyCallReasonType.php
+++ b/app/Domains/Settings/ManageCallReasons/Services/DestroyCallReasonType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageCallReasons\Services;
+namespace App\Domains\Settings\ManageCallReasons\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\CallReasonType;
diff --git a/domains/Settings/ManageCallReasons/Services/UpdateCallReason.php b/app/Domains/Settings/ManageCallReasons/Services/UpdateCallReason.php
similarity index 96%
rename from domains/Settings/ManageCallReasons/Services/UpdateCallReason.php
rename to app/Domains/Settings/ManageCallReasons/Services/UpdateCallReason.php
index 0729c154b..ffc177432 100644
--- a/domains/Settings/ManageCallReasons/Services/UpdateCallReason.php
+++ b/app/Domains/Settings/ManageCallReasons/Services/UpdateCallReason.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageCallReasons\Services;
+namespace App\Domains\Settings\ManageCallReasons\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\CallReason;
diff --git a/domains/Settings/ManageCallReasons/Services/UpdateCallReasonType.php b/app/Domains/Settings/ManageCallReasons/Services/UpdateCallReasonType.php
similarity index 95%
rename from domains/Settings/ManageCallReasons/Services/UpdateCallReasonType.php
rename to app/Domains/Settings/ManageCallReasons/Services/UpdateCallReasonType.php
index dec1cf163..81fc20d17 100644
--- a/domains/Settings/ManageCallReasons/Services/UpdateCallReasonType.php
+++ b/app/Domains/Settings/ManageCallReasons/Services/UpdateCallReasonType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageCallReasons\Services;
+namespace App\Domains\Settings\ManageCallReasons\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\CallReasonType;
diff --git a/domains/Settings/ManageCallReasons/Web/Controllers/PersonalizeCallReasonTypesController.php b/app/Domains/Settings/ManageCallReasons/Web/Controllers/PersonalizeCallReasonTypesController.php
similarity index 80%
rename from domains/Settings/ManageCallReasons/Web/Controllers/PersonalizeCallReasonTypesController.php
rename to app/Domains/Settings/ManageCallReasons/Web/Controllers/PersonalizeCallReasonTypesController.php
index 586240ff2..38e93cd45 100644
--- a/domains/Settings/ManageCallReasons/Web/Controllers/PersonalizeCallReasonTypesController.php
+++ b/app/Domains/Settings/ManageCallReasons/Web/Controllers/PersonalizeCallReasonTypesController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Settings\ManageCallReasons\Web\Controllers;
+namespace App\Domains\Settings\ManageCallReasons\Web\Controllers;
 
+use App\Domains\Settings\ManageCallReasons\Services\CreateCallReasonType;
+use App\Domains\Settings\ManageCallReasons\Services\DestroyCallReasonType;
+use App\Domains\Settings\ManageCallReasons\Services\UpdateCallReasonType;
+use App\Domains\Settings\ManageCallReasons\Web\ViewHelpers\PersonalizeCallReasonsIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageCallReasons\Services\CreateCallReasonType;
-use App\Settings\ManageCallReasons\Services\DestroyCallReasonType;
-use App\Settings\ManageCallReasons\Services\UpdateCallReasonType;
-use App\Settings\ManageCallReasons\Web\ViewHelpers\PersonalizeCallReasonsIndexViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Settings/ManageCallReasons/Web/Controllers/PersonalizeCallReasonsController.php b/app/Domains/Settings/ManageCallReasons/Web/Controllers/PersonalizeCallReasonsController.php
similarity index 82%
rename from domains/Settings/ManageCallReasons/Web/Controllers/PersonalizeCallReasonsController.php
rename to app/Domains/Settings/ManageCallReasons/Web/Controllers/PersonalizeCallReasonsController.php
index c27c18740..7a83c3efc 100644
--- a/domains/Settings/ManageCallReasons/Web/Controllers/PersonalizeCallReasonsController.php
+++ b/app/Domains/Settings/ManageCallReasons/Web/Controllers/PersonalizeCallReasonsController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Settings\ManageCallReasons\Web\Controllers;
+namespace App\Domains\Settings\ManageCallReasons\Web\Controllers;
 
+use App\Domains\Settings\ManageCallReasons\Services\CreateCallReason;
+use App\Domains\Settings\ManageCallReasons\Services\DestroyCallReason;
+use App\Domains\Settings\ManageCallReasons\Services\UpdateCallReason;
+use App\Domains\Settings\ManageCallReasons\Web\ViewHelpers\PersonalizeCallReasonsIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageCallReasons\Services\CreateCallReason;
-use App\Settings\ManageCallReasons\Services\DestroyCallReason;
-use App\Settings\ManageCallReasons\Services\UpdateCallReason;
-use App\Settings\ManageCallReasons\Web\ViewHelpers\PersonalizeCallReasonsIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageCallReasons/Web/ViewHelpers/PersonalizeCallReasonsIndexViewHelper.php b/app/Domains/Settings/ManageCallReasons/Web/ViewHelpers/PersonalizeCallReasonsIndexViewHelper.php
similarity index 97%
rename from domains/Settings/ManageCallReasons/Web/ViewHelpers/PersonalizeCallReasonsIndexViewHelper.php
rename to app/Domains/Settings/ManageCallReasons/Web/ViewHelpers/PersonalizeCallReasonsIndexViewHelper.php
index 178534923..236805579 100644
--- a/domains/Settings/ManageCallReasons/Web/ViewHelpers/PersonalizeCallReasonsIndexViewHelper.php
+++ b/app/Domains/Settings/ManageCallReasons/Web/ViewHelpers/PersonalizeCallReasonsIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageCallReasons\Web\ViewHelpers;
+namespace App\Domains\Settings\ManageCallReasons\Web\ViewHelpers;
 
 use App\Models\Account;
 use App\Models\CallReason;
diff --git a/domains/Settings/ManageContactInformationTypes/Services/CreateContactInformationType.php b/app/Domains/Settings/ManageContactInformationTypes/Services/CreateContactInformationType.php
similarity index 95%
rename from domains/Settings/ManageContactInformationTypes/Services/CreateContactInformationType.php
rename to app/Domains/Settings/ManageContactInformationTypes/Services/CreateContactInformationType.php
index 239d2e55f..87751e922 100644
--- a/domains/Settings/ManageContactInformationTypes/Services/CreateContactInformationType.php
+++ b/app/Domains/Settings/ManageContactInformationTypes/Services/CreateContactInformationType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageContactInformationTypes\Services;
+namespace App\Domains\Settings\ManageContactInformationTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactInformationType;
diff --git a/domains/Settings/ManageContactInformationTypes/Services/DestroyContactInformationType.php b/app/Domains/Settings/ManageContactInformationTypes/Services/DestroyContactInformationType.php
similarity index 94%
rename from domains/Settings/ManageContactInformationTypes/Services/DestroyContactInformationType.php
rename to app/Domains/Settings/ManageContactInformationTypes/Services/DestroyContactInformationType.php
index a6748b123..f3fb84e17 100644
--- a/domains/Settings/ManageContactInformationTypes/Services/DestroyContactInformationType.php
+++ b/app/Domains/Settings/ManageContactInformationTypes/Services/DestroyContactInformationType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageContactInformationTypes\Services;
+namespace App\Domains\Settings\ManageContactInformationTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactInformationType;
diff --git a/domains/Settings/ManageContactInformationTypes/Services/UpdateContactInformationType.php b/app/Domains/Settings/ManageContactInformationTypes/Services/UpdateContactInformationType.php
similarity index 95%
rename from domains/Settings/ManageContactInformationTypes/Services/UpdateContactInformationType.php
rename to app/Domains/Settings/ManageContactInformationTypes/Services/UpdateContactInformationType.php
index 1abe20ab9..91395b359 100644
--- a/domains/Settings/ManageContactInformationTypes/Services/UpdateContactInformationType.php
+++ b/app/Domains/Settings/ManageContactInformationTypes/Services/UpdateContactInformationType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageContactInformationTypes\Services;
+namespace App\Domains\Settings\ManageContactInformationTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactInformationType;
diff --git a/domains/Settings/ManageContactInformationTypes/Web/Controllers/PersonalizeContatInformationTypesController.php b/app/Domains/Settings/ManageContactInformationTypes/Web/Controllers/PersonalizeContatInformationTypesController.php
similarity index 79%
rename from domains/Settings/ManageContactInformationTypes/Web/Controllers/PersonalizeContatInformationTypesController.php
rename to app/Domains/Settings/ManageContactInformationTypes/Web/Controllers/PersonalizeContatInformationTypesController.php
index ab07c213a..8fa0e590e 100644
--- a/domains/Settings/ManageContactInformationTypes/Web/Controllers/PersonalizeContatInformationTypesController.php
+++ b/app/Domains/Settings/ManageContactInformationTypes/Web/Controllers/PersonalizeContatInformationTypesController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Settings\ManageContactInformationTypes\Web\Controllers;
+namespace App\Domains\Settings\ManageContactInformationTypes\Web\Controllers;
 
+use App\Domains\Settings\ManageContactInformationTypes\Services\CreateContactInformationType;
+use App\Domains\Settings\ManageContactInformationTypes\Services\DestroyContactInformationType;
+use App\Domains\Settings\ManageContactInformationTypes\Services\UpdateContactInformationType;
+use App\Domains\Settings\ManageContactInformationTypes\Web\ViewHelpers\PersonalizeContactInformationTypeIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageContactInformationTypes\Services\CreateContactInformationType;
-use App\Settings\ManageContactInformationTypes\Services\DestroyContactInformationType;
-use App\Settings\ManageContactInformationTypes\Services\UpdateContactInformationType;
-use App\Settings\ManageContactInformationTypes\Web\ViewHelpers\PersonalizeContactInformationTypeIndexViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Settings/ManageContactInformationTypes/Web/ViewHelpers/PersonalizeContactInformationTypeIndexViewHelper.php b/app/Domains/Settings/ManageContactInformationTypes/Web/ViewHelpers/PersonalizeContactInformationTypeIndexViewHelper.php
similarity index 94%
rename from domains/Settings/ManageContactInformationTypes/Web/ViewHelpers/PersonalizeContactInformationTypeIndexViewHelper.php
rename to app/Domains/Settings/ManageContactInformationTypes/Web/ViewHelpers/PersonalizeContactInformationTypeIndexViewHelper.php
index 9e81d4424..ab61fd29a 100644
--- a/domains/Settings/ManageContactInformationTypes/Web/ViewHelpers/PersonalizeContactInformationTypeIndexViewHelper.php
+++ b/app/Domains/Settings/ManageContactInformationTypes/Web/ViewHelpers/PersonalizeContactInformationTypeIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageContactInformationTypes\Web\ViewHelpers;
+namespace App\Domains\Settings\ManageContactInformationTypes\Web\ViewHelpers;
 
 use App\Models\Account;
 use App\Models\ContactInformationType;
diff --git a/domains/Settings/ManageCurrencies/Services/DisableAllCurrencies.php b/app/Domains/Settings/ManageCurrencies/Services/DisableAllCurrencies.php
similarity index 95%
rename from domains/Settings/ManageCurrencies/Services/DisableAllCurrencies.php
rename to app/Domains/Settings/ManageCurrencies/Services/DisableAllCurrencies.php
index 92501ced7..9d5bff357 100644
--- a/domains/Settings/ManageCurrencies/Services/DisableAllCurrencies.php
+++ b/app/Domains/Settings/ManageCurrencies/Services/DisableAllCurrencies.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageCurrencies\Services;
+namespace App\Domains\Settings\ManageCurrencies\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Services\BaseService;
diff --git a/domains/Settings/ManageCurrencies/Services/EnableAllCurrencies.php b/app/Domains/Settings/ManageCurrencies/Services/EnableAllCurrencies.php
similarity index 95%
rename from domains/Settings/ManageCurrencies/Services/EnableAllCurrencies.php
rename to app/Domains/Settings/ManageCurrencies/Services/EnableAllCurrencies.php
index 3e20437d7..a4d9eb6a5 100644
--- a/domains/Settings/ManageCurrencies/Services/EnableAllCurrencies.php
+++ b/app/Domains/Settings/ManageCurrencies/Services/EnableAllCurrencies.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageCurrencies\Services;
+namespace App\Domains\Settings\ManageCurrencies\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Services\BaseService;
diff --git a/domains/Settings/ManageCurrencies/Services/ToggleCurrency.php b/app/Domains/Settings/ManageCurrencies/Services/ToggleCurrency.php
similarity index 95%
rename from domains/Settings/ManageCurrencies/Services/ToggleCurrency.php
rename to app/Domains/Settings/ManageCurrencies/Services/ToggleCurrency.php
index 37b8b96a6..6edbdeeb2 100644
--- a/domains/Settings/ManageCurrencies/Services/ToggleCurrency.php
+++ b/app/Domains/Settings/ManageCurrencies/Services/ToggleCurrency.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageCurrencies\Services;
+namespace App\Domains\Settings\ManageCurrencies\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Services\BaseService;
diff --git a/domains/Settings/ManageCurrencies/Web/Controllers/CurrencyController.php b/app/Domains/Settings/ManageCurrencies/Web/Controllers/CurrencyController.php
similarity index 73%
rename from domains/Settings/ManageCurrencies/Web/Controllers/CurrencyController.php
rename to app/Domains/Settings/ManageCurrencies/Web/Controllers/CurrencyController.php
index c63464267..b826d7c83 100644
--- a/domains/Settings/ManageCurrencies/Web/Controllers/CurrencyController.php
+++ b/app/Domains/Settings/ManageCurrencies/Web/Controllers/CurrencyController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Settings\ManageCurrencies\Web\Controllers;
+namespace App\Domains\Settings\ManageCurrencies\Web\Controllers;
 
+use App\Domains\Settings\ManageCurrencies\Web\ViewHelpers\CurrencyIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageCurrencies\Web\ViewHelpers\CurrencyIndexViewHelper;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageCurrencies/Web/Controllers/PersonalizeCurrencyController.php b/app/Domains/Settings/ManageCurrencies/Web/Controllers/PersonalizeCurrencyController.php
similarity index 77%
rename from domains/Settings/ManageCurrencies/Web/Controllers/PersonalizeCurrencyController.php
rename to app/Domains/Settings/ManageCurrencies/Web/Controllers/PersonalizeCurrencyController.php
index e28f7771c..b28dc9f0d 100644
--- a/domains/Settings/ManageCurrencies/Web/Controllers/PersonalizeCurrencyController.php
+++ b/app/Domains/Settings/ManageCurrencies/Web/Controllers/PersonalizeCurrencyController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Settings\ManageCurrencies\Web\Controllers;
+namespace App\Domains\Settings\ManageCurrencies\Web\Controllers;
 
+use App\Domains\Settings\ManageCurrencies\Services\DisableAllCurrencies;
+use App\Domains\Settings\ManageCurrencies\Services\EnableAllCurrencies;
+use App\Domains\Settings\ManageCurrencies\Services\ToggleCurrency;
+use App\Domains\Settings\ManageCurrencies\Web\ViewHelpers\PersonalizeCurrencyIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageCurrencies\Services\DisableAllCurrencies;
-use App\Settings\ManageCurrencies\Services\EnableAllCurrencies;
-use App\Settings\ManageCurrencies\Services\ToggleCurrency;
-use App\Settings\ManageCurrencies\Web\ViewHelpers\PersonalizeCurrencyIndexViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Settings/ManageCurrencies/Web/ViewHelpers/CurrencyIndexViewHelper.php b/app/Domains/Settings/ManageCurrencies/Web/ViewHelpers/CurrencyIndexViewHelper.php
similarity index 90%
rename from domains/Settings/ManageCurrencies/Web/ViewHelpers/CurrencyIndexViewHelper.php
rename to app/Domains/Settings/ManageCurrencies/Web/ViewHelpers/CurrencyIndexViewHelper.php
index cf7d74991..e1f4f7ec7 100644
--- a/domains/Settings/ManageCurrencies/Web/ViewHelpers/CurrencyIndexViewHelper.php
+++ b/app/Domains/Settings/ManageCurrencies/Web/ViewHelpers/CurrencyIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageCurrencies\Web\ViewHelpers;
+namespace App\Domains\Settings\ManageCurrencies\Web\ViewHelpers;
 
 use App\Models\Account;
 use Illuminate\Support\Collection;
diff --git a/domains/Settings/ManageCurrencies/Web/ViewHelpers/PersonalizeCurrencyIndexViewHelper.php b/app/Domains/Settings/ManageCurrencies/Web/ViewHelpers/PersonalizeCurrencyIndexViewHelper.php
similarity index 95%
rename from domains/Settings/ManageCurrencies/Web/ViewHelpers/PersonalizeCurrencyIndexViewHelper.php
rename to app/Domains/Settings/ManageCurrencies/Web/ViewHelpers/PersonalizeCurrencyIndexViewHelper.php
index a9259d6bd..c01f04776 100644
--- a/domains/Settings/ManageCurrencies/Web/ViewHelpers/PersonalizeCurrencyIndexViewHelper.php
+++ b/app/Domains/Settings/ManageCurrencies/Web/ViewHelpers/PersonalizeCurrencyIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageCurrencies\Web\ViewHelpers;
+namespace App\Domains\Settings\ManageCurrencies\Web\ViewHelpers;
 
 use App\Models\Account;
 use App\Models\Currency;
diff --git a/domains/Settings/ManageGenders/Services/CreateGender.php b/app/Domains/Settings/ManageGenders/Services/CreateGender.php
similarity index 95%
rename from domains/Settings/ManageGenders/Services/CreateGender.php
rename to app/Domains/Settings/ManageGenders/Services/CreateGender.php
index 6f94fab50..cefcaabda 100644
--- a/domains/Settings/ManageGenders/Services/CreateGender.php
+++ b/app/Domains/Settings/ManageGenders/Services/CreateGender.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageGenders\Services;
+namespace App\Domains\Settings\ManageGenders\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Gender;
diff --git a/domains/Settings/ManageGenders/Services/DestroyGender.php b/app/Domains/Settings/ManageGenders/Services/DestroyGender.php
similarity index 95%
rename from domains/Settings/ManageGenders/Services/DestroyGender.php
rename to app/Domains/Settings/ManageGenders/Services/DestroyGender.php
index 64a6bf085..2b2d8a000 100644
--- a/domains/Settings/ManageGenders/Services/DestroyGender.php
+++ b/app/Domains/Settings/ManageGenders/Services/DestroyGender.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageGenders\Services;
+namespace App\Domains\Settings\ManageGenders\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Gender;
diff --git a/domains/Settings/ManageGenders/Services/UpdateGender.php b/app/Domains/Settings/ManageGenders/Services/UpdateGender.php
similarity index 95%
rename from domains/Settings/ManageGenders/Services/UpdateGender.php
rename to app/Domains/Settings/ManageGenders/Services/UpdateGender.php
index c89a85400..41bc4e7bd 100644
--- a/domains/Settings/ManageGenders/Services/UpdateGender.php
+++ b/app/Domains/Settings/ManageGenders/Services/UpdateGender.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageGenders\Services;
+namespace App\Domains\Settings\ManageGenders\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Gender;
diff --git a/domains/Settings/ManageGenders/Web/Controllers/ManageGenderController.php b/app/Domains/Settings/ManageGenders/Web/Controllers/ManageGenderController.php
similarity index 80%
rename from domains/Settings/ManageGenders/Web/Controllers/ManageGenderController.php
rename to app/Domains/Settings/ManageGenders/Web/Controllers/ManageGenderController.php
index dcec973a9..c3772a957 100644
--- a/domains/Settings/ManageGenders/Web/Controllers/ManageGenderController.php
+++ b/app/Domains/Settings/ManageGenders/Web/Controllers/ManageGenderController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Settings\ManageGenders\Web\Controllers;
+namespace App\Domains\Settings\ManageGenders\Web\Controllers;
 
+use App\Domains\Settings\ManageGenders\Services\CreateGender;
+use App\Domains\Settings\ManageGenders\Services\DestroyGender;
+use App\Domains\Settings\ManageGenders\Services\UpdateGender;
+use App\Domains\Settings\ManageGenders\Web\ViewHelpers\ManageGenderIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageGenders\Services\CreateGender;
-use App\Settings\ManageGenders\Services\DestroyGender;
-use App\Settings\ManageGenders\Services\UpdateGender;
-use App\Settings\ManageGenders\Web\ViewHelpers\ManageGenderIndexViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Settings/ManageGenders/Web/ViewHelpers/ManageGenderIndexViewHelper.php b/app/Domains/Settings/ManageGenders/Web/ViewHelpers/ManageGenderIndexViewHelper.php
similarity index 95%
rename from domains/Settings/ManageGenders/Web/ViewHelpers/ManageGenderIndexViewHelper.php
rename to app/Domains/Settings/ManageGenders/Web/ViewHelpers/ManageGenderIndexViewHelper.php
index 9ea41bdc8..d09f9d3a9 100644
--- a/domains/Settings/ManageGenders/Web/ViewHelpers/ManageGenderIndexViewHelper.php
+++ b/app/Domains/Settings/ManageGenders/Web/ViewHelpers/ManageGenderIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageGenders\Web\ViewHelpers;
+namespace App\Domains\Settings\ManageGenders\Web\ViewHelpers;
 
 use App\Models\Account;
 use App\Models\Gender;
diff --git a/domains/Settings/ManageGiftOccasions/Services/CreateGiftOccasion.php b/app/Domains/Settings/ManageGiftOccasions/Services/CreateGiftOccasion.php
similarity index 96%
rename from domains/Settings/ManageGiftOccasions/Services/CreateGiftOccasion.php
rename to app/Domains/Settings/ManageGiftOccasions/Services/CreateGiftOccasion.php
index ce03b4fbb..8b2176015 100644
--- a/domains/Settings/ManageGiftOccasions/Services/CreateGiftOccasion.php
+++ b/app/Domains/Settings/ManageGiftOccasions/Services/CreateGiftOccasion.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageGiftOccasions\Services;
+namespace App\Domains\Settings\ManageGiftOccasions\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\GiftOccasion;
diff --git a/domains/Settings/ManageGiftOccasions/Services/DestroyGiftOccasion.php b/app/Domains/Settings/ManageGiftOccasions/Services/DestroyGiftOccasion.php
similarity index 96%
rename from domains/Settings/ManageGiftOccasions/Services/DestroyGiftOccasion.php
rename to app/Domains/Settings/ManageGiftOccasions/Services/DestroyGiftOccasion.php
index 4b58a8c70..734c784f2 100644
--- a/domains/Settings/ManageGiftOccasions/Services/DestroyGiftOccasion.php
+++ b/app/Domains/Settings/ManageGiftOccasions/Services/DestroyGiftOccasion.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageGiftOccasions\Services;
+namespace App\Domains\Settings\ManageGiftOccasions\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\GiftOccasion;
diff --git a/domains/Settings/ManageGiftOccasions/Services/UpdateGiftOccasion.php b/app/Domains/Settings/ManageGiftOccasions/Services/UpdateGiftOccasion.php
similarity index 96%
rename from domains/Settings/ManageGiftOccasions/Services/UpdateGiftOccasion.php
rename to app/Domains/Settings/ManageGiftOccasions/Services/UpdateGiftOccasion.php
index ebd1a76c2..d43b457bd 100644
--- a/domains/Settings/ManageGiftOccasions/Services/UpdateGiftOccasion.php
+++ b/app/Domains/Settings/ManageGiftOccasions/Services/UpdateGiftOccasion.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageGiftOccasions\Services;
+namespace App\Domains\Settings\ManageGiftOccasions\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\GiftOccasion;
diff --git a/domains/Settings/ManageGiftOccasions/Services/UpdateGiftOccasionPosition.php b/app/Domains/Settings/ManageGiftOccasions/Services/UpdateGiftOccasionPosition.php
similarity index 97%
rename from domains/Settings/ManageGiftOccasions/Services/UpdateGiftOccasionPosition.php
rename to app/Domains/Settings/ManageGiftOccasions/Services/UpdateGiftOccasionPosition.php
index d47dfd680..83543f6d4 100644
--- a/domains/Settings/ManageGiftOccasions/Services/UpdateGiftOccasionPosition.php
+++ b/app/Domains/Settings/ManageGiftOccasions/Services/UpdateGiftOccasionPosition.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageGiftOccasions\Services;
+namespace App\Domains\Settings\ManageGiftOccasions\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\GiftOccasion;
diff --git a/domains/Settings/ManageGiftOccasions/Web/Controllers/PersonalizeGiftOccasionController.php b/app/Domains/Settings/ManageGiftOccasions/Web/Controllers/PersonalizeGiftOccasionController.php
similarity index 79%
rename from domains/Settings/ManageGiftOccasions/Web/Controllers/PersonalizeGiftOccasionController.php
rename to app/Domains/Settings/ManageGiftOccasions/Web/Controllers/PersonalizeGiftOccasionController.php
index dea332af5..2f1429b31 100644
--- a/domains/Settings/ManageGiftOccasions/Web/Controllers/PersonalizeGiftOccasionController.php
+++ b/app/Domains/Settings/ManageGiftOccasions/Web/Controllers/PersonalizeGiftOccasionController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Settings\ManageGiftOccasions\Web\Controllers;
+namespace App\Domains\Settings\ManageGiftOccasions\Web\Controllers;
 
+use App\Domains\Settings\ManageGiftOccasions\Services\CreateGiftOccasion;
+use App\Domains\Settings\ManageGiftOccasions\Services\DestroyGiftOccasion;
+use App\Domains\Settings\ManageGiftOccasions\Services\UpdateGiftOccasion;
+use App\Domains\Settings\ManageGiftOccasions\Web\ViewHelpers\PersonalizeGiftOccasionViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageGiftOccasions\Services\CreateGiftOccasion;
-use App\Settings\ManageGiftOccasions\Services\DestroyGiftOccasion;
-use App\Settings\ManageGiftOccasions\Services\UpdateGiftOccasion;
-use App\Settings\ManageGiftOccasions\Web\ViewHelpers\PersonalizeGiftOccasionViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Settings/ManageGiftOccasions/Web/Controllers/PersonalizeGiftOccasionsPositionController.php b/app/Domains/Settings/ManageGiftOccasions/Web/Controllers/PersonalizeGiftOccasionsPositionController.php
similarity index 74%
rename from domains/Settings/ManageGiftOccasions/Web/Controllers/PersonalizeGiftOccasionsPositionController.php
rename to app/Domains/Settings/ManageGiftOccasions/Web/Controllers/PersonalizeGiftOccasionsPositionController.php
index fd95cc72b..27f74dd32 100644
--- a/domains/Settings/ManageGiftOccasions/Web/Controllers/PersonalizeGiftOccasionsPositionController.php
+++ b/app/Domains/Settings/ManageGiftOccasions/Web/Controllers/PersonalizeGiftOccasionsPositionController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Settings\ManageGiftOccasions\Web\Controllers;
+namespace App\Domains\Settings\ManageGiftOccasions\Web\Controllers;
 
+use App\Domains\Settings\ManageGiftOccasions\Services\UpdateGiftOccasionPosition;
+use App\Domains\Settings\ManageGiftOccasions\Web\ViewHelpers\PersonalizeGiftOccasionViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageGiftOccasions\Services\UpdateGiftOccasionPosition;
-use App\Settings\ManageGiftOccasions\Web\ViewHelpers\PersonalizeGiftOccasionViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageGiftOccasions/Web/ViewHelpers/PersonalizeGiftOccasionViewHelper.php b/app/Domains/Settings/ManageGiftOccasions/Web/ViewHelpers/PersonalizeGiftOccasionViewHelper.php
similarity index 95%
rename from domains/Settings/ManageGiftOccasions/Web/ViewHelpers/PersonalizeGiftOccasionViewHelper.php
rename to app/Domains/Settings/ManageGiftOccasions/Web/ViewHelpers/PersonalizeGiftOccasionViewHelper.php
index fa615bad6..0dfa171e1 100644
--- a/domains/Settings/ManageGiftOccasions/Web/ViewHelpers/PersonalizeGiftOccasionViewHelper.php
+++ b/app/Domains/Settings/ManageGiftOccasions/Web/ViewHelpers/PersonalizeGiftOccasionViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageGiftOccasions\Web\ViewHelpers;
+namespace App\Domains\Settings\ManageGiftOccasions\Web\ViewHelpers;
 
 use App\Models\Account;
 use App\Models\GiftOccasion;
diff --git a/domains/Settings/ManageGiftStates/Services/CreateGiftState.php b/app/Domains/Settings/ManageGiftStates/Services/CreateGiftState.php
similarity index 96%
rename from domains/Settings/ManageGiftStates/Services/CreateGiftState.php
rename to app/Domains/Settings/ManageGiftStates/Services/CreateGiftState.php
index 35200f51e..983204f8e 100644
--- a/domains/Settings/ManageGiftStates/Services/CreateGiftState.php
+++ b/app/Domains/Settings/ManageGiftStates/Services/CreateGiftState.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageGiftStates\Services;
+namespace App\Domains\Settings\ManageGiftStates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\GiftState;
diff --git a/domains/Settings/ManageGiftStates/Services/DestroyGiftState.php b/app/Domains/Settings/ManageGiftStates/Services/DestroyGiftState.php
similarity index 96%
rename from domains/Settings/ManageGiftStates/Services/DestroyGiftState.php
rename to app/Domains/Settings/ManageGiftStates/Services/DestroyGiftState.php
index 4a973680f..a5af44d2a 100644
--- a/domains/Settings/ManageGiftStates/Services/DestroyGiftState.php
+++ b/app/Domains/Settings/ManageGiftStates/Services/DestroyGiftState.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageGiftStates\Services;
+namespace App\Domains\Settings\ManageGiftStates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\GiftState;
diff --git a/domains/Settings/ManageGiftStates/Services/UpdateGiftState.php b/app/Domains/Settings/ManageGiftStates/Services/UpdateGiftState.php
similarity index 96%
rename from domains/Settings/ManageGiftStates/Services/UpdateGiftState.php
rename to app/Domains/Settings/ManageGiftStates/Services/UpdateGiftState.php
index 80f99218e..78b10946b 100644
--- a/domains/Settings/ManageGiftStates/Services/UpdateGiftState.php
+++ b/app/Domains/Settings/ManageGiftStates/Services/UpdateGiftState.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageGiftStates\Services;
+namespace App\Domains\Settings\ManageGiftStates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\GiftState;
diff --git a/domains/Settings/ManageGiftStates/Services/UpdateGiftStatePosition.php b/app/Domains/Settings/ManageGiftStates/Services/UpdateGiftStatePosition.php
similarity index 97%
rename from domains/Settings/ManageGiftStates/Services/UpdateGiftStatePosition.php
rename to app/Domains/Settings/ManageGiftStates/Services/UpdateGiftStatePosition.php
index 2496c420d..96375b406 100644
--- a/domains/Settings/ManageGiftStates/Services/UpdateGiftStatePosition.php
+++ b/app/Domains/Settings/ManageGiftStates/Services/UpdateGiftStatePosition.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageGiftStates\Services;
+namespace App\Domains\Settings\ManageGiftStates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\GiftState;
diff --git a/domains/Settings/ManageGiftStates/Web/Controllers/PersonalizeGiftStateController.php b/app/Domains/Settings/ManageGiftStates/Web/Controllers/PersonalizeGiftStateController.php
similarity index 74%
rename from domains/Settings/ManageGiftStates/Web/Controllers/PersonalizeGiftStateController.php
rename to app/Domains/Settings/ManageGiftStates/Web/Controllers/PersonalizeGiftStateController.php
index 226c56810..53b32ec1f 100644
--- a/domains/Settings/ManageGiftStates/Web/Controllers/PersonalizeGiftStateController.php
+++ b/app/Domains/Settings/ManageGiftStates/Web/Controllers/PersonalizeGiftStateController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Settings\ManageGiftStates\Web\Controllers;
+namespace App\Domains\Settings\ManageGiftStates\Web\Controllers;
 
+use App\Domains\Settings\ManageGiftStates\Services\CreateGiftState;
+use App\Domains\Settings\ManageGiftStates\Services\DestroyGiftState;
+use App\Domains\Settings\ManageGiftStates\Services\UpdateGiftState;
+use App\Domains\Settings\ManageGiftStates\Web\ViewHelpers\PersonalizeGiftStateViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageGiftStates\Services\CreateGiftState;
-use App\Settings\ManageGiftStates\Services\DestroyGiftState;
-use App\Settings\ManageGiftStates\Services\UpdateGiftState;
-use App\Settings\ManageGiftStates\Web\ViewHelpers\PersonalizeGiftStateViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
@@ -46,10 +46,10 @@ class PersonalizeGiftStateController extends Controller
             'label' => $request->input('label'),
         ];
 
-        $giftState = (new UpdateGiftState())->execute($data);
+        $newGiftState = (new UpdateGiftState())->execute($data);
 
         return response()->json([
-            'data' => PersonalizeGiftStateViewHelper::dto($giftState),
+            'data' => PersonalizeGiftStateViewHelper::dto($newGiftState),
         ], 200);
     }
 
diff --git a/domains/Settings/ManageGiftStates/Web/Controllers/PersonalizeGiftStatesPositionController.php b/app/Domains/Settings/ManageGiftStates/Web/Controllers/PersonalizeGiftStatesPositionController.php
similarity index 74%
rename from domains/Settings/ManageGiftStates/Web/Controllers/PersonalizeGiftStatesPositionController.php
rename to app/Domains/Settings/ManageGiftStates/Web/Controllers/PersonalizeGiftStatesPositionController.php
index dc0108875..431b8a485 100644
--- a/domains/Settings/ManageGiftStates/Web/Controllers/PersonalizeGiftStatesPositionController.php
+++ b/app/Domains/Settings/ManageGiftStates/Web/Controllers/PersonalizeGiftStatesPositionController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Settings\ManageGiftStates\Web\Controllers;
+namespace App\Domains\Settings\ManageGiftStates\Web\Controllers;
 
+use App\Domains\Settings\ManageGiftStates\Services\UpdateGiftStatePosition;
+use App\Domains\Settings\ManageGiftStates\Web\ViewHelpers\PersonalizeGiftStateViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageGiftStates\Services\UpdateGiftStatePosition;
-use App\Settings\ManageGiftStates\Web\ViewHelpers\PersonalizeGiftStateViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageGiftStates/Web/ViewHelpers/PersonalizeGiftStateViewHelper.php b/app/Domains/Settings/ManageGiftStates/Web/ViewHelpers/PersonalizeGiftStateViewHelper.php
similarity index 95%
rename from domains/Settings/ManageGiftStates/Web/ViewHelpers/PersonalizeGiftStateViewHelper.php
rename to app/Domains/Settings/ManageGiftStates/Web/ViewHelpers/PersonalizeGiftStateViewHelper.php
index b9c9c3585..382f7dc02 100644
--- a/domains/Settings/ManageGiftStates/Web/ViewHelpers/PersonalizeGiftStateViewHelper.php
+++ b/app/Domains/Settings/ManageGiftStates/Web/ViewHelpers/PersonalizeGiftStateViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageGiftStates\Web\ViewHelpers;
+namespace App\Domains\Settings\ManageGiftStates\Web\ViewHelpers;
 
 use App\Models\Account;
 use App\Models\GiftState;
diff --git a/domains/Settings/ManageGroupTypes/Services/CreateGroupType.php b/app/Domains/Settings/ManageGroupTypes/Services/CreateGroupType.php
similarity index 96%
rename from domains/Settings/ManageGroupTypes/Services/CreateGroupType.php
rename to app/Domains/Settings/ManageGroupTypes/Services/CreateGroupType.php
index 7acd79da9..eb898f296 100644
--- a/domains/Settings/ManageGroupTypes/Services/CreateGroupType.php
+++ b/app/Domains/Settings/ManageGroupTypes/Services/CreateGroupType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageGroupTypes\Services;
+namespace App\Domains\Settings\ManageGroupTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\GroupType;
diff --git a/domains/Settings/ManageGroupTypes/Services/CreateGroupTypeRole.php b/app/Domains/Settings/ManageGroupTypes/Services/CreateGroupTypeRole.php
similarity index 96%
rename from domains/Settings/ManageGroupTypes/Services/CreateGroupTypeRole.php
rename to app/Domains/Settings/ManageGroupTypes/Services/CreateGroupTypeRole.php
index ccc78cf24..b8e5401b6 100644
--- a/domains/Settings/ManageGroupTypes/Services/CreateGroupTypeRole.php
+++ b/app/Domains/Settings/ManageGroupTypes/Services/CreateGroupTypeRole.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageGroupTypes\Services;
+namespace App\Domains\Settings\ManageGroupTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\GroupTypeRole;
diff --git a/domains/Settings/ManageGroupTypes/Services/DestroyGroupType.php b/app/Domains/Settings/ManageGroupTypes/Services/DestroyGroupType.php
similarity index 96%
rename from domains/Settings/ManageGroupTypes/Services/DestroyGroupType.php
rename to app/Domains/Settings/ManageGroupTypes/Services/DestroyGroupType.php
index 37581c983..0de76d2c1 100644
--- a/domains/Settings/ManageGroupTypes/Services/DestroyGroupType.php
+++ b/app/Domains/Settings/ManageGroupTypes/Services/DestroyGroupType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageGroupTypes\Services;
+namespace App\Domains\Settings\ManageGroupTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\GroupType;
diff --git a/domains/Settings/ManageGroupTypes/Services/DestroyGroupTypeRole.php b/app/Domains/Settings/ManageGroupTypes/Services/DestroyGroupTypeRole.php
similarity index 96%
rename from domains/Settings/ManageGroupTypes/Services/DestroyGroupTypeRole.php
rename to app/Domains/Settings/ManageGroupTypes/Services/DestroyGroupTypeRole.php
index b14425151..fa2d08368 100644
--- a/domains/Settings/ManageGroupTypes/Services/DestroyGroupTypeRole.php
+++ b/app/Domains/Settings/ManageGroupTypes/Services/DestroyGroupTypeRole.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageGroupTypes\Services;
+namespace App\Domains\Settings\ManageGroupTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\GroupType;
diff --git a/domains/Settings/ManageGroupTypes/Services/UpdateGroupType.php b/app/Domains/Settings/ManageGroupTypes/Services/UpdateGroupType.php
similarity index 96%
rename from domains/Settings/ManageGroupTypes/Services/UpdateGroupType.php
rename to app/Domains/Settings/ManageGroupTypes/Services/UpdateGroupType.php
index dfeaa671e..649f40c74 100644
--- a/domains/Settings/ManageGroupTypes/Services/UpdateGroupType.php
+++ b/app/Domains/Settings/ManageGroupTypes/Services/UpdateGroupType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageGroupTypes\Services;
+namespace App\Domains\Settings\ManageGroupTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\GroupType;
diff --git a/domains/Settings/ManageGroupTypes/Services/UpdateGroupTypePosition.php b/app/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypePosition.php
similarity index 97%
rename from domains/Settings/ManageGroupTypes/Services/UpdateGroupTypePosition.php
rename to app/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypePosition.php
index 5cae4e0be..5b0b25fdf 100644
--- a/domains/Settings/ManageGroupTypes/Services/UpdateGroupTypePosition.php
+++ b/app/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypePosition.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageGroupTypes\Services;
+namespace App\Domains\Settings\ManageGroupTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\GroupType;
diff --git a/domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeRole.php b/app/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeRole.php
similarity index 97%
rename from domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeRole.php
rename to app/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeRole.php
index 58ed44714..19e9f0f08 100644
--- a/domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeRole.php
+++ b/app/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeRole.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageGroupTypes\Services;
+namespace App\Domains\Settings\ManageGroupTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\GroupType;
diff --git a/domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeRolePosition.php b/app/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeRolePosition.php
similarity index 98%
rename from domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeRolePosition.php
rename to app/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeRolePosition.php
index bffde3810..abc644f6f 100644
--- a/domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeRolePosition.php
+++ b/app/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeRolePosition.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageGroupTypes\Services;
+namespace App\Domains\Settings\ManageGroupTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\GroupType;
diff --git a/domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypeController.php b/app/Domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypeController.php
similarity index 80%
rename from domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypeController.php
rename to app/Domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypeController.php
index c0c83de4b..0a7a8df21 100644
--- a/domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypeController.php
+++ b/app/Domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypeController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Settings\ManageGroupTypes\Web\Controllers;
+namespace App\Domains\Settings\ManageGroupTypes\Web\Controllers;
 
+use App\Domains\Settings\ManageGroupTypes\Services\CreateGroupType;
+use App\Domains\Settings\ManageGroupTypes\Services\DestroyGroupType;
+use App\Domains\Settings\ManageGroupTypes\Services\UpdateGroupType;
+use App\Domains\Settings\ManageGroupTypes\Web\ViewHelpers\PersonalizeGroupTypeViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageGroupTypes\Services\CreateGroupType;
-use App\Settings\ManageGroupTypes\Services\DestroyGroupType;
-use App\Settings\ManageGroupTypes\Services\UpdateGroupType;
-use App\Settings\ManageGroupTypes\Web\ViewHelpers\PersonalizeGroupTypeViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypePositionController.php b/app/Domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypePositionController.php
similarity index 74%
rename from domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypePositionController.php
rename to app/Domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypePositionController.php
index 5b28ee710..69fc485a4 100644
--- a/domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypePositionController.php
+++ b/app/Domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypePositionController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Settings\ManageGroupTypes\Web\Controllers;
+namespace App\Domains\Settings\ManageGroupTypes\Web\Controllers;
 
+use App\Domains\Settings\ManageGroupTypes\Services\UpdateGroupTypePosition;
+use App\Domains\Settings\ManageGroupTypes\Web\ViewHelpers\PersonalizeGroupTypeViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageGroupTypes\Services\UpdateGroupTypePosition;
-use App\Settings\ManageGroupTypes\Web\ViewHelpers\PersonalizeGroupTypeViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypeRoleController.php b/app/Domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypeRoleController.php
similarity index 82%
rename from domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypeRoleController.php
rename to app/Domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypeRoleController.php
index a4748bc75..a54c0b508 100644
--- a/domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypeRoleController.php
+++ b/app/Domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypeRoleController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Settings\ManageGroupTypes\Web\Controllers;
+namespace App\Domains\Settings\ManageGroupTypes\Web\Controllers;
 
+use App\Domains\Settings\ManageGroupTypes\Services\CreateGroupTypeRole;
+use App\Domains\Settings\ManageGroupTypes\Services\DestroyGroupTypeRole;
+use App\Domains\Settings\ManageGroupTypes\Services\UpdateGroupTypeRole;
+use App\Domains\Settings\ManageGroupTypes\Web\ViewHelpers\PersonalizeGroupTypeViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageGroupTypes\Services\CreateGroupTypeRole;
-use App\Settings\ManageGroupTypes\Services\DestroyGroupTypeRole;
-use App\Settings\ManageGroupTypes\Services\UpdateGroupTypeRole;
-use App\Settings\ManageGroupTypes\Web\ViewHelpers\PersonalizeGroupTypeViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypeRolePositionController.php b/app/Domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypeRolePositionController.php
similarity index 76%
rename from domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypeRolePositionController.php
rename to app/Domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypeRolePositionController.php
index 5b305544d..ae2891dfc 100644
--- a/domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypeRolePositionController.php
+++ b/app/Domains/Settings/ManageGroupTypes/Web/Controllers/PersonalizeGroupTypeRolePositionController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Settings\ManageGroupTypes\Web\Controllers;
+namespace App\Domains\Settings\ManageGroupTypes\Web\Controllers;
 
+use App\Domains\Settings\ManageGroupTypes\Services\UpdateGroupTypeRolePosition;
+use App\Domains\Settings\ManageGroupTypes\Web\ViewHelpers\PersonalizeGroupTypeViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageGroupTypes\Services\UpdateGroupTypeRolePosition;
-use App\Settings\ManageGroupTypes\Web\ViewHelpers\PersonalizeGroupTypeViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageGroupTypes/Web/ViewHelpers/PersonalizeGroupTypeViewHelper.php b/app/Domains/Settings/ManageGroupTypes/Web/ViewHelpers/PersonalizeGroupTypeViewHelper.php
similarity index 97%
rename from domains/Settings/ManageGroupTypes/Web/ViewHelpers/PersonalizeGroupTypeViewHelper.php
rename to app/Domains/Settings/ManageGroupTypes/Web/ViewHelpers/PersonalizeGroupTypeViewHelper.php
index 10475b9ec..f4abba051 100644
--- a/domains/Settings/ManageGroupTypes/Web/ViewHelpers/PersonalizeGroupTypeViewHelper.php
+++ b/app/Domains/Settings/ManageGroupTypes/Web/ViewHelpers/PersonalizeGroupTypeViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageGroupTypes\Web\ViewHelpers;
+namespace App\Domains\Settings\ManageGroupTypes\Web\ViewHelpers;
 
 use App\Models\Account;
 use App\Models\GroupType;
diff --git a/domains/Settings/ManageLifeEventCategories/Services/CreateLifeEventCategory.php b/app/Domains/Settings/ManageLifeEventCategories/Services/CreateLifeEventCategory.php
similarity index 95%
rename from domains/Settings/ManageLifeEventCategories/Services/CreateLifeEventCategory.php
rename to app/Domains/Settings/ManageLifeEventCategories/Services/CreateLifeEventCategory.php
index f31154b06..e7deefda2 100644
--- a/domains/Settings/ManageLifeEventCategories/Services/CreateLifeEventCategory.php
+++ b/app/Domains/Settings/ManageLifeEventCategories/Services/CreateLifeEventCategory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageLifeEventCategories\Services;
+namespace App\Domains\Settings\ManageLifeEventCategories\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\LifeEventCategory;
diff --git a/domains/Settings/ManageLifeEventCategories/Services/CreateLifeEventType.php b/app/Domains/Settings/ManageLifeEventCategories/Services/CreateLifeEventType.php
similarity index 96%
rename from domains/Settings/ManageLifeEventCategories/Services/CreateLifeEventType.php
rename to app/Domains/Settings/ManageLifeEventCategories/Services/CreateLifeEventType.php
index 654609537..902a62f90 100644
--- a/domains/Settings/ManageLifeEventCategories/Services/CreateLifeEventType.php
+++ b/app/Domains/Settings/ManageLifeEventCategories/Services/CreateLifeEventType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageLifeEventCategories\Services;
+namespace App\Domains\Settings\ManageLifeEventCategories\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\LifeEventCategory;
diff --git a/domains/Settings/ManageLifeEventCategories/Services/DestroyLifeEventCategory.php b/app/Domains/Settings/ManageLifeEventCategories/Services/DestroyLifeEventCategory.php
similarity index 95%
rename from domains/Settings/ManageLifeEventCategories/Services/DestroyLifeEventCategory.php
rename to app/Domains/Settings/ManageLifeEventCategories/Services/DestroyLifeEventCategory.php
index 0b07b6215..9c50ce4d3 100644
--- a/domains/Settings/ManageLifeEventCategories/Services/DestroyLifeEventCategory.php
+++ b/app/Domains/Settings/ManageLifeEventCategories/Services/DestroyLifeEventCategory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageLifeEventCategories\Services;
+namespace App\Domains\Settings\ManageLifeEventCategories\Services;
 
 use App\Exceptions\CantBeDeletedException;
 use App\Interfaces\ServiceInterface;
diff --git a/domains/Settings/ManageLifeEventCategories/Services/DestroyLifeEventType.php b/app/Domains/Settings/ManageLifeEventCategories/Services/DestroyLifeEventType.php
similarity index 96%
rename from domains/Settings/ManageLifeEventCategories/Services/DestroyLifeEventType.php
rename to app/Domains/Settings/ManageLifeEventCategories/Services/DestroyLifeEventType.php
index 8e53f12d4..7f328be0d 100644
--- a/domains/Settings/ManageLifeEventCategories/Services/DestroyLifeEventType.php
+++ b/app/Domains/Settings/ManageLifeEventCategories/Services/DestroyLifeEventType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageLifeEventCategories\Services;
+namespace App\Domains\Settings\ManageLifeEventCategories\Services;
 
 use App\Exceptions\CantBeDeletedException;
 use App\Interfaces\ServiceInterface;
diff --git a/domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventCategory.php b/app/Domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventCategory.php
similarity index 96%
rename from domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventCategory.php
rename to app/Domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventCategory.php
index f63f8bd7d..6e5d4555d 100644
--- a/domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventCategory.php
+++ b/app/Domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventCategory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageLifeEventCategories\Services;
+namespace App\Domains\Settings\ManageLifeEventCategories\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\LifeEventCategory;
diff --git a/domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventType.php b/app/Domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventType.php
similarity index 96%
rename from domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventType.php
rename to app/Domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventType.php
index ce28820d4..a172a0b6c 100644
--- a/domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventType.php
+++ b/app/Domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageLifeEventCategories\Services;
+namespace App\Domains\Settings\ManageLifeEventCategories\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\LifeEventCategory;
diff --git a/domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventTypePosition.php b/app/Domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventTypePosition.php
similarity index 98%
rename from domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventTypePosition.php
rename to app/Domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventTypePosition.php
index 2a09a6d0c..478c6d4e8 100644
--- a/domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventTypePosition.php
+++ b/app/Domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventTypePosition.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageLifeEventCategories\Services;
+namespace App\Domains\Settings\ManageLifeEventCategories\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\LifeEventCategory;
diff --git a/domains/Settings/ManageLifeEventCategories/Web/Controllers/PersonalizeLifeEventCategoriesController.php b/app/Domains/Settings/ManageLifeEventCategories/Web/Controllers/PersonalizeLifeEventCategoriesController.php
similarity index 80%
rename from domains/Settings/ManageLifeEventCategories/Web/Controllers/PersonalizeLifeEventCategoriesController.php
rename to app/Domains/Settings/ManageLifeEventCategories/Web/Controllers/PersonalizeLifeEventCategoriesController.php
index 54301c095..a4389d0f7 100644
--- a/domains/Settings/ManageLifeEventCategories/Web/Controllers/PersonalizeLifeEventCategoriesController.php
+++ b/app/Domains/Settings/ManageLifeEventCategories/Web/Controllers/PersonalizeLifeEventCategoriesController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Settings\ManageLifeEventCategories\Web\Controllers;
+namespace App\Domains\Settings\ManageLifeEventCategories\Web\Controllers;
 
+use App\Domains\Settings\ManageLifeEventCategories\Services\CreateLifeEventCategory;
+use App\Domains\Settings\ManageLifeEventCategories\Services\DestroyLifeEventCategory;
+use App\Domains\Settings\ManageLifeEventCategories\Services\UpdateLifeEventCategory;
+use App\Domains\Settings\ManageLifeEventCategories\Web\ViewHelpers\PersonalizeLifeEventCategoriesViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageLifeEventCategories\Services\CreateLifeEventCategory;
-use App\Settings\ManageLifeEventCategories\Services\DestroyLifeEventCategory;
-use App\Settings\ManageLifeEventCategories\Services\UpdateLifeEventCategory;
-use App\Settings\ManageLifeEventCategories\Web\ViewHelpers\PersonalizeLifeEventCategoriesViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Settings/ManageLifeEventCategories/Web/Controllers/PersonalizeLifeEventTypesController.php b/app/Domains/Settings/ManageLifeEventCategories/Web/Controllers/PersonalizeLifeEventTypesController.php
similarity index 82%
rename from domains/Settings/ManageLifeEventCategories/Web/Controllers/PersonalizeLifeEventTypesController.php
rename to app/Domains/Settings/ManageLifeEventCategories/Web/Controllers/PersonalizeLifeEventTypesController.php
index 33bea4dbc..22e5675a2 100644
--- a/domains/Settings/ManageLifeEventCategories/Web/Controllers/PersonalizeLifeEventTypesController.php
+++ b/app/Domains/Settings/ManageLifeEventCategories/Web/Controllers/PersonalizeLifeEventTypesController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Settings\ManageLifeEventCategories\Web\Controllers;
+namespace App\Domains\Settings\ManageLifeEventCategories\Web\Controllers;
 
+use App\Domains\Settings\ManageLifeEventCategories\Services\CreateLifeEventType;
+use App\Domains\Settings\ManageLifeEventCategories\Services\DestroyLifeEventType;
+use App\Domains\Settings\ManageLifeEventCategories\Services\UpdateLifeEventType;
+use App\Domains\Settings\ManageLifeEventCategories\Web\ViewHelpers\PersonalizeLifeEventCategoriesViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageLifeEventCategories\Services\CreateLifeEventType;
-use App\Settings\ManageLifeEventCategories\Services\DestroyLifeEventType;
-use App\Settings\ManageLifeEventCategories\Services\UpdateLifeEventType;
-use App\Settings\ManageLifeEventCategories\Web\ViewHelpers\PersonalizeLifeEventCategoriesViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageLifeEventCategories/Web/Controllers/PersonalizeLifeEventTypesPositionController.php b/app/Domains/Settings/ManageLifeEventCategories/Web/Controllers/PersonalizeLifeEventTypesPositionController.php
similarity index 75%
rename from domains/Settings/ManageLifeEventCategories/Web/Controllers/PersonalizeLifeEventTypesPositionController.php
rename to app/Domains/Settings/ManageLifeEventCategories/Web/Controllers/PersonalizeLifeEventTypesPositionController.php
index ab572a525..ea4047ed5 100644
--- a/domains/Settings/ManageLifeEventCategories/Web/Controllers/PersonalizeLifeEventTypesPositionController.php
+++ b/app/Domains/Settings/ManageLifeEventCategories/Web/Controllers/PersonalizeLifeEventTypesPositionController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Settings\ManageLifeEventCategories\Web\Controllers;
+namespace App\Domains\Settings\ManageLifeEventCategories\Web\Controllers;
 
+use App\Domains\Settings\ManageLifeEventCategories\Services\UpdateLifeEventTypePosition;
+use App\Domains\Settings\ManageLifeEventCategories\Web\ViewHelpers\PersonalizeLifeEventCategoriesViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageLifeEventCategories\Services\UpdateLifeEventTypePosition;
-use App\Settings\ManageLifeEventCategories\Web\ViewHelpers\PersonalizeLifeEventCategoriesViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageLifeEventCategories/Web/ViewHelpers/PersonalizeLifeEventCategoriesViewHelper.php b/app/Domains/Settings/ManageLifeEventCategories/Web/ViewHelpers/PersonalizeLifeEventCategoriesViewHelper.php
similarity index 97%
rename from domains/Settings/ManageLifeEventCategories/Web/ViewHelpers/PersonalizeLifeEventCategoriesViewHelper.php
rename to app/Domains/Settings/ManageLifeEventCategories/Web/ViewHelpers/PersonalizeLifeEventCategoriesViewHelper.php
index 8b691dc96..df84106fa 100644
--- a/domains/Settings/ManageLifeEventCategories/Web/ViewHelpers/PersonalizeLifeEventCategoriesViewHelper.php
+++ b/app/Domains/Settings/ManageLifeEventCategories/Web/ViewHelpers/PersonalizeLifeEventCategoriesViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageLifeEventCategories\Web\ViewHelpers;
+namespace App\Domains\Settings\ManageLifeEventCategories\Web\ViewHelpers;
 
 use App\Models\Account;
 use App\Models\LifeEventCategory;
diff --git a/domains/Settings/ManageModules/Web/Controllers/PersonalizeModulesController.php b/app/Domains/Settings/ManageModules/Web/Controllers/PersonalizeModulesController.php
similarity index 66%
rename from domains/Settings/ManageModules/Web/Controllers/PersonalizeModulesController.php
rename to app/Domains/Settings/ManageModules/Web/Controllers/PersonalizeModulesController.php
index 498831e5b..8757b3a0e 100644
--- a/domains/Settings/ManageModules/Web/Controllers/PersonalizeModulesController.php
+++ b/app/Domains/Settings/ManageModules/Web/Controllers/PersonalizeModulesController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Settings\ManageModules\Web\Controllers;
+namespace App\Domains\Settings\ManageModules\Web\Controllers;
 
+use App\Domains\Settings\ManageModules\Web\ViewHelpers\PersonalizeModuleIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageModules\Web\ViewHelpers\PersonalizeModuleIndexViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
 
diff --git a/domains/Settings/ManageModules/Web/ViewHelpers/PersonalizeModuleIndexViewHelper.php b/app/Domains/Settings/ManageModules/Web/ViewHelpers/PersonalizeModuleIndexViewHelper.php
similarity index 95%
rename from domains/Settings/ManageModules/Web/ViewHelpers/PersonalizeModuleIndexViewHelper.php
rename to app/Domains/Settings/ManageModules/Web/ViewHelpers/PersonalizeModuleIndexViewHelper.php
index bea47d258..9cfd75aa1 100644
--- a/domains/Settings/ManageModules/Web/ViewHelpers/PersonalizeModuleIndexViewHelper.php
+++ b/app/Domains/Settings/ManageModules/Web/ViewHelpers/PersonalizeModuleIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageModules\Web\ViewHelpers;
+namespace App\Domains\Settings\ManageModules\Web\ViewHelpers;
 
 use App\Models\Account;
 use App\Models\Module;
diff --git a/domains/Settings/ManageNotificationChannels/Jobs/SendVerificationEmailChannel.php b/app/Domains/Settings/ManageNotificationChannels/Jobs/SendVerificationEmailChannel.php
similarity index 95%
rename from domains/Settings/ManageNotificationChannels/Jobs/SendVerificationEmailChannel.php
rename to app/Domains/Settings/ManageNotificationChannels/Jobs/SendVerificationEmailChannel.php
index ac84cb844..5743b0dbc 100644
--- a/domains/Settings/ManageNotificationChannels/Jobs/SendVerificationEmailChannel.php
+++ b/app/Domains/Settings/ManageNotificationChannels/Jobs/SendVerificationEmailChannel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageNotificationChannels\Jobs;
+namespace App\Domains\Settings\ManageNotificationChannels\Jobs;
 
 use App\Mail\UserNotificationChannelEmailCreated;
 use App\Models\UserNotificationChannel;
diff --git a/domains/Settings/ManageNotificationChannels/Services/CreateUserNotificationChannel.php b/app/Domains/Settings/ManageNotificationChannels/Services/CreateUserNotificationChannel.php
similarity index 94%
rename from domains/Settings/ManageNotificationChannels/Services/CreateUserNotificationChannel.php
rename to app/Domains/Settings/ManageNotificationChannels/Services/CreateUserNotificationChannel.php
index 9251d0f1d..5da45cce8 100644
--- a/domains/Settings/ManageNotificationChannels/Services/CreateUserNotificationChannel.php
+++ b/app/Domains/Settings/ManageNotificationChannels/Services/CreateUserNotificationChannel.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Settings\ManageNotificationChannels\Services;
+namespace App\Domains\Settings\ManageNotificationChannels\Services;
 
+use App\Domains\Settings\ManageNotificationChannels\Jobs\SendVerificationEmailChannel;
 use App\Exceptions\EmailAlreadyExistException;
 use App\Interfaces\ServiceInterface;
 use App\Models\User;
 use App\Models\UserNotificationChannel;
 use App\Services\BaseService;
-use App\Settings\ManageNotificationChannels\Jobs\SendVerificationEmailChannel;
 use Illuminate\Support\Str;
 
 class CreateUserNotificationChannel extends BaseService implements ServiceInterface
diff --git a/domains/Settings/ManageNotificationChannels/Services/DestroyUserNotificationChannel.php b/app/Domains/Settings/ManageNotificationChannels/Services/DestroyUserNotificationChannel.php
similarity index 95%
rename from domains/Settings/ManageNotificationChannels/Services/DestroyUserNotificationChannel.php
rename to app/Domains/Settings/ManageNotificationChannels/Services/DestroyUserNotificationChannel.php
index e141e3f96..46fd3ed29 100644
--- a/domains/Settings/ManageNotificationChannels/Services/DestroyUserNotificationChannel.php
+++ b/app/Domains/Settings/ManageNotificationChannels/Services/DestroyUserNotificationChannel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageNotificationChannels\Services;
+namespace App\Domains\Settings\ManageNotificationChannels\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\User;
diff --git a/domains/Settings/ManageNotificationChannels/Services/ScheduleAllContactRemindersForNotificationChannel.php b/app/Domains/Settings/ManageNotificationChannels/Services/ScheduleAllContactRemindersForNotificationChannel.php
similarity index 98%
rename from domains/Settings/ManageNotificationChannels/Services/ScheduleAllContactRemindersForNotificationChannel.php
rename to app/Domains/Settings/ManageNotificationChannels/Services/ScheduleAllContactRemindersForNotificationChannel.php
index fa3435400..6486f3d21 100644
--- a/domains/Settings/ManageNotificationChannels/Services/ScheduleAllContactRemindersForNotificationChannel.php
+++ b/app/Domains/Settings/ManageNotificationChannels/Services/ScheduleAllContactRemindersForNotificationChannel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageNotificationChannels\Services;
+namespace App\Domains\Settings\ManageNotificationChannels\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Contact;
diff --git a/domains/Settings/ManageNotificationChannels/Services/SendTestEmail.php b/app/Domains/Settings/ManageNotificationChannels/Services/SendTestEmail.php
similarity index 97%
rename from domains/Settings/ManageNotificationChannels/Services/SendTestEmail.php
rename to app/Domains/Settings/ManageNotificationChannels/Services/SendTestEmail.php
index 047ff329e..0a9b582f6 100644
--- a/domains/Settings/ManageNotificationChannels/Services/SendTestEmail.php
+++ b/app/Domains/Settings/ManageNotificationChannels/Services/SendTestEmail.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageNotificationChannels\Services;
+namespace App\Domains\Settings\ManageNotificationChannels\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Mail\TestEmailSent;
diff --git a/domains/Settings/ManageNotificationChannels/Services/SendTestTelegramNotification.php b/app/Domains/Settings/ManageNotificationChannels/Services/SendTestTelegramNotification.php
similarity index 97%
rename from domains/Settings/ManageNotificationChannels/Services/SendTestTelegramNotification.php
rename to app/Domains/Settings/ManageNotificationChannels/Services/SendTestTelegramNotification.php
index 6dc016146..83277c848 100644
--- a/domains/Settings/ManageNotificationChannels/Services/SendTestTelegramNotification.php
+++ b/app/Domains/Settings/ManageNotificationChannels/Services/SendTestTelegramNotification.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageNotificationChannels\Services;
+namespace App\Domains\Settings\ManageNotificationChannels\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\UserNotificationChannel;
diff --git a/domains/Settings/ManageNotificationChannels/Services/ToggleUserNotificationChannel.php b/app/Domains/Settings/ManageNotificationChannels/Services/ToggleUserNotificationChannel.php
similarity index 97%
rename from domains/Settings/ManageNotificationChannels/Services/ToggleUserNotificationChannel.php
rename to app/Domains/Settings/ManageNotificationChannels/Services/ToggleUserNotificationChannel.php
index 71533bb63..1d348c2a4 100644
--- a/domains/Settings/ManageNotificationChannels/Services/ToggleUserNotificationChannel.php
+++ b/app/Domains/Settings/ManageNotificationChannels/Services/ToggleUserNotificationChannel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageNotificationChannels\Services;
+namespace App\Domains\Settings\ManageNotificationChannels\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\UserNotificationChannel;
diff --git a/domains/Settings/ManageNotificationChannels/Services/VerifyUserNotificationChannelEmailAddress.php b/app/Domains/Settings/ManageNotificationChannels/Services/VerifyUserNotificationChannelEmailAddress.php
similarity index 97%
rename from domains/Settings/ManageNotificationChannels/Services/VerifyUserNotificationChannelEmailAddress.php
rename to app/Domains/Settings/ManageNotificationChannels/Services/VerifyUserNotificationChannelEmailAddress.php
index f19e029dc..7f14373f2 100644
--- a/domains/Settings/ManageNotificationChannels/Services/VerifyUserNotificationChannelEmailAddress.php
+++ b/app/Domains/Settings/ManageNotificationChannels/Services/VerifyUserNotificationChannelEmailAddress.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageNotificationChannels\Services;
+namespace App\Domains\Settings\ManageNotificationChannels\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\User;
diff --git a/domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsController.php b/app/Domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsController.php
similarity index 78%
rename from domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsController.php
rename to app/Domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsController.php
index 25eb43871..5507b2912 100644
--- a/domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsController.php
+++ b/app/Domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Settings\ManageNotificationChannels\Web\Controllers;
+namespace App\Domains\Settings\ManageNotificationChannels\Web\Controllers;
 
+use App\Domains\Settings\ManageNotificationChannels\Services\CreateUserNotificationChannel;
+use App\Domains\Settings\ManageNotificationChannels\Services\DestroyUserNotificationChannel;
+use App\Domains\Settings\ManageNotificationChannels\Web\ViewHelpers\NotificationsIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\UserNotificationChannel;
-use App\Settings\ManageNotificationChannels\Services\CreateUserNotificationChannel;
-use App\Settings\ManageNotificationChannels\Services\DestroyUserNotificationChannel;
-use App\Settings\ManageNotificationChannels\Web\ViewHelpers\NotificationsIndexViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsLogController.php b/app/Domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsLogController.php
similarity index 77%
rename from domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsLogController.php
rename to app/Domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsLogController.php
index c3e06eccd..8279f9804 100644
--- a/domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsLogController.php
+++ b/app/Domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsLogController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Settings\ManageNotificationChannels\Web\Controllers;
+namespace App\Domains\Settings\ManageNotificationChannels\Web\Controllers;
 
+use App\Domains\Settings\ManageNotificationChannels\Web\ViewHelpers\NotificationsLogIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\UserNotificationChannel;
-use App\Settings\ManageNotificationChannels\Web\ViewHelpers\NotificationsLogIndexViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
diff --git a/domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsTestController.php b/app/Domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsTestController.php
similarity index 79%
rename from domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsTestController.php
rename to app/Domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsTestController.php
index 4f8bc63c5..8794ec78f 100644
--- a/domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsTestController.php
+++ b/app/Domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsTestController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Settings\ManageNotificationChannels\Web\Controllers;
+namespace App\Domains\Settings\ManageNotificationChannels\Web\Controllers;
 
+use App\Domains\Settings\ManageNotificationChannels\Services\SendTestEmail;
+use App\Domains\Settings\ManageNotificationChannels\Services\SendTestTelegramNotification;
 use App\Http\Controllers\Controller;
 use App\Models\UserNotificationChannel;
-use App\Settings\ManageNotificationChannels\Services\SendTestEmail;
-use App\Settings\ManageNotificationChannels\Services\SendTestTelegramNotification;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsToggleController.php b/app/Domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsToggleController.php
similarity index 71%
rename from domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsToggleController.php
rename to app/Domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsToggleController.php
index b6fa0a2d9..4426b51f8 100644
--- a/domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsToggleController.php
+++ b/app/Domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsToggleController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Settings\ManageNotificationChannels\Web\Controllers;
+namespace App\Domains\Settings\ManageNotificationChannels\Web\Controllers;
 
+use App\Domains\Settings\ManageNotificationChannels\Services\ToggleUserNotificationChannel;
+use App\Domains\Settings\ManageNotificationChannels\Web\ViewHelpers\NotificationsIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageNotificationChannels\Services\ToggleUserNotificationChannel;
-use App\Settings\ManageNotificationChannels\Web\ViewHelpers\NotificationsIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsVerificationController.php b/app/Domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsVerificationController.php
similarity index 67%
rename from domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsVerificationController.php
rename to app/Domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsVerificationController.php
index e84fc925d..ce5d16289 100644
--- a/domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsVerificationController.php
+++ b/app/Domains/Settings/ManageNotificationChannels/Web/Controllers/NotificationsVerificationController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Settings\ManageNotificationChannels\Web\Controllers;
+namespace App\Domains\Settings\ManageNotificationChannels\Web\Controllers;
 
+use App\Domains\Settings\ManageNotificationChannels\Services\VerifyUserNotificationChannelEmailAddress;
+use App\Domains\Settings\ManageNotificationChannels\Web\ViewHelpers\NotificationsIndexViewHelper as ViewHelpersNotificationsIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageNotificationChannels\Services\VerifyUserNotificationChannelEmailAddress;
-use App\Settings\ManageNotificationChannels\Web\ViewHelpers\NotificationsIndexViewHelper as ViewHelpersNotificationsIndexViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Settings/ManageNotificationChannels/Web/Controllers/TelegramNotificationsController.php b/app/Domains/Settings/ManageNotificationChannels/Web/Controllers/TelegramNotificationsController.php
similarity index 76%
rename from domains/Settings/ManageNotificationChannels/Web/Controllers/TelegramNotificationsController.php
rename to app/Domains/Settings/ManageNotificationChannels/Web/Controllers/TelegramNotificationsController.php
index 5a0f7122f..274fbd6b0 100644
--- a/domains/Settings/ManageNotificationChannels/Web/Controllers/TelegramNotificationsController.php
+++ b/app/Domains/Settings/ManageNotificationChannels/Web/Controllers/TelegramNotificationsController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Settings\ManageNotificationChannels\Web\Controllers;
+namespace App\Domains\Settings\ManageNotificationChannels\Web\Controllers;
 
+use App\Domains\Settings\ManageNotificationChannels\Services\CreateUserNotificationChannel;
+use App\Domains\Settings\ManageNotificationChannels\Web\ViewHelpers\NotificationsIndexViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\UserNotificationChannel;
-use App\Settings\ManageNotificationChannels\Services\CreateUserNotificationChannel;
-use App\Settings\ManageNotificationChannels\Web\ViewHelpers\NotificationsIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageNotificationChannels/Web/Controllers/TelegramWebhookController.php b/app/Domains/Settings/ManageNotificationChannels/Web/Controllers/TelegramWebhookController.php
similarity index 95%
rename from domains/Settings/ManageNotificationChannels/Web/Controllers/TelegramWebhookController.php
rename to app/Domains/Settings/ManageNotificationChannels/Web/Controllers/TelegramWebhookController.php
index 42daa7cdb..260056cee 100644
--- a/domains/Settings/ManageNotificationChannels/Web/Controllers/TelegramWebhookController.php
+++ b/app/Domains/Settings/ManageNotificationChannels/Web/Controllers/TelegramWebhookController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageNotificationChannels\Web\Controllers;
+namespace App\Domains\Settings\ManageNotificationChannels\Web\Controllers;
 
 use App\Http\Controllers\Controller;
 use App\Models\UserNotificationChannel;
diff --git a/domains/Settings/ManageNotificationChannels/Web/ViewHelpers/NotificationsIndexViewHelper.php b/app/Domains/Settings/ManageNotificationChannels/Web/ViewHelpers/NotificationsIndexViewHelper.php
similarity index 97%
rename from domains/Settings/ManageNotificationChannels/Web/ViewHelpers/NotificationsIndexViewHelper.php
rename to app/Domains/Settings/ManageNotificationChannels/Web/ViewHelpers/NotificationsIndexViewHelper.php
index e84002bdd..c47929511 100644
--- a/domains/Settings/ManageNotificationChannels/Web/ViewHelpers/NotificationsIndexViewHelper.php
+++ b/app/Domains/Settings/ManageNotificationChannels/Web/ViewHelpers/NotificationsIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageNotificationChannels\Web\ViewHelpers;
+namespace App\Domains\Settings\ManageNotificationChannels\Web\ViewHelpers;
 
 use App\Models\User;
 use App\Models\UserNotificationChannel;
diff --git a/domains/Settings/ManageNotificationChannels/Web/ViewHelpers/NotificationsLogIndexViewHelper.php b/app/Domains/Settings/ManageNotificationChannels/Web/ViewHelpers/NotificationsLogIndexViewHelper.php
similarity index 93%
rename from domains/Settings/ManageNotificationChannels/Web/ViewHelpers/NotificationsLogIndexViewHelper.php
rename to app/Domains/Settings/ManageNotificationChannels/Web/ViewHelpers/NotificationsLogIndexViewHelper.php
index d2dd6ea54..9a8529ac3 100644
--- a/domains/Settings/ManageNotificationChannels/Web/ViewHelpers/NotificationsLogIndexViewHelper.php
+++ b/app/Domains/Settings/ManageNotificationChannels/Web/ViewHelpers/NotificationsLogIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageNotificationChannels\Web\ViewHelpers;
+namespace App\Domains\Settings\ManageNotificationChannels\Web\ViewHelpers;
 
 use App\Helpers\DateHelper;
 use App\Models\User;
diff --git a/domains/Settings/ManagePersonalization/Web/Controllers/PersonalizeController.php b/app/Domains/Settings/ManagePersonalization/Web/Controllers/PersonalizeController.php
similarity index 60%
rename from domains/Settings/ManagePersonalization/Web/Controllers/PersonalizeController.php
rename to app/Domains/Settings/ManagePersonalization/Web/Controllers/PersonalizeController.php
index d2e240062..56e10e0d3 100644
--- a/domains/Settings/ManagePersonalization/Web/Controllers/PersonalizeController.php
+++ b/app/Domains/Settings/ManagePersonalization/Web/Controllers/PersonalizeController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Settings\ManagePersonalization\Web\Controllers;
+namespace App\Domains\Settings\ManagePersonalization\Web\Controllers;
 
+use App\Domains\Settings\ManagePersonalization\Web\ViewHelpers\PersonalizeIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManagePersonalization\Web\ViewHelpers\PersonalizeIndexViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Inertia\Inertia;
 
 class PersonalizeController extends Controller
diff --git a/domains/Settings/ManagePersonalization/Web/ViewHelpers/PersonalizeIndexViewHelper.php b/app/Domains/Settings/ManagePersonalization/Web/ViewHelpers/PersonalizeIndexViewHelper.php
similarity index 96%
rename from domains/Settings/ManagePersonalization/Web/ViewHelpers/PersonalizeIndexViewHelper.php
rename to app/Domains/Settings/ManagePersonalization/Web/ViewHelpers/PersonalizeIndexViewHelper.php
index 8f44e558d..fefbd10f5 100644
--- a/domains/Settings/ManagePersonalization/Web/ViewHelpers/PersonalizeIndexViewHelper.php
+++ b/app/Domains/Settings/ManagePersonalization/Web/ViewHelpers/PersonalizeIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManagePersonalization\Web\ViewHelpers;
+namespace App\Domains\Settings\ManagePersonalization\Web\ViewHelpers;
 
 class PersonalizeIndexViewHelper
 {
diff --git a/domains/Settings/ManagePetCategories/Services/CreatePetCategory.php b/app/Domains/Settings/ManagePetCategories/Services/CreatePetCategory.php
similarity index 95%
rename from domains/Settings/ManagePetCategories/Services/CreatePetCategory.php
rename to app/Domains/Settings/ManagePetCategories/Services/CreatePetCategory.php
index 3d4a31f34..7f7bfdf18 100644
--- a/domains/Settings/ManagePetCategories/Services/CreatePetCategory.php
+++ b/app/Domains/Settings/ManagePetCategories/Services/CreatePetCategory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManagePetCategories\Services;
+namespace App\Domains\Settings\ManagePetCategories\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\PetCategory;
diff --git a/domains/Settings/ManagePetCategories/Services/DestroyPetCategory.php b/app/Domains/Settings/ManagePetCategories/Services/DestroyPetCategory.php
similarity index 95%
rename from domains/Settings/ManagePetCategories/Services/DestroyPetCategory.php
rename to app/Domains/Settings/ManagePetCategories/Services/DestroyPetCategory.php
index 016cad2b7..2ff55330f 100644
--- a/domains/Settings/ManagePetCategories/Services/DestroyPetCategory.php
+++ b/app/Domains/Settings/ManagePetCategories/Services/DestroyPetCategory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManagePetCategories\Services;
+namespace App\Domains\Settings\ManagePetCategories\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\PetCategory;
diff --git a/domains/Settings/ManagePetCategories/Services/UpdatePetCategory.php b/app/Domains/Settings/ManagePetCategories/Services/UpdatePetCategory.php
similarity index 95%
rename from domains/Settings/ManagePetCategories/Services/UpdatePetCategory.php
rename to app/Domains/Settings/ManagePetCategories/Services/UpdatePetCategory.php
index 223a0fed4..8998979f2 100644
--- a/domains/Settings/ManagePetCategories/Services/UpdatePetCategory.php
+++ b/app/Domains/Settings/ManagePetCategories/Services/UpdatePetCategory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManagePetCategories\Services;
+namespace App\Domains\Settings\ManagePetCategories\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\PetCategory;
diff --git a/domains/Settings/ManagePetCategories/Web/Controllers/PersonalizePetCategoriesController.php b/app/Domains/Settings/ManagePetCategories/Web/Controllers/PersonalizePetCategoriesController.php
similarity index 79%
rename from domains/Settings/ManagePetCategories/Web/Controllers/PersonalizePetCategoriesController.php
rename to app/Domains/Settings/ManagePetCategories/Web/Controllers/PersonalizePetCategoriesController.php
index c4721bc46..87cd8e421 100644
--- a/domains/Settings/ManagePetCategories/Web/Controllers/PersonalizePetCategoriesController.php
+++ b/app/Domains/Settings/ManagePetCategories/Web/Controllers/PersonalizePetCategoriesController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Settings\ManagePetCategories\Web\Controllers;
+namespace App\Domains\Settings\ManagePetCategories\Web\Controllers;
 
+use App\Domains\Settings\ManagePetCategories\Services\CreatePetCategory;
+use App\Domains\Settings\ManagePetCategories\Services\DestroyPetCategory;
+use App\Domains\Settings\ManagePetCategories\Services\UpdatePetCategory;
+use App\Domains\Settings\ManagePetCategories\Web\ViewHelpers\PersonalizePetCategoriesIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManagePetCategories\Services\CreatePetCategory;
-use App\Settings\ManagePetCategories\Services\DestroyPetCategory;
-use App\Settings\ManagePetCategories\Services\UpdatePetCategory;
-use App\Settings\ManagePetCategories\Web\ViewHelpers\PersonalizePetCategoriesIndexViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Settings/ManagePetCategories/Web/ViewHelpers/PersonalizePetCategoriesIndexViewHelper.php b/app/Domains/Settings/ManagePetCategories/Web/ViewHelpers/PersonalizePetCategoriesIndexViewHelper.php
similarity index 95%
rename from domains/Settings/ManagePetCategories/Web/ViewHelpers/PersonalizePetCategoriesIndexViewHelper.php
rename to app/Domains/Settings/ManagePetCategories/Web/ViewHelpers/PersonalizePetCategoriesIndexViewHelper.php
index 92bb6109a..f713a36d9 100644
--- a/domains/Settings/ManagePetCategories/Web/ViewHelpers/PersonalizePetCategoriesIndexViewHelper.php
+++ b/app/Domains/Settings/ManagePetCategories/Web/ViewHelpers/PersonalizePetCategoriesIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManagePetCategories\Web\ViewHelpers;
+namespace App\Domains\Settings\ManagePetCategories\Web\ViewHelpers;
 
 use App\Models\Account;
 use App\Models\PetCategory;
diff --git a/domains/Settings/ManagePostTemplates/Services/CreatePostTemplate.php b/app/Domains/Settings/ManagePostTemplates/Services/CreatePostTemplate.php
similarity index 96%
rename from domains/Settings/ManagePostTemplates/Services/CreatePostTemplate.php
rename to app/Domains/Settings/ManagePostTemplates/Services/CreatePostTemplate.php
index 3c0e99b64..197e1906a 100644
--- a/domains/Settings/ManagePostTemplates/Services/CreatePostTemplate.php
+++ b/app/Domains/Settings/ManagePostTemplates/Services/CreatePostTemplate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManagePostTemplates\Services;
+namespace App\Domains\Settings\ManagePostTemplates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\PostTemplate;
diff --git a/domains/Settings/ManagePostTemplates/Services/CreatePostTemplateSection.php b/app/Domains/Settings/ManagePostTemplates/Services/CreatePostTemplateSection.php
similarity index 97%
rename from domains/Settings/ManagePostTemplates/Services/CreatePostTemplateSection.php
rename to app/Domains/Settings/ManagePostTemplates/Services/CreatePostTemplateSection.php
index 1d7f6139c..d10ceeec7 100644
--- a/domains/Settings/ManagePostTemplates/Services/CreatePostTemplateSection.php
+++ b/app/Domains/Settings/ManagePostTemplates/Services/CreatePostTemplateSection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManagePostTemplates\Services;
+namespace App\Domains\Settings\ManagePostTemplates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\PostTemplate;
diff --git a/domains/Settings/ManagePostTemplates/Services/DestroyPostTemplate.php b/app/Domains/Settings/ManagePostTemplates/Services/DestroyPostTemplate.php
similarity index 95%
rename from domains/Settings/ManagePostTemplates/Services/DestroyPostTemplate.php
rename to app/Domains/Settings/ManagePostTemplates/Services/DestroyPostTemplate.php
index b4cec0f1b..198449f12 100644
--- a/domains/Settings/ManagePostTemplates/Services/DestroyPostTemplate.php
+++ b/app/Domains/Settings/ManagePostTemplates/Services/DestroyPostTemplate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManagePostTemplates\Services;
+namespace App\Domains\Settings\ManagePostTemplates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\PostTemplate;
diff --git a/domains/Settings/ManagePostTemplates/Services/DestroyPostTemplateSection.php b/app/Domains/Settings/ManagePostTemplates/Services/DestroyPostTemplateSection.php
similarity index 96%
rename from domains/Settings/ManagePostTemplates/Services/DestroyPostTemplateSection.php
rename to app/Domains/Settings/ManagePostTemplates/Services/DestroyPostTemplateSection.php
index 1699150ed..60ad6a6c6 100644
--- a/domains/Settings/ManagePostTemplates/Services/DestroyPostTemplateSection.php
+++ b/app/Domains/Settings/ManagePostTemplates/Services/DestroyPostTemplateSection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManagePostTemplates\Services;
+namespace App\Domains\Settings\ManagePostTemplates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\PostTemplate;
diff --git a/domains/Settings/ManagePostTemplates/Services/UpdatePostTemplate.php b/app/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplate.php
similarity index 95%
rename from domains/Settings/ManagePostTemplates/Services/UpdatePostTemplate.php
rename to app/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplate.php
index 82f8def77..e1ff51039 100644
--- a/domains/Settings/ManagePostTemplates/Services/UpdatePostTemplate.php
+++ b/app/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManagePostTemplates\Services;
+namespace App\Domains\Settings\ManagePostTemplates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\PostTemplate;
diff --git a/domains/Settings/ManagePostTemplates/Services/UpdatePostTemplatePosition.php b/app/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplatePosition.php
similarity index 97%
rename from domains/Settings/ManagePostTemplates/Services/UpdatePostTemplatePosition.php
rename to app/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplatePosition.php
index b0dcd466e..d4be1b2f0 100644
--- a/domains/Settings/ManagePostTemplates/Services/UpdatePostTemplatePosition.php
+++ b/app/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplatePosition.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManagePostTemplates\Services;
+namespace App\Domains\Settings\ManagePostTemplates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\PostTemplate;
diff --git a/domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateSection.php b/app/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateSection.php
similarity index 96%
rename from domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateSection.php
rename to app/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateSection.php
index 3f1137756..530cd5d40 100644
--- a/domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateSection.php
+++ b/app/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateSection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManagePostTemplates\Services;
+namespace App\Domains\Settings\ManagePostTemplates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\PostTemplate;
diff --git a/domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateSectionPosition.php b/app/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateSectionPosition.php
similarity index 98%
rename from domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateSectionPosition.php
rename to app/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateSectionPosition.php
index 679304071..1c841ff85 100644
--- a/domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateSectionPosition.php
+++ b/app/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateSectionPosition.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManagePostTemplates\Services;
+namespace App\Domains\Settings\ManagePostTemplates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\PostTemplate;
diff --git a/domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplateController.php b/app/Domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplateController.php
similarity index 80%
rename from domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplateController.php
rename to app/Domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplateController.php
index 82dd95a54..67c5d0f16 100644
--- a/domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplateController.php
+++ b/app/Domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplateController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Settings\ManagePostTemplates\Web\Controllers;
+namespace App\Domains\Settings\ManagePostTemplates\Web\Controllers;
 
+use App\Domains\Settings\ManagePostTemplates\Services\CreatePostTemplate;
+use App\Domains\Settings\ManagePostTemplates\Services\DestroyPostTemplate;
+use App\Domains\Settings\ManagePostTemplates\Services\UpdatePostTemplate;
+use App\Domains\Settings\ManagePostTemplates\Web\ViewHelpers\PersonalizePostTemplateViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManagePostTemplates\Services\CreatePostTemplate;
-use App\Settings\ManagePostTemplates\Services\DestroyPostTemplate;
-use App\Settings\ManagePostTemplates\Services\UpdatePostTemplate;
-use App\Settings\ManagePostTemplates\Web\ViewHelpers\PersonalizePostTemplateViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplatePositionController.php b/app/Domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplatePositionController.php
similarity index 74%
rename from domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplatePositionController.php
rename to app/Domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplatePositionController.php
index 1ad2065cf..5e13a5121 100644
--- a/domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplatePositionController.php
+++ b/app/Domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplatePositionController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Settings\ManagePostTemplates\Web\Controllers;
+namespace App\Domains\Settings\ManagePostTemplates\Web\Controllers;
 
+use App\Domains\Settings\ManagePostTemplates\Services\UpdatePostTemplatePosition;
+use App\Domains\Settings\ManagePostTemplates\Web\ViewHelpers\PersonalizePostTemplateViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManagePostTemplates\Services\UpdatePostTemplatePosition;
-use App\Settings\ManagePostTemplates\Web\ViewHelpers\PersonalizePostTemplateViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplateSectionController.php b/app/Domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplateSectionController.php
similarity index 83%
rename from domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplateSectionController.php
rename to app/Domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplateSectionController.php
index b8b151565..2535a9bff 100644
--- a/domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplateSectionController.php
+++ b/app/Domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplateSectionController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Settings\ManagePostTemplates\Web\Controllers;
+namespace App\Domains\Settings\ManagePostTemplates\Web\Controllers;
 
+use App\Domains\Settings\ManagePostTemplates\Services\CreatePostTemplateSection;
+use App\Domains\Settings\ManagePostTemplates\Services\DestroyPostTemplateSection;
+use App\Domains\Settings\ManagePostTemplates\Services\UpdatePostTemplateSection;
+use App\Domains\Settings\ManagePostTemplates\Web\ViewHelpers\PersonalizePostTemplateViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\PostTemplate;
-use App\Settings\ManagePostTemplates\Services\CreatePostTemplateSection;
-use App\Settings\ManagePostTemplates\Services\DestroyPostTemplateSection;
-use App\Settings\ManagePostTemplates\Services\UpdatePostTemplateSection;
-use App\Settings\ManagePostTemplates\Web\ViewHelpers\PersonalizePostTemplateViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplateSectionPositionController.php b/app/Domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplateSectionPositionController.php
similarity index 79%
rename from domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplateSectionPositionController.php
rename to app/Domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplateSectionPositionController.php
index 12bf7f422..d789799ef 100644
--- a/domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplateSectionPositionController.php
+++ b/app/Domains/Settings/ManagePostTemplates/Web/Controllers/PersonalizePostTemplateSectionPositionController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Settings\ManagePostTemplates\Web\Controllers;
+namespace App\Domains\Settings\ManagePostTemplates\Web\Controllers;
 
+use App\Domains\Settings\ManagePostTemplates\Services\UpdatePostTemplateSectionPosition;
+use App\Domains\Settings\ManagePostTemplates\Web\ViewHelpers\PersonalizePostTemplateViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\PostTemplate;
-use App\Settings\ManagePostTemplates\Services\UpdatePostTemplateSectionPosition;
-use App\Settings\ManagePostTemplates\Web\ViewHelpers\PersonalizePostTemplateViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManagePostTemplates/Web/ViewHelpers/PersonalizePostTemplateViewHelper.php b/app/Domains/Settings/ManagePostTemplates/Web/ViewHelpers/PersonalizePostTemplateViewHelper.php
similarity index 98%
rename from domains/Settings/ManagePostTemplates/Web/ViewHelpers/PersonalizePostTemplateViewHelper.php
rename to app/Domains/Settings/ManagePostTemplates/Web/ViewHelpers/PersonalizePostTemplateViewHelper.php
index 6e8226f86..392a40ec6 100644
--- a/domains/Settings/ManagePostTemplates/Web/ViewHelpers/PersonalizePostTemplateViewHelper.php
+++ b/app/Domains/Settings/ManagePostTemplates/Web/ViewHelpers/PersonalizePostTemplateViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManagePostTemplates\Web\ViewHelpers;
+namespace App\Domains\Settings\ManagePostTemplates\Web\ViewHelpers;
 
 use App\Models\Account;
 use App\Models\PostTemplate;
diff --git a/domains/Settings/ManagePronouns/Services/CreatePronoun.php b/app/Domains/Settings/ManagePronouns/Services/CreatePronoun.php
similarity index 95%
rename from domains/Settings/ManagePronouns/Services/CreatePronoun.php
rename to app/Domains/Settings/ManagePronouns/Services/CreatePronoun.php
index 0b22d34cb..8501d9cf6 100644
--- a/domains/Settings/ManagePronouns/Services/CreatePronoun.php
+++ b/app/Domains/Settings/ManagePronouns/Services/CreatePronoun.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManagePronouns\Services;
+namespace App\Domains\Settings\ManagePronouns\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Pronoun;
diff --git a/domains/Settings/ManagePronouns/Services/DestroyPronoun.php b/app/Domains/Settings/ManagePronouns/Services/DestroyPronoun.php
similarity index 95%
rename from domains/Settings/ManagePronouns/Services/DestroyPronoun.php
rename to app/Domains/Settings/ManagePronouns/Services/DestroyPronoun.php
index 3a228fd44..9e57eb311 100644
--- a/domains/Settings/ManagePronouns/Services/DestroyPronoun.php
+++ b/app/Domains/Settings/ManagePronouns/Services/DestroyPronoun.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManagePronouns\Services;
+namespace App\Domains\Settings\ManagePronouns\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Pronoun;
diff --git a/domains/Settings/ManagePronouns/Services/UpdatePronoun.php b/app/Domains/Settings/ManagePronouns/Services/UpdatePronoun.php
similarity index 95%
rename from domains/Settings/ManagePronouns/Services/UpdatePronoun.php
rename to app/Domains/Settings/ManagePronouns/Services/UpdatePronoun.php
index 75d916f0c..d2159016a 100644
--- a/domains/Settings/ManagePronouns/Services/UpdatePronoun.php
+++ b/app/Domains/Settings/ManagePronouns/Services/UpdatePronoun.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManagePronouns\Services;
+namespace App\Domains\Settings\ManagePronouns\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Pronoun;
diff --git a/domains/Settings/ManagePronouns/Web/Controllers/PersonalizePronounController.php b/app/Domains/Settings/ManagePronouns/Web/Controllers/PersonalizePronounController.php
similarity index 80%
rename from domains/Settings/ManagePronouns/Web/Controllers/PersonalizePronounController.php
rename to app/Domains/Settings/ManagePronouns/Web/Controllers/PersonalizePronounController.php
index 4b7fa4986..9ed0880e8 100644
--- a/domains/Settings/ManagePronouns/Web/Controllers/PersonalizePronounController.php
+++ b/app/Domains/Settings/ManagePronouns/Web/Controllers/PersonalizePronounController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Settings\ManagePronouns\Web\Controllers;
+namespace App\Domains\Settings\ManagePronouns\Web\Controllers;
 
+use App\Domains\Settings\ManagePronouns\Services\CreatePronoun;
+use App\Domains\Settings\ManagePronouns\Services\DestroyPronoun;
+use App\Domains\Settings\ManagePronouns\Services\UpdatePronoun;
+use App\Domains\Settings\ManagePronouns\Web\ViewHelpers\PersonalizePronounIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManagePronouns\Services\CreatePronoun;
-use App\Settings\ManagePronouns\Services\DestroyPronoun;
-use App\Settings\ManagePronouns\Services\UpdatePronoun;
-use App\Settings\ManagePronouns\Web\ViewHelpers\PersonalizePronounIndexViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Settings/ManagePronouns/Web/ViewHelpers/PersonalizePronounIndexViewHelper.php b/app/Domains/Settings/ManagePronouns/Web/ViewHelpers/PersonalizePronounIndexViewHelper.php
similarity index 95%
rename from domains/Settings/ManagePronouns/Web/ViewHelpers/PersonalizePronounIndexViewHelper.php
rename to app/Domains/Settings/ManagePronouns/Web/ViewHelpers/PersonalizePronounIndexViewHelper.php
index ae3d27cb9..9068fd757 100644
--- a/domains/Settings/ManagePronouns/Web/ViewHelpers/PersonalizePronounIndexViewHelper.php
+++ b/app/Domains/Settings/ManagePronouns/Web/ViewHelpers/PersonalizePronounIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManagePronouns\Web\ViewHelpers;
+namespace App\Domains\Settings\ManagePronouns\Web\ViewHelpers;
 
 use App\Models\Account;
 use App\Models\Pronoun;
diff --git a/domains/Settings/ManageRelationshipTypes/Services/CreateRelationshipGroupType.php b/app/Domains/Settings/ManageRelationshipTypes/Services/CreateRelationshipGroupType.php
similarity index 95%
rename from domains/Settings/ManageRelationshipTypes/Services/CreateRelationshipGroupType.php
rename to app/Domains/Settings/ManageRelationshipTypes/Services/CreateRelationshipGroupType.php
index b8767d19b..c9fe556d7 100644
--- a/domains/Settings/ManageRelationshipTypes/Services/CreateRelationshipGroupType.php
+++ b/app/Domains/Settings/ManageRelationshipTypes/Services/CreateRelationshipGroupType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageRelationshipTypes\Services;
+namespace App\Domains\Settings\ManageRelationshipTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\RelationshipGroupType;
diff --git a/domains/Settings/ManageRelationshipTypes/Services/CreateRelationshipType.php b/app/Domains/Settings/ManageRelationshipTypes/Services/CreateRelationshipType.php
similarity index 96%
rename from domains/Settings/ManageRelationshipTypes/Services/CreateRelationshipType.php
rename to app/Domains/Settings/ManageRelationshipTypes/Services/CreateRelationshipType.php
index 696abec9c..7e71cd51e 100644
--- a/domains/Settings/ManageRelationshipTypes/Services/CreateRelationshipType.php
+++ b/app/Domains/Settings/ManageRelationshipTypes/Services/CreateRelationshipType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageRelationshipTypes\Services;
+namespace App\Domains\Settings\ManageRelationshipTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\RelationshipGroupType;
diff --git a/domains/Settings/ManageRelationshipTypes/Services/DestroyRelationshipGroupType.php b/app/Domains/Settings/ManageRelationshipTypes/Services/DestroyRelationshipGroupType.php
similarity index 95%
rename from domains/Settings/ManageRelationshipTypes/Services/DestroyRelationshipGroupType.php
rename to app/Domains/Settings/ManageRelationshipTypes/Services/DestroyRelationshipGroupType.php
index 0ff411fb7..560685165 100644
--- a/domains/Settings/ManageRelationshipTypes/Services/DestroyRelationshipGroupType.php
+++ b/app/Domains/Settings/ManageRelationshipTypes/Services/DestroyRelationshipGroupType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageRelationshipTypes\Services;
+namespace App\Domains\Settings\ManageRelationshipTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\RelationshipGroupType;
diff --git a/domains/Settings/ManageRelationshipTypes/Services/DestroyRelationshipType.php b/app/Domains/Settings/ManageRelationshipTypes/Services/DestroyRelationshipType.php
similarity index 96%
rename from domains/Settings/ManageRelationshipTypes/Services/DestroyRelationshipType.php
rename to app/Domains/Settings/ManageRelationshipTypes/Services/DestroyRelationshipType.php
index 7ece56629..d42e053c8 100644
--- a/domains/Settings/ManageRelationshipTypes/Services/DestroyRelationshipType.php
+++ b/app/Domains/Settings/ManageRelationshipTypes/Services/DestroyRelationshipType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageRelationshipTypes\Services;
+namespace App\Domains\Settings\ManageRelationshipTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\RelationshipGroupType;
diff --git a/domains/Settings/ManageRelationshipTypes/Services/UpdateRelationshipGroupType.php b/app/Domains/Settings/ManageRelationshipTypes/Services/UpdateRelationshipGroupType.php
similarity index 95%
rename from domains/Settings/ManageRelationshipTypes/Services/UpdateRelationshipGroupType.php
rename to app/Domains/Settings/ManageRelationshipTypes/Services/UpdateRelationshipGroupType.php
index c08f50110..c2509926e 100644
--- a/domains/Settings/ManageRelationshipTypes/Services/UpdateRelationshipGroupType.php
+++ b/app/Domains/Settings/ManageRelationshipTypes/Services/UpdateRelationshipGroupType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageRelationshipTypes\Services;
+namespace App\Domains\Settings\ManageRelationshipTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\RelationshipGroupType;
diff --git a/domains/Settings/ManageRelationshipTypes/Services/UpdateRelationshipType.php b/app/Domains/Settings/ManageRelationshipTypes/Services/UpdateRelationshipType.php
similarity index 96%
rename from domains/Settings/ManageRelationshipTypes/Services/UpdateRelationshipType.php
rename to app/Domains/Settings/ManageRelationshipTypes/Services/UpdateRelationshipType.php
index 65ad22bd5..44bd6fff3 100644
--- a/domains/Settings/ManageRelationshipTypes/Services/UpdateRelationshipType.php
+++ b/app/Domains/Settings/ManageRelationshipTypes/Services/UpdateRelationshipType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageRelationshipTypes\Services;
+namespace App\Domains\Settings\ManageRelationshipTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\RelationshipGroupType;
diff --git a/domains/Settings/ManageRelationshipTypes/Web/Controllers/PersonalizeRelationshipController.php b/app/Domains/Settings/ManageRelationshipTypes/Web/Controllers/PersonalizeRelationshipController.php
similarity index 78%
rename from domains/Settings/ManageRelationshipTypes/Web/Controllers/PersonalizeRelationshipController.php
rename to app/Domains/Settings/ManageRelationshipTypes/Web/Controllers/PersonalizeRelationshipController.php
index 6bf5b62f5..6999aba6f 100644
--- a/domains/Settings/ManageRelationshipTypes/Web/Controllers/PersonalizeRelationshipController.php
+++ b/app/Domains/Settings/ManageRelationshipTypes/Web/Controllers/PersonalizeRelationshipController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Settings\ManageRelationshipTypes\Web\Controllers;
+namespace App\Domains\Settings\ManageRelationshipTypes\Web\Controllers;
 
+use App\Domains\Settings\ManageRelationshipTypes\Services\CreateRelationshipGroupType;
+use App\Domains\Settings\ManageRelationshipTypes\Services\DestroyRelationshipGroupType;
+use App\Domains\Settings\ManageRelationshipTypes\Services\UpdateRelationshipGroupType;
+use App\Domains\Settings\ManageRelationshipTypes\Web\ViewHelpers\PersonalizeRelationshipIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageRelationshipTypes\Services\CreateRelationshipGroupType;
-use App\Settings\ManageRelationshipTypes\Services\DestroyRelationshipGroupType;
-use App\Settings\ManageRelationshipTypes\Services\UpdateRelationshipGroupType;
-use App\Settings\ManageRelationshipTypes\Web\ViewHelpers\PersonalizeRelationshipIndexViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Settings/ManageRelationshipTypes/Web/Controllers/PersonalizeRelationshipTypeController.php b/app/Domains/Settings/ManageRelationshipTypes/Web/Controllers/PersonalizeRelationshipTypeController.php
similarity index 82%
rename from domains/Settings/ManageRelationshipTypes/Web/Controllers/PersonalizeRelationshipTypeController.php
rename to app/Domains/Settings/ManageRelationshipTypes/Web/Controllers/PersonalizeRelationshipTypeController.php
index 3572e31ed..13f0ea0c0 100644
--- a/domains/Settings/ManageRelationshipTypes/Web/Controllers/PersonalizeRelationshipTypeController.php
+++ b/app/Domains/Settings/ManageRelationshipTypes/Web/Controllers/PersonalizeRelationshipTypeController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Settings\ManageRelationshipTypes\Web\Controllers;
+namespace App\Domains\Settings\ManageRelationshipTypes\Web\Controllers;
 
+use App\Domains\Settings\ManageRelationshipTypes\Services\CreateRelationshipType;
+use App\Domains\Settings\ManageRelationshipTypes\Services\DestroyRelationshipType;
+use App\Domains\Settings\ManageRelationshipTypes\Services\UpdateRelationshipType;
+use App\Domains\Settings\ManageRelationshipTypes\Web\ViewHelpers\PersonalizeRelationshipIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageRelationshipTypes\Services\CreateRelationshipType;
-use App\Settings\ManageRelationshipTypes\Services\DestroyRelationshipType;
-use App\Settings\ManageRelationshipTypes\Services\UpdateRelationshipType;
-use App\Settings\ManageRelationshipTypes\Web\ViewHelpers\PersonalizeRelationshipIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageRelationshipTypes/Web/ViewHelpers/PersonalizeRelationshipIndexViewHelper.php b/app/Domains/Settings/ManageRelationshipTypes/Web/ViewHelpers/PersonalizeRelationshipIndexViewHelper.php
similarity index 97%
rename from domains/Settings/ManageRelationshipTypes/Web/ViewHelpers/PersonalizeRelationshipIndexViewHelper.php
rename to app/Domains/Settings/ManageRelationshipTypes/Web/ViewHelpers/PersonalizeRelationshipIndexViewHelper.php
index 6a179a29c..faf9472c2 100644
--- a/domains/Settings/ManageRelationshipTypes/Web/ViewHelpers/PersonalizeRelationshipIndexViewHelper.php
+++ b/app/Domains/Settings/ManageRelationshipTypes/Web/ViewHelpers/PersonalizeRelationshipIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageRelationshipTypes\Web\ViewHelpers;
+namespace App\Domains\Settings\ManageRelationshipTypes\Web\ViewHelpers;
 
 use App\Models\Account;
 use App\Models\RelationshipGroupType;
diff --git a/domains/Settings/ManageSettings/Web/Controllers/SettingsController.php b/app/Domains/Settings/ManageSettings/Web/Controllers/SettingsController.php
similarity index 64%
rename from domains/Settings/ManageSettings/Web/Controllers/SettingsController.php
rename to app/Domains/Settings/ManageSettings/Web/Controllers/SettingsController.php
index b94a48b9b..5a40ae2c6 100644
--- a/domains/Settings/ManageSettings/Web/Controllers/SettingsController.php
+++ b/app/Domains/Settings/ManageSettings/Web/Controllers/SettingsController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Settings\ManageSettings\Web\Controllers;
+namespace App\Domains\Settings\ManageSettings\Web\Controllers;
 
+use App\Domains\Settings\ManageSettings\Web\ViewHelpers\SettingsIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageSettings\Web\ViewHelpers\SettingsIndexViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
 
diff --git a/domains/Settings/ManageSettings/Web/ViewHelpers/SettingsIndexViewHelper.php b/app/Domains/Settings/ManageSettings/Web/ViewHelpers/SettingsIndexViewHelper.php
similarity index 93%
rename from domains/Settings/ManageSettings/Web/ViewHelpers/SettingsIndexViewHelper.php
rename to app/Domains/Settings/ManageSettings/Web/ViewHelpers/SettingsIndexViewHelper.php
index 3cd19a1d9..d1947489d 100644
--- a/domains/Settings/ManageSettings/Web/ViewHelpers/SettingsIndexViewHelper.php
+++ b/app/Domains/Settings/ManageSettings/Web/ViewHelpers/SettingsIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageSettings\Web\ViewHelpers;
+namespace App\Domains\Settings\ManageSettings\Web\ViewHelpers;
 
 use App\Models\User;
 
diff --git a/domains/Settings/ManageStorage/Web/Controllers/AccountStorageController.php b/app/Domains/Settings/ManageStorage/Web/Controllers/AccountStorageController.php
similarity index 65%
rename from domains/Settings/ManageStorage/Web/Controllers/AccountStorageController.php
rename to app/Domains/Settings/ManageStorage/Web/Controllers/AccountStorageController.php
index a37c4ac08..fc6c757e7 100644
--- a/domains/Settings/ManageStorage/Web/Controllers/AccountStorageController.php
+++ b/app/Domains/Settings/ManageStorage/Web/Controllers/AccountStorageController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Settings\ManageStorage\Web\Controllers;
+namespace App\Domains\Settings\ManageStorage\Web\Controllers;
 
+use App\Domains\Settings\ManageStorage\Web\ViewHelpers\StorageIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageStorage\Web\ViewHelpers\StorageIndexViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
 
diff --git a/domains/Settings/ManageStorage/Web/ViewHelpers/StorageIndexViewHelper.php b/app/Domains/Settings/ManageStorage/Web/ViewHelpers/StorageIndexViewHelper.php
similarity index 97%
rename from domains/Settings/ManageStorage/Web/ViewHelpers/StorageIndexViewHelper.php
rename to app/Domains/Settings/ManageStorage/Web/ViewHelpers/StorageIndexViewHelper.php
index 101ec4d10..62b9fd68d 100644
--- a/domains/Settings/ManageStorage/Web/ViewHelpers/StorageIndexViewHelper.php
+++ b/app/Domains/Settings/ManageStorage/Web/ViewHelpers/StorageIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageStorage\Web\ViewHelpers;
+namespace App\Domains\Settings\ManageStorage\Web\ViewHelpers;
 
 use App\Helpers\FileHelper;
 use App\Models\Account;
diff --git a/domains/Settings/ManageTemplates/Services/AssociateModuleToTemplatePage.php b/app/Domains/Settings/ManageTemplates/Services/AssociateModuleToTemplatePage.php
similarity index 97%
rename from domains/Settings/ManageTemplates/Services/AssociateModuleToTemplatePage.php
rename to app/Domains/Settings/ManageTemplates/Services/AssociateModuleToTemplatePage.php
index 811627052..0aa6e330a 100644
--- a/domains/Settings/ManageTemplates/Services/AssociateModuleToTemplatePage.php
+++ b/app/Domains/Settings/ManageTemplates/Services/AssociateModuleToTemplatePage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageTemplates\Services;
+namespace App\Domains\Settings\ManageTemplates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Module;
diff --git a/domains/Settings/ManageTemplates/Services/CreateModule.php b/app/Domains/Settings/ManageTemplates/Services/CreateModule.php
similarity index 96%
rename from domains/Settings/ManageTemplates/Services/CreateModule.php
rename to app/Domains/Settings/ManageTemplates/Services/CreateModule.php
index cf144e63d..1d8a3d96b 100644
--- a/domains/Settings/ManageTemplates/Services/CreateModule.php
+++ b/app/Domains/Settings/ManageTemplates/Services/CreateModule.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageTemplates\Services;
+namespace App\Domains\Settings\ManageTemplates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Module;
diff --git a/domains/Settings/ManageTemplates/Services/CreateTemplate.php b/app/Domains/Settings/ManageTemplates/Services/CreateTemplate.php
similarity index 96%
rename from domains/Settings/ManageTemplates/Services/CreateTemplate.php
rename to app/Domains/Settings/ManageTemplates/Services/CreateTemplate.php
index afa0b9a3f..d4c6ff940 100644
--- a/domains/Settings/ManageTemplates/Services/CreateTemplate.php
+++ b/app/Domains/Settings/ManageTemplates/Services/CreateTemplate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageTemplates\Services;
+namespace App\Domains\Settings\ManageTemplates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Template;
diff --git a/domains/Settings/ManageTemplates/Services/CreateTemplatePage.php b/app/Domains/Settings/ManageTemplates/Services/CreateTemplatePage.php
similarity index 97%
rename from domains/Settings/ManageTemplates/Services/CreateTemplatePage.php
rename to app/Domains/Settings/ManageTemplates/Services/CreateTemplatePage.php
index 182cdac28..b321468b3 100644
--- a/domains/Settings/ManageTemplates/Services/CreateTemplatePage.php
+++ b/app/Domains/Settings/ManageTemplates/Services/CreateTemplatePage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageTemplates\Services;
+namespace App\Domains\Settings\ManageTemplates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Template;
diff --git a/domains/Settings/ManageTemplates/Services/DestroyModule.php b/app/Domains/Settings/ManageTemplates/Services/DestroyModule.php
similarity index 95%
rename from domains/Settings/ManageTemplates/Services/DestroyModule.php
rename to app/Domains/Settings/ManageTemplates/Services/DestroyModule.php
index 4b7624178..da6485fb7 100644
--- a/domains/Settings/ManageTemplates/Services/DestroyModule.php
+++ b/app/Domains/Settings/ManageTemplates/Services/DestroyModule.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageTemplates\Services;
+namespace App\Domains\Settings\ManageTemplates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Module;
diff --git a/domains/Settings/ManageTemplates/Services/DestroyTemplate.php b/app/Domains/Settings/ManageTemplates/Services/DestroyTemplate.php
similarity index 95%
rename from domains/Settings/ManageTemplates/Services/DestroyTemplate.php
rename to app/Domains/Settings/ManageTemplates/Services/DestroyTemplate.php
index 6069f62d0..85766371d 100644
--- a/domains/Settings/ManageTemplates/Services/DestroyTemplate.php
+++ b/app/Domains/Settings/ManageTemplates/Services/DestroyTemplate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageTemplates\Services;
+namespace App\Domains\Settings\ManageTemplates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Template;
diff --git a/domains/Settings/ManageTemplates/Services/DestroyTemplatePage.php b/app/Domains/Settings/ManageTemplates/Services/DestroyTemplatePage.php
similarity index 96%
rename from domains/Settings/ManageTemplates/Services/DestroyTemplatePage.php
rename to app/Domains/Settings/ManageTemplates/Services/DestroyTemplatePage.php
index 33d02e75d..417855b08 100644
--- a/domains/Settings/ManageTemplates/Services/DestroyTemplatePage.php
+++ b/app/Domains/Settings/ManageTemplates/Services/DestroyTemplatePage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageTemplates\Services;
+namespace App\Domains\Settings\ManageTemplates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Template;
diff --git a/domains/Settings/ManageTemplates/Services/RemoveModuleFromTemplatePage.php b/app/Domains/Settings/ManageTemplates/Services/RemoveModuleFromTemplatePage.php
similarity index 96%
rename from domains/Settings/ManageTemplates/Services/RemoveModuleFromTemplatePage.php
rename to app/Domains/Settings/ManageTemplates/Services/RemoveModuleFromTemplatePage.php
index 1f6552bbf..4f7dfb84d 100644
--- a/domains/Settings/ManageTemplates/Services/RemoveModuleFromTemplatePage.php
+++ b/app/Domains/Settings/ManageTemplates/Services/RemoveModuleFromTemplatePage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageTemplates\Services;
+namespace App\Domains\Settings\ManageTemplates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Module;
diff --git a/domains/Settings/ManageTemplates/Services/UpdateModule.php b/app/Domains/Settings/ManageTemplates/Services/UpdateModule.php
similarity index 95%
rename from domains/Settings/ManageTemplates/Services/UpdateModule.php
rename to app/Domains/Settings/ManageTemplates/Services/UpdateModule.php
index 2ab4596ec..5da4ed364 100644
--- a/domains/Settings/ManageTemplates/Services/UpdateModule.php
+++ b/app/Domains/Settings/ManageTemplates/Services/UpdateModule.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageTemplates\Services;
+namespace App\Domains\Settings\ManageTemplates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Module;
diff --git a/domains/Settings/ManageTemplates/Services/UpdateModulePosition.php b/app/Domains/Settings/ManageTemplates/Services/UpdateModulePosition.php
similarity index 98%
rename from domains/Settings/ManageTemplates/Services/UpdateModulePosition.php
rename to app/Domains/Settings/ManageTemplates/Services/UpdateModulePosition.php
index cd8a3eb67..499ab10e8 100644
--- a/domains/Settings/ManageTemplates/Services/UpdateModulePosition.php
+++ b/app/Domains/Settings/ManageTemplates/Services/UpdateModulePosition.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageTemplates\Services;
+namespace App\Domains\Settings\ManageTemplates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Module;
diff --git a/domains/Settings/ManageTemplates/Services/UpdateTemplate.php b/app/Domains/Settings/ManageTemplates/Services/UpdateTemplate.php
similarity index 96%
rename from domains/Settings/ManageTemplates/Services/UpdateTemplate.php
rename to app/Domains/Settings/ManageTemplates/Services/UpdateTemplate.php
index a4dcbff8e..31eea4973 100644
--- a/domains/Settings/ManageTemplates/Services/UpdateTemplate.php
+++ b/app/Domains/Settings/ManageTemplates/Services/UpdateTemplate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageTemplates\Services;
+namespace App\Domains\Settings\ManageTemplates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Template;
diff --git a/domains/Settings/ManageTemplates/Services/UpdateTemplatePage.php b/app/Domains/Settings/ManageTemplates/Services/UpdateTemplatePage.php
similarity index 96%
rename from domains/Settings/ManageTemplates/Services/UpdateTemplatePage.php
rename to app/Domains/Settings/ManageTemplates/Services/UpdateTemplatePage.php
index b39eaf53a..afb00bf64 100644
--- a/domains/Settings/ManageTemplates/Services/UpdateTemplatePage.php
+++ b/app/Domains/Settings/ManageTemplates/Services/UpdateTemplatePage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageTemplates\Services;
+namespace App\Domains\Settings\ManageTemplates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Template;
diff --git a/domains/Settings/ManageTemplates/Services/UpdateTemplatePagePosition.php b/app/Domains/Settings/ManageTemplates/Services/UpdateTemplatePagePosition.php
similarity index 98%
rename from domains/Settings/ManageTemplates/Services/UpdateTemplatePagePosition.php
rename to app/Domains/Settings/ManageTemplates/Services/UpdateTemplatePagePosition.php
index ba3ae1de6..a584153ca 100644
--- a/domains/Settings/ManageTemplates/Services/UpdateTemplatePagePosition.php
+++ b/app/Domains/Settings/ManageTemplates/Services/UpdateTemplatePagePosition.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageTemplates\Services;
+namespace App\Domains\Settings\ManageTemplates\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Template;
diff --git a/domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePageModulesController.php b/app/Domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePageModulesController.php
similarity index 82%
rename from domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePageModulesController.php
rename to app/Domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePageModulesController.php
index 2ff2843ca..463d208f1 100644
--- a/domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePageModulesController.php
+++ b/app/Domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePageModulesController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Settings\ManageTemplates\Web\Controllers;
+namespace App\Domains\Settings\ManageTemplates\Web\Controllers;
 
+use App\Domains\Settings\ManageTemplates\Services\AssociateModuleToTemplatePage;
+use App\Domains\Settings\ManageTemplates\Services\RemoveModuleFromTemplatePage;
+use App\Domains\Settings\ManageTemplates\Web\ViewHelpers\PersonalizeTemplatePageShowViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\TemplatePage;
-use App\Settings\ManageTemplates\Services\AssociateModuleToTemplatePage;
-use App\Settings\ManageTemplates\Services\RemoveModuleFromTemplatePage;
-use App\Settings\ManageTemplates\Web\ViewHelpers\PersonalizeTemplatePageShowViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePageModulesPositionController.php b/app/Domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePageModulesPositionController.php
similarity index 79%
rename from domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePageModulesPositionController.php
rename to app/Domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePageModulesPositionController.php
index 9f45195aa..c35c45657 100644
--- a/domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePageModulesPositionController.php
+++ b/app/Domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePageModulesPositionController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Settings\ManageTemplates\Web\Controllers;
+namespace App\Domains\Settings\ManageTemplates\Web\Controllers;
 
+use App\Domains\Settings\ManageTemplates\Services\UpdateModulePosition;
+use App\Domains\Settings\ManageTemplates\Web\ViewHelpers\PersonalizeTemplatePageShowViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\TemplatePage;
-use App\Settings\ManageTemplates\Services\UpdateModulePosition;
-use App\Settings\ManageTemplates\Web\ViewHelpers\PersonalizeTemplatePageShowViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePagePositionController.php b/app/Domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePagePositionController.php
similarity index 77%
rename from domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePagePositionController.php
rename to app/Domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePagePositionController.php
index 0e3d845dd..b92fec511 100644
--- a/domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePagePositionController.php
+++ b/app/Domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePagePositionController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Settings\ManageTemplates\Web\Controllers;
+namespace App\Domains\Settings\ManageTemplates\Web\Controllers;
 
+use App\Domains\Settings\ManageTemplates\Services\UpdateTemplatePagePosition;
+use App\Domains\Settings\ManageTemplates\Web\ViewHelpers\PersonalizeTemplateShowViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageTemplates\Services\UpdateTemplatePagePosition;
-use App\Settings\ManageTemplates\Web\ViewHelpers\PersonalizeTemplateShowViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePagesController.php b/app/Domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePagesController.php
similarity index 83%
rename from domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePagesController.php
rename to app/Domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePagesController.php
index 39bb381e7..ce557b457 100644
--- a/domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePagesController.php
+++ b/app/Domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatePagesController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Settings\ManageTemplates\Web\Controllers;
+namespace App\Domains\Settings\ManageTemplates\Web\Controllers;
 
+use App\Domains\Settings\ManageTemplates\Services\CreateTemplatePage;
+use App\Domains\Settings\ManageTemplates\Services\DestroyTemplatePage;
+use App\Domains\Settings\ManageTemplates\Services\UpdateTemplatePage;
+use App\Domains\Settings\ManageTemplates\Web\ViewHelpers\PersonalizeTemplatePageShowViewHelper;
+use App\Domains\Settings\ManageTemplates\Web\ViewHelpers\PersonalizeTemplateShowViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Template;
 use App\Models\TemplatePage;
-use App\Settings\ManageTemplates\Services\CreateTemplatePage;
-use App\Settings\ManageTemplates\Services\DestroyTemplatePage;
-use App\Settings\ManageTemplates\Services\UpdateTemplatePage;
-use App\Settings\ManageTemplates\Web\ViewHelpers\PersonalizeTemplatePageShowViewHelper;
-use App\Settings\ManageTemplates\Web\ViewHelpers\PersonalizeTemplateShowViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatesController.php b/app/Domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatesController.php
similarity index 81%
rename from domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatesController.php
rename to app/Domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatesController.php
index 70976964e..964bdf005 100644
--- a/domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatesController.php
+++ b/app/Domains/Settings/ManageTemplates/Web/Controllers/PersonalizeTemplatesController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Settings\ManageTemplates\Web\Controllers;
+namespace App\Domains\Settings\ManageTemplates\Web\Controllers;
 
+use App\Domains\Settings\ManageTemplates\Services\CreateTemplate;
+use App\Domains\Settings\ManageTemplates\Services\DestroyTemplate;
+use App\Domains\Settings\ManageTemplates\Services\UpdateTemplate;
+use App\Domains\Settings\ManageTemplates\Web\ViewHelpers\PersonalizeTemplateIndexViewHelper;
+use App\Domains\Settings\ManageTemplates\Web\ViewHelpers\PersonalizeTemplateShowViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Template;
-use App\Settings\ManageTemplates\Services\CreateTemplate;
-use App\Settings\ManageTemplates\Services\DestroyTemplate;
-use App\Settings\ManageTemplates\Services\UpdateTemplate;
-use App\Settings\ManageTemplates\Web\ViewHelpers\PersonalizeTemplateIndexViewHelper;
-use App\Settings\ManageTemplates\Web\ViewHelpers\PersonalizeTemplateShowViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
diff --git a/domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplateIndexViewHelper.php b/app/Domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplateIndexViewHelper.php
similarity index 95%
rename from domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplateIndexViewHelper.php
rename to app/Domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplateIndexViewHelper.php
index c39bfaa33..d13e5421b 100644
--- a/domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplateIndexViewHelper.php
+++ b/app/Domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplateIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageTemplates\Web\ViewHelpers;
+namespace App\Domains\Settings\ManageTemplates\Web\ViewHelpers;
 
 use App\Models\Account;
 use App\Models\Template;
diff --git a/domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplatePageShowViewHelper.php b/app/Domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplatePageShowViewHelper.php
similarity index 97%
rename from domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplatePageShowViewHelper.php
rename to app/Domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplatePageShowViewHelper.php
index 080b4d073..6bb5e8d82 100644
--- a/domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplatePageShowViewHelper.php
+++ b/app/Domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplatePageShowViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageTemplates\Web\ViewHelpers;
+namespace App\Domains\Settings\ManageTemplates\Web\ViewHelpers;
 
 use App\Models\Module;
 use App\Models\TemplatePage;
diff --git a/domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplateShowViewHelper.php b/app/Domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplateShowViewHelper.php
similarity index 97%
rename from domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplateShowViewHelper.php
rename to app/Domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplateShowViewHelper.php
index 85469c852..ef4f7b09f 100644
--- a/domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplateShowViewHelper.php
+++ b/app/Domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplateShowViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageTemplates\Web\ViewHelpers;
+namespace App\Domains\Settings\ManageTemplates\Web\ViewHelpers;
 
 use App\Models\Template;
 use App\Models\TemplatePage;
diff --git a/domains/Settings/ManageUserPreferences/Services/StoreDateFormatPreference.php b/app/Domains/Settings/ManageUserPreferences/Services/StoreDateFormatPreference.php
similarity index 95%
rename from domains/Settings/ManageUserPreferences/Services/StoreDateFormatPreference.php
rename to app/Domains/Settings/ManageUserPreferences/Services/StoreDateFormatPreference.php
index fee0d3576..a1fb6a278 100644
--- a/domains/Settings/ManageUserPreferences/Services/StoreDateFormatPreference.php
+++ b/app/Domains/Settings/ManageUserPreferences/Services/StoreDateFormatPreference.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageUserPreferences\Services;
+namespace App\Domains\Settings\ManageUserPreferences\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\User;
diff --git a/domains/Settings/ManageUserPreferences/Services/StoreHelpPreference.php b/app/Domains/Settings/ManageUserPreferences/Services/StoreHelpPreference.php
similarity index 95%
rename from domains/Settings/ManageUserPreferences/Services/StoreHelpPreference.php
rename to app/Domains/Settings/ManageUserPreferences/Services/StoreHelpPreference.php
index 0f0cab20a..5c6107034 100644
--- a/domains/Settings/ManageUserPreferences/Services/StoreHelpPreference.php
+++ b/app/Domains/Settings/ManageUserPreferences/Services/StoreHelpPreference.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageUserPreferences\Services;
+namespace App\Domains\Settings\ManageUserPreferences\Services;
 
 use App\Models\User;
 use App\Services\BaseService;
diff --git a/domains/Settings/ManageUserPreferences/Services/StoreLocale.php b/app/Domains/Settings/ManageUserPreferences/Services/StoreLocale.php
similarity index 95%
rename from domains/Settings/ManageUserPreferences/Services/StoreLocale.php
rename to app/Domains/Settings/ManageUserPreferences/Services/StoreLocale.php
index 18280814e..f01fd24b9 100644
--- a/domains/Settings/ManageUserPreferences/Services/StoreLocale.php
+++ b/app/Domains/Settings/ManageUserPreferences/Services/StoreLocale.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageUserPreferences\Services;
+namespace App\Domains\Settings\ManageUserPreferences\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\User;
diff --git a/domains/Settings/ManageUserPreferences/Services/StoreMapsPreference.php b/app/Domains/Settings/ManageUserPreferences/Services/StoreMapsPreference.php
similarity index 95%
rename from domains/Settings/ManageUserPreferences/Services/StoreMapsPreference.php
rename to app/Domains/Settings/ManageUserPreferences/Services/StoreMapsPreference.php
index 5156ef841..d7f084a13 100644
--- a/domains/Settings/ManageUserPreferences/Services/StoreMapsPreference.php
+++ b/app/Domains/Settings/ManageUserPreferences/Services/StoreMapsPreference.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageUserPreferences\Services;
+namespace App\Domains\Settings\ManageUserPreferences\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\User;
diff --git a/domains/Settings/ManageUserPreferences/Services/StoreNameOrderPreference.php b/app/Domains/Settings/ManageUserPreferences/Services/StoreNameOrderPreference.php
similarity index 96%
rename from domains/Settings/ManageUserPreferences/Services/StoreNameOrderPreference.php
rename to app/Domains/Settings/ManageUserPreferences/Services/StoreNameOrderPreference.php
index 479819416..5673ff7b5 100644
--- a/domains/Settings/ManageUserPreferences/Services/StoreNameOrderPreference.php
+++ b/app/Domains/Settings/ManageUserPreferences/Services/StoreNameOrderPreference.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageUserPreferences\Services;
+namespace App\Domains\Settings\ManageUserPreferences\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\User;
diff --git a/domains/Settings/ManageUserPreferences/Services/StoreNumberFormatPreference.php b/app/Domains/Settings/ManageUserPreferences/Services/StoreNumberFormatPreference.php
similarity index 95%
rename from domains/Settings/ManageUserPreferences/Services/StoreNumberFormatPreference.php
rename to app/Domains/Settings/ManageUserPreferences/Services/StoreNumberFormatPreference.php
index ccf2c2147..2773ad61d 100644
--- a/domains/Settings/ManageUserPreferences/Services/StoreNumberFormatPreference.php
+++ b/app/Domains/Settings/ManageUserPreferences/Services/StoreNumberFormatPreference.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageUserPreferences\Services;
+namespace App\Domains\Settings\ManageUserPreferences\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\User;
diff --git a/domains/Settings/ManageUserPreferences/Services/StoreTimezone.php b/app/Domains/Settings/ManageUserPreferences/Services/StoreTimezone.php
similarity index 95%
rename from domains/Settings/ManageUserPreferences/Services/StoreTimezone.php
rename to app/Domains/Settings/ManageUserPreferences/Services/StoreTimezone.php
index 8b443eb03..2cbca7a62 100644
--- a/domains/Settings/ManageUserPreferences/Services/StoreTimezone.php
+++ b/app/Domains/Settings/ManageUserPreferences/Services/StoreTimezone.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageUserPreferences\Services;
+namespace App\Domains\Settings\ManageUserPreferences\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\User;
diff --git a/domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesController.php b/app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesController.php
similarity index 63%
rename from domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesController.php
rename to app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesController.php
index cfbb3dafc..2db18b1a6 100644
--- a/domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesController.php
+++ b/app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Settings\ManageUserPreferences\Web\Controllers;
+namespace App\Domains\Settings\ManageUserPreferences\Web\Controllers;
 
+use App\Domains\Settings\ManageUserPreferences\Web\ViewHelpers\UserPreferencesIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageUserPreferences\Web\ViewHelpers\UserPreferencesIndexViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
 
diff --git a/domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesDateFormatController.php b/app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesDateFormatController.php
similarity index 71%
rename from domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesDateFormatController.php
rename to app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesDateFormatController.php
index 38e082454..bd57b1ba9 100644
--- a/domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesDateFormatController.php
+++ b/app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesDateFormatController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Settings\ManageUserPreferences\Web\Controllers;
+namespace App\Domains\Settings\ManageUserPreferences\Web\Controllers;
 
+use App\Domains\Settings\ManageUserPreferences\Services\StoreDateFormatPreference;
+use App\Domains\Settings\ManageUserPreferences\Web\ViewHelpers\UserPreferencesIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageUserPreferences\Services\StoreDateFormatPreference;
-use App\Settings\ManageUserPreferences\Web\ViewHelpers\UserPreferencesIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesHelpController.php b/app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesHelpController.php
similarity index 64%
rename from domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesHelpController.php
rename to app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesHelpController.php
index 143130b77..a02cecf6e 100644
--- a/domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesHelpController.php
+++ b/app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesHelpController.php
@@ -1,16 +1,15 @@
 <?php
 
-namespace App\Settings\ManageUserPreferences\Web\Controllers;
+namespace App\Domains\Settings\ManageUserPreferences\Web\Controllers;
 
+use App\Domains\Settings\ManageUserPreferences\Services\StoreHelpPreference;
+use App\Domains\Settings\ManageUserPreferences\Web\ViewHelpers\UserPreferencesIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageUserPreferences\Services\StoreHelpPreference;
-use App\Settings\ManageUserPreferences\Web\ViewHelpers\UserPreferencesIndexViewHelper;
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
 class PreferencesHelpController extends Controller
 {
-    public function store(Request $request)
+    public function store()
     {
         $request = [
             'account_id' => Auth::user()->account_id,
diff --git a/domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesLocaleController.php b/app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesLocaleController.php
similarity index 71%
rename from domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesLocaleController.php
rename to app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesLocaleController.php
index 2bb53c511..3523e8a55 100644
--- a/domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesLocaleController.php
+++ b/app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesLocaleController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Settings\ManageUserPreferences\Web\Controllers;
+namespace App\Domains\Settings\ManageUserPreferences\Web\Controllers;
 
+use App\Domains\Settings\ManageUserPreferences\Services\StoreLocale;
+use App\Domains\Settings\ManageUserPreferences\Web\ViewHelpers\UserPreferencesIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageUserPreferences\Services\StoreLocale;
-use App\Settings\ManageUserPreferences\Web\ViewHelpers\UserPreferencesIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesMapsPreferenceController.php b/app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesMapsPreferenceController.php
similarity index 71%
rename from domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesMapsPreferenceController.php
rename to app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesMapsPreferenceController.php
index 90de6aa17..5bb8f0970 100644
--- a/domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesMapsPreferenceController.php
+++ b/app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesMapsPreferenceController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Settings\ManageUserPreferences\Web\Controllers;
+namespace App\Domains\Settings\ManageUserPreferences\Web\Controllers;
 
+use App\Domains\Settings\ManageUserPreferences\Services\StoreMapsPreference;
+use App\Domains\Settings\ManageUserPreferences\Web\ViewHelpers\UserPreferencesIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageUserPreferences\Services\StoreMapsPreference;
-use App\Settings\ManageUserPreferences\Web\ViewHelpers\UserPreferencesIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesNameOrderController.php b/app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesNameOrderController.php
similarity index 71%
rename from domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesNameOrderController.php
rename to app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesNameOrderController.php
index 4ca4f463f..c80c83d3e 100644
--- a/domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesNameOrderController.php
+++ b/app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesNameOrderController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Settings\ManageUserPreferences\Web\Controllers;
+namespace App\Domains\Settings\ManageUserPreferences\Web\Controllers;
 
+use App\Domains\Settings\ManageUserPreferences\Services\StoreNameOrderPreference;
+use App\Domains\Settings\ManageUserPreferences\Web\ViewHelpers\UserPreferencesIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageUserPreferences\Services\StoreNameOrderPreference;
-use App\Settings\ManageUserPreferences\Web\ViewHelpers\UserPreferencesIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesNumberFormatController.php b/app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesNumberFormatController.php
similarity index 71%
rename from domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesNumberFormatController.php
rename to app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesNumberFormatController.php
index 008e1d5d8..6b0b32967 100644
--- a/domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesNumberFormatController.php
+++ b/app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesNumberFormatController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Settings\ManageUserPreferences\Web\Controllers;
+namespace App\Domains\Settings\ManageUserPreferences\Web\Controllers;
 
+use App\Domains\Settings\ManageUserPreferences\Services\StoreNumberFormatPreference;
+use App\Domains\Settings\ManageUserPreferences\Web\ViewHelpers\UserPreferencesIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageUserPreferences\Services\StoreNumberFormatPreference;
-use App\Settings\ManageUserPreferences\Web\ViewHelpers\UserPreferencesIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesTimezoneController.php b/app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesTimezoneController.php
similarity index 71%
rename from domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesTimezoneController.php
rename to app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesTimezoneController.php
index 7399016dd..df12c02e1 100644
--- a/domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesTimezoneController.php
+++ b/app/Domains/Settings/ManageUserPreferences/Web/Controllers/PreferencesTimezoneController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Settings\ManageUserPreferences\Web\Controllers;
+namespace App\Domains\Settings\ManageUserPreferences\Web\Controllers;
 
+use App\Domains\Settings\ManageUserPreferences\Services\StoreTimezone;
+use App\Domains\Settings\ManageUserPreferences\Web\ViewHelpers\UserPreferencesIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageUserPreferences\Services\StoreTimezone;
-use App\Settings\ManageUserPreferences\Web\ViewHelpers\UserPreferencesIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Settings/ManageUserPreferences/Web/ViewHelpers/UserPreferencesIndexViewHelper.php b/app/Domains/Settings/ManageUserPreferences/Web/ViewHelpers/UserPreferencesIndexViewHelper.php
similarity index 98%
rename from domains/Settings/ManageUserPreferences/Web/ViewHelpers/UserPreferencesIndexViewHelper.php
rename to app/Domains/Settings/ManageUserPreferences/Web/ViewHelpers/UserPreferencesIndexViewHelper.php
index fb2bbeb71..811a12b92 100644
--- a/domains/Settings/ManageUserPreferences/Web/ViewHelpers/UserPreferencesIndexViewHelper.php
+++ b/app/Domains/Settings/ManageUserPreferences/Web/ViewHelpers/UserPreferencesIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageUserPreferences\Web\ViewHelpers;
+namespace App\Domains\Settings\ManageUserPreferences\Web\ViewHelpers;
 
 use App\Helpers\NameHelper;
 use App\Models\Contact;
diff --git a/domains/Settings/ManageUsers/Services/AcceptInvitation.php b/app/Domains/Settings/ManageUsers/Services/AcceptInvitation.php
similarity index 94%
rename from domains/Settings/ManageUsers/Services/AcceptInvitation.php
rename to app/Domains/Settings/ManageUsers/Services/AcceptInvitation.php
index baf387dab..bb7b63410 100644
--- a/domains/Settings/ManageUsers/Services/AcceptInvitation.php
+++ b/app/Domains/Settings/ManageUsers/Services/AcceptInvitation.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Settings\ManageUsers\Services;
+namespace App\Domains\Settings\ManageUsers\Services;
 
+use App\Domains\Settings\ManageNotificationChannels\Services\CreateUserNotificationChannel;
 use App\Interfaces\ServiceInterface;
 use App\Models\User;
 use App\Models\UserNotificationChannel;
 use App\Services\BaseService;
-use App\Settings\ManageNotificationChannels\Services\CreateUserNotificationChannel;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Hash;
 
diff --git a/domains/Settings/ManageUsers/Services/DestroyUser.php b/app/Domains/Settings/ManageUsers/Services/DestroyUser.php
similarity index 97%
rename from domains/Settings/ManageUsers/Services/DestroyUser.php
rename to app/Domains/Settings/ManageUsers/Services/DestroyUser.php
index 009a7dd0f..e549b415d 100644
--- a/domains/Settings/ManageUsers/Services/DestroyUser.php
+++ b/app/Domains/Settings/ManageUsers/Services/DestroyUser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageUsers\Services;
+namespace App\Domains\Settings\ManageUsers\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\User;
diff --git a/domains/Settings/ManageUsers/Services/GiveAdministratorPrivilege.php b/app/Domains/Settings/ManageUsers/Services/GiveAdministratorPrivilege.php
similarity index 96%
rename from domains/Settings/ManageUsers/Services/GiveAdministratorPrivilege.php
rename to app/Domains/Settings/ManageUsers/Services/GiveAdministratorPrivilege.php
index 0abbf57d8..31bbbb1c8 100644
--- a/domains/Settings/ManageUsers/Services/GiveAdministratorPrivilege.php
+++ b/app/Domains/Settings/ManageUsers/Services/GiveAdministratorPrivilege.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageUsers\Services;
+namespace App\Domains\Settings\ManageUsers\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\User;
diff --git a/domains/Settings/ManageUsers/Services/InviteUser.php b/app/Domains/Settings/ManageUsers/Services/InviteUser.php
similarity index 97%
rename from domains/Settings/ManageUsers/Services/InviteUser.php
rename to app/Domains/Settings/ManageUsers/Services/InviteUser.php
index 8c25a9c3d..d9cc130a5 100644
--- a/domains/Settings/ManageUsers/Services/InviteUser.php
+++ b/app/Domains/Settings/ManageUsers/Services/InviteUser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageUsers\Services;
+namespace App\Domains\Settings\ManageUsers\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Mail\UserInvited;
diff --git a/domains/Settings/ManageUsers/Services/RemoveAdministratorPrivilege.php b/app/Domains/Settings/ManageUsers/Services/RemoveAdministratorPrivilege.php
similarity index 96%
rename from domains/Settings/ManageUsers/Services/RemoveAdministratorPrivilege.php
rename to app/Domains/Settings/ManageUsers/Services/RemoveAdministratorPrivilege.php
index d4bee2d75..02a49a721 100644
--- a/domains/Settings/ManageUsers/Services/RemoveAdministratorPrivilege.php
+++ b/app/Domains/Settings/ManageUsers/Services/RemoveAdministratorPrivilege.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageUsers\Services;
+namespace App\Domains\Settings\ManageUsers\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\User;
diff --git a/domains/Settings/ManageUsers/Web/Controllers/UserController.php b/app/Domains/Settings/ManageUsers/Web/Controllers/UserController.php
similarity index 79%
rename from domains/Settings/ManageUsers/Web/Controllers/UserController.php
rename to app/Domains/Settings/ManageUsers/Web/Controllers/UserController.php
index 3e7fd2809..e3fdef698 100644
--- a/domains/Settings/ManageUsers/Web/Controllers/UserController.php
+++ b/app/Domains/Settings/ManageUsers/Web/Controllers/UserController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Settings\ManageUsers\Web\Controllers;
+namespace App\Domains\Settings\ManageUsers\Web\Controllers;
 
+use App\Domains\Settings\ManageUsers\Services\DestroyUser;
+use App\Domains\Settings\ManageUsers\Services\GiveAdministratorPrivilege;
+use App\Domains\Settings\ManageUsers\Services\InviteUser;
+use App\Domains\Settings\ManageUsers\Services\RemoveAdministratorPrivilege;
+use App\Domains\Settings\ManageUsers\Web\ViewHelpers\UserCreateViewHelper;
+use App\Domains\Settings\ManageUsers\Web\ViewHelpers\UserIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
-use App\Settings\ManageUsers\Services\DestroyUser;
-use App\Settings\ManageUsers\Services\GiveAdministratorPrivilege;
-use App\Settings\ManageUsers\Services\InviteUser;
-use App\Settings\ManageUsers\Services\RemoveAdministratorPrivilege;
-use App\Settings\ManageUsers\Web\ViewHelpers\UserCreateViewHelper;
-use App\Settings\ManageUsers\Web\ViewHelpers\UserIndexViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Settings/ManageUsers/Web/ViewHelpers/UserCreateViewHelper.php b/app/Domains/Settings/ManageUsers/Web/ViewHelpers/UserCreateViewHelper.php
similarity index 84%
rename from domains/Settings/ManageUsers/Web/ViewHelpers/UserCreateViewHelper.php
rename to app/Domains/Settings/ManageUsers/Web/ViewHelpers/UserCreateViewHelper.php
index fef9ccaf7..4292d67d1 100644
--- a/domains/Settings/ManageUsers/Web/ViewHelpers/UserCreateViewHelper.php
+++ b/app/Domains/Settings/ManageUsers/Web/ViewHelpers/UserCreateViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageUsers\Web\ViewHelpers;
+namespace App\Domains\Settings\ManageUsers\Web\ViewHelpers;
 
 class UserCreateViewHelper
 {
diff --git a/domains/Settings/ManageUsers/Web/ViewHelpers/UserIndexViewHelper.php b/app/Domains/Settings/ManageUsers/Web/ViewHelpers/UserIndexViewHelper.php
similarity index 96%
rename from domains/Settings/ManageUsers/Web/ViewHelpers/UserIndexViewHelper.php
rename to app/Domains/Settings/ManageUsers/Web/ViewHelpers/UserIndexViewHelper.php
index 212fb8a54..dec32228f 100644
--- a/domains/Settings/ManageUsers/Web/ViewHelpers/UserIndexViewHelper.php
+++ b/app/Domains/Settings/ManageUsers/Web/ViewHelpers/UserIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Settings\ManageUsers\Web\ViewHelpers;
+namespace App\Domains\Settings\ManageUsers\Web\ViewHelpers;
 
 use App\Helpers\DateHelper;
 use App\Models\User;
diff --git a/domains/Vault/ManageCompanies/Services/CreateCompany.php b/app/Domains/Vault/ManageCompanies/Services/CreateCompany.php
similarity index 96%
rename from domains/Vault/ManageCompanies/Services/CreateCompany.php
rename to app/Domains/Vault/ManageCompanies/Services/CreateCompany.php
index ea8f35a4d..8479f2e6f 100644
--- a/domains/Vault/ManageCompanies/Services/CreateCompany.php
+++ b/app/Domains/Vault/ManageCompanies/Services/CreateCompany.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageCompanies\Services;
+namespace App\Domains\Vault\ManageCompanies\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Company;
diff --git a/domains/Vault/ManageCompanies/Web/ViewHelpers/CompanyViewHelper.php b/app/Domains/Vault/ManageCompanies/Web/ViewHelpers/CompanyViewHelper.php
similarity index 91%
rename from domains/Vault/ManageCompanies/Web/ViewHelpers/CompanyViewHelper.php
rename to app/Domains/Vault/ManageCompanies/Web/ViewHelpers/CompanyViewHelper.php
index 45914765b..bf07b2243 100644
--- a/domains/Vault/ManageCompanies/Web/ViewHelpers/CompanyViewHelper.php
+++ b/app/Domains/Vault/ManageCompanies/Web/ViewHelpers/CompanyViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageCompanies\Web\ViewHelpers;
+namespace App\Domains\Vault\ManageCompanies\Web\ViewHelpers;
 
 use App\Models\Company;
 use App\Models\Vault;
diff --git a/domains/Vault/ManageFiles/Web/Controllers/VaultFileController.php b/app/Domains/Vault/ManageFiles/Web/Controllers/VaultFileController.php
similarity index 93%
rename from domains/Vault/ManageFiles/Web/Controllers/VaultFileController.php
rename to app/Domains/Vault/ManageFiles/Web/Controllers/VaultFileController.php
index ddc726803..1f297b0cd 100644
--- a/domains/Vault/ManageFiles/Web/Controllers/VaultFileController.php
+++ b/app/Domains/Vault/ManageFiles/Web/Controllers/VaultFileController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Vault\ManageFiles\Web\Controllers;
+namespace App\Domains\Vault\ManageFiles\Web\Controllers;
 
+use App\Domains\Vault\ManageFiles\Web\ViewHelpers\VaultFileIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Helpers\PaginatorHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
 use App\Models\File;
 use App\Models\Vault;
-use App\Vault\ManageFiles\Web\ViewHelpers\VaultFileIndexViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Vault/ManageFiles/Web/ViewHelpers/VaultFileIndexViewHelper.php b/app/Domains/Vault/ManageFiles/Web/ViewHelpers/VaultFileIndexViewHelper.php
similarity index 98%
rename from domains/Vault/ManageFiles/Web/ViewHelpers/VaultFileIndexViewHelper.php
rename to app/Domains/Vault/ManageFiles/Web/ViewHelpers/VaultFileIndexViewHelper.php
index be110c618..39cd6529d 100644
--- a/domains/Vault/ManageFiles/Web/ViewHelpers/VaultFileIndexViewHelper.php
+++ b/app/Domains/Vault/ManageFiles/Web/ViewHelpers/VaultFileIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageFiles\Web\ViewHelpers;
+namespace App\Domains\Vault\ManageFiles\Web\ViewHelpers;
 
 use App\Helpers\DateHelper;
 use App\Helpers\FileHelper;
diff --git a/domains/Vault/ManageJournals/Services/AssignTag.php b/app/Domains/Vault/ManageJournals/Services/AssignTag.php
similarity index 96%
rename from domains/Vault/ManageJournals/Services/AssignTag.php
rename to app/Domains/Vault/ManageJournals/Services/AssignTag.php
index c3e43eea6..561874cb4 100644
--- a/domains/Vault/ManageJournals/Services/AssignTag.php
+++ b/app/Domains/Vault/ManageJournals/Services/AssignTag.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageJournals\Services;
+namespace App\Domains\Vault\ManageJournals\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Journal;
diff --git a/domains/Vault/ManageJournals/Services/CreateJournal.php b/app/Domains/Vault/ManageJournals/Services/CreateJournal.php
similarity index 96%
rename from domains/Vault/ManageJournals/Services/CreateJournal.php
rename to app/Domains/Vault/ManageJournals/Services/CreateJournal.php
index 538957c16..3e734873b 100644
--- a/domains/Vault/ManageJournals/Services/CreateJournal.php
+++ b/app/Domains/Vault/ManageJournals/Services/CreateJournal.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageJournals\Services;
+namespace App\Domains\Vault\ManageJournals\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Journal;
diff --git a/domains/Vault/ManageJournals/Services/CreatePost.php b/app/Domains/Vault/ManageJournals/Services/CreatePost.php
similarity index 98%
rename from domains/Vault/ManageJournals/Services/CreatePost.php
rename to app/Domains/Vault/ManageJournals/Services/CreatePost.php
index 75836ccd6..e10c91eba 100644
--- a/domains/Vault/ManageJournals/Services/CreatePost.php
+++ b/app/Domains/Vault/ManageJournals/Services/CreatePost.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageJournals\Services;
+namespace App\Domains\Vault\ManageJournals\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Journal;
diff --git a/domains/Vault/ManageJournals/Services/DestroyJournal.php b/app/Domains/Vault/ManageJournals/Services/DestroyJournal.php
similarity index 96%
rename from domains/Vault/ManageJournals/Services/DestroyJournal.php
rename to app/Domains/Vault/ManageJournals/Services/DestroyJournal.php
index 480c868da..e188eb12d 100644
--- a/domains/Vault/ManageJournals/Services/DestroyJournal.php
+++ b/app/Domains/Vault/ManageJournals/Services/DestroyJournal.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageJournals\Services;
+namespace App\Domains\Vault\ManageJournals\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Journal;
diff --git a/domains/Vault/ManageJournals/Services/DestroyPost.php b/app/Domains/Vault/ManageJournals/Services/DestroyPost.php
similarity index 96%
rename from domains/Vault/ManageJournals/Services/DestroyPost.php
rename to app/Domains/Vault/ManageJournals/Services/DestroyPost.php
index 80353938f..d9223b218 100644
--- a/domains/Vault/ManageJournals/Services/DestroyPost.php
+++ b/app/Domains/Vault/ManageJournals/Services/DestroyPost.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageJournals\Services;
+namespace App\Domains\Vault\ManageJournals\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Journal;
diff --git a/domains/Vault/ManageJournals/Services/IncrementPostReadCounter.php b/app/Domains/Vault/ManageJournals/Services/IncrementPostReadCounter.php
similarity index 97%
rename from domains/Vault/ManageJournals/Services/IncrementPostReadCounter.php
rename to app/Domains/Vault/ManageJournals/Services/IncrementPostReadCounter.php
index 7a4336a26..29bdbb823 100644
--- a/domains/Vault/ManageJournals/Services/IncrementPostReadCounter.php
+++ b/app/Domains/Vault/ManageJournals/Services/IncrementPostReadCounter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageJournals\Services;
+namespace App\Domains\Vault\ManageJournals\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Journal;
diff --git a/domains/Vault/ManageJournals/Services/RemoveTag.php b/app/Domains/Vault/ManageJournals/Services/RemoveTag.php
similarity index 96%
rename from domains/Vault/ManageJournals/Services/RemoveTag.php
rename to app/Domains/Vault/ManageJournals/Services/RemoveTag.php
index 634c5ae5a..c01a2606d 100644
--- a/domains/Vault/ManageJournals/Services/RemoveTag.php
+++ b/app/Domains/Vault/ManageJournals/Services/RemoveTag.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageJournals\Services;
+namespace App\Domains\Vault\ManageJournals\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Journal;
diff --git a/domains/Vault/ManageJournals/Services/UpdateJournal.php b/app/Domains/Vault/ManageJournals/Services/UpdateJournal.php
similarity index 97%
rename from domains/Vault/ManageJournals/Services/UpdateJournal.php
rename to app/Domains/Vault/ManageJournals/Services/UpdateJournal.php
index ab6257d29..9cca68d64 100644
--- a/domains/Vault/ManageJournals/Services/UpdateJournal.php
+++ b/app/Domains/Vault/ManageJournals/Services/UpdateJournal.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageJournals\Services;
+namespace App\Domains\Vault\ManageJournals\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Journal;
diff --git a/domains/Vault/ManageJournals/Services/UpdatePost.php b/app/Domains/Vault/ManageJournals/Services/UpdatePost.php
similarity index 98%
rename from domains/Vault/ManageJournals/Services/UpdatePost.php
rename to app/Domains/Vault/ManageJournals/Services/UpdatePost.php
index 581c82376..bbe8c6617 100644
--- a/domains/Vault/ManageJournals/Services/UpdatePost.php
+++ b/app/Domains/Vault/ManageJournals/Services/UpdatePost.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageJournals\Services;
+namespace App\Domains\Vault\ManageJournals\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Journal;
diff --git a/domains/Vault/ManageJournals/Web/Controllers/JournalController.php b/app/Domains/Vault/ManageJournals/Web/Controllers/JournalController.php
similarity index 84%
rename from domains/Vault/ManageJournals/Web/Controllers/JournalController.php
rename to app/Domains/Vault/ManageJournals/Web/Controllers/JournalController.php
index 462452fde..f03f5b382 100644
--- a/domains/Vault/ManageJournals/Web/Controllers/JournalController.php
+++ b/app/Domains/Vault/ManageJournals/Web/Controllers/JournalController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Vault\ManageJournals\Web\Controllers;
+namespace App\Domains\Vault\ManageJournals\Web\Controllers;
 
+use App\Domains\Vault\ManageJournals\Services\CreateJournal;
+use App\Domains\Vault\ManageJournals\Web\ViewHelpers\JournalCreateViewHelper;
+use App\Domains\Vault\ManageJournals\Web\ViewHelpers\JournalIndexViewHelper;
+use App\Domains\Vault\ManageJournals\Web\ViewHelpers\JournalShowViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Journal;
 use App\Models\Vault;
-use App\Vault\ManageJournals\Services\CreateJournal;
-use App\Vault\ManageJournals\Web\ViewHelpers\JournalCreateViewHelper;
-use App\Vault\ManageJournals\Web\ViewHelpers\JournalIndexViewHelper;
-use App\Vault\ManageJournals\Web\ViewHelpers\JournalShowViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
diff --git a/domains/Vault/ManageJournals/Web/Controllers/PostController.php b/app/Domains/Vault/ManageJournals/Web/Controllers/PostController.php
similarity index 88%
rename from domains/Vault/ManageJournals/Web/Controllers/PostController.php
rename to app/Domains/Vault/ManageJournals/Web/Controllers/PostController.php
index 02560ab3a..5a889d9e6 100644
--- a/domains/Vault/ManageJournals/Web/Controllers/PostController.php
+++ b/app/Domains/Vault/ManageJournals/Web/Controllers/PostController.php
@@ -1,21 +1,21 @@
 <?php
 
-namespace App\Vault\ManageJournals\Web\Controllers;
+namespace App\Domains\Vault\ManageJournals\Web\Controllers;
 
+use App\Domains\Vault\ManageJournals\Services\CreatePost;
+use App\Domains\Vault\ManageJournals\Services\DestroyPost;
+use App\Domains\Vault\ManageJournals\Services\IncrementPostReadCounter;
+use App\Domains\Vault\ManageJournals\Services\UpdatePost;
+use App\Domains\Vault\ManageJournals\Web\ViewHelpers\PostCreateViewHelper;
+use App\Domains\Vault\ManageJournals\Web\ViewHelpers\PostEditViewHelper;
+use App\Domains\Vault\ManageJournals\Web\ViewHelpers\PostShowViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Helpers\PostHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Journal;
 use App\Models\Post;
 use App\Models\PostTemplate;
 use App\Models\Vault;
-use App\Vault\ManageJournals\Services\CreatePost;
-use App\Vault\ManageJournals\Services\DestroyPost;
-use App\Vault\ManageJournals\Services\IncrementPostReadCounter;
-use App\Vault\ManageJournals\Services\UpdatePost;
-use App\Vault\ManageJournals\Web\ViewHelpers\PostCreateViewHelper;
-use App\Vault\ManageJournals\Web\ViewHelpers\PostEditViewHelper;
-use App\Vault\ManageJournals\Web\ViewHelpers\PostShowViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Http\Request;
diff --git a/domains/Vault/ManageJournals/Web/Controllers/PostTagController.php b/app/Domains/Vault/ManageJournals/Web/Controllers/PostTagController.php
similarity index 88%
rename from domains/Vault/ManageJournals/Web/Controllers/PostTagController.php
rename to app/Domains/Vault/ManageJournals/Web/Controllers/PostTagController.php
index 28efbb72f..7466a007b 100644
--- a/domains/Vault/ManageJournals/Web/Controllers/PostTagController.php
+++ b/app/Domains/Vault/ManageJournals/Web/Controllers/PostTagController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Vault\ManageJournals\Web\Controllers;
+namespace App\Domains\Vault\ManageJournals\Web\Controllers;
 
+use App\Domains\Vault\ManageJournals\Services\AssignTag;
+use App\Domains\Vault\ManageJournals\Services\RemoveTag;
+use App\Domains\Vault\ManageJournals\Web\ViewHelpers\PostEditViewHelper;
+use App\Domains\Vault\ManageVaultSettings\Services\CreateTag;
 use App\Http\Controllers\Controller;
 use App\Models\Journal;
 use App\Models\Post;
-use App\Vault\ManageJournals\Services\AssignTag;
-use App\Vault\ManageJournals\Services\RemoveTag;
-use App\Vault\ManageJournals\Web\ViewHelpers\PostEditViewHelper;
-use App\Vault\ManageVaultSettings\Services\CreateTag;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Vault/ManageJournals/Web/ViewHelpers/JournalCreateViewHelper.php b/app/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalCreateViewHelper.php
similarity index 87%
rename from domains/Vault/ManageJournals/Web/ViewHelpers/JournalCreateViewHelper.php
rename to app/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalCreateViewHelper.php
index 7822e0399..e4998b9ae 100644
--- a/domains/Vault/ManageJournals/Web/ViewHelpers/JournalCreateViewHelper.php
+++ b/app/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalCreateViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageJournals\Web\ViewHelpers;
+namespace App\Domains\Vault\ManageJournals\Web\ViewHelpers;
 
 use App\Models\Vault;
 
diff --git a/domains/Vault/ManageJournals/Web/ViewHelpers/JournalIndexViewHelper.php b/app/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalIndexViewHelper.php
similarity index 95%
rename from domains/Vault/ManageJournals/Web/ViewHelpers/JournalIndexViewHelper.php
rename to app/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalIndexViewHelper.php
index ad92d2153..e228e2553 100644
--- a/domains/Vault/ManageJournals/Web/ViewHelpers/JournalIndexViewHelper.php
+++ b/app/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageJournals\Web\ViewHelpers;
+namespace App\Domains\Vault\ManageJournals\Web\ViewHelpers;
 
 use App\Helpers\DateHelper;
 use App\Models\User;
diff --git a/domains/Vault/ManageJournals/Web/ViewHelpers/JournalShowViewHelper.php b/app/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalShowViewHelper.php
similarity index 98%
rename from domains/Vault/ManageJournals/Web/ViewHelpers/JournalShowViewHelper.php
rename to app/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalShowViewHelper.php
index 490365540..8209b6ea1 100644
--- a/domains/Vault/ManageJournals/Web/ViewHelpers/JournalShowViewHelper.php
+++ b/app/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalShowViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageJournals\Web\ViewHelpers;
+namespace App\Domains\Vault\ManageJournals\Web\ViewHelpers;
 
 use App\Helpers\DateHelper;
 use App\Helpers\SQLHelper;
diff --git a/domains/Vault/ManageJournals/Web/ViewHelpers/PostCreateViewHelper.php b/app/Domains/Vault/ManageJournals/Web/ViewHelpers/PostCreateViewHelper.php
similarity index 96%
rename from domains/Vault/ManageJournals/Web/ViewHelpers/PostCreateViewHelper.php
rename to app/Domains/Vault/ManageJournals/Web/ViewHelpers/PostCreateViewHelper.php
index 8d0cfc377..4983daad9 100644
--- a/domains/Vault/ManageJournals/Web/ViewHelpers/PostCreateViewHelper.php
+++ b/app/Domains/Vault/ManageJournals/Web/ViewHelpers/PostCreateViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageJournals\Web\ViewHelpers;
+namespace App\Domains\Vault\ManageJournals\Web\ViewHelpers;
 
 use App\Models\Journal;
 use App\Models\PostTemplate;
diff --git a/domains/Vault/ManageJournals/Web/ViewHelpers/PostEditViewHelper.php b/app/Domains/Vault/ManageJournals/Web/ViewHelpers/PostEditViewHelper.php
similarity index 98%
rename from domains/Vault/ManageJournals/Web/ViewHelpers/PostEditViewHelper.php
rename to app/Domains/Vault/ManageJournals/Web/ViewHelpers/PostEditViewHelper.php
index f28ece248..d5a3c9a40 100644
--- a/domains/Vault/ManageJournals/Web/ViewHelpers/PostEditViewHelper.php
+++ b/app/Domains/Vault/ManageJournals/Web/ViewHelpers/PostEditViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageJournals\Web\ViewHelpers;
+namespace App\Domains\Vault\ManageJournals\Web\ViewHelpers;
 
 use App\Helpers\PostHelper;
 use App\Models\Journal;
diff --git a/domains/Vault/ManageJournals/Web/ViewHelpers/PostShowViewHelper.php b/app/Domains/Vault/ManageJournals/Web/ViewHelpers/PostShowViewHelper.php
similarity index 96%
rename from domains/Vault/ManageJournals/Web/ViewHelpers/PostShowViewHelper.php
rename to app/Domains/Vault/ManageJournals/Web/ViewHelpers/PostShowViewHelper.php
index 0b4ffb243..303648df3 100644
--- a/domains/Vault/ManageJournals/Web/ViewHelpers/PostShowViewHelper.php
+++ b/app/Domains/Vault/ManageJournals/Web/ViewHelpers/PostShowViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageJournals\Web\ViewHelpers;
+namespace App\Domains\Vault\ManageJournals\Web\ViewHelpers;
 
 use App\Helpers\DateHelper;
 use App\Models\Post;
diff --git a/domains/Vault/ManageTasks/Web/Controllers/VaultTaskController.php b/app/Domains/Vault/ManageTasks/Web/Controllers/VaultTaskController.php
similarity index 72%
rename from domains/Vault/ManageTasks/Web/Controllers/VaultTaskController.php
rename to app/Domains/Vault/ManageTasks/Web/Controllers/VaultTaskController.php
index 48fd09fb6..38ea6b0e5 100644
--- a/domains/Vault/ManageTasks/Web/Controllers/VaultTaskController.php
+++ b/app/Domains/Vault/ManageTasks/Web/Controllers/VaultTaskController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Vault\ManageTasks\Web\Controllers;
+namespace App\Domains\Vault\ManageTasks\Web\Controllers;
 
+use App\Domains\Vault\ManageTasks\Web\ViewHelpers\VaultTasksIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Vault;
-use App\Vault\ManageTasks\Web\ViewHelpers\VaultTasksIndexViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Vault/ManageTasks/Web/ViewHelpers/VaultTasksIndexViewHelper.php b/app/Domains/Vault/ManageTasks/Web/ViewHelpers/VaultTasksIndexViewHelper.php
similarity index 97%
rename from domains/Vault/ManageTasks/Web/ViewHelpers/VaultTasksIndexViewHelper.php
rename to app/Domains/Vault/ManageTasks/Web/ViewHelpers/VaultTasksIndexViewHelper.php
index f1ce306ea..07d7247ee 100644
--- a/domains/Vault/ManageTasks/Web/ViewHelpers/VaultTasksIndexViewHelper.php
+++ b/app/Domains/Vault/ManageTasks/Web/ViewHelpers/VaultTasksIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageTasks\Web\ViewHelpers;
+namespace App\Domains\Vault\ManageTasks\Web\ViewHelpers;
 
 use App\Helpers\DateHelper;
 use App\Models\User;
diff --git a/domains/Vault/ManageVault/Services/CreateVault.php b/app/Domains/Vault/ManageVault/Services/CreateVault.php
similarity index 96%
rename from domains/Vault/ManageVault/Services/CreateVault.php
rename to app/Domains/Vault/ManageVault/Services/CreateVault.php
index 86dab4f9c..775ec68c8 100644
--- a/domains/Vault/ManageVault/Services/CreateVault.php
+++ b/app/Domains/Vault/ManageVault/Services/CreateVault.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Vault\ManageVault\Services;
+namespace App\Domains\Vault\ManageVault\Services;
 
+use App\Domains\Vault\ManageVaultImportantDateTypes\Services\CreateContactImportantDateType;
 use App\Interfaces\ServiceInterface;
 use App\Models\Contact;
 use App\Models\ContactImportantDate;
 use App\Models\Template;
 use App\Models\Vault;
 use App\Services\BaseService;
-use App\Vault\ManageVaultImportantDateTypes\Services\CreateContactImportantDateType;
 
 class CreateVault extends BaseService implements ServiceInterface
 {
diff --git a/domains/Vault/ManageVault/Services/DestroyVault.php b/app/Domains/Vault/ManageVault/Services/DestroyVault.php
similarity index 96%
rename from domains/Vault/ManageVault/Services/DestroyVault.php
rename to app/Domains/Vault/ManageVault/Services/DestroyVault.php
index 24cb5a8d5..5324121fc 100644
--- a/domains/Vault/ManageVault/Services/DestroyVault.php
+++ b/app/Domains/Vault/ManageVault/Services/DestroyVault.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageVault\Services;
+namespace App\Domains\Vault\ManageVault\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Contact;
diff --git a/domains/Vault/ManageVault/Services/UpdateVault.php b/app/Domains/Vault/ManageVault/Services/UpdateVault.php
similarity index 96%
rename from domains/Vault/ManageVault/Services/UpdateVault.php
rename to app/Domains/Vault/ManageVault/Services/UpdateVault.php
index c86e9ac19..0c5cda3b6 100644
--- a/domains/Vault/ManageVault/Services/UpdateVault.php
+++ b/app/Domains/Vault/ManageVault/Services/UpdateVault.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageVault\Services;
+namespace App\Domains\Vault\ManageVault\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Vault;
diff --git a/domains/Vault/ManageVault/Web/Controllers/VaultController.php b/app/Domains/Vault/ManageVault/Web/Controllers/VaultController.php
similarity index 85%
rename from domains/Vault/ManageVault/Web/Controllers/VaultController.php
rename to app/Domains/Vault/ManageVault/Web/Controllers/VaultController.php
index 04b52b6cd..dde7ee038 100644
--- a/domains/Vault/ManageVault/Web/Controllers/VaultController.php
+++ b/app/Domains/Vault/ManageVault/Web/Controllers/VaultController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Vault\ManageVault\Web\Controllers;
+namespace App\Domains\Vault\ManageVault\Web\Controllers;
 
+use App\Domains\Vault\ManageVault\Services\CreateVault;
+use App\Domains\Vault\ManageVault\Services\DestroyVault;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultCreateViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultShowViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Vault;
-use App\Vault\ManageVault\Services\CreateVault;
-use App\Vault\ManageVault\Services\DestroyVault;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultCreateViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultShowViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Vault/ManageVault/Web/Controllers/VaultFeedController.php b/app/Domains/Vault/ManageVault/Web/Controllers/VaultFeedController.php
similarity index 87%
rename from domains/Vault/ManageVault/Web/Controllers/VaultFeedController.php
rename to app/Domains/Vault/ManageVault/Web/Controllers/VaultFeedController.php
index 434667054..96fc57f31 100644
--- a/domains/Vault/ManageVault/Web/Controllers/VaultFeedController.php
+++ b/app/Domains/Vault/ManageVault/Web/Controllers/VaultFeedController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Vault\ManageVault\Web\Controllers;
+namespace App\Domains\Vault\ManageVault\Web\Controllers;
 
-use App\Contact\ManageContactFeed\Web\ViewHelpers\ModuleFeedViewHelper;
+use App\Domains\Contact\ManageContactFeed\Web\ViewHelpers\ModuleFeedViewHelper;
 use App\Helpers\PaginatorHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Contact;
diff --git a/domains/Vault/ManageVault/Web/Controllers/VaultReminderController.php b/app/Domains/Vault/ManageVault/Web/Controllers/VaultReminderController.php
similarity index 73%
rename from domains/Vault/ManageVault/Web/Controllers/VaultReminderController.php
rename to app/Domains/Vault/ManageVault/Web/Controllers/VaultReminderController.php
index 85d4f7d2a..685b9f6ff 100644
--- a/domains/Vault/ManageVault/Web/Controllers/VaultReminderController.php
+++ b/app/Domains/Vault/ManageVault/Web/Controllers/VaultReminderController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Vault\ManageVault\Web\Controllers;
+namespace App\Domains\Vault\ManageVault\Web\Controllers;
 
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultReminderIndexViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Vault;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultReminderIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Inertia;
diff --git a/domains/Vault/ManageVault/Web/ViewHelpers/VaultCreateViewHelper.php b/app/Domains/Vault/ManageVault/Web/ViewHelpers/VaultCreateViewHelper.php
similarity index 81%
rename from domains/Vault/ManageVault/Web/ViewHelpers/VaultCreateViewHelper.php
rename to app/Domains/Vault/ManageVault/Web/ViewHelpers/VaultCreateViewHelper.php
index 6a6d699f2..2a67486e9 100644
--- a/domains/Vault/ManageVault/Web/ViewHelpers/VaultCreateViewHelper.php
+++ b/app/Domains/Vault/ManageVault/Web/ViewHelpers/VaultCreateViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageVault\Web\ViewHelpers;
+namespace App\Domains\Vault\ManageVault\Web\ViewHelpers;
 
 class VaultCreateViewHelper
 {
diff --git a/domains/Vault/ManageVault/Web/ViewHelpers/VaultIndexViewHelper.php b/app/Domains/Vault/ManageVault/Web/ViewHelpers/VaultIndexViewHelper.php
similarity index 98%
rename from domains/Vault/ManageVault/Web/ViewHelpers/VaultIndexViewHelper.php
rename to app/Domains/Vault/ManageVault/Web/ViewHelpers/VaultIndexViewHelper.php
index 007140642..40905efb1 100644
--- a/domains/Vault/ManageVault/Web/ViewHelpers/VaultIndexViewHelper.php
+++ b/app/Domains/Vault/ManageVault/Web/ViewHelpers/VaultIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageVault\Web\ViewHelpers;
+namespace App\Domains\Vault\ManageVault\Web\ViewHelpers;
 
 use App\Helpers\VaultHelper;
 use App\Models\Contact;
diff --git a/domains/Vault/ManageVault/Web/ViewHelpers/VaultReminderIndexViewHelper.php b/app/Domains/Vault/ManageVault/Web/ViewHelpers/VaultReminderIndexViewHelper.php
similarity index 98%
rename from domains/Vault/ManageVault/Web/ViewHelpers/VaultReminderIndexViewHelper.php
rename to app/Domains/Vault/ManageVault/Web/ViewHelpers/VaultReminderIndexViewHelper.php
index 8143ce612..12fcddb14 100644
--- a/domains/Vault/ManageVault/Web/ViewHelpers/VaultReminderIndexViewHelper.php
+++ b/app/Domains/Vault/ManageVault/Web/ViewHelpers/VaultReminderIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageVault\Web\ViewHelpers;
+namespace App\Domains\Vault\ManageVault\Web\ViewHelpers;
 
 use App\Helpers\DateHelper;
 use App\Models\ContactReminder;
diff --git a/domains/Vault/ManageVault/Web/ViewHelpers/VaultShowViewHelper.php b/app/Domains/Vault/ManageVault/Web/ViewHelpers/VaultShowViewHelper.php
similarity index 99%
rename from domains/Vault/ManageVault/Web/ViewHelpers/VaultShowViewHelper.php
rename to app/Domains/Vault/ManageVault/Web/ViewHelpers/VaultShowViewHelper.php
index 9a55edb6f..135d2f91b 100644
--- a/domains/Vault/ManageVault/Web/ViewHelpers/VaultShowViewHelper.php
+++ b/app/Domains/Vault/ManageVault/Web/ViewHelpers/VaultShowViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageVault\Web\ViewHelpers;
+namespace App\Domains\Vault\ManageVault\Web\ViewHelpers;
 
 use App\Helpers\DateHelper;
 use App\Models\User;
diff --git a/domains/Vault/ManageVaultImportantDateTypes/Services/CreateContactImportantDateType.php b/app/Domains/Vault/ManageVaultImportantDateTypes/Services/CreateContactImportantDateType.php
similarity index 96%
rename from domains/Vault/ManageVaultImportantDateTypes/Services/CreateContactImportantDateType.php
rename to app/Domains/Vault/ManageVaultImportantDateTypes/Services/CreateContactImportantDateType.php
index 78703d867..76166051e 100644
--- a/domains/Vault/ManageVaultImportantDateTypes/Services/CreateContactImportantDateType.php
+++ b/app/Domains/Vault/ManageVaultImportantDateTypes/Services/CreateContactImportantDateType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageVaultImportantDateTypes\Services;
+namespace App\Domains\Vault\ManageVaultImportantDateTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactImportantDateType;
diff --git a/domains/Vault/ManageVaultImportantDateTypes/Services/DestroyContactImportantDateType.php b/app/Domains/Vault/ManageVaultImportantDateTypes/Services/DestroyContactImportantDateType.php
similarity index 95%
rename from domains/Vault/ManageVaultImportantDateTypes/Services/DestroyContactImportantDateType.php
rename to app/Domains/Vault/ManageVaultImportantDateTypes/Services/DestroyContactImportantDateType.php
index 6bf5933af..633415e2f 100644
--- a/domains/Vault/ManageVaultImportantDateTypes/Services/DestroyContactImportantDateType.php
+++ b/app/Domains/Vault/ManageVaultImportantDateTypes/Services/DestroyContactImportantDateType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageVaultImportantDateTypes\Services;
+namespace App\Domains\Vault\ManageVaultImportantDateTypes\Services;
 
 use App\Exceptions\CantBeDeletedException;
 use App\Interfaces\ServiceInterface;
diff --git a/domains/Vault/ManageVaultImportantDateTypes/Services/UpdateContactImportantDateType.php b/app/Domains/Vault/ManageVaultImportantDateTypes/Services/UpdateContactImportantDateType.php
similarity index 96%
rename from domains/Vault/ManageVaultImportantDateTypes/Services/UpdateContactImportantDateType.php
rename to app/Domains/Vault/ManageVaultImportantDateTypes/Services/UpdateContactImportantDateType.php
index ffb30329c..930f96cc2 100644
--- a/domains/Vault/ManageVaultImportantDateTypes/Services/UpdateContactImportantDateType.php
+++ b/app/Domains/Vault/ManageVaultImportantDateTypes/Services/UpdateContactImportantDateType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageVaultImportantDateTypes\Services;
+namespace App\Domains\Vault\ManageVaultImportantDateTypes\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\ContactImportantDateType;
diff --git a/domains/Vault/ManageVaultImportantDateTypes/Web/ViewHelpers/VaultImportantDateTypesViewHelper.php b/app/Domains/Vault/ManageVaultImportantDateTypes/Web/ViewHelpers/VaultImportantDateTypesViewHelper.php
similarity index 93%
rename from domains/Vault/ManageVaultImportantDateTypes/Web/ViewHelpers/VaultImportantDateTypesViewHelper.php
rename to app/Domains/Vault/ManageVaultImportantDateTypes/Web/ViewHelpers/VaultImportantDateTypesViewHelper.php
index dff7070d4..9ca45319f 100644
--- a/domains/Vault/ManageVaultImportantDateTypes/Web/ViewHelpers/VaultImportantDateTypesViewHelper.php
+++ b/app/Domains/Vault/ManageVaultImportantDateTypes/Web/ViewHelpers/VaultImportantDateTypesViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageVaultImportantDateTypes\Web\ViewHelpers;
+namespace App\Domains\Vault\ManageVaultImportantDateTypes\Web\ViewHelpers;
 
 use App\Models\ContactImportantDateType;
 use App\Models\Vault;
diff --git a/domains/Vault/ManageVaultSettings/Services/ChangeVaultAccess.php b/app/Domains/Vault/ManageVaultSettings/Services/ChangeVaultAccess.php
similarity index 97%
rename from domains/Vault/ManageVaultSettings/Services/ChangeVaultAccess.php
rename to app/Domains/Vault/ManageVaultSettings/Services/ChangeVaultAccess.php
index e8fec806c..d8979707c 100644
--- a/domains/Vault/ManageVaultSettings/Services/ChangeVaultAccess.php
+++ b/app/Domains/Vault/ManageVaultSettings/Services/ChangeVaultAccess.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageVaultSettings\Services;
+namespace App\Domains\Vault\ManageVaultSettings\Services;
 
 use App\Exceptions\SameUserException;
 use App\Interfaces\ServiceInterface;
diff --git a/domains/Vault/ManageVaultSettings/Services/CreateLabel.php b/app/Domains/Vault/ManageVaultSettings/Services/CreateLabel.php
similarity index 96%
rename from domains/Vault/ManageVaultSettings/Services/CreateLabel.php
rename to app/Domains/Vault/ManageVaultSettings/Services/CreateLabel.php
index 971e2d448..25f6f9eed 100644
--- a/domains/Vault/ManageVaultSettings/Services/CreateLabel.php
+++ b/app/Domains/Vault/ManageVaultSettings/Services/CreateLabel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageVaultSettings\Services;
+namespace App\Domains\Vault\ManageVaultSettings\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Label;
diff --git a/domains/Vault/ManageVaultSettings/Services/CreateTag.php b/app/Domains/Vault/ManageVaultSettings/Services/CreateTag.php
similarity index 95%
rename from domains/Vault/ManageVaultSettings/Services/CreateTag.php
rename to app/Domains/Vault/ManageVaultSettings/Services/CreateTag.php
index 3978daf34..4e2edb044 100644
--- a/domains/Vault/ManageVaultSettings/Services/CreateTag.php
+++ b/app/Domains/Vault/ManageVaultSettings/Services/CreateTag.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageVaultSettings\Services;
+namespace App\Domains\Vault\ManageVaultSettings\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Tag;
diff --git a/domains/Vault/ManageVaultSettings/Services/DestroyLabel.php b/app/Domains/Vault/ManageVaultSettings/Services/DestroyLabel.php
similarity index 95%
rename from domains/Vault/ManageVaultSettings/Services/DestroyLabel.php
rename to app/Domains/Vault/ManageVaultSettings/Services/DestroyLabel.php
index 42f3e45d2..935c9c88b 100644
--- a/domains/Vault/ManageVaultSettings/Services/DestroyLabel.php
+++ b/app/Domains/Vault/ManageVaultSettings/Services/DestroyLabel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageVaultSettings\Services;
+namespace App\Domains\Vault\ManageVaultSettings\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Label;
diff --git a/domains/Vault/ManageVaultSettings/Services/DestroyTag.php b/app/Domains/Vault/ManageVaultSettings/Services/DestroyTag.php
similarity index 95%
rename from domains/Vault/ManageVaultSettings/Services/DestroyTag.php
rename to app/Domains/Vault/ManageVaultSettings/Services/DestroyTag.php
index e8664d5c5..0e571367f 100644
--- a/domains/Vault/ManageVaultSettings/Services/DestroyTag.php
+++ b/app/Domains/Vault/ManageVaultSettings/Services/DestroyTag.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageVaultSettings\Services;
+namespace App\Domains\Vault\ManageVaultSettings\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Tag;
diff --git a/domains/Vault/ManageVaultSettings/Services/GrantVaultAccessToUser.php b/app/Domains/Vault/ManageVaultSettings/Services/GrantVaultAccessToUser.php
similarity index 96%
rename from domains/Vault/ManageVaultSettings/Services/GrantVaultAccessToUser.php
rename to app/Domains/Vault/ManageVaultSettings/Services/GrantVaultAccessToUser.php
index 1f9de50fd..25eff444d 100644
--- a/domains/Vault/ManageVaultSettings/Services/GrantVaultAccessToUser.php
+++ b/app/Domains/Vault/ManageVaultSettings/Services/GrantVaultAccessToUser.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Vault\ManageVaultSettings\Services;
+namespace App\Domains\Vault\ManageVaultSettings\Services;
 
-use App\Contact\ManageReminders\Services\ScheduleContactReminderForUser;
+use App\Domains\Contact\ManageReminders\Services\ScheduleContactReminderForUser;
 use App\Exceptions\SameUserException;
 use App\Interfaces\ServiceInterface;
 use App\Models\Contact;
diff --git a/domains/Vault/ManageVaultSettings/Services/RemoveVaultAccess.php b/app/Domains/Vault/ManageVaultSettings/Services/RemoveVaultAccess.php
similarity index 97%
rename from domains/Vault/ManageVaultSettings/Services/RemoveVaultAccess.php
rename to app/Domains/Vault/ManageVaultSettings/Services/RemoveVaultAccess.php
index 93a3c6211..ecd77b592 100644
--- a/domains/Vault/ManageVaultSettings/Services/RemoveVaultAccess.php
+++ b/app/Domains/Vault/ManageVaultSettings/Services/RemoveVaultAccess.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageVaultSettings\Services;
+namespace App\Domains\Vault\ManageVaultSettings\Services;
 
 use App\Exceptions\SameUserException;
 use App\Interfaces\ServiceInterface;
diff --git a/domains/Vault/ManageVaultSettings/Services/UpdateLabel.php b/app/Domains/Vault/ManageVaultSettings/Services/UpdateLabel.php
similarity index 96%
rename from domains/Vault/ManageVaultSettings/Services/UpdateLabel.php
rename to app/Domains/Vault/ManageVaultSettings/Services/UpdateLabel.php
index 03479fb68..a6ae74fa0 100644
--- a/domains/Vault/ManageVaultSettings/Services/UpdateLabel.php
+++ b/app/Domains/Vault/ManageVaultSettings/Services/UpdateLabel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageVaultSettings\Services;
+namespace App\Domains\Vault\ManageVaultSettings\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Label;
diff --git a/domains/Vault/ManageVaultSettings/Services/UpdateTag.php b/app/Domains/Vault/ManageVaultSettings/Services/UpdateTag.php
similarity index 96%
rename from domains/Vault/ManageVaultSettings/Services/UpdateTag.php
rename to app/Domains/Vault/ManageVaultSettings/Services/UpdateTag.php
index 9fe366908..9fa138f31 100644
--- a/domains/Vault/ManageVaultSettings/Services/UpdateTag.php
+++ b/app/Domains/Vault/ManageVaultSettings/Services/UpdateTag.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageVaultSettings\Services;
+namespace App\Domains\Vault\ManageVaultSettings\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Tag;
diff --git a/domains/Vault/ManageVaultSettings/Services/UpdateVaultDefaultTemplate.php b/app/Domains/Vault/ManageVaultSettings/Services/UpdateVaultDefaultTemplate.php
similarity index 96%
rename from domains/Vault/ManageVaultSettings/Services/UpdateVaultDefaultTemplate.php
rename to app/Domains/Vault/ManageVaultSettings/Services/UpdateVaultDefaultTemplate.php
index b73fe8f3c..53f6287b1 100644
--- a/domains/Vault/ManageVaultSettings/Services/UpdateVaultDefaultTemplate.php
+++ b/app/Domains/Vault/ManageVaultSettings/Services/UpdateVaultDefaultTemplate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\ManageVaultSettings\Services;
+namespace App\Domains\Vault\ManageVaultSettings\Services;
 
 use App\Interfaces\ServiceInterface;
 use App\Models\Template;
diff --git a/domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsContactImportantDateTypeController.php b/app/Domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsContactImportantDateTypeController.php
similarity index 82%
rename from domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsContactImportantDateTypeController.php
rename to app/Domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsContactImportantDateTypeController.php
index 94672b28d..50f9fd505 100644
--- a/domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsContactImportantDateTypeController.php
+++ b/app/Domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsContactImportantDateTypeController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Vault\ManageVaultSettings\Web\Controllers;
+namespace App\Domains\Vault\ManageVaultSettings\Web\Controllers;
 
+use App\Domains\Vault\ManageVaultImportantDateTypes\Services\CreateContactImportantDateType;
+use App\Domains\Vault\ManageVaultImportantDateTypes\Services\DestroyContactImportantDateType;
+use App\Domains\Vault\ManageVaultImportantDateTypes\Services\UpdateContactImportantDateType;
+use App\Domains\Vault\ManageVaultImportantDateTypes\Web\ViewHelpers\VaultImportantDateTypesViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Vault;
-use App\Vault\ManageVaultImportantDateTypes\Services\CreateContactImportantDateType;
-use App\Vault\ManageVaultImportantDateTypes\Services\DestroyContactImportantDateType;
-use App\Vault\ManageVaultImportantDateTypes\Services\UpdateContactImportantDateType;
-use App\Vault\ManageVaultImportantDateTypes\Web\ViewHelpers\VaultImportantDateTypesViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsController.php b/app/Domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsController.php
similarity index 68%
rename from domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsController.php
rename to app/Domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsController.php
index c16d01b54..18c7e7375 100644
--- a/domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsController.php
+++ b/app/Domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Vault\ManageVaultSettings\Web\Controllers;
+namespace App\Domains\Vault\ManageVaultSettings\Web\Controllers;
 
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
+use App\Domains\Vault\ManageVaultSettings\Web\ViewHelpers\VaultSettingsIndexViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Vault;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
-use App\Vault\ManageVaultSettings\Web\ViewHelpers\VaultSettingsIndexViewHelper;
 use Illuminate\Http\Request;
 use Inertia\Inertia;
 
diff --git a/domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsLabelController.php b/app/Domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsLabelController.php
similarity index 85%
rename from domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsLabelController.php
rename to app/Domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsLabelController.php
index d5593596b..25c1a5bef 100644
--- a/domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsLabelController.php
+++ b/app/Domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsLabelController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Vault\ManageVaultSettings\Web\Controllers;
+namespace App\Domains\Vault\ManageVaultSettings\Web\Controllers;
 
+use App\Domains\Vault\ManageVaultSettings\Services\CreateLabel;
+use App\Domains\Vault\ManageVaultSettings\Services\DestroyLabel;
+use App\Domains\Vault\ManageVaultSettings\Services\UpdateLabel;
+use App\Domains\Vault\ManageVaultSettings\Web\ViewHelpers\VaultSettingsIndexViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Vault;
-use App\Vault\ManageVaultSettings\Services\CreateLabel;
-use App\Vault\ManageVaultSettings\Services\DestroyLabel;
-use App\Vault\ManageVaultSettings\Services\UpdateLabel;
-use App\Vault\ManageVaultSettings\Web\ViewHelpers\VaultSettingsIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsTagController.php b/app/Domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsTagController.php
similarity index 82%
rename from domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsTagController.php
rename to app/Domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsTagController.php
index b06912a6d..4652c33fc 100644
--- a/domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsTagController.php
+++ b/app/Domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsTagController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Vault\ManageVaultSettings\Web\Controllers;
+namespace App\Domains\Vault\ManageVaultSettings\Web\Controllers;
 
+use App\Domains\Vault\ManageVaultSettings\Services\CreateTag;
+use App\Domains\Vault\ManageVaultSettings\Services\DestroyTag;
+use App\Domains\Vault\ManageVaultSettings\Services\UpdateTag;
+use App\Domains\Vault\ManageVaultSettings\Web\ViewHelpers\VaultSettingsIndexViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Vault;
-use App\Vault\ManageVaultSettings\Services\CreateTag;
-use App\Vault\ManageVaultSettings\Services\DestroyTag;
-use App\Vault\ManageVaultSettings\Services\UpdateTag;
-use App\Vault\ManageVaultSettings\Web\ViewHelpers\VaultSettingsIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsTemplateController.php b/app/Domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsTemplateController.php
similarity index 80%
rename from domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsTemplateController.php
rename to app/Domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsTemplateController.php
index 44bf07da7..559571c65 100644
--- a/domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsTemplateController.php
+++ b/app/Domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsTemplateController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Vault\ManageVaultSettings\Web\Controllers;
+namespace App\Domains\Vault\ManageVaultSettings\Web\Controllers;
 
+use App\Domains\Vault\ManageVaultSettings\Services\UpdateVaultDefaultTemplate;
 use App\Http\Controllers\Controller;
-use App\Vault\ManageVaultSettings\Services\UpdateVaultDefaultTemplate;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsUserController.php b/app/Domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsUserController.php
similarity index 82%
rename from domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsUserController.php
rename to app/Domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsUserController.php
index fe83281de..08a0ccd73 100644
--- a/domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsUserController.php
+++ b/app/Domains/Vault/ManageVaultSettings/Web/Controllers/VaultSettingsUserController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Vault\ManageVaultSettings\Web\Controllers;
+namespace App\Domains\Vault\ManageVaultSettings\Web\Controllers;
 
+use App\Domains\Vault\ManageVaultSettings\Services\ChangeVaultAccess;
+use App\Domains\Vault\ManageVaultSettings\Services\GrantVaultAccessToUser;
+use App\Domains\Vault\ManageVaultSettings\Services\RemoveVaultAccess;
+use App\Domains\Vault\ManageVaultSettings\Web\ViewHelpers\VaultSettingsIndexViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Vault;
-use App\Vault\ManageVaultSettings\Services\ChangeVaultAccess;
-use App\Vault\ManageVaultSettings\Services\GrantVaultAccessToUser;
-use App\Vault\ManageVaultSettings\Services\RemoveVaultAccess;
-use App\Vault\ManageVaultSettings\Web\ViewHelpers\VaultSettingsIndexViewHelper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/domains/Vault/ManageVaultSettings/Web/ViewHelpers/VaultSettingsIndexViewHelper.php b/app/Domains/Vault/ManageVaultSettings/Web/ViewHelpers/VaultSettingsIndexViewHelper.php
similarity index 97%
rename from domains/Vault/ManageVaultSettings/Web/ViewHelpers/VaultSettingsIndexViewHelper.php
rename to app/Domains/Vault/ManageVaultSettings/Web/ViewHelpers/VaultSettingsIndexViewHelper.php
index ced45d420..115d914dd 100644
--- a/domains/Vault/ManageVaultSettings/Web/ViewHelpers/VaultSettingsIndexViewHelper.php
+++ b/app/Domains/Vault/ManageVaultSettings/Web/ViewHelpers/VaultSettingsIndexViewHelper.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Vault\ManageVaultSettings\Web\ViewHelpers;
+namespace App\Domains\Vault\ManageVaultSettings\Web\ViewHelpers;
 
+use App\Domains\Vault\ManageVaultImportantDateTypes\Web\ViewHelpers\VaultImportantDateTypesViewHelper;
 use App\Helpers\VaultHelper;
 use App\Models\Label;
 use App\Models\Tag;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageVaultImportantDateTypes\Web\ViewHelpers\VaultImportantDateTypesViewHelper;
 
 class VaultSettingsIndexViewHelper
 {
diff --git a/domains/Vault/Search/Web/Controllers/VaultContactSearchController.php b/app/Domains/Vault/Search/Web/Controllers/VaultContactSearchController.php
similarity index 80%
rename from domains/Vault/Search/Web/Controllers/VaultContactSearchController.php
rename to app/Domains/Vault/Search/Web/Controllers/VaultContactSearchController.php
index 5f037333b..f67a54d9a 100644
--- a/domains/Vault/Search/Web/Controllers/VaultContactSearchController.php
+++ b/app/Domains/Vault/Search/Web/Controllers/VaultContactSearchController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Vault\Search\Web\Controllers;
+namespace App\Domains\Vault\Search\Web\Controllers;
 
+use App\Domains\Vault\Search\Web\ViewHelpers\VaultContactSearchViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Vault;
-use App\Vault\Search\Web\ViewHelpers\VaultContactSearchViewHelper;
 use Illuminate\Http\Request;
 
 /**
diff --git a/domains/Vault/Search/Web/Controllers/VaultMostConsultedContactsController.php b/app/Domains/Vault/Search/Web/Controllers/VaultMostConsultedContactsController.php
similarity index 84%
rename from domains/Vault/Search/Web/Controllers/VaultMostConsultedContactsController.php
rename to app/Domains/Vault/Search/Web/Controllers/VaultMostConsultedContactsController.php
index 395d2f6bf..aeff85508 100644
--- a/domains/Vault/Search/Web/Controllers/VaultMostConsultedContactsController.php
+++ b/app/Domains/Vault/Search/Web/Controllers/VaultMostConsultedContactsController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Vault\Search\Web\Controllers;
+namespace App\Domains\Vault\Search\Web\Controllers;
 
+use App\Domains\Vault\Search\Web\ViewHelpers\VaultMostConsultedViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Vault;
-use App\Vault\Search\Web\ViewHelpers\VaultMostConsultedViewHelper;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
diff --git a/domains/Vault/Search/Web/Controllers/VaultSearchController.php b/app/Domains/Vault/Search/Web/Controllers/VaultSearchController.php
similarity index 79%
rename from domains/Vault/Search/Web/Controllers/VaultSearchController.php
rename to app/Domains/Vault/Search/Web/Controllers/VaultSearchController.php
index 102a46266..7fd562a69 100644
--- a/domains/Vault/Search/Web/Controllers/VaultSearchController.php
+++ b/app/Domains/Vault/Search/Web/Controllers/VaultSearchController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Vault\Search\Web\Controllers;
+namespace App\Domains\Vault\Search\Web\Controllers;
 
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
+use App\Domains\Vault\Search\Web\ViewHelpers\VaultSearchIndexViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\Vault;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
-use App\Vault\Search\Web\ViewHelpers\VaultSearchIndexViewHelper;
 use Illuminate\Http\Request;
 use Inertia\Inertia;
 
diff --git a/domains/Vault/Search/Web/ViewHelpers/VaultContactSearchViewHelper.php b/app/Domains/Vault/Search/Web/ViewHelpers/VaultContactSearchViewHelper.php
similarity index 94%
rename from domains/Vault/Search/Web/ViewHelpers/VaultContactSearchViewHelper.php
rename to app/Domains/Vault/Search/Web/ViewHelpers/VaultContactSearchViewHelper.php
index 6aa88671d..21432f3c1 100644
--- a/domains/Vault/Search/Web/ViewHelpers/VaultContactSearchViewHelper.php
+++ b/app/Domains/Vault/Search/Web/ViewHelpers/VaultContactSearchViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\Search\Web\ViewHelpers;
+namespace App\Domains\Vault\Search\Web\ViewHelpers;
 
 use App\Models\Contact;
 use App\Models\Vault;
diff --git a/domains/Vault/Search/Web/ViewHelpers/VaultMostConsultedViewHelper.php b/app/Domains/Vault/Search/Web/ViewHelpers/VaultMostConsultedViewHelper.php
similarity index 95%
rename from domains/Vault/Search/Web/ViewHelpers/VaultMostConsultedViewHelper.php
rename to app/Domains/Vault/Search/Web/ViewHelpers/VaultMostConsultedViewHelper.php
index 28c23247b..c4f56b9ab 100644
--- a/domains/Vault/Search/Web/ViewHelpers/VaultMostConsultedViewHelper.php
+++ b/app/Domains/Vault/Search/Web/ViewHelpers/VaultMostConsultedViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\Search\Web\ViewHelpers;
+namespace App\Domains\Vault\Search\Web\ViewHelpers;
 
 use App\Models\Contact;
 use App\Models\User;
diff --git a/domains/Vault/Search/Web/ViewHelpers/VaultSearchIndexViewHelper.php b/app/Domains/Vault/Search/Web/ViewHelpers/VaultSearchIndexViewHelper.php
similarity index 98%
rename from domains/Vault/Search/Web/ViewHelpers/VaultSearchIndexViewHelper.php
rename to app/Domains/Vault/Search/Web/ViewHelpers/VaultSearchIndexViewHelper.php
index e59300a4e..1583a17de 100644
--- a/domains/Vault/Search/Web/ViewHelpers/VaultSearchIndexViewHelper.php
+++ b/app/Domains/Vault/Search/Web/ViewHelpers/VaultSearchIndexViewHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Vault\Search\Web\ViewHelpers;
+namespace App\Domains\Vault\Search\Web\ViewHelpers;
 
 use App\Helpers\DateHelper;
 use App\Models\Contact;
diff --git a/app/Helpers/ContactCardHelper.php b/app/Helpers/ContactCardHelper.php
index 693765920..5d6d88d98 100644
--- a/app/Helpers/ContactCardHelper.php
+++ b/app/Helpers/ContactCardHelper.php
@@ -2,7 +2,7 @@
 
 namespace App\Helpers;
 
-use App\Contact\ManageGroups\Web\ViewHelpers\GroupsViewHelper;
+use App\Domains\Contact\ManageGroups\Web\ViewHelpers\GroupsViewHelper;
 use App\Models\Contact;
 use App\Models\User;
 
diff --git a/app/Http/Controllers/Auth/AcceptInvitationController.php b/app/Http/Controllers/Auth/AcceptInvitationController.php
index 1c0686a9f..4230b550d 100644
--- a/app/Http/Controllers/Auth/AcceptInvitationController.php
+++ b/app/Http/Controllers/Auth/AcceptInvitationController.php
@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers\Auth;
 
+use App\Domains\Settings\ManageUsers\Services\AcceptInvitation;
 use App\Http\Controllers\Auth\ViewHelpers\AcceptInvitationShowViewHelper;
 use App\Http\Controllers\Controller;
 use App\Models\User;
-use App\Settings\ManageUsers\Services\AcceptInvitation;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
diff --git a/app/Jobs/SetupAccount.php b/app/Jobs/SetupAccount.php
index 9debaf228..31fe739eb 100644
--- a/app/Jobs/SetupAccount.php
+++ b/app/Jobs/SetupAccount.php
@@ -2,6 +2,24 @@
 
 namespace App\Jobs;
 
+use App\Domains\Settings\ManageActivityTypes\Services\CreateActivityType;
+use App\Domains\Settings\ManageAddressTypes\Services\CreateAddressType;
+use App\Domains\Settings\ManageCallReasons\Services\CreateCallReason;
+use App\Domains\Settings\ManageCallReasons\Services\CreateCallReasonType;
+use App\Domains\Settings\ManageContactInformationTypes\Services\CreateContactInformationType;
+use App\Domains\Settings\ManageGenders\Services\CreateGender;
+use App\Domains\Settings\ManageGroupTypes\Services\CreateGroupType;
+use App\Domains\Settings\ManageGroupTypes\Services\CreateGroupTypeRole;
+use App\Domains\Settings\ManageNotificationChannels\Services\CreateUserNotificationChannel;
+use App\Domains\Settings\ManagePetCategories\Services\CreatePetCategory;
+use App\Domains\Settings\ManagePostTemplates\Services\CreatePostTemplate;
+use App\Domains\Settings\ManagePostTemplates\Services\CreatePostTemplateSection;
+use App\Domains\Settings\ManagePronouns\Services\CreatePronoun;
+use App\Domains\Settings\ManageRelationshipTypes\Services\CreateRelationshipGroupType;
+use App\Domains\Settings\ManageTemplates\Services\AssociateModuleToTemplatePage;
+use App\Domains\Settings\ManageTemplates\Services\CreateModule;
+use App\Domains\Settings\ManageTemplates\Services\CreateTemplate;
+use App\Domains\Settings\ManageTemplates\Services\CreateTemplatePage;
 use App\Models\Currency;
 use App\Models\Emotion;
 use App\Models\LifeEventCategory;
@@ -13,24 +31,6 @@ use App\Models\Template;
 use App\Models\TemplatePage;
 use App\Models\User;
 use App\Models\UserNotificationChannel;
-use App\Settings\ManageActivityTypes\Services\CreateActivityType;
-use App\Settings\ManageAddressTypes\Services\CreateAddressType;
-use App\Settings\ManageCallReasons\Services\CreateCallReason;
-use App\Settings\ManageCallReasons\Services\CreateCallReasonType;
-use App\Settings\ManageContactInformationTypes\Services\CreateContactInformationType;
-use App\Settings\ManageGenders\Services\CreateGender;
-use App\Settings\ManageGroupTypes\Services\CreateGroupType;
-use App\Settings\ManageGroupTypes\Services\CreateGroupTypeRole;
-use App\Settings\ManageNotificationChannels\Services\CreateUserNotificationChannel;
-use App\Settings\ManagePetCategories\Services\CreatePetCategory;
-use App\Settings\ManagePostTemplates\Services\CreatePostTemplate;
-use App\Settings\ManagePostTemplates\Services\CreatePostTemplateSection;
-use App\Settings\ManagePronouns\Services\CreatePronoun;
-use App\Settings\ManageRelationshipTypes\Services\CreateRelationshipGroupType;
-use App\Settings\ManageTemplates\Services\AssociateModuleToTemplatePage;
-use App\Settings\ManageTemplates\Services\CreateModule;
-use App\Settings\ManageTemplates\Services\CreateTemplate;
-use App\Settings\ManageTemplates\Services\CreateTemplatePage;
 use Carbon\Carbon;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/app/Models/File.php b/app/Models/File.php
index c6b55b08a..ffa841059 100644
--- a/app/Models/File.php
+++ b/app/Models/File.php
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-use App\Contact\ManageDocuments\Events\FileDeleted;
+use App\Domains\Contact\ManageDocuments\Events\FileDeleted;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 4da90925d..e339b1b77 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
-use App\Contact\ManageDocuments\Events\FileDeleted;
-use App\Contact\ManageDocuments\Listeners\DeleteFileInStorage;
+use App\Domains\Contact\ManageDocuments\Events\FileDeleted;
+use App\Domains\Contact\ManageDocuments\Listeners\DeleteFileInStorage;
 use App\Listeners\LoginListener;
 use Illuminate\Auth\Events\Login;
 use Illuminate\Auth\Events\Registered;
diff --git a/composer.json b/composer.json
index 7318a4509..b24657948 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,7 @@
   },
   "autoload": {
     "psr-4": {
-      "App\\": ["app/", "domains/"],
+      "App\\": "app/",
       "Database\\Factories\\": "database/factories/",
       "Database\\Seeders\\": "database/seeders/"
     }
diff --git a/phpstan.neon b/phpstan.neon
index 299b269ec..458c05afc 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -7,7 +7,6 @@ parameters:
         - database/factories
         - database/seeders
         - routes
-        - domains
 
     inferPrivatePropertyTypeFromConstructor: true
     level: 5
@@ -33,4 +32,4 @@ parameters:
         - message: '#Call to an undefined method Illuminate\\Database\\Eloquent\\Builder<App\\Models\\Contact>::unsearchable\(\)\.#'
           path: */app/Models/Vault.php
         - message: '#Parameter \#1 \$value of function count expects array\|Countable, App\\Models\\Contact given\.#'
-          path: */domains/Vault/ManageVault/Web/ViewHelpers/VaultIndexViewHelper.php
+          path: */app/Domains/Vault/ManageVault/Web/ViewHelpers/VaultIndexViewHelper.php
diff --git a/phpunit.xml b/phpunit.xml
index 921c10f96..65851c9e9 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -13,7 +13,6 @@
   <coverage processUncoveredFiles="true">
     <include>
       <directory suffix=".php">./app</directory>
-      <directory suffix=".php">./domains</directory>
     </include>
   </coverage>
   <php>
diff --git a/psalm.xml b/psalm.xml
index 868861459..45a55ce00 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -11,7 +11,6 @@
         <directory name="database/factories"/>
         <directory name="database/seeders"/>
         <directory name="routes"/>
-        <directory name="domains"/>
         <ignoreFiles>
             <directory name="vendor"/>
         </ignoreFiles>
diff --git a/routes/web.php b/routes/web.php
index 6a188eb6e..a559a3586 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,112 +1,112 @@
 <?php
 
-use App\Contact\ManageAvatar\Web\Controllers\ModuleAvatarController;
-use App\Contact\ManageCalls\Web\Controllers\ContactModuleCallController;
-use App\Contact\ManageContact\Web\Controllers\ContactArchiveController;
-use App\Contact\ManageContact\Web\Controllers\ContactController;
-use App\Contact\ManageContact\Web\Controllers\ContactFavoriteController;
-use App\Contact\ManageContact\Web\Controllers\ContactLabelController;
-use App\Contact\ManageContact\Web\Controllers\ContactNoTemplateController;
-use App\Contact\ManageContact\Web\Controllers\ContactPageController;
-use App\Contact\ManageContact\Web\Controllers\ContactTemplateController;
-use App\Contact\ManageContactAddresses\Web\Controllers\ContactModuleAddressController;
-use App\Contact\ManageContactAddresses\Web\Controllers\ContactModuleAddressImageController;
-use App\Contact\ManageContactFeed\Web\Controllers\ContactFeedController;
-use App\Contact\ManageContactImportantDates\Web\Controllers\ContactImportantDatesController;
-use App\Contact\ManageContactInformation\Web\Controllers\ContactInformationController;
-use App\Contact\ManageDocuments\Web\Controllers\ContactModuleDocumentController;
-use App\Contact\ManageGoals\Web\Controllers\ContactGoalController;
-use App\Contact\ManageGoals\Web\Controllers\ContactModuleGoalController;
-use App\Contact\ManageGoals\Web\Controllers\ContactModuleStreakController;
-use App\Contact\ManageGroups\Web\Controllers\ContactModuleGroupController;
-use App\Contact\ManageGroups\Web\Controllers\GroupController;
-use App\Contact\ManageJobInformation\Web\Controllers\ContactModuleJobInformationController;
-use App\Contact\ManageLabels\Web\Controllers\ContactModuleLabelController;
-use App\Contact\ManageLoans\Web\Controllers\ContactModuleLoanController;
-use App\Contact\ManageLoans\Web\Controllers\ContactModuleToggleLoanController;
-use App\Contact\ManageNotes\Web\Controllers\ContactModuleNoteController;
-use App\Contact\ManageNotes\Web\Controllers\ContactNotesController;
-use App\Contact\ManagePets\Web\Controllers\ContactModulePetController;
-use App\Contact\ManagePhotos\Web\Controllers\ContactModulePhotoController;
-use App\Contact\ManagePhotos\Web\Controllers\ContactPhotoController;
-use App\Contact\ManageRelationships\Web\Controllers\ContactRelationshipsController;
-use App\Contact\ManageReminders\Web\Controllers\ContactModuleReminderController;
-use App\Contact\ManageTasks\Web\Controllers\ContactModuleTaskController;
+use App\Domains\Contact\ManageAvatar\Web\Controllers\ModuleAvatarController;
+use App\Domains\Contact\ManageCalls\Web\Controllers\ContactModuleCallController;
+use App\Domains\Contact\ManageContact\Web\Controllers\ContactArchiveController;
+use App\Domains\Contact\ManageContact\Web\Controllers\ContactController;
+use App\Domains\Contact\ManageContact\Web\Controllers\ContactFavoriteController;
+use App\Domains\Contact\ManageContact\Web\Controllers\ContactLabelController;
+use App\Domains\Contact\ManageContact\Web\Controllers\ContactNoTemplateController;
+use App\Domains\Contact\ManageContact\Web\Controllers\ContactPageController;
+use App\Domains\Contact\ManageContact\Web\Controllers\ContactTemplateController;
+use App\Domains\Contact\ManageContactAddresses\Web\Controllers\ContactModuleAddressController;
+use App\Domains\Contact\ManageContactAddresses\Web\Controllers\ContactModuleAddressImageController;
+use App\Domains\Contact\ManageContactFeed\Web\Controllers\ContactFeedController;
+use App\Domains\Contact\ManageContactImportantDates\Web\Controllers\ContactImportantDatesController;
+use App\Domains\Contact\ManageContactInformation\Web\Controllers\ContactInformationController;
+use App\Domains\Contact\ManageDocuments\Web\Controllers\ContactModuleDocumentController;
+use App\Domains\Contact\ManageGoals\Web\Controllers\ContactGoalController;
+use App\Domains\Contact\ManageGoals\Web\Controllers\ContactModuleGoalController;
+use App\Domains\Contact\ManageGoals\Web\Controllers\ContactModuleStreakController;
+use App\Domains\Contact\ManageGroups\Web\Controllers\ContactModuleGroupController;
+use App\Domains\Contact\ManageGroups\Web\Controllers\GroupController;
+use App\Domains\Contact\ManageJobInformation\Web\Controllers\ContactModuleJobInformationController;
+use App\Domains\Contact\ManageLabels\Web\Controllers\ContactModuleLabelController;
+use App\Domains\Contact\ManageLoans\Web\Controllers\ContactModuleLoanController;
+use App\Domains\Contact\ManageLoans\Web\Controllers\ContactModuleToggleLoanController;
+use App\Domains\Contact\ManageNotes\Web\Controllers\ContactModuleNoteController;
+use App\Domains\Contact\ManageNotes\Web\Controllers\ContactNotesController;
+use App\Domains\Contact\ManagePets\Web\Controllers\ContactModulePetController;
+use App\Domains\Contact\ManagePhotos\Web\Controllers\ContactModulePhotoController;
+use App\Domains\Contact\ManagePhotos\Web\Controllers\ContactPhotoController;
+use App\Domains\Contact\ManageRelationships\Web\Controllers\ContactRelationshipsController;
+use App\Domains\Contact\ManageReminders\Web\Controllers\ContactModuleReminderController;
+use App\Domains\Contact\ManageTasks\Web\Controllers\ContactModuleTaskController;
+use App\Domains\Settings\CancelAccount\Web\Controllers\CancelAccountController;
+use App\Domains\Settings\ManageActivityTypes\Web\Controllers\PersonalizeActivitiesController;
+use App\Domains\Settings\ManageActivityTypes\Web\Controllers\PersonalizeActivityTypesController;
+use App\Domains\Settings\ManageAddressTypes\Web\Controllers\PersonalizeAddressTypeController;
+use App\Domains\Settings\ManageCallReasons\Web\Controllers\PersonalizeCallReasonsController;
+use App\Domains\Settings\ManageCallReasons\Web\Controllers\PersonalizeCallReasonTypesController;
+use App\Domains\Settings\ManageContactInformationTypes\Web\Controllers\PersonalizeContatInformationTypesController;
+use App\Domains\Settings\ManageCurrencies\Web\Controllers\CurrencyController;
+use App\Domains\Settings\ManageCurrencies\Web\Controllers\PersonalizeCurrencyController;
+use App\Domains\Settings\ManageGenders\Web\Controllers\ManageGenderController;
+use App\Domains\Settings\ManageGiftOccasions\Web\Controllers\PersonalizeGiftOccasionController;
+use App\Domains\Settings\ManageGiftOccasions\Web\Controllers\PersonalizeGiftOccasionsPositionController;
+use App\Domains\Settings\ManageGiftStates\Web\Controllers\PersonalizeGiftStateController;
+use App\Domains\Settings\ManageGiftStates\Web\Controllers\PersonalizeGiftStatesPositionController;
+use App\Domains\Settings\ManageGroupTypes\Web\Controllers\PersonalizeGroupTypeController;
+use App\Domains\Settings\ManageGroupTypes\Web\Controllers\PersonalizeGroupTypePositionController;
+use App\Domains\Settings\ManageGroupTypes\Web\Controllers\PersonalizeGroupTypeRoleController;
+use App\Domains\Settings\ManageGroupTypes\Web\Controllers\PersonalizeGroupTypeRolePositionController;
+use App\Domains\Settings\ManageLifeEventCategories\Web\Controllers\PersonalizeLifeEventCategoriesController;
+use App\Domains\Settings\ManageLifeEventCategories\Web\Controllers\PersonalizeLifeEventTypesController;
+use App\Domains\Settings\ManageLifeEventCategories\Web\Controllers\PersonalizeLifeEventTypesPositionController;
+use App\Domains\Settings\ManageModules\Web\Controllers\PersonalizeModulesController;
+use App\Domains\Settings\ManageNotificationChannels\Web\Controllers\NotificationsController;
+use App\Domains\Settings\ManageNotificationChannels\Web\Controllers\NotificationsLogController;
+use App\Domains\Settings\ManageNotificationChannels\Web\Controllers\NotificationsTestController;
+use App\Domains\Settings\ManageNotificationChannels\Web\Controllers\NotificationsToggleController;
+use App\Domains\Settings\ManageNotificationChannels\Web\Controllers\NotificationsVerificationController;
+use App\Domains\Settings\ManageNotificationChannels\Web\Controllers\TelegramNotificationsController;
+use App\Domains\Settings\ManageNotificationChannels\Web\Controllers\TelegramWebhookController;
+use App\Domains\Settings\ManagePersonalization\Web\Controllers\PersonalizeController;
+use App\Domains\Settings\ManagePetCategories\Web\Controllers\PersonalizePetCategoriesController;
+use App\Domains\Settings\ManagePostTemplates\Web\Controllers\PersonalizePostTemplateController;
+use App\Domains\Settings\ManagePostTemplates\Web\Controllers\PersonalizePostTemplatePositionController;
+use App\Domains\Settings\ManagePostTemplates\Web\Controllers\PersonalizePostTemplateSectionController;
+use App\Domains\Settings\ManagePostTemplates\Web\Controllers\PersonalizePostTemplateSectionPositionController;
+use App\Domains\Settings\ManagePronouns\Web\Controllers\PersonalizePronounController;
+use App\Domains\Settings\ManageRelationshipTypes\Web\Controllers\PersonalizeRelationshipController;
+use App\Domains\Settings\ManageRelationshipTypes\Web\Controllers\PersonalizeRelationshipTypeController;
+use App\Domains\Settings\ManageSettings\Web\Controllers\SettingsController;
+use App\Domains\Settings\ManageStorage\Web\Controllers\AccountStorageController;
+use App\Domains\Settings\ManageTemplates\Web\Controllers\PersonalizeTemplatePageModulesController;
+use App\Domains\Settings\ManageTemplates\Web\Controllers\PersonalizeTemplatePageModulesPositionController;
+use App\Domains\Settings\ManageTemplates\Web\Controllers\PersonalizeTemplatePagePositionController;
+use App\Domains\Settings\ManageTemplates\Web\Controllers\PersonalizeTemplatePagesController;
+use App\Domains\Settings\ManageTemplates\Web\Controllers\PersonalizeTemplatesController;
+use App\Domains\Settings\ManageUserPreferences\Web\Controllers\PreferencesController;
+use App\Domains\Settings\ManageUserPreferences\Web\Controllers\PreferencesDateFormatController;
+use App\Domains\Settings\ManageUserPreferences\Web\Controllers\PreferencesHelpController;
+use App\Domains\Settings\ManageUserPreferences\Web\Controllers\PreferencesLocaleController;
+use App\Domains\Settings\ManageUserPreferences\Web\Controllers\PreferencesMapsPreferenceController;
+use App\Domains\Settings\ManageUserPreferences\Web\Controllers\PreferencesNameOrderController;
+use App\Domains\Settings\ManageUserPreferences\Web\Controllers\PreferencesNumberFormatController;
+use App\Domains\Settings\ManageUserPreferences\Web\Controllers\PreferencesTimezoneController;
+use App\Domains\Settings\ManageUsers\Web\Controllers\UserController;
+use App\Domains\Vault\ManageFiles\Web\Controllers\VaultFileController;
+use App\Domains\Vault\ManageJournals\Web\Controllers\JournalController;
+use App\Domains\Vault\ManageJournals\Web\Controllers\PostController;
+use App\Domains\Vault\ManageJournals\Web\Controllers\PostTagController;
+use App\Domains\Vault\ManageTasks\Web\Controllers\VaultTaskController;
+use App\Domains\Vault\ManageVault\Web\Controllers\VaultController;
+use App\Domains\Vault\ManageVault\Web\Controllers\VaultFeedController;
+use App\Domains\Vault\ManageVault\Web\Controllers\VaultReminderController;
+use App\Domains\Vault\ManageVaultSettings\Web\Controllers\VaultSettingsContactImportantDateTypeController;
+use App\Domains\Vault\ManageVaultSettings\Web\Controllers\VaultSettingsController;
+use App\Domains\Vault\ManageVaultSettings\Web\Controllers\VaultSettingsLabelController;
+use App\Domains\Vault\ManageVaultSettings\Web\Controllers\VaultSettingsTagController;
+use App\Domains\Vault\ManageVaultSettings\Web\Controllers\VaultSettingsTemplateController;
+use App\Domains\Vault\ManageVaultSettings\Web\Controllers\VaultSettingsUserController;
+use App\Domains\Vault\Search\Web\Controllers\VaultContactSearchController;
+use App\Domains\Vault\Search\Web\Controllers\VaultMostConsultedContactsController;
+use App\Domains\Vault\Search\Web\Controllers\VaultSearchController;
 use App\Http\Controllers\Auth\AcceptInvitationController;
 use App\Http\Controllers\Auth\SocialiteCallbackController;
 use App\Http\Controllers\Profile\UserTokenController;
 use App\Providers\RouteServiceProvider;
-use App\Settings\CancelAccount\Web\Controllers\CancelAccountController;
-use App\Settings\ManageActivityTypes\Web\Controllers\PersonalizeActivitiesController;
-use App\Settings\ManageActivityTypes\Web\Controllers\PersonalizeActivityTypesController;
-use App\Settings\ManageAddressTypes\Web\Controllers\PersonalizeAddressTypeController;
-use App\Settings\ManageCallReasons\Web\Controllers\PersonalizeCallReasonsController;
-use App\Settings\ManageCallReasons\Web\Controllers\PersonalizeCallReasonTypesController;
-use App\Settings\ManageContactInformationTypes\Web\Controllers\PersonalizeContatInformationTypesController;
-use App\Settings\ManageCurrencies\Web\Controllers\CurrencyController;
-use App\Settings\ManageCurrencies\Web\Controllers\PersonalizeCurrencyController;
-use App\Settings\ManageGenders\Web\Controllers\ManageGenderController;
-use App\Settings\ManageGiftOccasions\Web\Controllers\PersonalizeGiftOccasionController;
-use App\Settings\ManageGiftOccasions\Web\Controllers\PersonalizeGiftOccasionsPositionController;
-use App\Settings\ManageGiftStates\Web\Controllers\PersonalizeGiftStateController;
-use App\Settings\ManageGiftStates\Web\Controllers\PersonalizeGiftStatesPositionController;
-use App\Settings\ManageGroupTypes\Web\Controllers\PersonalizeGroupTypeController;
-use App\Settings\ManageGroupTypes\Web\Controllers\PersonalizeGroupTypePositionController;
-use App\Settings\ManageGroupTypes\Web\Controllers\PersonalizeGroupTypeRoleController;
-use App\Settings\ManageGroupTypes\Web\Controllers\PersonalizeGroupTypeRolePositionController;
-use App\Settings\ManageLifeEventCategories\Web\Controllers\PersonalizeLifeEventCategoriesController;
-use App\Settings\ManageLifeEventCategories\Web\Controllers\PersonalizeLifeEventTypesController;
-use App\Settings\ManageLifeEventCategories\Web\Controllers\PersonalizeLifeEventTypesPositionController;
-use App\Settings\ManageModules\Web\Controllers\PersonalizeModulesController;
-use App\Settings\ManageNotificationChannels\Web\Controllers\NotificationsController;
-use App\Settings\ManageNotificationChannels\Web\Controllers\NotificationsLogController;
-use App\Settings\ManageNotificationChannels\Web\Controllers\NotificationsTestController;
-use App\Settings\ManageNotificationChannels\Web\Controllers\NotificationsToggleController;
-use App\Settings\ManageNotificationChannels\Web\Controllers\NotificationsVerificationController;
-use App\Settings\ManageNotificationChannels\Web\Controllers\TelegramNotificationsController;
-use App\Settings\ManageNotificationChannels\Web\Controllers\TelegramWebhookController;
-use App\Settings\ManagePersonalization\Web\Controllers\PersonalizeController;
-use App\Settings\ManagePetCategories\Web\Controllers\PersonalizePetCategoriesController;
-use App\Settings\ManagePostTemplates\Web\Controllers\PersonalizePostTemplateController;
-use App\Settings\ManagePostTemplates\Web\Controllers\PersonalizePostTemplatePositionController;
-use App\Settings\ManagePostTemplates\Web\Controllers\PersonalizePostTemplateSectionController;
-use App\Settings\ManagePostTemplates\Web\Controllers\PersonalizePostTemplateSectionPositionController;
-use App\Settings\ManagePronouns\Web\Controllers\PersonalizePronounController;
-use App\Settings\ManageRelationshipTypes\Web\Controllers\PersonalizeRelationshipController;
-use App\Settings\ManageRelationshipTypes\Web\Controllers\PersonalizeRelationshipTypeController;
-use App\Settings\ManageSettings\Web\Controllers\SettingsController;
-use App\Settings\ManageStorage\Web\Controllers\AccountStorageController;
-use App\Settings\ManageTemplates\Web\Controllers\PersonalizeTemplatePageModulesController;
-use App\Settings\ManageTemplates\Web\Controllers\PersonalizeTemplatePageModulesPositionController;
-use App\Settings\ManageTemplates\Web\Controllers\PersonalizeTemplatePagePositionController;
-use App\Settings\ManageTemplates\Web\Controllers\PersonalizeTemplatePagesController;
-use App\Settings\ManageTemplates\Web\Controllers\PersonalizeTemplatesController;
-use App\Settings\ManageUserPreferences\Web\Controllers\PreferencesController;
-use App\Settings\ManageUserPreferences\Web\Controllers\PreferencesDateFormatController;
-use App\Settings\ManageUserPreferences\Web\Controllers\PreferencesHelpController;
-use App\Settings\ManageUserPreferences\Web\Controllers\PreferencesLocaleController;
-use App\Settings\ManageUserPreferences\Web\Controllers\PreferencesMapsPreferenceController;
-use App\Settings\ManageUserPreferences\Web\Controllers\PreferencesNameOrderController;
-use App\Settings\ManageUserPreferences\Web\Controllers\PreferencesNumberFormatController;
-use App\Settings\ManageUserPreferences\Web\Controllers\PreferencesTimezoneController;
-use App\Settings\ManageUsers\Web\Controllers\UserController;
-use App\Vault\ManageFiles\Web\Controllers\VaultFileController;
-use App\Vault\ManageJournals\Web\Controllers\JournalController;
-use App\Vault\ManageJournals\Web\Controllers\PostController;
-use App\Vault\ManageJournals\Web\Controllers\PostTagController;
-use App\Vault\ManageTasks\Web\Controllers\VaultTaskController;
-use App\Vault\ManageVault\Web\Controllers\VaultController;
-use App\Vault\ManageVault\Web\Controllers\VaultFeedController;
-use App\Vault\ManageVault\Web\Controllers\VaultReminderController;
-use App\Vault\ManageVaultSettings\Web\Controllers\VaultSettingsContactImportantDateTypeController;
-use App\Vault\ManageVaultSettings\Web\Controllers\VaultSettingsController;
-use App\Vault\ManageVaultSettings\Web\Controllers\VaultSettingsLabelController;
-use App\Vault\ManageVaultSettings\Web\Controllers\VaultSettingsTagController;
-use App\Vault\ManageVaultSettings\Web\Controllers\VaultSettingsTemplateController;
-use App\Vault\ManageVaultSettings\Web\Controllers\VaultSettingsUserController;
-use App\Vault\Search\Web\Controllers\VaultContactSearchController;
-use App\Vault\Search\Web\Controllers\VaultMostConsultedContactsController;
-use App\Vault\Search\Web\Controllers\VaultSearchController;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Route;
 
diff --git a/tests/Unit/Domains/Contact/ManageAvatar/Services/DestroyAvatarTest.php b/tests/Unit/Domains/Contact/ManageAvatar/Services/DestroyAvatarTest.php
index 1f6e38064..ad3de333e 100644
--- a/tests/Unit/Domains/Contact/ManageAvatar/Services/DestroyAvatarTest.php
+++ b/tests/Unit/Domains/Contact/ManageAvatar/Services/DestroyAvatarTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageAvatar\Services;
 
-use App\Contact\ManageAvatar\Services\DestroyAvatar;
+use App\Domains\Contact\ManageAvatar\Services\DestroyAvatar;
 use App\Models\Account;
 use App\Models\Contact;
 use App\Models\File;
diff --git a/tests/Unit/Domains/Contact/ManageAvatar/Services/UpdatePhotoAsAvatarTest.php b/tests/Unit/Domains/Contact/ManageAvatar/Services/UpdatePhotoAsAvatarTest.php
index 3f38d4ae6..27aaa385d 100644
--- a/tests/Unit/Domains/Contact/ManageAvatar/Services/UpdatePhotoAsAvatarTest.php
+++ b/tests/Unit/Domains/Contact/ManageAvatar/Services/UpdatePhotoAsAvatarTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageAvatar\Services;
 
-use App\Contact\ManageAvatar\Services\UpdatePhotoAsAvatar;
+use App\Domains\Contact\ManageAvatar\Services\UpdatePhotoAsAvatar;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageCalls/Services/CreateCallTest.php b/tests/Unit/Domains/Contact/ManageCalls/Services/CreateCallTest.php
index a83de759e..e166e2527 100644
--- a/tests/Unit/Domains/Contact/ManageCalls/Services/CreateCallTest.php
+++ b/tests/Unit/Domains/Contact/ManageCalls/Services/CreateCallTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageCalls\Services;
 
-use App\Contact\ManageCalls\Services\CreateCall;
+use App\Domains\Contact\ManageCalls\Services\CreateCall;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\CallReason;
diff --git a/tests/Unit/Domains/Contact/ManageCalls/Services/DestroyCallTest.php b/tests/Unit/Domains/Contact/ManageCalls/Services/DestroyCallTest.php
index 7301976db..2baaad829 100644
--- a/tests/Unit/Domains/Contact/ManageCalls/Services/DestroyCallTest.php
+++ b/tests/Unit/Domains/Contact/ManageCalls/Services/DestroyCallTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageCalls\Services;
 
-use App\Contact\ManageCalls\Services\DestroyCall;
+use App\Domains\Contact\ManageCalls\Services\DestroyCall;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Call;
diff --git a/tests/Unit/Domains/Contact/ManageCalls/Services/UpdateCallTest.php b/tests/Unit/Domains/Contact/ManageCalls/Services/UpdateCallTest.php
index 9186abf9c..720dc57c5 100644
--- a/tests/Unit/Domains/Contact/ManageCalls/Services/UpdateCallTest.php
+++ b/tests/Unit/Domains/Contact/ManageCalls/Services/UpdateCallTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageCalls\Services;
 
-use App\Contact\ManageCalls\Services\UpdateCall;
+use App\Domains\Contact\ManageCalls\Services\UpdateCall;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Call;
diff --git a/tests/Unit/Domains/Contact/ManageCalls/Web/ViewHelpers/ModuleCallsViewHelperTest.php b/tests/Unit/Domains/Contact/ManageCalls/Web/ViewHelpers/ModuleCallsViewHelperTest.php
index 9dcc834d6..2d88e411a 100644
--- a/tests/Unit/Domains/Contact/ManageCalls/Web/ViewHelpers/ModuleCallsViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageCalls/Web/ViewHelpers/ModuleCallsViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageCalls\Web\ViewHelpers;
 
-use App\Contact\ManageCalls\Web\ViewHelpers\ModuleCallsViewHelper;
+use App\Domains\Contact\ManageCalls\Web\ViewHelpers\ModuleCallsViewHelper;
 use App\Models\Call;
 use App\Models\Contact;
 use App\Models\Emotion;
diff --git a/tests/Unit/Domains/Contact/ManageContact/Services/CopyContactToAnotherVaultTest.php b/tests/Unit/Domains/Contact/ManageContact/Services/CopyContactToAnotherVaultTest.php
index bcf81a17a..1d4c19442 100644
--- a/tests/Unit/Domains/Contact/ManageContact/Services/CopyContactToAnotherVaultTest.php
+++ b/tests/Unit/Domains/Contact/ManageContact/Services/CopyContactToAnotherVaultTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContact\Services;
 
-use App\Contact\ManageContact\Services\CopyContactToAnotherVault;
+use App\Domains\Contact\ManageContact\Services\CopyContactToAnotherVault;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageContact/Services/CreateContactTest.php b/tests/Unit/Domains/Contact/ManageContact/Services/CreateContactTest.php
index c641dfde1..faab83e1b 100644
--- a/tests/Unit/Domains/Contact/ManageContact/Services/CreateContactTest.php
+++ b/tests/Unit/Domains/Contact/ManageContact/Services/CreateContactTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContact\Services;
 
-use App\Contact\ManageContact\Services\CreateContact;
+use App\Domains\Contact\ManageContact\Services\CreateContact;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageContact/Services/DestroyContactTest.php b/tests/Unit/Domains/Contact/ManageContact/Services/DestroyContactTest.php
index 1b5961d89..77bfd90e3 100644
--- a/tests/Unit/Domains/Contact/ManageContact/Services/DestroyContactTest.php
+++ b/tests/Unit/Domains/Contact/ManageContact/Services/DestroyContactTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContact\Services;
 
-use App\Contact\ManageContact\Services\DestroyContact;
+use App\Domains\Contact\ManageContact\Services\DestroyContact;
 use App\Exceptions\CantBeDeletedException;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
diff --git a/tests/Unit/Domains/Contact/ManageContact/Services/MoveContactToAnotherVaultTest.php b/tests/Unit/Domains/Contact/ManageContact/Services/MoveContactToAnotherVaultTest.php
index dce7f0438..7f9973cfa 100644
--- a/tests/Unit/Domains/Contact/ManageContact/Services/MoveContactToAnotherVaultTest.php
+++ b/tests/Unit/Domains/Contact/ManageContact/Services/MoveContactToAnotherVaultTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContact\Services;
 
-use App\Contact\ManageContact\Services\MoveContactToAnotherVault;
+use App\Domains\Contact\ManageContact\Services\MoveContactToAnotherVault;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageContact/Services/ToggleArchiveContactTest.php b/tests/Unit/Domains/Contact/ManageContact/Services/ToggleArchiveContactTest.php
index dfbf4e2db..d9fb067f1 100644
--- a/tests/Unit/Domains/Contact/ManageContact/Services/ToggleArchiveContactTest.php
+++ b/tests/Unit/Domains/Contact/ManageContact/Services/ToggleArchiveContactTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContact\Services;
 
-use App\Contact\ManageContact\Services\ToggleArchiveContact;
+use App\Domains\Contact\ManageContact\Services\ToggleArchiveContact;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageContact/Services/ToggleFavoriteContactTest.php b/tests/Unit/Domains/Contact/ManageContact/Services/ToggleFavoriteContactTest.php
index 8825e7e91..ed094d3cb 100644
--- a/tests/Unit/Domains/Contact/ManageContact/Services/ToggleFavoriteContactTest.php
+++ b/tests/Unit/Domains/Contact/ManageContact/Services/ToggleFavoriteContactTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContact\Services;
 
-use App\Contact\ManageContact\Services\ToggleFavoriteContact;
+use App\Domains\Contact\ManageContact\Services\ToggleFavoriteContact;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageContact/Services/UpdateContactTemplateTest.php b/tests/Unit/Domains/Contact/ManageContact/Services/UpdateContactTemplateTest.php
index 54f18d791..d74fe8789 100644
--- a/tests/Unit/Domains/Contact/ManageContact/Services/UpdateContactTemplateTest.php
+++ b/tests/Unit/Domains/Contact/ManageContact/Services/UpdateContactTemplateTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContact\Services;
 
-use App\Contact\ManageContact\Services\UpdateContactTemplate;
+use App\Domains\Contact\ManageContact\Services\UpdateContactTemplate;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageContact/Services/UpdateContactTest.php b/tests/Unit/Domains/Contact/ManageContact/Services/UpdateContactTest.php
index 20a513987..010899b6f 100644
--- a/tests/Unit/Domains/Contact/ManageContact/Services/UpdateContactTest.php
+++ b/tests/Unit/Domains/Contact/ManageContact/Services/UpdateContactTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContact\Services;
 
-use App\Contact\ManageContact\Services\UpdateContact;
+use App\Domains\Contact\ManageContact\Services\UpdateContact;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageContact/Services/UpdateContactViewTest.php b/tests/Unit/Domains/Contact/ManageContact/Services/UpdateContactViewTest.php
index c6f7ca7f0..312ed15a7 100644
--- a/tests/Unit/Domains/Contact/ManageContact/Services/UpdateContactViewTest.php
+++ b/tests/Unit/Domains/Contact/ManageContact/Services/UpdateContactViewTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContact\Services;
 
-use App\Contact\ManageContact\Services\UpdateContactView;
+use App\Domains\Contact\ManageContact\Services\UpdateContactView;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageContact/Web/ViewHelpers/ContactCreateViewHelperTest.php b/tests/Unit/Domains/Contact/ManageContact/Web/ViewHelpers/ContactCreateViewHelperTest.php
index 57e4ea599..546afbdd3 100644
--- a/tests/Unit/Domains/Contact/ManageContact/Web/ViewHelpers/ContactCreateViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageContact/Web/ViewHelpers/ContactCreateViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContact\Web\ViewHelpers;
 
-use App\Contact\ManageContact\Web\ViewHelpers\ContactCreateViewHelper;
+use App\Domains\Contact\ManageContact\Web\ViewHelpers\ContactCreateViewHelper;
 use App\Models\Gender;
 use App\Models\Pronoun;
 use App\Models\Template;
diff --git a/tests/Unit/Domains/Contact/ManageContact/Web/ViewHelpers/ContactEditViewHelperTest.php b/tests/Unit/Domains/Contact/ManageContact/Web/ViewHelpers/ContactEditViewHelperTest.php
index c4dac4398..a92062ae3 100644
--- a/tests/Unit/Domains/Contact/ManageContact/Web/ViewHelpers/ContactEditViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageContact/Web/ViewHelpers/ContactEditViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContact\Web\ViewHelpers;
 
-use App\Contact\ManageContact\Web\ViewHelpers\ContactEditViewHelper;
+use App\Domains\Contact\ManageContact\Web\ViewHelpers\ContactEditViewHelper;
 use App\Models\Contact;
 use App\Models\Gender;
 use App\Models\Pronoun;
diff --git a/tests/Unit/Domains/Contact/ManageContact/Web/ViewHelpers/ContactIndexViewHelperTest.php b/tests/Unit/Domains/Contact/ManageContact/Web/ViewHelpers/ContactIndexViewHelperTest.php
index 4eb445012..6f9d7757c 100644
--- a/tests/Unit/Domains/Contact/ManageContact/Web/ViewHelpers/ContactIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageContact/Web/ViewHelpers/ContactIndexViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContact\Web\ViewHelpers;
 
-use App\Contact\ManageContact\Web\ViewHelpers\ContactIndexViewHelper;
+use App\Domains\Contact\ManageContact\Web\ViewHelpers\ContactIndexViewHelper;
 use App\Models\Contact;
 use App\Models\Label;
 use App\Models\Vault;
diff --git a/tests/Unit/Domains/Contact/ManageContact/Web/ViewHelpers/ContactShowBlankViewHelperTest.php b/tests/Unit/Domains/Contact/ManageContact/Web/ViewHelpers/ContactShowBlankViewHelperTest.php
index 8e7d378f9..67c2a5d24 100644
--- a/tests/Unit/Domains/Contact/ManageContact/Web/ViewHelpers/ContactShowBlankViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageContact/Web/ViewHelpers/ContactShowBlankViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContact\Web\ViewHelpers;
 
-use App\Contact\ManageContact\Web\ViewHelpers\ContactShowBlankViewHelper;
+use App\Domains\Contact\ManageContact\Web\ViewHelpers\ContactShowBlankViewHelper;
 use App\Models\Contact;
 use App\Models\Template;
 use App\Models\User;
diff --git a/tests/Unit/Domains/Contact/ManageContact/Web/ViewHelpers/ContactShowViewHelperTest.php b/tests/Unit/Domains/Contact/ManageContact/Web/ViewHelpers/ContactShowViewHelperTest.php
index 498db30b0..73e4b0b6f 100644
--- a/tests/Unit/Domains/Contact/ManageContact/Web/ViewHelpers/ContactShowViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageContact/Web/ViewHelpers/ContactShowViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContact\Web\ViewHelpers;
 
-use App\Contact\ManageContact\Web\ViewHelpers\ContactShowViewHelper;
+use App\Domains\Contact\ManageContact\Web\ViewHelpers\ContactShowViewHelper;
 use App\Models\Contact;
 use App\Models\Module;
 use App\Models\Template;
diff --git a/tests/Unit/Domains/Contact/ManageContactAddresses/Services/CreateContactAddressTest.php b/tests/Unit/Domains/Contact/ManageContactAddresses/Services/CreateContactAddressTest.php
index 1aa32d0f9..f6ea3928f 100644
--- a/tests/Unit/Domains/Contact/ManageContactAddresses/Services/CreateContactAddressTest.php
+++ b/tests/Unit/Domains/Contact/ManageContactAddresses/Services/CreateContactAddressTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContactAddresses\Services;
 
-use App\Contact\ManageContactAddresses\Jobs\FetchAddressGeocoding;
-use App\Contact\ManageContactAddresses\Services\CreateContactAddress;
+use App\Domains\Contact\ManageContactAddresses\Jobs\FetchAddressGeocoding;
+use App\Domains\Contact\ManageContactAddresses\Services\CreateContactAddress;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Address;
diff --git a/tests/Unit/Domains/Contact/ManageContactAddresses/Services/DestroyContactAddressTest.php b/tests/Unit/Domains/Contact/ManageContactAddresses/Services/DestroyContactAddressTest.php
index 5b2c02326..99d7c224b 100644
--- a/tests/Unit/Domains/Contact/ManageContactAddresses/Services/DestroyContactAddressTest.php
+++ b/tests/Unit/Domains/Contact/ManageContactAddresses/Services/DestroyContactAddressTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContactAddresses\Services;
 
-use App\Contact\ManageContactAddresses\Services\DestroyContactAddress;
+use App\Domains\Contact\ManageContactAddresses\Services\DestroyContactAddress;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Address;
diff --git a/tests/Unit/Domains/Contact/ManageContactAddresses/Services/GetGPSCoordinateTest.php b/tests/Unit/Domains/Contact/ManageContactAddresses/Services/GetGPSCoordinateTest.php
index 63884d6e4..500e64451 100644
--- a/tests/Unit/Domains/Contact/ManageContactAddresses/Services/GetGPSCoordinateTest.php
+++ b/tests/Unit/Domains/Contact/ManageContactAddresses/Services/GetGPSCoordinateTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContactAddresses\Services;
 
-use App\Contact\ManageContactAddresses\Services\GetGPSCoordinate;
+use App\Domains\Contact\ManageContactAddresses\Services\GetGPSCoordinate;
 use App\Exceptions\EnvVariablesNotSetException;
 use App\Models\Address;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Domains/Contact/ManageContactAddresses/Services/UpdateContactAddressTest.php b/tests/Unit/Domains/Contact/ManageContactAddresses/Services/UpdateContactAddressTest.php
index 066d6e402..6d7763918 100644
--- a/tests/Unit/Domains/Contact/ManageContactAddresses/Services/UpdateContactAddressTest.php
+++ b/tests/Unit/Domains/Contact/ManageContactAddresses/Services/UpdateContactAddressTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContactAddresses\Services;
 
-use App\Contact\ManageContactAddresses\Jobs\FetchAddressGeocoding;
-use App\Contact\ManageContactAddresses\Services\UpdateContactAddress;
+use App\Domains\Contact\ManageContactAddresses\Jobs\FetchAddressGeocoding;
+use App\Domains\Contact\ManageContactAddresses\Services\UpdateContactAddress;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Address;
diff --git a/tests/Unit/Domains/Contact/ManageContactAddresses/Web/ViewHelpers/ModuleContactAddressesViewHelperTest.php b/tests/Unit/Domains/Contact/ManageContactAddresses/Web/ViewHelpers/ModuleContactAddressesViewHelperTest.php
index e1bbf0982..55a6574ce 100644
--- a/tests/Unit/Domains/Contact/ManageContactAddresses/Web/ViewHelpers/ModuleContactAddressesViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageContactAddresses/Web/ViewHelpers/ModuleContactAddressesViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContactAddresses\Web\ViewHelpers;
 
-use App\Contact\ManageContactAddresses\Web\ViewHelpers\ModuleContactAddressesViewHelper;
+use App\Domains\Contact\ManageContactAddresses\Web\ViewHelpers\ModuleContactAddressesViewHelper;
 use App\Models\Address;
 use App\Models\AddressType;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedAddressTest.php b/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedAddressTest.php
index f2b32c3cc..4043cbafa 100644
--- a/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedAddressTest.php
+++ b/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedAddressTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions;
 
-use App\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedAddress;
+use App\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedAddress;
 use App\Models\Address;
 use App\Models\AddressType;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedContactInformationTest.php b/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedContactInformationTest.php
index e783aaf4b..5944d877f 100644
--- a/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedContactInformationTest.php
+++ b/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedContactInformationTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions;
 
-use App\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedContactInformation;
+use App\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedContactInformation;
 use App\Models\Contact;
 use App\Models\ContactFeedItem;
 use App\Models\ContactInformation;
diff --git a/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedGenericContactInformationTest.php b/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedGenericContactInformationTest.php
index 58d08cb0b..8423a37cf 100644
--- a/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedGenericContactInformationTest.php
+++ b/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedGenericContactInformationTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions;
 
-use App\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedGenericContactInformation;
+use App\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedGenericContactInformation;
 use App\Models\Contact;
 use App\Models\ContactFeedItem;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedGoalTest.php b/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedGoalTest.php
index 580f453b2..5b99680b6 100644
--- a/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedGoalTest.php
+++ b/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedGoalTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions;
 
-use App\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedGoal;
+use App\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedGoal;
 use App\Models\Contact;
 use App\Models\ContactFeedItem;
 use App\Models\Pet;
diff --git a/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedLabelAssignedTest.php b/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedLabelAssignedTest.php
index ced29ca7b..2f73ba9c9 100644
--- a/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedLabelAssignedTest.php
+++ b/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedLabelAssignedTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions;
 
-use App\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedLabelAssigned;
+use App\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedLabelAssigned;
 use App\Models\Contact;
 use App\Models\ContactFeedItem;
 use App\Models\Label;
diff --git a/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedPetTest.php b/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedPetTest.php
index efc01af05..fa248db63 100644
--- a/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedPetTest.php
+++ b/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/Actions/ActionFeedPetTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions;
 
-use App\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedPet;
+use App\Domains\Contact\ManageContactFeed\Web\ViewHelpers\Actions\ActionFeedPet;
 use App\Models\Contact;
 use App\Models\ContactFeedItem;
 use App\Models\Pet;
diff --git a/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/ModuleFeedViewHelperTest.php b/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/ModuleFeedViewHelperTest.php
index 3a52ca7f6..2da9e0e10 100644
--- a/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/ModuleFeedViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/ModuleFeedViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContactFeed\Web\ViewHelpers;
 
-use App\Contact\ManageContactFeed\Web\ViewHelpers\ModuleFeedViewHelper;
+use App\Domains\Contact\ManageContactFeed\Web\ViewHelpers\ModuleFeedViewHelper;
 use App\Models\Contact;
 use App\Models\ContactFeedItem;
 use App\Models\User;
diff --git a/tests/Unit/Domains/Contact/ManageContactImportantDates/Services/CreateContactImportantDateTest.php b/tests/Unit/Domains/Contact/ManageContactImportantDates/Services/CreateContactImportantDateTest.php
index 83f2bdf24..1c29f9924 100644
--- a/tests/Unit/Domains/Contact/ManageContactImportantDates/Services/CreateContactImportantDateTest.php
+++ b/tests/Unit/Domains/Contact/ManageContactImportantDates/Services/CreateContactImportantDateTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContactImportantDates\Services;
 
-use App\Contact\ManageContactImportantDates\Services\CreateContactImportantDate;
+use App\Domains\Contact\ManageContactImportantDates\Services\CreateContactImportantDate;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageContactImportantDates/Services/DestroyContactImportantDateTest.php b/tests/Unit/Domains/Contact/ManageContactImportantDates/Services/DestroyContactImportantDateTest.php
index ca31a76e6..7754b6913 100644
--- a/tests/Unit/Domains/Contact/ManageContactImportantDates/Services/DestroyContactImportantDateTest.php
+++ b/tests/Unit/Domains/Contact/ManageContactImportantDates/Services/DestroyContactImportantDateTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContactImportantDates\Services;
 
-use App\Contact\ManageContactImportantDates\Services\DestroyContactImportantDate;
+use App\Domains\Contact\ManageContactImportantDates\Services\DestroyContactImportantDate;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageContactImportantDates/Services/UpdateContactImportantDateTest.php b/tests/Unit/Domains/Contact/ManageContactImportantDates/Services/UpdateContactImportantDateTest.php
index edcf8a973..6227a590f 100644
--- a/tests/Unit/Domains/Contact/ManageContactImportantDates/Services/UpdateContactImportantDateTest.php
+++ b/tests/Unit/Domains/Contact/ManageContactImportantDates/Services/UpdateContactImportantDateTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContactImportantDates\Services;
 
-use App\Contact\ManageContactImportantDates\Services\UpdateContactImportantDate;
+use App\Domains\Contact\ManageContactImportantDates\Services\UpdateContactImportantDate;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageContactImportantDates/Web/ViewHelpers/ContactImportantDatesViewHelperTest.php b/tests/Unit/Domains/Contact/ManageContactImportantDates/Web/ViewHelpers/ContactImportantDatesViewHelperTest.php
index e7f4a71c2..d6b2bd34b 100644
--- a/tests/Unit/Domains/Contact/ManageContactImportantDates/Web/ViewHelpers/ContactImportantDatesViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageContactImportantDates/Web/ViewHelpers/ContactImportantDatesViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContactImportantDates\Web\ViewHelpers;
 
-use App\Contact\ManageContactImportantDates\Web\ViewHelpers\ContactImportantDatesViewHelper;
+use App\Domains\Contact\ManageContactImportantDates\Web\ViewHelpers\ContactImportantDatesViewHelper;
 use App\Models\Contact;
 use App\Models\ContactImportantDate;
 use App\Models\User;
diff --git a/tests/Unit/Domains/Contact/ManageContactImportantDates/Web/ViewHelpers/ModuleImportantDatesViewHelperTest.php b/tests/Unit/Domains/Contact/ManageContactImportantDates/Web/ViewHelpers/ModuleImportantDatesViewHelperTest.php
index b4e2b54b3..1f140b464 100644
--- a/tests/Unit/Domains/Contact/ManageContactImportantDates/Web/ViewHelpers/ModuleImportantDatesViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageContactImportantDates/Web/ViewHelpers/ModuleImportantDatesViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContactImportantDates\Web\ViewHelpers;
 
-use App\Contact\ManageContactImportantDates\Web\ViewHelpers\ModuleImportantDatesViewHelper;
+use App\Domains\Contact\ManageContactImportantDates\Web\ViewHelpers\ModuleImportantDatesViewHelper;
 use App\Models\Contact;
 use App\Models\ContactImportantDate;
 use App\Models\User;
diff --git a/tests/Unit/Domains/Contact/ManageContactInformation/Services/CreateContactInformationTest.php b/tests/Unit/Domains/Contact/ManageContactInformation/Services/CreateContactInformationTest.php
index acc27449e..15a65c21d 100644
--- a/tests/Unit/Domains/Contact/ManageContactInformation/Services/CreateContactInformationTest.php
+++ b/tests/Unit/Domains/Contact/ManageContactInformation/Services/CreateContactInformationTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContactInformation\Services;
 
-use App\Contact\ManageContactInformation\Services\CreateContactInformation;
+use App\Domains\Contact\ManageContactInformation\Services\CreateContactInformation;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageContactInformation/Services/DestroyContactInformationTest.php b/tests/Unit/Domains/Contact/ManageContactInformation/Services/DestroyContactInformationTest.php
index f1d8a9df4..6fadb0909 100644
--- a/tests/Unit/Domains/Contact/ManageContactInformation/Services/DestroyContactInformationTest.php
+++ b/tests/Unit/Domains/Contact/ManageContactInformation/Services/DestroyContactInformationTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContactInformation\Services;
 
-use App\Contact\ManageContactInformation\Services\DestroyContactInformation;
+use App\Domains\Contact\ManageContactInformation\Services\DestroyContactInformation;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageContactInformation/Services/UpdateContactInformationTest.php b/tests/Unit/Domains/Contact/ManageContactInformation/Services/UpdateContactInformationTest.php
index 6eeadec09..4c38ee6f6 100644
--- a/tests/Unit/Domains/Contact/ManageContactInformation/Services/UpdateContactInformationTest.php
+++ b/tests/Unit/Domains/Contact/ManageContactInformation/Services/UpdateContactInformationTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContactInformation\Services;
 
-use App\Contact\ManageContactInformation\Services\UpdateContactInformation;
+use App\Domains\Contact\ManageContactInformation\Services\UpdateContactInformation;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageContactInformation/Web/ViewHelpers/ModuleContactInformationViewHelperTest.php b/tests/Unit/Domains/Contact/ManageContactInformation/Web/ViewHelpers/ModuleContactInformationViewHelperTest.php
index 525fab6ab..bcde81a38 100644
--- a/tests/Unit/Domains/Contact/ManageContactInformation/Web/ViewHelpers/ModuleContactInformationViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageContactInformation/Web/ViewHelpers/ModuleContactInformationViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContactInformation\Web\ViewHelpers;
 
-use App\Contact\ManageContactInformation\Web\ViewHelpers\ModuleContactInformationViewHelper;
+use App\Domains\Contact\ManageContactInformation\Web\ViewHelpers\ModuleContactInformationViewHelper;
 use App\Models\Contact;
 use App\Models\ContactInformation;
 use App\Models\ContactInformationType;
diff --git a/tests/Unit/Domains/Contact/ManageContactName/Web/ViewHelpers/ModuleContactNameViewHelperTest.php b/tests/Unit/Domains/Contact/ManageContactName/Web/ViewHelpers/ModuleContactNameViewHelperTest.php
index 4e784fb0e..1c548033a 100644
--- a/tests/Unit/Domains/Contact/ManageContactName/Web/ViewHelpers/ModuleContactNameViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageContactName/Web/ViewHelpers/ModuleContactNameViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageContactName\Web\ViewHelpers;
 
-use App\Contact\ManageContactName\Web\ViewHelpers\ModuleContactNameViewHelper;
+use App\Domains\Contact\ManageContactName\Web\ViewHelpers\ModuleContactNameViewHelper;
 use App\Models\Contact;
 use App\Models\User;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Domains/Contact/ManageDocuments/Services/DestroyDocumentTest.php b/tests/Unit/Domains/Contact/ManageDocuments/Services/DestroyDocumentTest.php
index b46dc1dae..4a7f4b780 100644
--- a/tests/Unit/Domains/Contact/ManageDocuments/Services/DestroyDocumentTest.php
+++ b/tests/Unit/Domains/Contact/ManageDocuments/Services/DestroyDocumentTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageDocuments\Services;
 
-use App\Contact\ManageDocuments\Services\DestroyDocument;
+use App\Domains\Contact\ManageDocuments\Services\DestroyDocument;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageDocuments/Services/UploadFileTest.php b/tests/Unit/Domains/Contact/ManageDocuments/Services/UploadFileTest.php
index 70522eb9f..e2d2de081 100644
--- a/tests/Unit/Domains/Contact/ManageDocuments/Services/UploadFileTest.php
+++ b/tests/Unit/Domains/Contact/ManageDocuments/Services/UploadFileTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageDocuments\Services;
 
-use App\Contact\ManageDocuments\Services\UploadFile;
+use App\Domains\Contact\ManageDocuments\Services\UploadFile;
 use App\Exceptions\EnvVariablesNotSetException;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
diff --git a/tests/Unit/Domains/Contact/ManageDocuments/Web/ViewHelpers/ModuleDocumentsViewHelperTest.php b/tests/Unit/Domains/Contact/ManageDocuments/Web/ViewHelpers/ModuleDocumentsViewHelperTest.php
index 9daf4dfe3..cfb25b2ff 100644
--- a/tests/Unit/Domains/Contact/ManageDocuments/Web/ViewHelpers/ModuleDocumentsViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageDocuments/Web/ViewHelpers/ModuleDocumentsViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageDocuments\Web\ViewHelpers;
 
-use App\Contact\ManageDocuments\Web\ViewHelpers\ModuleDocumentsViewHelper;
+use App\Domains\Contact\ManageDocuments\Web\ViewHelpers\ModuleDocumentsViewHelper;
 use App\Models\Contact;
 use App\Models\File;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Domains/Contact/ManageGoals/Services/CreateGoalTest.php b/tests/Unit/Domains/Contact/ManageGoals/Services/CreateGoalTest.php
index 747e12223..1e38f4509 100644
--- a/tests/Unit/Domains/Contact/ManageGoals/Services/CreateGoalTest.php
+++ b/tests/Unit/Domains/Contact/ManageGoals/Services/CreateGoalTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageGoals\Services;
 
-use App\Contact\ManageGoals\Services\CreateGoal;
+use App\Domains\Contact\ManageGoals\Services\CreateGoal;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageGoals/Services/DestroyGoalTest.php b/tests/Unit/Domains/Contact/ManageGoals/Services/DestroyGoalTest.php
index 8a3263d77..301b40879 100644
--- a/tests/Unit/Domains/Contact/ManageGoals/Services/DestroyGoalTest.php
+++ b/tests/Unit/Domains/Contact/ManageGoals/Services/DestroyGoalTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageGoals\Services;
 
-use App\Contact\ManageGoals\Services\DestroyGoal;
+use App\Domains\Contact\ManageGoals\Services\DestroyGoal;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageGoals/Services/ToggleStreakTest.php b/tests/Unit/Domains/Contact/ManageGoals/Services/ToggleStreakTest.php
index a345b1c54..42da38100 100644
--- a/tests/Unit/Domains/Contact/ManageGoals/Services/ToggleStreakTest.php
+++ b/tests/Unit/Domains/Contact/ManageGoals/Services/ToggleStreakTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageGoals\Services;
 
-use App\Contact\ManageGoals\Services\ToggleStreak;
+use App\Domains\Contact\ManageGoals\Services\ToggleStreak;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageGoals/Services/UpdateGoalTest.php b/tests/Unit/Domains/Contact/ManageGoals/Services/UpdateGoalTest.php
index 33aa6e4f8..8138f200e 100644
--- a/tests/Unit/Domains/Contact/ManageGoals/Services/UpdateGoalTest.php
+++ b/tests/Unit/Domains/Contact/ManageGoals/Services/UpdateGoalTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageGoals\Services;
 
-use App\Contact\ManageGoals\Services\UpdateGoal;
+use App\Domains\Contact\ManageGoals\Services\UpdateGoal;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageGoals/Web/ViewHelpers/GoalShowViewHelperTest.php b/tests/Unit/Domains/Contact/ManageGoals/Web/ViewHelpers/GoalShowViewHelperTest.php
index 5f20affb6..b76f819f7 100644
--- a/tests/Unit/Domains/Contact/ManageGoals/Web/ViewHelpers/GoalShowViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageGoals/Web/ViewHelpers/GoalShowViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageGoals\Web\ViewHelpers;
 
-use App\Contact\ManageGoals\Web\ViewHelpers\GoalShowViewHelper;
+use App\Domains\Contact\ManageGoals\Web\ViewHelpers\GoalShowViewHelper;
 use App\Models\Contact;
 use App\Models\Goal;
 use App\Models\User;
diff --git a/tests/Unit/Domains/Contact/ManageGoals/Web/ViewHelpers/ModuleGoalsViewHelperTest.php b/tests/Unit/Domains/Contact/ManageGoals/Web/ViewHelpers/ModuleGoalsViewHelperTest.php
index bba967d84..af2fb371b 100644
--- a/tests/Unit/Domains/Contact/ManageGoals/Web/ViewHelpers/ModuleGoalsViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageGoals/Web/ViewHelpers/ModuleGoalsViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageGoals\Web\ViewHelpers;
 
-use App\Contact\ManageGoals\Web\ViewHelpers\ModuleGoalsViewHelper;
+use App\Domains\Contact\ManageGoals\Web\ViewHelpers\ModuleGoalsViewHelper;
 use App\Models\Contact;
 use App\Models\Goal;
 use App\Models\User;
diff --git a/tests/Unit/Domains/Contact/ManageGroups/Services/AddContactToGroupTest.php b/tests/Unit/Domains/Contact/ManageGroups/Services/AddContactToGroupTest.php
index 2eb064896..63ee69fc3 100644
--- a/tests/Unit/Domains/Contact/ManageGroups/Services/AddContactToGroupTest.php
+++ b/tests/Unit/Domains/Contact/ManageGroups/Services/AddContactToGroupTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageGroups\Services;
 
-use App\Contact\ManageGroups\Services\AddContactToGroup;
+use App\Domains\Contact\ManageGroups\Services\AddContactToGroup;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageGroups/Services/CreateGroupTest.php b/tests/Unit/Domains/Contact/ManageGroups/Services/CreateGroupTest.php
index 1eab360a4..f450f9beb 100644
--- a/tests/Unit/Domains/Contact/ManageGroups/Services/CreateGroupTest.php
+++ b/tests/Unit/Domains/Contact/ManageGroups/Services/CreateGroupTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageGroups\Services;
 
-use App\Contact\ManageGroups\Services\CreateGroup;
+use App\Domains\Contact\ManageGroups\Services\CreateGroup;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\GroupType;
diff --git a/tests/Unit/Domains/Contact/ManageGroups/Services/DestroyGroupTest.php b/tests/Unit/Domains/Contact/ManageGroups/Services/DestroyGroupTest.php
index 0a1ff1e75..3ccbf2bad 100644
--- a/tests/Unit/Domains/Contact/ManageGroups/Services/DestroyGroupTest.php
+++ b/tests/Unit/Domains/Contact/ManageGroups/Services/DestroyGroupTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageGroups\Services;
 
-use App\Contact\ManageGroups\Services\DestroyGroup;
+use App\Domains\Contact\ManageGroups\Services\DestroyGroup;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Group;
diff --git a/tests/Unit/Domains/Contact/ManageGroups/Services/RemoveContactFromGroupTest.php b/tests/Unit/Domains/Contact/ManageGroups/Services/RemoveContactFromGroupTest.php
index 9b05a9efe..f95202f8a 100644
--- a/tests/Unit/Domains/Contact/ManageGroups/Services/RemoveContactFromGroupTest.php
+++ b/tests/Unit/Domains/Contact/ManageGroups/Services/RemoveContactFromGroupTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageGroups\Services;
 
-use App\Contact\ManageGroups\Services\RemoveContactFromGroup;
+use App\Domains\Contact\ManageGroups\Services\RemoveContactFromGroup;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageGroups/Services/UpdateGroupTest.php b/tests/Unit/Domains/Contact/ManageGroups/Services/UpdateGroupTest.php
index 9a99df710..e0d9afddd 100644
--- a/tests/Unit/Domains/Contact/ManageGroups/Services/UpdateGroupTest.php
+++ b/tests/Unit/Domains/Contact/ManageGroups/Services/UpdateGroupTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageGroups\Services;
 
-use App\Contact\ManageGroups\Services\UpdateGroup;
+use App\Domains\Contact\ManageGroups\Services\UpdateGroup;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Group;
diff --git a/tests/Unit/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupIndexViewHelperTest.php b/tests/Unit/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupIndexViewHelperTest.php
index 489602d22..ee63d6419 100644
--- a/tests/Unit/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupIndexViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageGroups\Web\ViewHelpers;
 
-use App\Contact\ManageGroups\Web\ViewHelpers\GroupIndexViewHelper;
+use App\Domains\Contact\ManageGroups\Web\ViewHelpers\GroupIndexViewHelper;
 use App\Models\Contact;
 use App\Models\Group;
 use App\Models\GroupType;
diff --git a/tests/Unit/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupShowViewHelperTest.php b/tests/Unit/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupShowViewHelperTest.php
index 2ef087ddf..835fad910 100644
--- a/tests/Unit/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupShowViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupShowViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageGroups\Web\ViewHelpers;
 
-use App\Contact\ManageGroups\Web\ViewHelpers\GroupShowViewHelper;
+use App\Domains\Contact\ManageGroups\Web\ViewHelpers\GroupShowViewHelper;
 use App\Models\Contact;
 use App\Models\Group;
 use App\Models\GroupType;
diff --git a/tests/Unit/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupsViewHelperTest.php b/tests/Unit/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupsViewHelperTest.php
index 07d299c64..c09ce5d4f 100644
--- a/tests/Unit/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupsViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageGroups/Web/ViewHelpers/GroupsViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageGroups\Web\ViewHelpers;
 
-use App\Contact\ManageGroups\Web\ViewHelpers\GroupsViewHelper;
+use App\Domains\Contact\ManageGroups\Web\ViewHelpers\GroupsViewHelper;
 use App\Models\Contact;
 use App\Models\Group;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Domains/Contact/ManageGroups/Web/ViewHelpers/ModuleGroupsViewHelperTest.php b/tests/Unit/Domains/Contact/ManageGroups/Web/ViewHelpers/ModuleGroupsViewHelperTest.php
index f613c14a6..583528098 100644
--- a/tests/Unit/Domains/Contact/ManageGroups/Web/ViewHelpers/ModuleGroupsViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageGroups/Web/ViewHelpers/ModuleGroupsViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageGroups\Web\ViewHelpers;
 
-use App\Contact\ManageGroups\Web\ViewHelpers\ModuleGroupsViewHelper;
+use App\Domains\Contact\ManageGroups\Web\ViewHelpers\ModuleGroupsViewHelper;
 use App\Models\Contact;
 use App\Models\Group;
 use App\Models\GroupType;
diff --git a/tests/Unit/Domains/Contact/ManageJobInformation/Services/UpdateJobInformationTest.php b/tests/Unit/Domains/Contact/ManageJobInformation/Services/UpdateJobInformationTest.php
index cc6484696..6993b6e9a 100644
--- a/tests/Unit/Domains/Contact/ManageJobInformation/Services/UpdateJobInformationTest.php
+++ b/tests/Unit/Domains/Contact/ManageJobInformation/Services/UpdateJobInformationTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageJobInformation\Services;
 
-use App\Contact\ManageJobInformation\Services\UpdateJobInformation;
+use App\Domains\Contact\ManageJobInformation\Services\UpdateJobInformation;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Company;
diff --git a/tests/Unit/Domains/Contact/ManageJobInformation/Web/ViewHelpers/ModuleCompanyViewHelperTest.php b/tests/Unit/Domains/Contact/ManageJobInformation/Web/ViewHelpers/ModuleCompanyViewHelperTest.php
index c70fdf64a..829e93ec2 100644
--- a/tests/Unit/Domains/Contact/ManageJobInformation/Web/ViewHelpers/ModuleCompanyViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageJobInformation/Web/ViewHelpers/ModuleCompanyViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageJobInformation\Web\ViewHelpers;
 
-use App\Contact\ManageJobInformation\Web\ViewHelpers\ModuleCompanyViewHelper;
+use App\Domains\Contact\ManageJobInformation\Web\ViewHelpers\ModuleCompanyViewHelper;
 use App\Models\Company;
 use App\Models\Contact;
 use App\Models\Vault;
diff --git a/tests/Unit/Domains/Contact/ManageLabels/Services/AssignLabelTest.php b/tests/Unit/Domains/Contact/ManageLabels/Services/AssignLabelTest.php
index 971a89c6f..191bf4edb 100644
--- a/tests/Unit/Domains/Contact/ManageLabels/Services/AssignLabelTest.php
+++ b/tests/Unit/Domains/Contact/ManageLabels/Services/AssignLabelTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageLabels\Services;
 
-use App\Contact\ManageLabels\Services\AssignLabel;
+use App\Domains\Contact\ManageLabels\Services\AssignLabel;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageLabels/Services/RemoveLabelTest.php b/tests/Unit/Domains/Contact/ManageLabels/Services/RemoveLabelTest.php
index 0d17777a7..3525b8bd0 100644
--- a/tests/Unit/Domains/Contact/ManageLabels/Services/RemoveLabelTest.php
+++ b/tests/Unit/Domains/Contact/ManageLabels/Services/RemoveLabelTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageLabels\Services;
 
-use App\Contact\ManageLabels\Services\RemoveLabel;
+use App\Domains\Contact\ManageLabels\Services\RemoveLabel;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageLoans/Services/CreateLoanTest.php b/tests/Unit/Domains/Contact/ManageLoans/Services/CreateLoanTest.php
index 587b0cede..c75e4bacf 100644
--- a/tests/Unit/Domains/Contact/ManageLoans/Services/CreateLoanTest.php
+++ b/tests/Unit/Domains/Contact/ManageLoans/Services/CreateLoanTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageLoans\Services;
 
-use App\Contact\ManageLoans\Services\CreateLoan;
+use App\Domains\Contact\ManageLoans\Services\CreateLoan;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageLoans/Services/DestroyLoanTest.php b/tests/Unit/Domains/Contact/ManageLoans/Services/DestroyLoanTest.php
index 51ded2f83..3a87ff294 100644
--- a/tests/Unit/Domains/Contact/ManageLoans/Services/DestroyLoanTest.php
+++ b/tests/Unit/Domains/Contact/ManageLoans/Services/DestroyLoanTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageLoans\Services;
 
-use App\Contact\ManageLoans\Services\DestroyLoan;
+use App\Domains\Contact\ManageLoans\Services\DestroyLoan;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageLoans/Services/ToggleLoanTest.php b/tests/Unit/Domains/Contact/ManageLoans/Services/ToggleLoanTest.php
index 966cbe5b4..b564a2b53 100644
--- a/tests/Unit/Domains/Contact/ManageLoans/Services/ToggleLoanTest.php
+++ b/tests/Unit/Domains/Contact/ManageLoans/Services/ToggleLoanTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageLoans\Services;
 
-use App\Contact\ManageLoans\Services\ToggleLoan;
+use App\Domains\Contact\ManageLoans\Services\ToggleLoan;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageLoans/Services/UpdateLoanTest.php b/tests/Unit/Domains/Contact/ManageLoans/Services/UpdateLoanTest.php
index c2b3d4ade..779b54841 100644
--- a/tests/Unit/Domains/Contact/ManageLoans/Services/UpdateLoanTest.php
+++ b/tests/Unit/Domains/Contact/ManageLoans/Services/UpdateLoanTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageLoans\Services;
 
-use App\Contact\ManageLoans\Services\UpdateLoan;
+use App\Domains\Contact\ManageLoans\Services\UpdateLoan;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageLoans/Web/ViewHelpers/ModuleLoanViewHelperTest.php b/tests/Unit/Domains/Contact/ManageLoans/Web/ViewHelpers/ModuleLoanViewHelperTest.php
index 64c088d20..6542298a9 100644
--- a/tests/Unit/Domains/Contact/ManageLoans/Web/ViewHelpers/ModuleLoanViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageLoans/Web/ViewHelpers/ModuleLoanViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageLoans\Web\ViewHelpers;
 
-use App\Contact\ManageLoans\Web\ViewHelpers\ModuleLoanViewHelper;
+use App\Domains\Contact\ManageLoans\Web\ViewHelpers\ModuleLoanViewHelper;
 use App\Models\Contact;
 use App\Models\Currency;
 use App\Models\Loan;
diff --git a/tests/Unit/Domains/Contact/ManageNotes/Services/CreateNoteTest.php b/tests/Unit/Domains/Contact/ManageNotes/Services/CreateNoteTest.php
index 4ada65fe9..a25e06b4b 100644
--- a/tests/Unit/Domains/Contact/ManageNotes/Services/CreateNoteTest.php
+++ b/tests/Unit/Domains/Contact/ManageNotes/Services/CreateNoteTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageNotes\Services;
 
-use App\Contact\ManageNotes\Services\CreateNote;
+use App\Domains\Contact\ManageNotes\Services\CreateNote;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageNotes/Services/DestroyNoteTest.php b/tests/Unit/Domains/Contact/ManageNotes/Services/DestroyNoteTest.php
index 94c1b7784..37b1357bd 100644
--- a/tests/Unit/Domains/Contact/ManageNotes/Services/DestroyNoteTest.php
+++ b/tests/Unit/Domains/Contact/ManageNotes/Services/DestroyNoteTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageNotes\Services;
 
-use App\Contact\ManageNotes\Services\DestroyNote;
+use App\Domains\Contact\ManageNotes\Services\DestroyNote;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageNotes/Services/UpdateNoteTest.php b/tests/Unit/Domains/Contact/ManageNotes/Services/UpdateNoteTest.php
index a03fc48bc..6f33736e2 100644
--- a/tests/Unit/Domains/Contact/ManageNotes/Services/UpdateNoteTest.php
+++ b/tests/Unit/Domains/Contact/ManageNotes/Services/UpdateNoteTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageNotes\Services;
 
-use App\Contact\ManageNotes\Services\UpdateNote;
+use App\Domains\Contact\ManageNotes\Services\UpdateNote;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageNotes/Web/ViewHelpers/ModuleNotesViewHelperTest.php b/tests/Unit/Domains/Contact/ManageNotes/Web/ViewHelpers/ModuleNotesViewHelperTest.php
index 6f5d4cdff..f6d4bd767 100644
--- a/tests/Unit/Domains/Contact/ManageNotes/Web/ViewHelpers/ModuleNotesViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageNotes/Web/ViewHelpers/ModuleNotesViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageNotes\Web\ViewHelpers;
 
-use App\Contact\ManageNotes\Web\ViewHelpers\ModuleNotesViewHelper;
+use App\Domains\Contact\ManageNotes\Web\ViewHelpers\ModuleNotesViewHelper;
 use App\Models\Contact;
 use App\Models\Emotion;
 use App\Models\Note;
diff --git a/tests/Unit/Domains/Contact/ManageNotes/Web/ViewHelpers/NotesIndexViewHelperTest.php b/tests/Unit/Domains/Contact/ManageNotes/Web/ViewHelpers/NotesIndexViewHelperTest.php
index 9f7aada55..d0fd8cc11 100644
--- a/tests/Unit/Domains/Contact/ManageNotes/Web/ViewHelpers/NotesIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageNotes/Web/ViewHelpers/NotesIndexViewHelperTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Domains\Contact\ManageNotes\Web\ViewHelpers;
 
-use App\Contact\ManageNotes\Web\ViewHelpers\ModuleNotesViewHelper;
-use App\Contact\ManageNotes\Web\ViewHelpers\NotesIndexViewHelper;
+use App\Domains\Contact\ManageNotes\Web\ViewHelpers\ModuleNotesViewHelper;
+use App\Domains\Contact\ManageNotes\Web\ViewHelpers\NotesIndexViewHelper;
 use App\Models\Contact;
 use App\Models\Emotion;
 use App\Models\Note;
diff --git a/tests/Unit/Domains/Contact/ManagePets/Services/CreatePetTest.php b/tests/Unit/Domains/Contact/ManagePets/Services/CreatePetTest.php
index 385cd483e..6057a15c5 100644
--- a/tests/Unit/Domains/Contact/ManagePets/Services/CreatePetTest.php
+++ b/tests/Unit/Domains/Contact/ManagePets/Services/CreatePetTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManagePets\Services;
 
-use App\Contact\ManagePets\Services\CreatePet;
+use App\Domains\Contact\ManagePets\Services\CreatePet;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManagePets/Services/DestroyPetTest.php b/tests/Unit/Domains/Contact/ManagePets/Services/DestroyPetTest.php
index 34be004e7..10a302587 100644
--- a/tests/Unit/Domains/Contact/ManagePets/Services/DestroyPetTest.php
+++ b/tests/Unit/Domains/Contact/ManagePets/Services/DestroyPetTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManagePets\Services;
 
-use App\Contact\ManagePets\Services\DestroyPet;
+use App\Domains\Contact\ManagePets\Services\DestroyPet;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManagePets/Services/UpdatePetTest.php b/tests/Unit/Domains/Contact/ManagePets/Services/UpdatePetTest.php
index 618ebe77a..4b3374782 100644
--- a/tests/Unit/Domains/Contact/ManagePets/Services/UpdatePetTest.php
+++ b/tests/Unit/Domains/Contact/ManagePets/Services/UpdatePetTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManagePets\Services;
 
-use App\Contact\ManagePets\Services\UpdatePet;
+use App\Domains\Contact\ManagePets\Services\UpdatePet;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManagePets/Web/ViewHelpers/ModulePetsViewHelperTest.php b/tests/Unit/Domains/Contact/ManagePets/Web/ViewHelpers/ModulePetsViewHelperTest.php
index 1602de559..5ec87ffb6 100644
--- a/tests/Unit/Domains/Contact/ManagePets/Web/ViewHelpers/ModulePetsViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManagePets/Web/ViewHelpers/ModulePetsViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManagePets\Web\ViewHelpers;
 
-use App\Contact\ManagePets\Web\ViewHelpers\ModulePetsViewHelper;
+use App\Domains\Contact\ManagePets\Web\ViewHelpers\ModulePetsViewHelper;
 use App\Models\Contact;
 use App\Models\Pet;
 use App\Models\PetCategory;
diff --git a/tests/Unit/Domains/Contact/ManagePhotos/Services/DestroyPhotoTest.php b/tests/Unit/Domains/Contact/ManagePhotos/Services/DestroyPhotoTest.php
index 3c6006b15..5381f5638 100644
--- a/tests/Unit/Domains/Contact/ManagePhotos/Services/DestroyPhotoTest.php
+++ b/tests/Unit/Domains/Contact/ManagePhotos/Services/DestroyPhotoTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManagePhotos\Services;
 
-use App\Contact\ManagePhotos\Services\DestroyPhoto;
+use App\Domains\Contact\ManagePhotos\Services\DestroyPhoto;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManagePhotos/Web/ViewHelpers/ContactPhotosIndexViewHelperTest.php b/tests/Unit/Domains/Contact/ManagePhotos/Web/ViewHelpers/ContactPhotosIndexViewHelperTest.php
index 956a2e3c4..11b5705a5 100644
--- a/tests/Unit/Domains/Contact/ManagePhotos/Web/ViewHelpers/ContactPhotosIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManagePhotos/Web/ViewHelpers/ContactPhotosIndexViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManagePhotos\Web\ViewHelpers;
 
-use App\Contact\ManagePhotos\Web\ViewHelpers\ContactPhotosIndexViewHelper;
+use App\Domains\Contact\ManagePhotos\Web\ViewHelpers\ContactPhotosIndexViewHelper;
 use App\Models\Contact;
 use App\Models\File;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Domains/Contact/ManagePhotos/Web/ViewHelpers/ContactPhotosShowViewHelperTest.php b/tests/Unit/Domains/Contact/ManagePhotos/Web/ViewHelpers/ContactPhotosShowViewHelperTest.php
index 605834a29..cc3f125c1 100644
--- a/tests/Unit/Domains/Contact/ManagePhotos/Web/ViewHelpers/ContactPhotosShowViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManagePhotos/Web/ViewHelpers/ContactPhotosShowViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManagePhotos\Web\ViewHelpers;
 
-use App\Contact\ManagePhotos\Web\ViewHelpers\ContactPhotosShowViewHelper;
+use App\Domains\Contact\ManagePhotos\Web\ViewHelpers\ContactPhotosShowViewHelper;
 use App\Models\Contact;
 use App\Models\File;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Domains/Contact/ManagePhotos/Web/ViewHelpers/ModulePhotosViewHelperTest.php b/tests/Unit/Domains/Contact/ManagePhotos/Web/ViewHelpers/ModulePhotosViewHelperTest.php
index 9a67f52ad..52508bef4 100644
--- a/tests/Unit/Domains/Contact/ManagePhotos/Web/ViewHelpers/ModulePhotosViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManagePhotos/Web/ViewHelpers/ModulePhotosViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManagePhotos\Web\ViewHelpers;
 
-use App\Contact\ManagePhotos\Web\ViewHelpers\ModulePhotosViewHelper;
+use App\Domains\Contact\ManagePhotos\Web\ViewHelpers\ModulePhotosViewHelper;
 use App\Models\Contact;
 use App\Models\File;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Domains/Contact/ManagePronouns/Services/RemovePronounTest.php b/tests/Unit/Domains/Contact/ManagePronouns/Services/RemovePronounTest.php
index 7d6de3336..d6ccfee99 100644
--- a/tests/Unit/Domains/Contact/ManagePronouns/Services/RemovePronounTest.php
+++ b/tests/Unit/Domains/Contact/ManagePronouns/Services/RemovePronounTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Domains\Contact\ManagePronouns\Services;
 
-use App\Contact\ManagePronouns\Services\RemovePronoun;
-use App\Contact\ManagePronouns\Services\SetPronoun;
+use App\Domains\Contact\ManagePronouns\Services\RemovePronoun;
+use App\Domains\Contact\ManagePronouns\Services\SetPronoun;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManagePronouns/Services/SetPronounTest.php b/tests/Unit/Domains/Contact/ManagePronouns/Services/SetPronounTest.php
index e572bb935..cc019e720 100644
--- a/tests/Unit/Domains/Contact/ManagePronouns/Services/SetPronounTest.php
+++ b/tests/Unit/Domains/Contact/ManagePronouns/Services/SetPronounTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManagePronouns\Services;
 
-use App\Contact\ManagePronouns\Services\SetPronoun;
+use App\Domains\Contact\ManagePronouns\Services\SetPronoun;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManagePronouns/Web/ViewHelpers/ModuleGenderPronounViewHelperTest.php b/tests/Unit/Domains/Contact/ManagePronouns/Web/ViewHelpers/ModuleGenderPronounViewHelperTest.php
index 5e3186d23..b42677305 100644
--- a/tests/Unit/Domains/Contact/ManagePronouns/Web/ViewHelpers/ModuleGenderPronounViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManagePronouns/Web/ViewHelpers/ModuleGenderPronounViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManagePronouns\Web\ViewHelpers;
 
-use App\Contact\ManagePronouns\Web\ViewHelpers\ModuleGenderPronounViewHelper;
+use App\Domains\Contact\ManagePronouns\Web\ViewHelpers\ModuleGenderPronounViewHelper;
 use App\Models\Contact;
 use App\Models\Gender;
 use App\Models\Pronoun;
diff --git a/tests/Unit/Domains/Contact/ManageRelationships/Services/SetRelationshipTest.php b/tests/Unit/Domains/Contact/ManageRelationships/Services/SetRelationshipTest.php
index 06ec3cbfa..523ae55c9 100644
--- a/tests/Unit/Domains/Contact/ManageRelationships/Services/SetRelationshipTest.php
+++ b/tests/Unit/Domains/Contact/ManageRelationships/Services/SetRelationshipTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageRelationships\Services;
 
-use App\Contact\ManageRelationships\Services\SetRelationship;
+use App\Domains\Contact\ManageRelationships\Services\SetRelationship;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageRelationships/Services/UnsetRelationshipTest.php b/tests/Unit/Domains/Contact/ManageRelationships/Services/UnsetRelationshipTest.php
index 062b27b67..72099e616 100644
--- a/tests/Unit/Domains/Contact/ManageRelationships/Services/UnsetRelationshipTest.php
+++ b/tests/Unit/Domains/Contact/ManageRelationships/Services/UnsetRelationshipTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageRelationships\Services;
 
-use App\Contact\ManageRelationships\Services\UnsetRelationship;
+use App\Domains\Contact\ManageRelationships\Services\UnsetRelationship;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageRelationships/Web/ViewHelpers/ContactRelationshipsCreateViewHelperTest.php b/tests/Unit/Domains/Contact/ManageRelationships/Web/ViewHelpers/ContactRelationshipsCreateViewHelperTest.php
index 8dc0ee055..c36f2fdab 100644
--- a/tests/Unit/Domains/Contact/ManageRelationships/Web/ViewHelpers/ContactRelationshipsCreateViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageRelationships/Web/ViewHelpers/ContactRelationshipsCreateViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageRelationships\Web\ViewHelpers;
 
-use App\Contact\ManageRelationships\Web\ViewHelpers\ContactRelationshipsCreateViewHelper;
+use App\Domains\Contact\ManageRelationships\Web\ViewHelpers\ContactRelationshipsCreateViewHelper;
 use App\Models\Contact;
 use App\Models\Gender;
 use App\Models\Pronoun;
diff --git a/tests/Unit/Domains/Contact/ManageRelationships/Web/ViewHelpers/ModuleRelationshipViewHelperTest.php b/tests/Unit/Domains/Contact/ManageRelationships/Web/ViewHelpers/ModuleRelationshipViewHelperTest.php
index e5da3d910..3e1ba9cd1 100644
--- a/tests/Unit/Domains/Contact/ManageRelationships/Web/ViewHelpers/ModuleRelationshipViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageRelationships/Web/ViewHelpers/ModuleRelationshipViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageRelationships\Web\ViewHelpers;
 
-use App\Contact\ManageRelationships\Web\ViewHelpers\ModuleRelationshipViewHelper;
+use App\Domains\Contact\ManageRelationships\Web\ViewHelpers\ModuleRelationshipViewHelper;
 use App\Models\Contact;
 use App\Models\RelationshipGroupType;
 use App\Models\RelationshipType;
diff --git a/tests/Unit/Domains/Contact/ManageReminders/Jobs/ProcessScheduledContactRemindersTest.php b/tests/Unit/Domains/Contact/ManageReminders/Jobs/ProcessScheduledContactRemindersTest.php
index 760012036..f3b4c37ac 100644
--- a/tests/Unit/Domains/Contact/ManageReminders/Jobs/ProcessScheduledContactRemindersTest.php
+++ b/tests/Unit/Domains/Contact/ManageReminders/Jobs/ProcessScheduledContactRemindersTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageReminders\Jobs;
 
-use App\Contact\ManageReminders\Jobs\ProcessScheduledContactReminders;
+use App\Domains\Contact\ManageReminders\Jobs\ProcessScheduledContactReminders;
 use App\Models\ContactReminder;
 use App\Models\UserNotificationChannel;
 use App\Notifications\ReminderTriggered;
diff --git a/tests/Unit/Domains/Contact/ManageReminders/Services/CreateContactReminderTest.php b/tests/Unit/Domains/Contact/ManageReminders/Services/CreateContactReminderTest.php
index 178280c66..d37130499 100644
--- a/tests/Unit/Domains/Contact/ManageReminders/Services/CreateContactReminderTest.php
+++ b/tests/Unit/Domains/Contact/ManageReminders/Services/CreateContactReminderTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageReminders\Services;
 
-use App\Contact\ManageReminders\Services\CreateContactReminder;
+use App\Domains\Contact\ManageReminders\Services\CreateContactReminder;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageReminders/Services/DestroyReminderTest.php b/tests/Unit/Domains/Contact/ManageReminders/Services/DestroyReminderTest.php
index 19b626c47..883fad6bc 100644
--- a/tests/Unit/Domains/Contact/ManageReminders/Services/DestroyReminderTest.php
+++ b/tests/Unit/Domains/Contact/ManageReminders/Services/DestroyReminderTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageReminders\Services;
 
-use App\Contact\ManageReminders\Services\DestroyReminder;
+use App\Domains\Contact\ManageReminders\Services\DestroyReminder;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageReminders/Services/RescheduleContactReminderForChannelTest.php b/tests/Unit/Domains/Contact/ManageReminders/Services/RescheduleContactReminderForChannelTest.php
index a6717c362..ac9404a32 100644
--- a/tests/Unit/Domains/Contact/ManageReminders/Services/RescheduleContactReminderForChannelTest.php
+++ b/tests/Unit/Domains/Contact/ManageReminders/Services/RescheduleContactReminderForChannelTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageReminders\Services;
 
-use App\Contact\ManageReminders\Services\RescheduleContactReminderForChannel;
+use App\Domains\Contact\ManageReminders\Services\RescheduleContactReminderForChannel;
 use App\Models\ContactReminder;
 use App\Models\UserNotificationChannel;
 use Carbon\Carbon;
diff --git a/tests/Unit/Domains/Contact/ManageReminders/Services/ScheduleContactReminderForUserTest.php b/tests/Unit/Domains/Contact/ManageReminders/Services/ScheduleContactReminderForUserTest.php
index 1143f87a5..9369c5eea 100644
--- a/tests/Unit/Domains/Contact/ManageReminders/Services/ScheduleContactReminderForUserTest.php
+++ b/tests/Unit/Domains/Contact/ManageReminders/Services/ScheduleContactReminderForUserTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageReminders\Services;
 
-use App\Contact\ManageReminders\Services\ScheduleContactReminderForUser;
+use App\Domains\Contact\ManageReminders\Services\ScheduleContactReminderForUser;
 use App\Models\Contact;
 use App\Models\ContactReminder;
 use App\Models\User;
diff --git a/tests/Unit/Domains/Contact/ManageReminders/Services/UpdateContactReminderTest.php b/tests/Unit/Domains/Contact/ManageReminders/Services/UpdateContactReminderTest.php
index 08cc8e39c..609b730f8 100644
--- a/tests/Unit/Domains/Contact/ManageReminders/Services/UpdateContactReminderTest.php
+++ b/tests/Unit/Domains/Contact/ManageReminders/Services/UpdateContactReminderTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageReminders\Services;
 
-use App\Contact\ManageReminders\Services\UpdateContactReminder;
+use App\Domains\Contact\ManageReminders\Services\UpdateContactReminder;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageReminders/Web/ViewHelpers/ModuleRemindersViewHelperTest.php b/tests/Unit/Domains/Contact/ManageReminders/Web/ViewHelpers/ModuleRemindersViewHelperTest.php
index a8fb372cb..3f796facd 100644
--- a/tests/Unit/Domains/Contact/ManageReminders/Web/ViewHelpers/ModuleRemindersViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageReminders/Web/ViewHelpers/ModuleRemindersViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageReminders\Web\ViewHelpers;
 
-use App\Contact\ManageReminders\Web\ViewHelpers\ModuleRemindersViewHelper;
+use App\Domains\Contact\ManageReminders\Web\ViewHelpers\ModuleRemindersViewHelper;
 use App\Models\Contact;
 use App\Models\ContactReminder;
 use App\Models\User;
diff --git a/tests/Unit/Domains/Contact/ManageTasks/Services/CreateContactTaskTest.php b/tests/Unit/Domains/Contact/ManageTasks/Services/CreateContactTaskTest.php
index 6c6fdbdf1..32f6e85d0 100644
--- a/tests/Unit/Domains/Contact/ManageTasks/Services/CreateContactTaskTest.php
+++ b/tests/Unit/Domains/Contact/ManageTasks/Services/CreateContactTaskTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageTasks\Services;
 
-use App\Contact\ManageTasks\Services\CreateContactTask;
+use App\Domains\Contact\ManageTasks\Services\CreateContactTask;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageTasks/Services/DestroyContactTaskTest.php b/tests/Unit/Domains/Contact/ManageTasks/Services/DestroyContactTaskTest.php
index a547bb646..e882fd2b0 100644
--- a/tests/Unit/Domains/Contact/ManageTasks/Services/DestroyContactTaskTest.php
+++ b/tests/Unit/Domains/Contact/ManageTasks/Services/DestroyContactTaskTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageTasks\Services;
 
-use App\Contact\ManageTasks\Services\DestroyContactTask;
+use App\Domains\Contact\ManageTasks\Services\DestroyContactTask;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageTasks/Services/ToggleContactTaskTest.php b/tests/Unit/Domains/Contact/ManageTasks/Services/ToggleContactTaskTest.php
index 9646276ae..fe32f212b 100644
--- a/tests/Unit/Domains/Contact/ManageTasks/Services/ToggleContactTaskTest.php
+++ b/tests/Unit/Domains/Contact/ManageTasks/Services/ToggleContactTaskTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageTasks\Services;
 
-use App\Contact\ManageTasks\Services\ToggleContactTask;
+use App\Domains\Contact\ManageTasks\Services\ToggleContactTask;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageTasks/Services/UpdateContactTaskTest.php b/tests/Unit/Domains/Contact/ManageTasks/Services/UpdateContactTaskTest.php
index ae85d9da9..769845714 100644
--- a/tests/Unit/Domains/Contact/ManageTasks/Services/UpdateContactTaskTest.php
+++ b/tests/Unit/Domains/Contact/ManageTasks/Services/UpdateContactTaskTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageTasks\Services;
 
-use App\Contact\ManageTasks\Services\UpdateContactTask;
+use App\Domains\Contact\ManageTasks\Services\UpdateContactTask;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
diff --git a/tests/Unit/Domains/Contact/ManageTasks/Web/ViewHelpers/ModuleContactTasksViewHelperTest.php b/tests/Unit/Domains/Contact/ManageTasks/Web/ViewHelpers/ModuleContactTasksViewHelperTest.php
index cc0048080..77ce6093c 100644
--- a/tests/Unit/Domains/Contact/ManageTasks/Web/ViewHelpers/ModuleContactTasksViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageTasks/Web/ViewHelpers/ModuleContactTasksViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Contact\ManageTasks\Web\ViewHelpers;
 
-use App\Contact\ManageTasks\Web\ViewHelpers\ModuleContactTasksViewHelper;
+use App\Domains\Contact\ManageTasks\Web\ViewHelpers\ModuleContactTasksViewHelper;
 use App\Models\Contact;
 use App\Models\ContactTask;
 use App\Models\User;
diff --git a/tests/Unit/Domains/Settings/CancelAccount/Services/CancelAccountTest.php b/tests/Unit/Domains/Settings/CancelAccount/Services/CancelAccountTest.php
index a4d78af58..e3925b087 100644
--- a/tests/Unit/Domains/Settings/CancelAccount/Services/CancelAccountTest.php
+++ b/tests/Unit/Domains/Settings/CancelAccount/Services/CancelAccountTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\CancelAccount\Services;
 
+use App\Domains\Settings\CancelAccount\Services\CancelAccount;
 use App\Models\Account;
 use App\Models\Contact;
 use App\Models\File;
 use App\Models\User;
-use App\Settings\CancelAccount\Services\CancelAccount;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Event;
diff --git a/tests/Unit/Domains/Settings/CancelAccount/Web/ViewHelpers/CancelAccountViewHelperTest.php b/tests/Unit/Domains/Settings/CancelAccount/Web/ViewHelpers/CancelAccountViewHelperTest.php
index e73fb401f..edb6274a4 100644
--- a/tests/Unit/Domains/Settings/CancelAccount/Web/ViewHelpers/CancelAccountViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/CancelAccount/Web/ViewHelpers/CancelAccountViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Settings\CancelAccount\Web\ViewHelpers;
 
-use App\Settings\CancelAccount\Web\ViewHelpers\CancelAccountViewHelper;
+use App\Domains\Settings\CancelAccount\Web\ViewHelpers\CancelAccountViewHelper;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
 
diff --git a/tests/Unit/Domains/Settings/CreateAccount/Services/CreateAccountTest.php b/tests/Unit/Domains/Settings/CreateAccount/Services/CreateAccountTest.php
index 2aa907316..23189c492 100644
--- a/tests/Unit/Domains/Settings/CreateAccount/Services/CreateAccountTest.php
+++ b/tests/Unit/Domains/Settings/CreateAccount/Services/CreateAccountTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Domains\Settings\CreateAccount\Services;
 
+use App\Domains\Settings\CreateAccount\Services\CreateAccount;
 use App\Jobs\SetupAccount;
 use App\Models\User;
-use App\Settings\CreateAccount\Services\CreateAccount;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageActivityTypes/Services/CreateActivityTest.php b/tests/Unit/Domains/Settings/ManageActivityTypes/Services/CreateActivityTest.php
index 07c284904..0cad3b99a 100644
--- a/tests/Unit/Domains/Settings/ManageActivityTypes/Services/CreateActivityTest.php
+++ b/tests/Unit/Domains/Settings/ManageActivityTypes/Services/CreateActivityTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Settings\ManageActivityTypes\Services;
 
+use App\Domains\Settings\ManageActivityTypes\Services\CreateActivity;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Activity;
 use App\Models\ActivityType;
 use App\Models\User;
-use App\Settings\ManageActivityTypes\Services\CreateActivity;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageActivityTypes/Services/CreateActivityTypeTest.php b/tests/Unit/Domains/Settings/ManageActivityTypes/Services/CreateActivityTypeTest.php
index f081cdf2e..d1d2155c6 100644
--- a/tests/Unit/Domains/Settings/ManageActivityTypes/Services/CreateActivityTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageActivityTypes/Services/CreateActivityTypeTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageActivityTypes\Services;
 
+use App\Domains\Settings\ManageActivityTypes\Services\CreateActivityType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\ActivityType;
 use App\Models\User;
-use App\Settings\ManageActivityTypes\Services\CreateActivityType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageActivityTypes/Services/DestroyActivityTest.php b/tests/Unit/Domains/Settings/ManageActivityTypes/Services/DestroyActivityTest.php
index f9b3d0b9a..f0e55012e 100644
--- a/tests/Unit/Domains/Settings/ManageActivityTypes/Services/DestroyActivityTest.php
+++ b/tests/Unit/Domains/Settings/ManageActivityTypes/Services/DestroyActivityTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Settings\ManageActivityTypes\Services;
 
+use App\Domains\Settings\ManageActivityTypes\Services\DestroyActivity;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Activity;
 use App\Models\ActivityType;
 use App\Models\User;
-use App\Settings\ManageActivityTypes\Services\DestroyActivity;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageActivityTypes/Services/DestroyActivityTypeTest.php b/tests/Unit/Domains/Settings/ManageActivityTypes/Services/DestroyActivityTypeTest.php
index beb3b837c..337507177 100644
--- a/tests/Unit/Domains/Settings/ManageActivityTypes/Services/DestroyActivityTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageActivityTypes/Services/DestroyActivityTypeTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageActivityTypes\Services;
 
+use App\Domains\Settings\ManageActivityTypes\Services\DestroyActivityType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\ActivityType;
 use App\Models\User;
-use App\Settings\ManageActivityTypes\Services\DestroyActivityType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageActivityTypes/Services/UpdateActivityTest.php b/tests/Unit/Domains/Settings/ManageActivityTypes/Services/UpdateActivityTest.php
index 9d146274b..ff427e2fe 100644
--- a/tests/Unit/Domains/Settings/ManageActivityTypes/Services/UpdateActivityTest.php
+++ b/tests/Unit/Domains/Settings/ManageActivityTypes/Services/UpdateActivityTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Settings\ManageActivityTypes\Services;
 
+use App\Domains\Settings\ManageActivityTypes\Services\UpdateActivity;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Activity;
 use App\Models\ActivityType;
 use App\Models\User;
-use App\Settings\ManageActivityTypes\Services\UpdateActivity;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageActivityTypes/Services/UpdateActivityTypeTest.php b/tests/Unit/Domains/Settings/ManageActivityTypes/Services/UpdateActivityTypeTest.php
index d7b7d7680..5b5191072 100644
--- a/tests/Unit/Domains/Settings/ManageActivityTypes/Services/UpdateActivityTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageActivityTypes/Services/UpdateActivityTypeTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageActivityTypes\Services;
 
+use App\Domains\Settings\ManageActivityTypes\Services\UpdateActivityType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\ActivityType;
 use App\Models\User;
-use App\Settings\ManageActivityTypes\Services\UpdateActivityType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageActivityTypes/Web/ViewHelpers/PersonalizeActivityTypesIndexViewHelperTest.php b/tests/Unit/Domains/Settings/ManageActivityTypes/Web/ViewHelpers/PersonalizeActivityTypesIndexViewHelperTest.php
index f842ee3ac..4d419ef21 100644
--- a/tests/Unit/Domains/Settings/ManageActivityTypes/Web/ViewHelpers/PersonalizeActivityTypesIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManageActivityTypes/Web/ViewHelpers/PersonalizeActivityTypesIndexViewHelperTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Domains\Settings\ManageActivityTypes\Web\ViewHelpers;
 
+use App\Domains\Settings\ManageActivityTypes\Web\ViewHelpers\PersonalizeActivityTypesIndexViewHelper;
 use App\Models\Activity;
 use App\Models\ActivityType;
-use App\Settings\ManageActivityTypes\Web\ViewHelpers\PersonalizeActivityTypesIndexViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManageAddressTypes/Services/CreateAddressTypeTest.php b/tests/Unit/Domains/Settings/ManageAddressTypes/Services/CreateAddressTypeTest.php
index 7824cc3a1..4eb328f67 100644
--- a/tests/Unit/Domains/Settings/ManageAddressTypes/Services/CreateAddressTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageAddressTypes/Services/CreateAddressTypeTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageAddressTypes\Services;
 
+use App\Domains\Settings\ManageAddressTypes\Services\CreateAddressType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\AddressType;
 use App\Models\User;
-use App\Settings\ManageAddressTypes\Services\CreateAddressType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageAddressTypes/Services/DestroyAddressTypeTest.php b/tests/Unit/Domains/Settings/ManageAddressTypes/Services/DestroyAddressTypeTest.php
index 16a41bcc2..20e071d8c 100644
--- a/tests/Unit/Domains/Settings/ManageAddressTypes/Services/DestroyAddressTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageAddressTypes/Services/DestroyAddressTypeTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageAddressTypes\Services;
 
+use App\Domains\Settings\ManageAddressTypes\Services\DestroyAddressType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\AddressType;
 use App\Models\User;
-use App\Settings\ManageAddressTypes\Services\DestroyAddressType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageAddressTypes/Services/UpdateAddressTypeTest.php b/tests/Unit/Domains/Settings/ManageAddressTypes/Services/UpdateAddressTypeTest.php
index dba4c4e43..60dc7b8f0 100644
--- a/tests/Unit/Domains/Settings/ManageAddressTypes/Services/UpdateAddressTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageAddressTypes/Services/UpdateAddressTypeTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageAddressTypes\Services;
 
+use App\Domains\Settings\ManageAddressTypes\Services\UpdateAddressType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\AddressType;
 use App\Models\User;
-use App\Settings\ManageAddressTypes\Services\UpdateAddressType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageAddressTypes/Web/ViewHelpers/PersonalizeAddressTypeIndexViewHelperTest.php b/tests/Unit/Domains/Settings/ManageAddressTypes/Web/ViewHelpers/PersonalizeAddressTypeIndexViewHelperTest.php
index ef3040717..abd075c07 100644
--- a/tests/Unit/Domains/Settings/ManageAddressTypes/Web/ViewHelpers/PersonalizeAddressTypeIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManageAddressTypes/Web/ViewHelpers/PersonalizeAddressTypeIndexViewHelperTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Domains\Settings\ManageAddressTypes\Web\ViewHelpers;
 
+use App\Domains\Settings\ManageAddressTypes\Web\ViewHelpers\PersonalizeAddressTypeIndexViewHelper;
 use App\Models\AddressType;
-use App\Settings\ManageAddressTypes\Web\ViewHelpers\PersonalizeAddressTypeIndexViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManageCallReasons/Services/CreateCallReasonTest.php b/tests/Unit/Domains/Settings/ManageCallReasons/Services/CreateCallReasonTest.php
index 9e002130c..485a3bc49 100644
--- a/tests/Unit/Domains/Settings/ManageCallReasons/Services/CreateCallReasonTest.php
+++ b/tests/Unit/Domains/Settings/ManageCallReasons/Services/CreateCallReasonTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Settings\ManageCallReasons\Services;
 
+use App\Domains\Settings\ManageCallReasons\Services\CreateCallReason;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\CallReason;
 use App\Models\CallReasonType;
 use App\Models\User;
-use App\Settings\ManageCallReasons\Services\CreateCallReason;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageCallReasons/Services/CreateCallReasonTypeTest.php b/tests/Unit/Domains/Settings/ManageCallReasons/Services/CreateCallReasonTypeTest.php
index 406dee4b2..8320e0f0a 100644
--- a/tests/Unit/Domains/Settings/ManageCallReasons/Services/CreateCallReasonTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageCallReasons/Services/CreateCallReasonTypeTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageCallReasons\Services;
 
+use App\Domains\Settings\ManageCallReasons\Services\CreateCallReasonType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\CallReasonType;
 use App\Models\User;
-use App\Settings\ManageCallReasons\Services\CreateCallReasonType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageCallReasons/Services/DestroyCallReasonTest.php b/tests/Unit/Domains/Settings/ManageCallReasons/Services/DestroyCallReasonTest.php
index cb94731b5..935e6f710 100644
--- a/tests/Unit/Domains/Settings/ManageCallReasons/Services/DestroyCallReasonTest.php
+++ b/tests/Unit/Domains/Settings/ManageCallReasons/Services/DestroyCallReasonTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Settings\ManageCallReasons\Services;
 
+use App\Domains\Settings\ManageCallReasons\Services\DestroyCallReason;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\CallReason;
 use App\Models\CallReasonType;
 use App\Models\User;
-use App\Settings\ManageCallReasons\Services\DestroyCallReason;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageCallReasons/Services/DestroyCallReasonTypeTest.php b/tests/Unit/Domains/Settings/ManageCallReasons/Services/DestroyCallReasonTypeTest.php
index 0a9708bf4..242345531 100644
--- a/tests/Unit/Domains/Settings/ManageCallReasons/Services/DestroyCallReasonTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageCallReasons/Services/DestroyCallReasonTypeTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageCallReasons\Services;
 
+use App\Domains\Settings\ManageCallReasons\Services\DestroyCallReasonType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\CallReasonType;
 use App\Models\User;
-use App\Settings\ManageCallReasons\Services\DestroyCallReasonType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageCallReasons/Services/UpdateCallReasonTest.php b/tests/Unit/Domains/Settings/ManageCallReasons/Services/UpdateCallReasonTest.php
index e6fc62fb8..71c9f3263 100644
--- a/tests/Unit/Domains/Settings/ManageCallReasons/Services/UpdateCallReasonTest.php
+++ b/tests/Unit/Domains/Settings/ManageCallReasons/Services/UpdateCallReasonTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Settings\ManageCallReasons\Services;
 
+use App\Domains\Settings\ManageCallReasons\Services\UpdateCallReason;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\CallReason;
 use App\Models\CallReasonType;
 use App\Models\User;
-use App\Settings\ManageCallReasons\Services\UpdateCallReason;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageCallReasons/Services/UpdateCallReasonTypeTest.php b/tests/Unit/Domains/Settings/ManageCallReasons/Services/UpdateCallReasonTypeTest.php
index bf13dda8d..de8e522a0 100644
--- a/tests/Unit/Domains/Settings/ManageCallReasons/Services/UpdateCallReasonTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageCallReasons/Services/UpdateCallReasonTypeTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageCallReasons\Services;
 
+use App\Domains\Settings\ManageCallReasons\Services\UpdateCallReasonType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\CallReasonType;
 use App\Models\User;
-use App\Settings\ManageCallReasons\Services\UpdateCallReasonType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageCallReasons/Web/ViewHelpers/PersonalizeCallReasonsIndexViewHelperTest.php b/tests/Unit/Domains/Settings/ManageCallReasons/Web/ViewHelpers/PersonalizeCallReasonsIndexViewHelperTest.php
index 864fcfde7..c5e87b877 100644
--- a/tests/Unit/Domains/Settings/ManageCallReasons/Web/ViewHelpers/PersonalizeCallReasonsIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManageCallReasons/Web/ViewHelpers/PersonalizeCallReasonsIndexViewHelperTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Domains\Settings\ManageCallReasons\Web\ViewHelpers;
 
+use App\Domains\Settings\ManageCallReasons\Web\ViewHelpers\PersonalizeCallReasonsIndexViewHelper;
 use App\Models\CallReason;
 use App\Models\CallReasonType;
-use App\Settings\ManageCallReasons\Web\ViewHelpers\PersonalizeCallReasonsIndexViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManageContactInformationTypes/Services/CreateContactInformationTypeTest.php b/tests/Unit/Domains/Settings/ManageContactInformationTypes/Services/CreateContactInformationTypeTest.php
index 071af9fbe..8455e5c88 100644
--- a/tests/Unit/Domains/Settings/ManageContactInformationTypes/Services/CreateContactInformationTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageContactInformationTypes/Services/CreateContactInformationTypeTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageContactInformationTypes\Services;
 
+use App\Domains\Settings\ManageContactInformationTypes\Services\CreateContactInformationType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\ContactInformationType;
 use App\Models\User;
-use App\Settings\ManageContactInformationTypes\Services\CreateContactInformationType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageContactInformationTypes/Services/DestroyContactInformationTypeTest.php b/tests/Unit/Domains/Settings/ManageContactInformationTypes/Services/DestroyContactInformationTypeTest.php
index 81b5e6342..0a995057f 100644
--- a/tests/Unit/Domains/Settings/ManageContactInformationTypes/Services/DestroyContactInformationTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageContactInformationTypes/Services/DestroyContactInformationTypeTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageContactInformationTypes\Services;
 
+use App\Domains\Settings\ManageContactInformationTypes\Services\DestroyContactInformationType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\ContactInformationType;
 use App\Models\User;
-use App\Settings\ManageContactInformationTypes\Services\DestroyContactInformationType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageContactInformationTypes/Services/UpdateContactInformationTypeTest.php b/tests/Unit/Domains/Settings/ManageContactInformationTypes/Services/UpdateContactInformationTypeTest.php
index 4f1607915..3e786cbd0 100644
--- a/tests/Unit/Domains/Settings/ManageContactInformationTypes/Services/UpdateContactInformationTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageContactInformationTypes/Services/UpdateContactInformationTypeTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageContactInformationTypes\Services;
 
+use App\Domains\Settings\ManageContactInformationTypes\Services\UpdateContactInformationType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\ContactInformationType;
 use App\Models\User;
-use App\Settings\ManageContactInformationTypes\Services\UpdateContactInformationType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageContactInformationTypes/Web/ViewHelpers/PersonalizeContactInformationTypeIndexViewHelperTest.php b/tests/Unit/Domains/Settings/ManageContactInformationTypes/Web/ViewHelpers/PersonalizeContactInformationTypeIndexViewHelperTest.php
index 035a4de6b..5be785808 100644
--- a/tests/Unit/Domains/Settings/ManageContactInformationTypes/Web/ViewHelpers/PersonalizeContactInformationTypeIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManageContactInformationTypes/Web/ViewHelpers/PersonalizeContactInformationTypeIndexViewHelperTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Domains\Settings\ManageContactInformationTypes\Web\ViewHelpers;
 
+use App\Domains\Settings\ManageContactInformationTypes\Web\ViewHelpers\PersonalizeContactInformationTypeIndexViewHelper;
 use App\Models\ContactInformationType;
-use App\Settings\ManageContactInformationTypes\Web\ViewHelpers\PersonalizeContactInformationTypeIndexViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManageCurrencies/Services/DisableAllCurrenciesTest.php b/tests/Unit/Domains/Settings/ManageCurrencies/Services/DisableAllCurrenciesTest.php
index 1cece0ed5..9658704fc 100644
--- a/tests/Unit/Domains/Settings/ManageCurrencies/Services/DisableAllCurrenciesTest.php
+++ b/tests/Unit/Domains/Settings/ManageCurrencies/Services/DisableAllCurrenciesTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageCurrencies\Services;
 
+use App\Domains\Settings\ManageCurrencies\Services\DisableAllCurrencies;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Currency;
 use App\Models\User;
-use App\Settings\ManageCurrencies\Services\DisableAllCurrencies;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageCurrencies/Services/EnableAllCurrenciesTest.php b/tests/Unit/Domains/Settings/ManageCurrencies/Services/EnableAllCurrenciesTest.php
index e93d69b7e..598ac19be 100644
--- a/tests/Unit/Domains/Settings/ManageCurrencies/Services/EnableAllCurrenciesTest.php
+++ b/tests/Unit/Domains/Settings/ManageCurrencies/Services/EnableAllCurrenciesTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageCurrencies\Services;
 
+use App\Domains\Settings\ManageCurrencies\Services\EnableAllCurrencies;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Currency;
 use App\Models\User;
-use App\Settings\ManageCurrencies\Services\EnableAllCurrencies;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageCurrencies/Services/ToggleCurrencyTest.php b/tests/Unit/Domains/Settings/ManageCurrencies/Services/ToggleCurrencyTest.php
index 3f4747822..52afa68e6 100644
--- a/tests/Unit/Domains/Settings/ManageCurrencies/Services/ToggleCurrencyTest.php
+++ b/tests/Unit/Domains/Settings/ManageCurrencies/Services/ToggleCurrencyTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageCurrencies\Services;
 
+use App\Domains\Settings\ManageCurrencies\Services\ToggleCurrency;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Currency;
 use App\Models\User;
-use App\Settings\ManageCurrencies\Services\ToggleCurrency;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageCurrencies/Web/ViewHelpers/CurrencyIndexViewHelperTest.php b/tests/Unit/Domains/Settings/ManageCurrencies/Web/ViewHelpers/CurrencyIndexViewHelperTest.php
index 399d47f22..dd9201d72 100644
--- a/tests/Unit/Domains/Settings/ManageCurrencies/Web/ViewHelpers/CurrencyIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManageCurrencies/Web/ViewHelpers/CurrencyIndexViewHelperTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Domains\Settings\ManageCurrencies\Web\ViewHelpers;
 
+use App\Domains\Settings\ManageCurrencies\Web\ViewHelpers\CurrencyIndexViewHelper;
 use App\Models\Account;
 use App\Models\Currency;
-use App\Settings\ManageCurrencies\Web\ViewHelpers\CurrencyIndexViewHelper;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
 
diff --git a/tests/Unit/Domains/Settings/ManageCurrencies/Web/ViewHelpers/PersonalizeCurrencyIndexViewHelperTest.php b/tests/Unit/Domains/Settings/ManageCurrencies/Web/ViewHelpers/PersonalizeCurrencyIndexViewHelperTest.php
index 6ed69614e..e12dfa78b 100644
--- a/tests/Unit/Domains/Settings/ManageCurrencies/Web/ViewHelpers/PersonalizeCurrencyIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManageCurrencies/Web/ViewHelpers/PersonalizeCurrencyIndexViewHelperTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Domains\Settings\ManageCurrencies\Web\ViewHelpers;
 
+use App\Domains\Settings\ManageCurrencies\Web\ViewHelpers\PersonalizeCurrencyIndexViewHelper;
 use App\Models\Account;
 use App\Models\Currency;
-use App\Settings\ManageCurrencies\Web\ViewHelpers\PersonalizeCurrencyIndexViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManageGenders/Services/CreateGenderTest.php b/tests/Unit/Domains/Settings/ManageGenders/Services/CreateGenderTest.php
index 1e15ced87..0b14f59fb 100644
--- a/tests/Unit/Domains/Settings/ManageGenders/Services/CreateGenderTest.php
+++ b/tests/Unit/Domains/Settings/ManageGenders/Services/CreateGenderTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageGenders\Services;
 
+use App\Domains\Settings\ManageGenders\Services\CreateGender;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Gender;
 use App\Models\User;
-use App\Settings\ManageGenders\Services\CreateGender;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageGenders/Services/DestroyGenderTest.php b/tests/Unit/Domains/Settings/ManageGenders/Services/DestroyGenderTest.php
index 644819578..468e8e855 100644
--- a/tests/Unit/Domains/Settings/ManageGenders/Services/DestroyGenderTest.php
+++ b/tests/Unit/Domains/Settings/ManageGenders/Services/DestroyGenderTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageGenders\Services;
 
+use App\Domains\Settings\ManageGenders\Services\DestroyGender;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Gender;
 use App\Models\User;
-use App\Settings\ManageGenders\Services\DestroyGender;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageGenders/Services/UpdateGenderTest.php b/tests/Unit/Domains/Settings/ManageGenders/Services/UpdateGenderTest.php
index 25e1e5735..a5d1e78ca 100644
--- a/tests/Unit/Domains/Settings/ManageGenders/Services/UpdateGenderTest.php
+++ b/tests/Unit/Domains/Settings/ManageGenders/Services/UpdateGenderTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageGenders\Services;
 
+use App\Domains\Settings\ManageGenders\Services\UpdateGender;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Gender;
 use App\Models\User;
-use App\Settings\ManageGenders\Services\UpdateGender;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageGenders/Web/ViewHelpers/ManageGenderIndexViewHelperTest.php b/tests/Unit/Domains/Settings/ManageGenders/Web/ViewHelpers/ManageGenderIndexViewHelperTest.php
index b3b0c05e8..67a619eff 100644
--- a/tests/Unit/Domains/Settings/ManageGenders/Web/ViewHelpers/ManageGenderIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManageGenders/Web/ViewHelpers/ManageGenderIndexViewHelperTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Domains\Settings\ManageGenders\Web\ViewHelpers;
 
+use App\Domains\Settings\ManageGenders\Web\ViewHelpers\ManageGenderIndexViewHelper;
 use App\Models\Gender;
-use App\Settings\ManageGenders\Web\ViewHelpers\ManageGenderIndexViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManageGiftOccasions/Services/CreateGiftOccasionTest.php b/tests/Unit/Domains/Settings/ManageGiftOccasions/Services/CreateGiftOccasionTest.php
index 30e9a0b92..2bbc78aa4 100644
--- a/tests/Unit/Domains/Settings/ManageGiftOccasions/Services/CreateGiftOccasionTest.php
+++ b/tests/Unit/Domains/Settings/ManageGiftOccasions/Services/CreateGiftOccasionTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageGiftOccasions\Services;
 
+use App\Domains\Settings\ManageGiftOccasions\Services\CreateGiftOccasion;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\GiftOccasion;
 use App\Models\User;
-use App\Settings\ManageGiftOccasions\Services\CreateGiftOccasion;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageGiftOccasions/Services/DestroyGiftOccasionTest.php b/tests/Unit/Domains/Settings/ManageGiftOccasions/Services/DestroyGiftOccasionTest.php
index 9c5aa3e8e..3ee79fbff 100644
--- a/tests/Unit/Domains/Settings/ManageGiftOccasions/Services/DestroyGiftOccasionTest.php
+++ b/tests/Unit/Domains/Settings/ManageGiftOccasions/Services/DestroyGiftOccasionTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageGiftOccasions\Services;
 
+use App\Domains\Settings\ManageGiftOccasions\Services\DestroyGiftOccasion;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\GiftOccasion;
 use App\Models\User;
-use App\Settings\ManageGiftOccasions\Services\DestroyGiftOccasion;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageGiftOccasions/Services/UpdateGiftOccasionPositionTest.php b/tests/Unit/Domains/Settings/ManageGiftOccasions/Services/UpdateGiftOccasionPositionTest.php
index efe8ea203..b6737b092 100644
--- a/tests/Unit/Domains/Settings/ManageGiftOccasions/Services/UpdateGiftOccasionPositionTest.php
+++ b/tests/Unit/Domains/Settings/ManageGiftOccasions/Services/UpdateGiftOccasionPositionTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Domains\Settings\ManageGiftOccasions\Services;
 
+use App\Domains\Settings\ManageGiftOccasions\Services\UpdateGiftOccasionPosition;
 use App\Models\Account;
 use App\Models\GiftOccasion;
 use App\Models\User;
-use App\Settings\ManageGiftOccasions\Services\UpdateGiftOccasionPosition;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageGiftOccasions/Services/UpdateGiftOccasionTest.php b/tests/Unit/Domains/Settings/ManageGiftOccasions/Services/UpdateGiftOccasionTest.php
index af0bf9a60..8c3d1ea15 100644
--- a/tests/Unit/Domains/Settings/ManageGiftOccasions/Services/UpdateGiftOccasionTest.php
+++ b/tests/Unit/Domains/Settings/ManageGiftOccasions/Services/UpdateGiftOccasionTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageGiftOccasions\Services;
 
+use App\Domains\Settings\ManageGiftOccasions\Services\UpdateGiftOccasion;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\GiftOccasion;
 use App\Models\User;
-use App\Settings\ManageGiftOccasions\Services\UpdateGiftOccasion;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageGiftOccasions/Web/ViewHelpers/PersonalizeGiftOccasionViewHelperTest.php b/tests/Unit/Domains/Settings/ManageGiftOccasions/Web/ViewHelpers/PersonalizeGiftOccasionViewHelperTest.php
index afda2a250..1fbb39498 100644
--- a/tests/Unit/Domains/Settings/ManageGiftOccasions/Web/ViewHelpers/PersonalizeGiftOccasionViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManageGiftOccasions/Web/ViewHelpers/PersonalizeGiftOccasionViewHelperTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Domains\Settings\ManageGiftOccasions\Web\ViewHelpers;
 
+use App\Domains\Settings\ManageGiftOccasions\Web\ViewHelpers\PersonalizeGiftOccasionViewHelper;
 use App\Models\GiftOccasion;
-use App\Settings\ManageGiftOccasions\Web\ViewHelpers\PersonalizeGiftOccasionViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManageGiftStates/Services/CreateGiftStateTest.php b/tests/Unit/Domains/Settings/ManageGiftStates/Services/CreateGiftStateTest.php
index 823f93dac..aa5419dda 100644
--- a/tests/Unit/Domains/Settings/ManageGiftStates/Services/CreateGiftStateTest.php
+++ b/tests/Unit/Domains/Settings/ManageGiftStates/Services/CreateGiftStateTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageGiftStates\Services;
 
+use App\Domains\Settings\ManageGiftStates\Services\CreateGiftState;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\GiftState;
 use App\Models\User;
-use App\Settings\ManageGiftStates\Services\CreateGiftState;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageGiftStates/Services/DestroyGiftStateTest.php b/tests/Unit/Domains/Settings/ManageGiftStates/Services/DestroyGiftStateTest.php
index 24f8c7128..8ab8550e5 100644
--- a/tests/Unit/Domains/Settings/ManageGiftStates/Services/DestroyGiftStateTest.php
+++ b/tests/Unit/Domains/Settings/ManageGiftStates/Services/DestroyGiftStateTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageGiftStates\Services;
 
+use App\Domains\Settings\ManageGiftStates\Services\DestroyGiftState;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\GiftState;
 use App\Models\User;
-use App\Settings\ManageGiftStates\Services\DestroyGiftState;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageGiftStates/Services/UpdateGiftStatePositionTest.php b/tests/Unit/Domains/Settings/ManageGiftStates/Services/UpdateGiftStatePositionTest.php
index 2d761fb47..b437821d1 100644
--- a/tests/Unit/Domains/Settings/ManageGiftStates/Services/UpdateGiftStatePositionTest.php
+++ b/tests/Unit/Domains/Settings/ManageGiftStates/Services/UpdateGiftStatePositionTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Domains\Settings\ManageGiftStates\Services;
 
+use App\Domains\Settings\ManageGiftStates\Services\UpdateGiftStatePosition;
 use App\Models\Account;
 use App\Models\GiftState;
 use App\Models\User;
-use App\Settings\ManageGiftStates\Services\UpdateGiftStatePosition;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageGiftStates/Services/UpdateGiftStateTest.php b/tests/Unit/Domains/Settings/ManageGiftStates/Services/UpdateGiftStateTest.php
index 563e99ecf..73e4bcf82 100644
--- a/tests/Unit/Domains/Settings/ManageGiftStates/Services/UpdateGiftStateTest.php
+++ b/tests/Unit/Domains/Settings/ManageGiftStates/Services/UpdateGiftStateTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageGiftStates\Services;
 
+use App\Domains\Settings\ManageGiftStates\Services\UpdateGiftState;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\GiftState;
 use App\Models\User;
-use App\Settings\ManageGiftStates\Services\UpdateGiftState;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageGiftStates/Web/ViewHelpers/PersonalizeGiftStateViewHelperTest.php b/tests/Unit/Domains/Settings/ManageGiftStates/Web/ViewHelpers/PersonalizeGiftStateViewHelperTest.php
index abde577fd..2278f5eed 100644
--- a/tests/Unit/Domains/Settings/ManageGiftStates/Web/ViewHelpers/PersonalizeGiftStateViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManageGiftStates/Web/ViewHelpers/PersonalizeGiftStateViewHelperTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Domains\Settings\ManageGiftStates\Web\ViewHelpers;
 
+use App\Domains\Settings\ManageGiftStates\Web\ViewHelpers\PersonalizeGiftStateViewHelper;
 use App\Models\GiftState;
-use App\Settings\ManageGiftStates\Web\ViewHelpers\PersonalizeGiftStateViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManageGroupTypes/Services/CreateGroupTypeRoleTest.php b/tests/Unit/Domains/Settings/ManageGroupTypes/Services/CreateGroupTypeRoleTest.php
index e65d983ee..aef20a337 100644
--- a/tests/Unit/Domains/Settings/ManageGroupTypes/Services/CreateGroupTypeRoleTest.php
+++ b/tests/Unit/Domains/Settings/ManageGroupTypes/Services/CreateGroupTypeRoleTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Settings\ManageGroupTypes\Services;
 
+use App\Domains\Settings\ManageGroupTypes\Services\CreateGroupTypeRole;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\GroupType;
 use App\Models\GroupTypeRole;
 use App\Models\User;
-use App\Settings\ManageGroupTypes\Services\CreateGroupTypeRole;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageGroupTypes/Services/CreateGroupTypeTest.php b/tests/Unit/Domains/Settings/ManageGroupTypes/Services/CreateGroupTypeTest.php
index bd9a40700..7b2883c05 100644
--- a/tests/Unit/Domains/Settings/ManageGroupTypes/Services/CreateGroupTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageGroupTypes/Services/CreateGroupTypeTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageGroupTypes\Services;
 
+use App\Domains\Settings\ManageGroupTypes\Services\CreateGroupType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\GroupType;
 use App\Models\User;
-use App\Settings\ManageGroupTypes\Services\CreateGroupType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageGroupTypes/Services/DestroyGroupTypeRoleTest.php b/tests/Unit/Domains/Settings/ManageGroupTypes/Services/DestroyGroupTypeRoleTest.php
index 19984e13a..76fe1acd9 100644
--- a/tests/Unit/Domains/Settings/ManageGroupTypes/Services/DestroyGroupTypeRoleTest.php
+++ b/tests/Unit/Domains/Settings/ManageGroupTypes/Services/DestroyGroupTypeRoleTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Settings\ManageGroupTypes\Services;
 
+use App\Domains\Settings\ManageGroupTypes\Services\DestroyGroupTypeRole;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\GroupType;
 use App\Models\GroupTypeRole;
 use App\Models\User;
-use App\Settings\ManageGroupTypes\Services\DestroyGroupTypeRole;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageGroupTypes/Services/DestroyGroupTypeTest.php b/tests/Unit/Domains/Settings/ManageGroupTypes/Services/DestroyGroupTypeTest.php
index 103aae734..9fc24ef9f 100644
--- a/tests/Unit/Domains/Settings/ManageGroupTypes/Services/DestroyGroupTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageGroupTypes/Services/DestroyGroupTypeTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageGroupTypes\Services;
 
+use App\Domains\Settings\ManageGroupTypes\Services\DestroyGroupType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\GroupType;
 use App\Models\User;
-use App\Settings\ManageGroupTypes\Services\DestroyGroupType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypePositionTest.php b/tests/Unit/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypePositionTest.php
index 34c526052..d0900e2c2 100644
--- a/tests/Unit/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypePositionTest.php
+++ b/tests/Unit/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypePositionTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Domains\Settings\ManageGroupTypes\Services;
 
+use App\Domains\Settings\ManageGroupTypes\Services\UpdateGroupTypePosition;
 use App\Models\Account;
 use App\Models\GroupType;
 use App\Models\User;
-use App\Settings\ManageGroupTypes\Services\UpdateGroupTypePosition;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeRolePositionTest.php b/tests/Unit/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeRolePositionTest.php
index 82836cebf..3975c8eae 100644
--- a/tests/Unit/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeRolePositionTest.php
+++ b/tests/Unit/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeRolePositionTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageGroupTypes\Services;
 
+use App\Domains\Settings\ManageGroupTypes\Services\UpdateGroupTypeRolePosition;
 use App\Models\Account;
 use App\Models\GroupType;
 use App\Models\GroupTypeRole;
 use App\Models\User;
-use App\Settings\ManageGroupTypes\Services\UpdateGroupTypeRolePosition;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeRoleTest.php b/tests/Unit/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeRoleTest.php
index 41b0a3b9a..a864ce082 100644
--- a/tests/Unit/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeRoleTest.php
+++ b/tests/Unit/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeRoleTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Settings\ManageGroupTypes\Services;
 
+use App\Domains\Settings\ManageGroupTypes\Services\UpdateGroupTypeRole;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\GroupType;
 use App\Models\GroupTypeRole;
 use App\Models\User;
-use App\Settings\ManageGroupTypes\Services\UpdateGroupTypeRole;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeTest.php b/tests/Unit/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeTest.php
index b0805b4c2..f6645805b 100644
--- a/tests/Unit/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageGroupTypes/Services/UpdateGroupTypeTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageGroupTypes\Services;
 
+use App\Domains\Settings\ManageGroupTypes\Services\UpdateGroupType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\GroupType;
 use App\Models\User;
-use App\Settings\ManageGroupTypes\Services\UpdateGroupType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageGroupTypes/Web/ViewHelpers/PersonalizeGroupTypeViewHelperTest.php b/tests/Unit/Domains/Settings/ManageGroupTypes/Web/ViewHelpers/PersonalizeGroupTypeViewHelperTest.php
index a25063724..cb85609ec 100644
--- a/tests/Unit/Domains/Settings/ManageGroupTypes/Web/ViewHelpers/PersonalizeGroupTypeViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManageGroupTypes/Web/ViewHelpers/PersonalizeGroupTypeViewHelperTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Domains\Settings\ManageGroupTypes\Web\ViewHelpers;
 
+use App\Domains\Settings\ManageGroupTypes\Web\ViewHelpers\PersonalizeGroupTypeViewHelper;
 use App\Models\GroupType;
 use App\Models\GroupTypeRole;
-use App\Settings\ManageGroupTypes\Web\ViewHelpers\PersonalizeGroupTypeViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/CreateLifeEventCategoryTest.php b/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/CreateLifeEventCategoryTest.php
index 37eac08e4..fb20648d4 100644
--- a/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/CreateLifeEventCategoryTest.php
+++ b/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/CreateLifeEventCategoryTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageLifeEventCategories\Services;
 
+use App\Domains\Settings\ManageLifeEventCategories\Services\CreateLifeEventCategory;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\LifeEventCategory;
 use App\Models\User;
-use App\Settings\ManageLifeEventCategories\Services\CreateLifeEventCategory;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/CreateLifeEventTypeTest.php b/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/CreateLifeEventTypeTest.php
index fd4d184e6..8e469f69e 100644
--- a/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/CreateLifeEventTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/CreateLifeEventTypeTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Settings\ManageLifeEventCategories\Services;
 
+use App\Domains\Settings\ManageLifeEventCategories\Services\CreateLifeEventType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\LifeEventCategory;
 use App\Models\LifeEventType;
 use App\Models\User;
-use App\Settings\ManageLifeEventCategories\Services\CreateLifeEventType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/DestroyLifeEventCategoryTest.php b/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/DestroyLifeEventCategoryTest.php
index ac3ba3065..acaa29d2d 100644
--- a/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/DestroyLifeEventCategoryTest.php
+++ b/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/DestroyLifeEventCategoryTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageLifeEventCategories\Services;
 
+use App\Domains\Settings\ManageLifeEventCategories\Services\DestroyLifeEventCategory;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\LifeEventCategory;
 use App\Models\User;
-use App\Settings\ManageLifeEventCategories\Services\DestroyLifeEventCategory;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/DestroyLifeEventTypeTest.php b/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/DestroyLifeEventTypeTest.php
index 2710f2c2a..51438a726 100644
--- a/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/DestroyLifeEventTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/DestroyLifeEventTypeTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Settings\ManageLifeEventCategories\Services;
 
+use App\Domains\Settings\ManageLifeEventCategories\Services\DestroyLifeEventType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\LifeEventCategory;
 use App\Models\LifeEventType;
 use App\Models\User;
-use App\Settings\ManageLifeEventCategories\Services\DestroyLifeEventType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventCategoryTest.php b/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventCategoryTest.php
index 80a3daf37..80dbcf847 100644
--- a/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventCategoryTest.php
+++ b/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventCategoryTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageLifeEventCategories\Services;
 
+use App\Domains\Settings\ManageLifeEventCategories\Services\UpdateLifeEventCategory;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\LifeEventCategory;
 use App\Models\User;
-use App\Settings\ManageLifeEventCategories\Services\UpdateLifeEventCategory;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventTypePositionTest.php b/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventTypePositionTest.php
index e9fd5233e..cf7315fb2 100644
--- a/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventTypePositionTest.php
+++ b/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventTypePositionTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageLifeEventCategories\Services;
 
+use App\Domains\Settings\ManageLifeEventCategories\Services\UpdateLifeEventTypePosition;
 use App\Models\Account;
 use App\Models\LifeEventCategory;
 use App\Models\LifeEventType;
 use App\Models\User;
-use App\Settings\ManageLifeEventCategories\Services\UpdateLifeEventTypePosition;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventTypeTest.php b/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventTypeTest.php
index 15b317bdc..b3028899a 100644
--- a/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageLifeEventCategories/Services/UpdateLifeEventTypeTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Settings\ManageLifeEventCategories\Services;
 
+use App\Domains\Settings\ManageLifeEventCategories\Services\UpdateLifeEventType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\LifeEventCategory;
 use App\Models\LifeEventType;
 use App\Models\User;
-use App\Settings\ManageLifeEventCategories\Services\UpdateLifeEventType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageLifeEventCategories/Web/ViewHelpers/PersonalizeLifeEventCategoriesViewHelperTest.php b/tests/Unit/Domains/Settings/ManageLifeEventCategories/Web/ViewHelpers/PersonalizeLifeEventCategoriesViewHelperTest.php
index 923636eae..f28c9ca1e 100644
--- a/tests/Unit/Domains/Settings/ManageLifeEventCategories/Web/ViewHelpers/PersonalizeLifeEventCategoriesViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManageLifeEventCategories/Web/ViewHelpers/PersonalizeLifeEventCategoriesViewHelperTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Domains\Settings\ManageLifeEventCategories\Web\ViewHelpers;
 
+use App\Domains\Settings\ManageLifeEventCategories\Web\ViewHelpers\PersonalizeLifeEventCategoriesViewHelper;
 use App\Models\LifeEventCategory;
 use App\Models\LifeEventType;
-use App\Settings\ManageLifeEventCategories\Web\ViewHelpers\PersonalizeLifeEventCategoriesViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManageModules/Web/ViewHelpers/PersonalizeModuleIndexViewHelperTest.php b/tests/Unit/Domains/Settings/ManageModules/Web/ViewHelpers/PersonalizeModuleIndexViewHelperTest.php
index f3a386916..85e0dc4f7 100644
--- a/tests/Unit/Domains/Settings/ManageModules/Web/ViewHelpers/PersonalizeModuleIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManageModules/Web/ViewHelpers/PersonalizeModuleIndexViewHelperTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Domains\Settings\ManageModules\Web\ViewHelpers;
 
+use App\Domains\Settings\ManageModules\Web\ViewHelpers\PersonalizeModuleIndexViewHelper;
 use App\Models\Module;
-use App\Settings\ManageModules\Web\ViewHelpers\PersonalizeModuleIndexViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManageNotificationChannels/Jobs/SendVerificationEmailChannelTest.php b/tests/Unit/Domains/Settings/ManageNotificationChannels/Jobs/SendVerificationEmailChannelTest.php
index e29960120..249a5fcd9 100644
--- a/tests/Unit/Domains/Settings/ManageNotificationChannels/Jobs/SendVerificationEmailChannelTest.php
+++ b/tests/Unit/Domains/Settings/ManageNotificationChannels/Jobs/SendVerificationEmailChannelTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Domains\Settings\ManageNotificationChannels\Jobs;
 
+use App\Domains\Settings\ManageNotificationChannels\Jobs\SendVerificationEmailChannel;
 use App\Mail\UserNotificationChannelEmailCreated;
 use App\Models\UserNotificationChannel;
-use App\Settings\ManageNotificationChannels\Jobs\SendVerificationEmailChannel;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Mail;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/CreateUserNotificationChannelTest.php b/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/CreateUserNotificationChannelTest.php
index a26335343..b3afbadb8 100644
--- a/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/CreateUserNotificationChannelTest.php
+++ b/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/CreateUserNotificationChannelTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Settings\ManageNotificationChannels\Services;
 
+use App\Domains\Settings\ManageNotificationChannels\Jobs\SendVerificationEmailChannel;
+use App\Domains\Settings\ManageNotificationChannels\Services\CreateUserNotificationChannel;
 use App\Exceptions\EmailAlreadyExistException;
 use App\Models\Account;
 use App\Models\User;
 use App\Models\UserNotificationChannel;
-use App\Settings\ManageNotificationChannels\Jobs\SendVerificationEmailChannel;
-use App\Settings\ManageNotificationChannels\Services\CreateUserNotificationChannel;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Bus;
diff --git a/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/DestroyUserNotificationChannelTest.php b/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/DestroyUserNotificationChannelTest.php
index af8b669a8..a2328a7a0 100644
--- a/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/DestroyUserNotificationChannelTest.php
+++ b/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/DestroyUserNotificationChannelTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageNotificationChannels\Services;
 
+use App\Domains\Settings\ManageNotificationChannels\Services\CreateUserNotificationChannel;
+use App\Domains\Settings\ManageNotificationChannels\Services\DestroyUserNotificationChannel;
 use App\Models\Account;
 use App\Models\User;
 use App\Models\UserNotificationChannel;
-use App\Settings\ManageNotificationChannels\Services\CreateUserNotificationChannel;
-use App\Settings\ManageNotificationChannels\Services\DestroyUserNotificationChannel;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/ScheduleAllContactRemindersForNotificationChannelTest.php b/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/ScheduleAllContactRemindersForNotificationChannelTest.php
index f103378fe..4171939b2 100644
--- a/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/ScheduleAllContactRemindersForNotificationChannelTest.php
+++ b/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/ScheduleAllContactRemindersForNotificationChannelTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageNotificationChannels\Services;
 
+use App\Domains\Settings\ManageNotificationChannels\Services\ScheduleAllContactRemindersForNotificationChannel;
 use App\Models\Contact;
 use App\Models\ContactReminder;
 use App\Models\UserNotificationChannel;
 use App\Models\Vault;
-use App\Settings\ManageNotificationChannels\Services\ScheduleAllContactRemindersForNotificationChannel;
 use Carbon\Carbon;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/SendTestEmailTest.php b/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/SendTestEmailTest.php
index caab4a573..8dc70f087 100644
--- a/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/SendTestEmailTest.php
+++ b/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/SendTestEmailTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Domains\Settings\ManageNotificationChannels\Services;
 
+use App\Domains\Settings\ManageNotificationChannels\Services\SendTestEmail;
 use App\Mail\TestEmailSent;
 use App\Models\User;
 use App\Models\UserNotificationChannel;
-use App\Settings\ManageNotificationChannels\Services\SendTestEmail;
 use Exception;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/SendTestTelegramNotificationTest.php b/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/SendTestTelegramNotificationTest.php
index 988059b72..c119b62a2 100644
--- a/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/SendTestTelegramNotificationTest.php
+++ b/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/SendTestTelegramNotificationTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Domains\Settings\ManageNotificationChannels\Services;
 
+use App\Domains\Settings\ManageNotificationChannels\Services\SendTestTelegramNotification;
 use App\Models\User;
 use App\Models\UserNotificationChannel;
 use App\Notifications\ReminderTriggered;
-use App\Settings\ManageNotificationChannels\Services\SendTestTelegramNotification;
 use Exception;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/ToggleUserNotificationChannelTest.php b/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/ToggleUserNotificationChannelTest.php
index e7a21dafd..ceb09429c 100644
--- a/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/ToggleUserNotificationChannelTest.php
+++ b/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/ToggleUserNotificationChannelTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Settings\ManageNotificationChannels\Services;
 
+use App\Domains\Settings\ManageNotificationChannels\Services\ToggleUserNotificationChannel;
 use App\Models\Contact;
 use App\Models\ContactReminder;
 use App\Models\User;
 use App\Models\UserNotificationChannel;
 use App\Models\Vault;
-use App\Settings\ManageNotificationChannels\Services\ToggleUserNotificationChannel;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/VerifyUserNotificationChannelEmailAddressTest.php b/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/VerifyUserNotificationChannelEmailAddressTest.php
index 00c74cd69..f0aa924b1 100644
--- a/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/VerifyUserNotificationChannelEmailAddressTest.php
+++ b/tests/Unit/Domains/Settings/ManageNotificationChannels/Services/VerifyUserNotificationChannelEmailAddressTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Domains\Settings\ManageNotificationChannels\Services;
 
+use App\Domains\Settings\ManageNotificationChannels\Services\VerifyUserNotificationChannelEmailAddress;
 use App\Models\User;
 use App\Models\UserNotificationChannel;
-use App\Settings\ManageNotificationChannels\Services\VerifyUserNotificationChannelEmailAddress;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Domains/Settings/ManageNotificationChannels/Web/ViewHelpers/NotificationsIndexViewHelperTest.php b/tests/Unit/Domains/Settings/ManageNotificationChannels/Web/ViewHelpers/NotificationsIndexViewHelperTest.php
index 287cce5e7..6d37f41c9 100644
--- a/tests/Unit/Domains/Settings/ManageNotificationChannels/Web/ViewHelpers/NotificationsIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManageNotificationChannels/Web/ViewHelpers/NotificationsIndexViewHelperTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Domains\Settings\ManageNotificationChannels\Web\ViewHelpers;
 
+use App\Domains\Settings\ManageNotificationChannels\Web\ViewHelpers\NotificationsIndexViewHelper;
 use App\Models\User;
 use App\Models\UserNotificationChannel;
-use App\Settings\ManageNotificationChannels\Web\ViewHelpers\NotificationsIndexViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManageNotificationChannels/Web/ViewHelpers/NotificationsLogIndexViewHelperTest.php b/tests/Unit/Domains/Settings/ManageNotificationChannels/Web/ViewHelpers/NotificationsLogIndexViewHelperTest.php
index a360d6dcd..0c571a69a 100644
--- a/tests/Unit/Domains/Settings/ManageNotificationChannels/Web/ViewHelpers/NotificationsLogIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManageNotificationChannels/Web/ViewHelpers/NotificationsLogIndexViewHelperTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Domains\Settings\ManageNotificationChannels\Web\ViewHelpers;
 
+use App\Domains\Settings\ManageNotificationChannels\Web\ViewHelpers\NotificationsLogIndexViewHelper;
 use App\Models\User;
 use App\Models\UserNotificationChannel;
 use App\Models\UserNotificationSent;
-use App\Settings\ManageNotificationChannels\Web\ViewHelpers\NotificationsLogIndexViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManagePersonalization/Web/ViewHelpers/PersonalizeIndexViewHelperTest.php b/tests/Unit/Domains/Settings/ManagePersonalization/Web/ViewHelpers/PersonalizeIndexViewHelperTest.php
index 89e5beab8..9d3a42bc7 100644
--- a/tests/Unit/Domains/Settings/ManagePersonalization/Web/ViewHelpers/PersonalizeIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManagePersonalization/Web/ViewHelpers/PersonalizeIndexViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Settings\ManagePersonalization\Web\ViewHelpers;
 
-use App\Settings\ManagePersonalization\Web\ViewHelpers\PersonalizeIndexViewHelper;
+use App\Domains\Settings\ManagePersonalization\Web\ViewHelpers\PersonalizeIndexViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManagePetCategories/Services/CreatePetCategoryTest.php b/tests/Unit/Domains/Settings/ManagePetCategories/Services/CreatePetCategoryTest.php
index afe33cb4f..4d86c78ef 100644
--- a/tests/Unit/Domains/Settings/ManagePetCategories/Services/CreatePetCategoryTest.php
+++ b/tests/Unit/Domains/Settings/ManagePetCategories/Services/CreatePetCategoryTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManagePetCategories\Services;
 
+use App\Domains\Settings\ManagePetCategories\Services\CreatePetCategory;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\PetCategory;
 use App\Models\User;
-use App\Settings\ManagePetCategories\Services\CreatePetCategory;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Settings/ManagePetCategories/Services/DestroyPetCategoryTest.php b/tests/Unit/Domains/Settings/ManagePetCategories/Services/DestroyPetCategoryTest.php
index 4cc446b75..66b9e7da2 100644
--- a/tests/Unit/Domains/Settings/ManagePetCategories/Services/DestroyPetCategoryTest.php
+++ b/tests/Unit/Domains/Settings/ManagePetCategories/Services/DestroyPetCategoryTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManagePetCategories\Services;
 
+use App\Domains\Settings\ManagePetCategories\Services\DestroyPetCategory;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\PetCategory;
 use App\Models\User;
-use App\Settings\ManagePetCategories\Services\DestroyPetCategory;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Settings/ManagePetCategories/Services/UpdatePetCategoryTest.php b/tests/Unit/Domains/Settings/ManagePetCategories/Services/UpdatePetCategoryTest.php
index 6ed75bd4f..b1cd918c4 100644
--- a/tests/Unit/Domains/Settings/ManagePetCategories/Services/UpdatePetCategoryTest.php
+++ b/tests/Unit/Domains/Settings/ManagePetCategories/Services/UpdatePetCategoryTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManagePetCategories\Services;
 
+use App\Domains\Settings\ManagePetCategories\Services\UpdatePetCategory;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\PetCategory;
 use App\Models\User;
-use App\Settings\ManagePetCategories\Services\UpdatePetCategory;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Settings/ManagePetCategories/Web/ViewHelpers/PersonalizePetCategoriesIndexViewHelperTest.php b/tests/Unit/Domains/Settings/ManagePetCategories/Web/ViewHelpers/PersonalizePetCategoriesIndexViewHelperTest.php
index de8c71626..07308b718 100644
--- a/tests/Unit/Domains/Settings/ManagePetCategories/Web/ViewHelpers/PersonalizePetCategoriesIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManagePetCategories/Web/ViewHelpers/PersonalizePetCategoriesIndexViewHelperTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Domains\Settings\ManagePetCategories\Web\ViewHelpers;
 
+use App\Domains\Settings\ManagePetCategories\Web\ViewHelpers\PersonalizePetCategoriesIndexViewHelper;
 use App\Models\PetCategory;
-use App\Settings\ManagePetCategories\Web\ViewHelpers\PersonalizePetCategoriesIndexViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManagePostTemplates/Services/CreatePostTemplateSectionTest.php b/tests/Unit/Domains/Settings/ManagePostTemplates/Services/CreatePostTemplateSectionTest.php
index e37ef7ad5..4af155dc6 100644
--- a/tests/Unit/Domains/Settings/ManagePostTemplates/Services/CreatePostTemplateSectionTest.php
+++ b/tests/Unit/Domains/Settings/ManagePostTemplates/Services/CreatePostTemplateSectionTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Domains\Settings\ManagePostTemplates\Services;
 
+use App\Domains\Settings\ManagePostTemplates\Services\CreatePostTemplateSection;
 use App\Models\Account;
 use App\Models\PostTemplate;
 use App\Models\User;
-use App\Settings\ManagePostTemplates\Services\CreatePostTemplateSection;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManagePostTemplates/Services/CreatePostTemplateTest.php b/tests/Unit/Domains/Settings/ManagePostTemplates/Services/CreatePostTemplateTest.php
index 613265ee5..cc11b426d 100644
--- a/tests/Unit/Domains/Settings/ManagePostTemplates/Services/CreatePostTemplateTest.php
+++ b/tests/Unit/Domains/Settings/ManagePostTemplates/Services/CreatePostTemplateTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Domains\Settings\ManagePostTemplates\Services;
 
+use App\Domains\Settings\ManagePostTemplates\Services\CreatePostTemplate;
 use App\Models\Account;
 use App\Models\PostTemplate;
 use App\Models\User;
-use App\Settings\ManagePostTemplates\Services\CreatePostTemplate;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManagePostTemplates/Services/DestroyPostTemplateSectionTest.php b/tests/Unit/Domains/Settings/ManagePostTemplates/Services/DestroyPostTemplateSectionTest.php
index 8d8e81391..96c7c6cbc 100644
--- a/tests/Unit/Domains/Settings/ManagePostTemplates/Services/DestroyPostTemplateSectionTest.php
+++ b/tests/Unit/Domains/Settings/ManagePostTemplates/Services/DestroyPostTemplateSectionTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManagePostTemplates\Services;
 
+use App\Domains\Settings\ManagePostTemplates\Services\DestroyPostTemplateSection;
 use App\Models\Account;
 use App\Models\PostTemplate;
 use App\Models\PostTemplateSection;
 use App\Models\User;
-use App\Settings\ManagePostTemplates\Services\DestroyPostTemplateSection;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Settings/ManagePostTemplates/Services/DestroyPostTemplateTest.php b/tests/Unit/Domains/Settings/ManagePostTemplates/Services/DestroyPostTemplateTest.php
index 14f5d9687..676a8739c 100644
--- a/tests/Unit/Domains/Settings/ManagePostTemplates/Services/DestroyPostTemplateTest.php
+++ b/tests/Unit/Domains/Settings/ManagePostTemplates/Services/DestroyPostTemplateTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Domains\Settings\ManagePostTemplates\Services;
 
+use App\Domains\Settings\ManagePostTemplates\Services\DestroyPostTemplate;
 use App\Models\Account;
 use App\Models\PostTemplate;
 use App\Models\User;
-use App\Settings\ManagePostTemplates\Services\DestroyPostTemplate;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplatePositionTest.php b/tests/Unit/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplatePositionTest.php
index 674a5269e..fc83e1324 100644
--- a/tests/Unit/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplatePositionTest.php
+++ b/tests/Unit/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplatePositionTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Domains\Settings\ManagePostTemplates\Services;
 
+use App\Domains\Settings\ManagePostTemplates\Services\UpdatePostTemplatePosition;
 use App\Models\Account;
 use App\Models\PostTemplate;
 use App\Models\User;
-use App\Settings\ManagePostTemplates\Services\UpdatePostTemplatePosition;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateSectionPositionTest.php b/tests/Unit/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateSectionPositionTest.php
index 74383b28c..7764dd5e4 100644
--- a/tests/Unit/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateSectionPositionTest.php
+++ b/tests/Unit/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateSectionPositionTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManagePostTemplates\Services;
 
+use App\Domains\Settings\ManagePostTemplates\Services\UpdatePostTemplateSectionPosition;
 use App\Models\Account;
 use App\Models\PostTemplate;
 use App\Models\PostTemplateSection;
 use App\Models\User;
-use App\Settings\ManagePostTemplates\Services\UpdatePostTemplateSectionPosition;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateSectionTest.php b/tests/Unit/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateSectionTest.php
index f441e62af..062cd831e 100644
--- a/tests/Unit/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateSectionTest.php
+++ b/tests/Unit/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateSectionTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManagePostTemplates\Services;
 
+use App\Domains\Settings\ManagePostTemplates\Services\UpdatePostTemplateSection;
 use App\Models\Account;
 use App\Models\PostTemplate;
 use App\Models\PostTemplateSection;
 use App\Models\User;
-use App\Settings\ManagePostTemplates\Services\UpdatePostTemplateSection;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateTest.php b/tests/Unit/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateTest.php
index b8a6e6968..9227d7383 100644
--- a/tests/Unit/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateTest.php
+++ b/tests/Unit/Domains/Settings/ManagePostTemplates/Services/UpdatePostTemplateTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Domains\Settings\ManagePostTemplates\Services;
 
+use App\Domains\Settings\ManagePostTemplates\Services\UpdatePostTemplate;
 use App\Models\Account;
 use App\Models\PostTemplate;
 use App\Models\User;
-use App\Settings\ManagePostTemplates\Services\UpdatePostTemplate;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManagePostTemplates/Web/ViewHelpers/PersonalizePostTemplateViewHelperTest.php b/tests/Unit/Domains/Settings/ManagePostTemplates/Web/ViewHelpers/PersonalizePostTemplateViewHelperTest.php
index 39f34c530..a621245bf 100644
--- a/tests/Unit/Domains/Settings/ManagePostTemplates/Web/ViewHelpers/PersonalizePostTemplateViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManagePostTemplates/Web/ViewHelpers/PersonalizePostTemplateViewHelperTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Domains\Settings\ManagePostTemplates\Web\ViewHelpers;
 
+use App\Domains\Settings\ManagePostTemplates\Web\ViewHelpers\PersonalizePostTemplateViewHelper;
 use App\Models\PostTemplate;
 use App\Models\PostTemplateSection;
-use App\Settings\ManagePostTemplates\Web\ViewHelpers\PersonalizePostTemplateViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManagePronouns/Services/CreatePronounTest.php b/tests/Unit/Domains/Settings/ManagePronouns/Services/CreatePronounTest.php
index e0ada058c..bfe839dce 100644
--- a/tests/Unit/Domains/Settings/ManagePronouns/Services/CreatePronounTest.php
+++ b/tests/Unit/Domains/Settings/ManagePronouns/Services/CreatePronounTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManagePronouns\Services;
 
+use App\Domains\Settings\ManagePronouns\Services\CreatePronoun;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Pronoun;
 use App\Models\User;
-use App\Settings\ManagePronouns\Services\CreatePronoun;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManagePronouns/Services/DestroyPronounTest.php b/tests/Unit/Domains/Settings/ManagePronouns/Services/DestroyPronounTest.php
index 8a92afb47..182d6d0c1 100644
--- a/tests/Unit/Domains/Settings/ManagePronouns/Services/DestroyPronounTest.php
+++ b/tests/Unit/Domains/Settings/ManagePronouns/Services/DestroyPronounTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManagePronouns\Services;
 
+use App\Domains\Settings\ManagePronouns\Services\DestroyPronoun;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Pronoun;
 use App\Models\User;
-use App\Settings\ManagePronouns\Services\DestroyPronoun;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManagePronouns/Services/UpdatePronounTest.php b/tests/Unit/Domains/Settings/ManagePronouns/Services/UpdatePronounTest.php
index 6cbdffc43..257f95f88 100644
--- a/tests/Unit/Domains/Settings/ManagePronouns/Services/UpdatePronounTest.php
+++ b/tests/Unit/Domains/Settings/ManagePronouns/Services/UpdatePronounTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManagePronouns\Services;
 
+use App\Domains\Settings\ManagePronouns\Services\UpdatePronoun;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Pronoun;
 use App\Models\User;
-use App\Settings\ManagePronouns\Services\UpdatePronoun;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManagePronouns/Web/ViewHelpers/PersonalizePronounIndexViewHelperTest.php b/tests/Unit/Domains/Settings/ManagePronouns/Web/ViewHelpers/PersonalizePronounIndexViewHelperTest.php
index f77419aae..166ad14ac 100644
--- a/tests/Unit/Domains/Settings/ManagePronouns/Web/ViewHelpers/PersonalizePronounIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManagePronouns/Web/ViewHelpers/PersonalizePronounIndexViewHelperTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Domains\Settings\ManagePronouns\Web\ViewHelpers;
 
+use App\Domains\Settings\ManagePronouns\Web\ViewHelpers\PersonalizePronounIndexViewHelper;
 use App\Models\Pronoun;
-use App\Settings\ManagePronouns\Web\ViewHelpers\PersonalizePronounIndexViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/CreateRelationshipGroupTypeTest.php b/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/CreateRelationshipGroupTypeTest.php
index 7e26d6f82..b7f1b0852 100644
--- a/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/CreateRelationshipGroupTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/CreateRelationshipGroupTypeTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageRelationshipTypes\Services;
 
+use App\Domains\Settings\ManageRelationshipTypes\Services\CreateRelationshipGroupType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\RelationshipGroupType;
 use App\Models\User;
-use App\Settings\ManageRelationshipTypes\Services\CreateRelationshipGroupType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/CreateRelationshipTypeTest.php b/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/CreateRelationshipTypeTest.php
index 90b262ced..fe8e41d37 100644
--- a/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/CreateRelationshipTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/CreateRelationshipTypeTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Settings\ManageRelationshipTypes\Services;
 
+use App\Domains\Settings\ManageRelationshipTypes\Services\CreateRelationshipType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\RelationshipGroupType;
 use App\Models\RelationshipType;
 use App\Models\User;
-use App\Settings\ManageRelationshipTypes\Services\CreateRelationshipType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/DestroyRelationshipGroupTypeTest.php b/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/DestroyRelationshipGroupTypeTest.php
index cac739007..dd8a79467 100644
--- a/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/DestroyRelationshipGroupTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/DestroyRelationshipGroupTypeTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageRelationshipTypes\Services;
 
+use App\Domains\Settings\ManageRelationshipTypes\Services\DestroyRelationshipGroupType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\RelationshipGroupType;
 use App\Models\User;
-use App\Settings\ManageRelationshipTypes\Services\DestroyRelationshipGroupType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/DestroyRelationshipTypeTest.php b/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/DestroyRelationshipTypeTest.php
index 77897d900..00ac249e2 100644
--- a/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/DestroyRelationshipTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/DestroyRelationshipTypeTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Settings\ManageRelationshipTypes\Services;
 
+use App\Domains\Settings\ManageRelationshipTypes\Services\DestroyRelationshipType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\RelationshipGroupType;
 use App\Models\RelationshipType;
 use App\Models\User;
-use App\Settings\ManageRelationshipTypes\Services\DestroyRelationshipType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/UpdateRelationshipGroupTypeTest.php b/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/UpdateRelationshipGroupTypeTest.php
index 12683b9dd..13a13ffb2 100644
--- a/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/UpdateRelationshipGroupTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/UpdateRelationshipGroupTypeTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageRelationshipTypes\Services;
 
+use App\Domains\Settings\ManageRelationshipTypes\Services\UpdateRelationshipGroupType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\RelationshipGroupType;
 use App\Models\User;
-use App\Settings\ManageRelationshipTypes\Services\UpdateRelationshipGroupType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/UpdateRelationshipTypeTest.php b/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/UpdateRelationshipTypeTest.php
index 0151a9727..3f3dd0552 100644
--- a/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/UpdateRelationshipTypeTest.php
+++ b/tests/Unit/Domains/Settings/ManageRelationshipTypes/Services/UpdateRelationshipTypeTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Settings\ManageRelationshipTypes\Services;
 
+use App\Domains\Settings\ManageRelationshipTypes\Services\UpdateRelationshipType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\RelationshipGroupType;
 use App\Models\RelationshipType;
 use App\Models\User;
-use App\Settings\ManageRelationshipTypes\Services\UpdateRelationshipType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageRelationshipTypes/Web/ViewHelpers/PersonalizeRelationshipIndexViewHelperTest.php b/tests/Unit/Domains/Settings/ManageRelationshipTypes/Web/ViewHelpers/PersonalizeRelationshipIndexViewHelperTest.php
index 0028cc12f..5edf4aebd 100644
--- a/tests/Unit/Domains/Settings/ManageRelationshipTypes/Web/ViewHelpers/PersonalizeRelationshipIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManageRelationshipTypes/Web/ViewHelpers/PersonalizeRelationshipIndexViewHelperTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Domains\Settings\ManageRelationshipTypes\Web\ViewHelpers;
 
+use App\Domains\Settings\ManageRelationshipTypes\Web\ViewHelpers\PersonalizeRelationshipIndexViewHelper;
 use App\Models\RelationshipGroupType;
 use App\Models\RelationshipType;
-use App\Settings\ManageRelationshipTypes\Web\ViewHelpers\PersonalizeRelationshipIndexViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManageSettings/Web/ViewHelpers/SettingsIndexViewHelperTest.php b/tests/Unit/Domains/Settings/ManageSettings/Web/ViewHelpers/SettingsIndexViewHelperTest.php
index e79d6e7ca..744628cc2 100644
--- a/tests/Unit/Domains/Settings/ManageSettings/Web/ViewHelpers/SettingsIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManageSettings/Web/ViewHelpers/SettingsIndexViewHelperTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Domains\Settings\ManageSettings\Web\ViewHelpers;
 
+use App\Domains\Settings\ManageSettings\Web\ViewHelpers\SettingsIndexViewHelper;
 use App\Models\User;
-use App\Settings\ManageSettings\Web\ViewHelpers\SettingsIndexViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManageStorage/Web/ViewHelpers/StorageIndexViewHelperTest.php b/tests/Unit/Domains/Settings/ManageStorage/Web/ViewHelpers/StorageIndexViewHelperTest.php
index f5cc2f935..cee4ac569 100644
--- a/tests/Unit/Domains/Settings/ManageStorage/Web/ViewHelpers/StorageIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManageStorage/Web/ViewHelpers/StorageIndexViewHelperTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageStorage\Web\ViewHelpers;
 
+use App\Domains\Settings\ManageStorage\Web\ViewHelpers\StorageIndexViewHelper;
 use App\Models\Account;
 use App\Models\Contact;
 use App\Models\File;
 use App\Models\Vault;
-use App\Settings\ManageStorage\Web\ViewHelpers\StorageIndexViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManageTemplates/Services/AssociateModuleToTemplatePageTest.php b/tests/Unit/Domains/Settings/ManageTemplates/Services/AssociateModuleToTemplatePageTest.php
index 61bd3b13a..aa2b65ef7 100644
--- a/tests/Unit/Domains/Settings/ManageTemplates/Services/AssociateModuleToTemplatePageTest.php
+++ b/tests/Unit/Domains/Settings/ManageTemplates/Services/AssociateModuleToTemplatePageTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Settings\ManageTemplates\Services;
 
+use App\Domains\Settings\ManageTemplates\Services\AssociateModuleToTemplatePage;
 use App\Models\Account;
 use App\Models\Module;
 use App\Models\Template;
 use App\Models\TemplatePage;
 use App\Models\User;
-use App\Settings\ManageTemplates\Services\AssociateModuleToTemplatePage;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Settings/ManageTemplates/Services/CreateModuleTest.php b/tests/Unit/Domains/Settings/ManageTemplates/Services/CreateModuleTest.php
index 92676515d..44869eaab 100644
--- a/tests/Unit/Domains/Settings/ManageTemplates/Services/CreateModuleTest.php
+++ b/tests/Unit/Domains/Settings/ManageTemplates/Services/CreateModuleTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Domains\Settings\ManageTemplates\Services;
 
+use App\Domains\Settings\ManageTemplates\Services\CreateModule;
 use App\Models\Account;
 use App\Models\Module;
 use App\Models\User;
-use App\Settings\ManageTemplates\Services\CreateModule;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Settings/ManageTemplates/Services/CreateTemplatePageTest.php b/tests/Unit/Domains/Settings/ManageTemplates/Services/CreateTemplatePageTest.php
index 123e4fb2c..e1b667e54 100644
--- a/tests/Unit/Domains/Settings/ManageTemplates/Services/CreateTemplatePageTest.php
+++ b/tests/Unit/Domains/Settings/ManageTemplates/Services/CreateTemplatePageTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageTemplates\Services;
 
+use App\Domains\Settings\ManageTemplates\Services\CreateTemplatePage;
 use App\Models\Account;
 use App\Models\Template;
 use App\Models\TemplatePage;
 use App\Models\User;
-use App\Settings\ManageTemplates\Services\CreateTemplatePage;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Settings/ManageTemplates/Services/CreateTemplateTest.php b/tests/Unit/Domains/Settings/ManageTemplates/Services/CreateTemplateTest.php
index 4bcb66a80..373cd9a45 100644
--- a/tests/Unit/Domains/Settings/ManageTemplates/Services/CreateTemplateTest.php
+++ b/tests/Unit/Domains/Settings/ManageTemplates/Services/CreateTemplateTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Domains\Settings\ManageTemplates\Services;
 
+use App\Domains\Settings\ManageTemplates\Services\CreateTemplate;
 use App\Models\Account;
 use App\Models\Template;
 use App\Models\User;
-use App\Settings\ManageTemplates\Services\CreateTemplate;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Settings/ManageTemplates/Services/DestroyModuleTest.php b/tests/Unit/Domains/Settings/ManageTemplates/Services/DestroyModuleTest.php
index 894ac57df..f5576e057 100644
--- a/tests/Unit/Domains/Settings/ManageTemplates/Services/DestroyModuleTest.php
+++ b/tests/Unit/Domains/Settings/ManageTemplates/Services/DestroyModuleTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Domains\Settings\ManageTemplates\Services;
 
+use App\Domains\Settings\ManageTemplates\Services\DestroyModule;
 use App\Models\Account;
 use App\Models\Module;
 use App\Models\User;
-use App\Settings\ManageTemplates\Services\DestroyModule;
 use Exception;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Domains/Settings/ManageTemplates/Services/DestroyTemplatePageTest.php b/tests/Unit/Domains/Settings/ManageTemplates/Services/DestroyTemplatePageTest.php
index 902f16d57..2f2667cf1 100644
--- a/tests/Unit/Domains/Settings/ManageTemplates/Services/DestroyTemplatePageTest.php
+++ b/tests/Unit/Domains/Settings/ManageTemplates/Services/DestroyTemplatePageTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Domains\Settings\ManageTemplates\Services;
 
+use App\Domains\Settings\ManageTemplates\Services\DestroyTemplate;
 use App\Models\Account;
 use App\Models\Template;
 use App\Models\User;
-use App\Settings\ManageTemplates\Services\DestroyTemplate;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Settings/ManageTemplates/Services/DestroyTemplateTest.php b/tests/Unit/Domains/Settings/ManageTemplates/Services/DestroyTemplateTest.php
index db2f79728..9030a493a 100644
--- a/tests/Unit/Domains/Settings/ManageTemplates/Services/DestroyTemplateTest.php
+++ b/tests/Unit/Domains/Settings/ManageTemplates/Services/DestroyTemplateTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Domains\Settings\ManageTemplates\Services;
 
+use App\Domains\Settings\ManageTemplates\Services\DestroyTemplate;
 use App\Models\Account;
 use App\Models\Template;
 use App\Models\User;
-use App\Settings\ManageTemplates\Services\DestroyTemplate;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Settings/ManageTemplates/Services/RemoveModuleFromTemplatePageTest.php b/tests/Unit/Domains/Settings/ManageTemplates/Services/RemoveModuleFromTemplatePageTest.php
index 0994c8501..02f3fc243 100644
--- a/tests/Unit/Domains/Settings/ManageTemplates/Services/RemoveModuleFromTemplatePageTest.php
+++ b/tests/Unit/Domains/Settings/ManageTemplates/Services/RemoveModuleFromTemplatePageTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Settings\ManageTemplates\Services;
 
+use App\Domains\Settings\ManageTemplates\Services\RemoveModuleFromTemplatePage;
 use App\Models\Account;
 use App\Models\Module;
 use App\Models\Template;
 use App\Models\TemplatePage;
 use App\Models\User;
-use App\Settings\ManageTemplates\Services\RemoveModuleFromTemplatePage;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Settings/ManageTemplates/Services/UpdateModulePositionTest.php b/tests/Unit/Domains/Settings/ManageTemplates/Services/UpdateModulePositionTest.php
index 47bef8341..95a212943 100644
--- a/tests/Unit/Domains/Settings/ManageTemplates/Services/UpdateModulePositionTest.php
+++ b/tests/Unit/Domains/Settings/ManageTemplates/Services/UpdateModulePositionTest.php
@@ -2,13 +2,13 @@
 
 namespace Tests\Unit\Domains\Settings\ManageTemplates\Services;
 
+use App\Domains\Settings\ManageTemplates\Services\UpdateModulePosition;
+use App\Domains\Settings\ManageTemplates\Services\UpdateTemplatePage;
 use App\Models\Account;
 use App\Models\Module;
 use App\Models\Template;
 use App\Models\TemplatePage;
 use App\Models\User;
-use App\Settings\ManageTemplates\Services\UpdateModulePosition;
-use App\Settings\ManageTemplates\Services\UpdateTemplatePage;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Settings/ManageTemplates/Services/UpdateModuleTest.php b/tests/Unit/Domains/Settings/ManageTemplates/Services/UpdateModuleTest.php
index d870d99a5..7488d5d86 100644
--- a/tests/Unit/Domains/Settings/ManageTemplates/Services/UpdateModuleTest.php
+++ b/tests/Unit/Domains/Settings/ManageTemplates/Services/UpdateModuleTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Domains\Settings\ManageTemplates\Services;
 
+use App\Domains\Settings\ManageTemplates\Services\UpdateModule;
 use App\Models\Account;
 use App\Models\Module;
 use App\Models\User;
-use App\Settings\ManageTemplates\Services\UpdateModule;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Settings/ManageTemplates/Services/UpdateTemplatePagePositionTest.php b/tests/Unit/Domains/Settings/ManageTemplates/Services/UpdateTemplatePagePositionTest.php
index e4106d140..ad2bd030e 100644
--- a/tests/Unit/Domains/Settings/ManageTemplates/Services/UpdateTemplatePagePositionTest.php
+++ b/tests/Unit/Domains/Settings/ManageTemplates/Services/UpdateTemplatePagePositionTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Settings\ManageTemplates\Services;
 
+use App\Domains\Settings\ManageTemplates\Services\UpdateTemplatePage;
+use App\Domains\Settings\ManageTemplates\Services\UpdateTemplatePagePosition;
 use App\Models\Account;
 use App\Models\Template;
 use App\Models\TemplatePage;
 use App\Models\User;
-use App\Settings\ManageTemplates\Services\UpdateTemplatePage;
-use App\Settings\ManageTemplates\Services\UpdateTemplatePagePosition;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Settings/ManageTemplates/Services/UpdateTemplatePageTest.php b/tests/Unit/Domains/Settings/ManageTemplates/Services/UpdateTemplatePageTest.php
index e669f27f7..d72c37009 100644
--- a/tests/Unit/Domains/Settings/ManageTemplates/Services/UpdateTemplatePageTest.php
+++ b/tests/Unit/Domains/Settings/ManageTemplates/Services/UpdateTemplatePageTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageTemplates\Services;
 
+use App\Domains\Settings\ManageTemplates\Services\UpdateTemplatePage;
 use App\Models\Account;
 use App\Models\Template;
 use App\Models\TemplatePage;
 use App\Models\User;
-use App\Settings\ManageTemplates\Services\UpdateTemplatePage;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Settings/ManageTemplates/Services/UpdateTemplateTest.php b/tests/Unit/Domains/Settings/ManageTemplates/Services/UpdateTemplateTest.php
index b8eaecaf2..c9063d9f7 100644
--- a/tests/Unit/Domains/Settings/ManageTemplates/Services/UpdateTemplateTest.php
+++ b/tests/Unit/Domains/Settings/ManageTemplates/Services/UpdateTemplateTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Domains\Settings\ManageTemplates\Services;
 
+use App\Domains\Settings\ManageTemplates\Services\UpdateTemplate;
 use App\Models\Account;
 use App\Models\Template;
 use App\Models\User;
-use App\Settings\ManageTemplates\Services\UpdateTemplate;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplateIndexViewHelperTest.php b/tests/Unit/Domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplateIndexViewHelperTest.php
index 38661b166..548800084 100644
--- a/tests/Unit/Domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplateIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplateIndexViewHelperTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Domains\Settings\ManageTemplates\Web\ViewHelpers;
 
+use App\Domains\Settings\ManageTemplates\Web\ViewHelpers\PersonalizeTemplateIndexViewHelper;
 use App\Models\Template;
-use App\Settings\ManageTemplates\Web\ViewHelpers\PersonalizeTemplateIndexViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplatePageShowViewHelperTest.php b/tests/Unit/Domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplatePageShowViewHelperTest.php
index 62847ba79..8bb68d6a3 100644
--- a/tests/Unit/Domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplatePageShowViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplatePageShowViewHelperTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Domains\Settings\ManageTemplates\Web\ViewHelpers;
 
+use App\Domains\Settings\ManageTemplates\Web\ViewHelpers\PersonalizeTemplatePageShowViewHelper;
 use App\Models\Module;
 use App\Models\Template;
 use App\Models\TemplatePage;
-use App\Settings\ManageTemplates\Web\ViewHelpers\PersonalizeTemplatePageShowViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplateShowViewHelperTest.php b/tests/Unit/Domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplateShowViewHelperTest.php
index a44365728..e56289f43 100644
--- a/tests/Unit/Domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplateShowViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManageTemplates/Web/ViewHelpers/PersonalizeTemplateShowViewHelperTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Domains\Settings\ManageTemplates\Web\ViewHelpers;
 
+use App\Domains\Settings\ManageTemplates\Web\ViewHelpers\PersonalizeTemplateShowViewHelper;
 use App\Models\Template;
 use App\Models\TemplatePage;
-use App\Settings\ManageTemplates\Web\ViewHelpers\PersonalizeTemplateShowViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreDateFormatPreferenceTest.php b/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreDateFormatPreferenceTest.php
index 89caa7363..cf2249a6a 100644
--- a/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreDateFormatPreferenceTest.php
+++ b/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreDateFormatPreferenceTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Domains\Settings\ManageUserPreferences\Services;
 
+use App\Domains\Settings\ManageUserPreferences\Services\StoreDateFormatPreference;
 use App\Models\Account;
 use App\Models\User;
-use App\Settings\ManageUserPreferences\Services\StoreDateFormatPreference;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreHelpPreferenceTest.php b/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreHelpPreferenceTest.php
index af7c1c9f6..c2c5d0393 100644
--- a/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreHelpPreferenceTest.php
+++ b/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreHelpPreferenceTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Domains\Settings\ManageUserPreferences\Services;
 
+use App\Domains\Settings\ManageUserPreferences\Services\StoreHelpPreference;
 use App\Models\Account;
 use App\Models\User;
-use App\Settings\ManageUserPreferences\Services\StoreHelpPreference;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreLocaleTest.php b/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreLocaleTest.php
index 63a7a8a88..d2b2d0c8a 100644
--- a/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreLocaleTest.php
+++ b/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreLocaleTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Domains\Settings\ManageUserPreferences\Services;
 
+use App\Domains\Settings\ManageUserPreferences\Services\StoreLocale;
 use App\Models\Account;
 use App\Models\User;
-use App\Settings\ManageUserPreferences\Services\StoreLocale;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreMapsPreferenceTest.php b/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreMapsPreferenceTest.php
index c72d7e101..670c7fd13 100644
--- a/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreMapsPreferenceTest.php
+++ b/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreMapsPreferenceTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Domains\Settings\ManageUserPreferences\Services;
 
+use App\Domains\Settings\ManageUserPreferences\Services\StoreMapsPreference;
 use App\Models\Account;
 use App\Models\User;
-use App\Settings\ManageUserPreferences\Services\StoreMapsPreference;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreNameOrderPreferenceTest.php b/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreNameOrderPreferenceTest.php
index be83bda47..d4b045ee3 100644
--- a/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreNameOrderPreferenceTest.php
+++ b/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreNameOrderPreferenceTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Domains\Settings\ManageUserPreferences\Services;
 
+use App\Domains\Settings\ManageUserPreferences\Services\StoreNameOrderPreference;
 use App\Models\Account;
 use App\Models\User;
-use App\Settings\ManageUserPreferences\Services\StoreNameOrderPreference;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreNumberFormatPreferenceTest.php b/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreNumberFormatPreferenceTest.php
index 74348349f..0bc81ead0 100644
--- a/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreNumberFormatPreferenceTest.php
+++ b/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreNumberFormatPreferenceTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Domains\Settings\ManageUserPreferences\Services;
 
+use App\Domains\Settings\ManageUserPreferences\Services\StoreNumberFormatPreference;
 use App\Models\Account;
 use App\Models\User;
-use App\Settings\ManageUserPreferences\Services\StoreNumberFormatPreference;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreTimezoneTest.php b/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreTimezoneTest.php
index df70341dc..7b096570f 100644
--- a/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreTimezoneTest.php
+++ b/tests/Unit/Domains/Settings/ManageUserPreferences/Services/StoreTimezoneTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Domains\Settings\ManageUserPreferences\Services;
 
+use App\Domains\Settings\ManageUserPreferences\Services\StoreTimezone;
 use App\Models\Account;
 use App\Models\User;
-use App\Settings\ManageUserPreferences\Services\StoreTimezone;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Settings/ManageUserPreferences/Web/ViewHelpers/UserPreferencesIndexViewHelperTest.php b/tests/Unit/Domains/Settings/ManageUserPreferences/Web/ViewHelpers/UserPreferencesIndexViewHelperTest.php
index b7d62f50a..900d280fa 100644
--- a/tests/Unit/Domains/Settings/ManageUserPreferences/Web/ViewHelpers/UserPreferencesIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManageUserPreferences/Web/ViewHelpers/UserPreferencesIndexViewHelperTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Domains\Settings\ManageUserPreferences\Web\ViewHelpers;
 
+use App\Domains\Settings\ManageUserPreferences\Web\ViewHelpers\UserPreferencesIndexViewHelper;
 use App\Models\User;
-use App\Settings\ManageUserPreferences\Web\ViewHelpers\UserPreferencesIndexViewHelper;
 use Carbon\Carbon;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Domains/Settings/ManageUsers/Services/AcceptInvitationTest.php b/tests/Unit/Domains/Settings/ManageUsers/Services/AcceptInvitationTest.php
index 69cfd45eb..17efb2fcf 100644
--- a/tests/Unit/Domains/Settings/ManageUsers/Services/AcceptInvitationTest.php
+++ b/tests/Unit/Domains/Settings/ManageUsers/Services/AcceptInvitationTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Domains\Settings\ManageUsers\Services;
 
+use App\Domains\Settings\ManageUsers\Services\AcceptInvitation;
 use App\Models\User;
-use App\Settings\ManageUsers\Services\AcceptInvitation;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Domains/Settings/ManageUsers/Services/DestroyUserTest.php b/tests/Unit/Domains/Settings/ManageUsers/Services/DestroyUserTest.php
index f529a2305..781d38184 100644
--- a/tests/Unit/Domains/Settings/ManageUsers/Services/DestroyUserTest.php
+++ b/tests/Unit/Domains/Settings/ManageUsers/Services/DestroyUserTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Settings\ManageUsers\Services;
 
+use App\Domains\Settings\ManageUsers\Services\DestroyUser;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
 use App\Models\User;
 use App\Models\Vault;
-use App\Settings\ManageUsers\Services\DestroyUser;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageUsers/Services/GiveAdministratorPrivilegeTest.php b/tests/Unit/Domains/Settings/ManageUsers/Services/GiveAdministratorPrivilegeTest.php
index 043fe195b..4d491d96c 100644
--- a/tests/Unit/Domains/Settings/ManageUsers/Services/GiveAdministratorPrivilegeTest.php
+++ b/tests/Unit/Domains/Settings/ManageUsers/Services/GiveAdministratorPrivilegeTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Domains\Settings\ManageUsers\Services;
 
+use App\Domains\Settings\ManageUsers\Services\GiveAdministratorPrivilege;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\User;
-use App\Settings\ManageUsers\Services\GiveAdministratorPrivilege;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Settings/ManageUsers/Services/InviteUserTest.php b/tests/Unit/Domains/Settings/ManageUsers/Services/InviteUserTest.php
index 83bcadacf..ed6d2587b 100644
--- a/tests/Unit/Domains/Settings/ManageUsers/Services/InviteUserTest.php
+++ b/tests/Unit/Domains/Settings/ManageUsers/Services/InviteUserTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Settings\ManageUsers\Services;
 
+use App\Domains\Settings\ManageUsers\Services\InviteUser;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Mail\UserInvited;
 use App\Models\Account;
 use App\Models\User;
-use App\Settings\ManageUsers\Services\InviteUser;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Mail;
diff --git a/tests/Unit/Domains/Settings/ManageUsers/Services/RemoveAdministratorPrivilegeTest.php b/tests/Unit/Domains/Settings/ManageUsers/Services/RemoveAdministratorPrivilegeTest.php
index 78fc548c4..08a16d1aa 100644
--- a/tests/Unit/Domains/Settings/ManageUsers/Services/RemoveAdministratorPrivilegeTest.php
+++ b/tests/Unit/Domains/Settings/ManageUsers/Services/RemoveAdministratorPrivilegeTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Domains\Settings\ManageUsers\Services;
 
+use App\Domains\Settings\ManageUsers\Services\RemoveAdministratorPrivilege;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\User;
-use App\Settings\ManageUsers\Services\RemoveAdministratorPrivilege;
 use Exception;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Domains/Settings/ManageUsers/Web/ViewHelpers/UserCreateViewHelperTest.php b/tests/Unit/Domains/Settings/ManageUsers/Web/ViewHelpers/UserCreateViewHelperTest.php
index 1d3bfc912..b59a14f1e 100644
--- a/tests/Unit/Domains/Settings/ManageUsers/Web/ViewHelpers/UserCreateViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManageUsers/Web/ViewHelpers/UserCreateViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Settings\ManageUsers\Web\ViewHelpers;
 
-use App\Settings\ManageUsers\Web\ViewHelpers\UserCreateViewHelper;
+use App\Domains\Settings\ManageUsers\Web\ViewHelpers\UserCreateViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Settings/ManageUsers/Web/ViewHelpers/UserIndexViewHelperTest.php b/tests/Unit/Domains/Settings/ManageUsers/Web/ViewHelpers/UserIndexViewHelperTest.php
index 72f22bd8c..acb944e5e 100644
--- a/tests/Unit/Domains/Settings/ManageUsers/Web/ViewHelpers/UserIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Settings/ManageUsers/Web/ViewHelpers/UserIndexViewHelperTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Domains\Settings\ManageUsers\Web\ViewHelpers;
 
+use App\Domains\Settings\ManageUsers\Web\ViewHelpers\UserIndexViewHelper;
 use App\Models\User;
-use App\Settings\ManageUsers\Web\ViewHelpers\UserIndexViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Vault/ManageCompanies/Services/CreateCompanyTest.php b/tests/Unit/Domains/Vault/ManageCompanies/Services/CreateCompanyTest.php
index 672baaa91..7d940a793 100644
--- a/tests/Unit/Domains/Vault/ManageCompanies/Services/CreateCompanyTest.php
+++ b/tests/Unit/Domains/Vault/ManageCompanies/Services/CreateCompanyTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Vault\ManageCompanies\Services;
 
+use App\Domains\Vault\ManageCompanies\Services\CreateCompany;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Company;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageCompanies\Services\CreateCompany;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Vault/ManageCompanies/Web/ViewHelpers/CompanyViewHelperTest.php b/tests/Unit/Domains/Vault/ManageCompanies/Web/ViewHelpers/CompanyViewHelperTest.php
index 5a3262bb2..c345934c4 100644
--- a/tests/Unit/Domains/Vault/ManageCompanies/Web/ViewHelpers/CompanyViewHelperTest.php
+++ b/tests/Unit/Domains/Vault/ManageCompanies/Web/ViewHelpers/CompanyViewHelperTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Domains\Vault\ManageCompanies\Web\ViewHelpers;
 
+use App\Domains\Vault\ManageCompanies\Web\ViewHelpers\CompanyViewHelper;
 use App\Models\Company;
 use App\Models\Vault;
-use App\Vault\ManageCompanies\Web\ViewHelpers\CompanyViewHelper;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
 
diff --git a/tests/Unit/Domains/Vault/ManageFiles/Web/ViewHelpers/VaultFileIndexViewHelperTest.php b/tests/Unit/Domains/Vault/ManageFiles/Web/ViewHelpers/VaultFileIndexViewHelperTest.php
index 1859dd76e..01e994fb8 100644
--- a/tests/Unit/Domains/Vault/ManageFiles/Web/ViewHelpers/VaultFileIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Vault/ManageFiles/Web/ViewHelpers/VaultFileIndexViewHelperTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Vault\ManageFiles\Web\ViewHelpers;
 
+use App\Domains\Vault\ManageFiles\Web\ViewHelpers\VaultFileIndexViewHelper;
 use App\Models\Contact;
 use App\Models\File;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageFiles\Web\ViewHelpers\VaultFileIndexViewHelper;
 use Carbon\Carbon;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Domains/Vault/ManageJournals/Services/AssignTagTest.php b/tests/Unit/Domains/Vault/ManageJournals/Services/AssignTagTest.php
index bb7006770..9fddf3084 100644
--- a/tests/Unit/Domains/Vault/ManageJournals/Services/AssignTagTest.php
+++ b/tests/Unit/Domains/Vault/ManageJournals/Services/AssignTagTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Unit\Domains\Vault\ManageJournals\Services;
 
+use App\Domains\Vault\ManageJournals\Services\AssignTag;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Journal;
@@ -9,7 +10,6 @@ use App\Models\Post;
 use App\Models\Tag;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageJournals\Services\AssignTag;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Vault/ManageJournals/Services/CreateJournalTest.php b/tests/Unit/Domains/Vault/ManageJournals/Services/CreateJournalTest.php
index 4ff0330aa..4097c95a3 100644
--- a/tests/Unit/Domains/Vault/ManageJournals/Services/CreateJournalTest.php
+++ b/tests/Unit/Domains/Vault/ManageJournals/Services/CreateJournalTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Vault\ManageJournals\Services;
 
+use App\Domains\Vault\ManageJournals\Services\CreateJournal;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageJournals\Services\CreateJournal;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Vault/ManageJournals/Services/CreatePostTest.php b/tests/Unit/Domains/Vault/ManageJournals/Services/CreatePostTest.php
index 5e3f6499f..843836d8e 100644
--- a/tests/Unit/Domains/Vault/ManageJournals/Services/CreatePostTest.php
+++ b/tests/Unit/Domains/Vault/ManageJournals/Services/CreatePostTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Unit\Domains\Vault\ManageJournals\Services;
 
+use App\Domains\Vault\ManageJournals\Services\CreatePost;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Journal;
@@ -9,7 +10,6 @@ use App\Models\PostTemplate;
 use App\Models\PostTemplateSection;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageJournals\Services\CreatePost;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Vault/ManageJournals/Services/DestroyJournalTest.php b/tests/Unit/Domains/Vault/ManageJournals/Services/DestroyJournalTest.php
index fe1d136a4..8d5697666 100644
--- a/tests/Unit/Domains/Vault/ManageJournals/Services/DestroyJournalTest.php
+++ b/tests/Unit/Domains/Vault/ManageJournals/Services/DestroyJournalTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Vault\ManageJournals\Services;
 
+use App\Domains\Vault\ManageJournals\Services\DestroyJournal;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Journal;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageJournals\Services\DestroyJournal;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Vault/ManageJournals/Services/DestroyPostTest.php b/tests/Unit/Domains/Vault/ManageJournals/Services/DestroyPostTest.php
index 51835773c..81283e99c 100644
--- a/tests/Unit/Domains/Vault/ManageJournals/Services/DestroyPostTest.php
+++ b/tests/Unit/Domains/Vault/ManageJournals/Services/DestroyPostTest.php
@@ -2,13 +2,13 @@
 
 namespace Tests\Unit\Domains\Vault\ManageJournals\Services;
 
+use App\Domains\Vault\ManageJournals\Services\DestroyPost;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Journal;
 use App\Models\Post;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageJournals\Services\DestroyPost;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Vault/ManageJournals/Services/IncrementPostReadCounterTest.php b/tests/Unit/Domains/Vault/ManageJournals/Services/IncrementPostReadCounterTest.php
index 6049022b4..8974ecc2b 100644
--- a/tests/Unit/Domains/Vault/ManageJournals/Services/IncrementPostReadCounterTest.php
+++ b/tests/Unit/Domains/Vault/ManageJournals/Services/IncrementPostReadCounterTest.php
@@ -2,13 +2,13 @@
 
 namespace Tests\Unit\Domains\Vault\ManageJournals\Services;
 
+use App\Domains\Vault\ManageJournals\Services\IncrementPostReadCounter;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Journal;
 use App\Models\Post;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageJournals\Services\IncrementPostReadCounter;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Vault/ManageJournals/Services/RemoveTagTest.php b/tests/Unit/Domains/Vault/ManageJournals/Services/RemoveTagTest.php
index f7147f616..6bb495a24 100644
--- a/tests/Unit/Domains/Vault/ManageJournals/Services/RemoveTagTest.php
+++ b/tests/Unit/Domains/Vault/ManageJournals/Services/RemoveTagTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Unit\Domains\Vault\ManageJournals\Services;
 
+use App\Domains\Vault\ManageJournals\Services\RemoveTag;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Journal;
@@ -9,7 +10,6 @@ use App\Models\Post;
 use App\Models\Tag;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageJournals\Services\RemoveTag;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Vault/ManageJournals/Services/UpdateJournalTest.php b/tests/Unit/Domains/Vault/ManageJournals/Services/UpdateJournalTest.php
index be9731d05..79d4ac847 100644
--- a/tests/Unit/Domains/Vault/ManageJournals/Services/UpdateJournalTest.php
+++ b/tests/Unit/Domains/Vault/ManageJournals/Services/UpdateJournalTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Vault\ManageJournals\Services;
 
+use App\Domains\Vault\ManageJournals\Services\UpdateJournal;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Journal;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageJournals\Services\UpdateJournal;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Unit/Domains/Vault/ManageJournals/Services/UpdatePostTest.php b/tests/Unit/Domains/Vault/ManageJournals/Services/UpdatePostTest.php
index 140e43c39..ae446cdc4 100644
--- a/tests/Unit/Domains/Vault/ManageJournals/Services/UpdatePostTest.php
+++ b/tests/Unit/Domains/Vault/ManageJournals/Services/UpdatePostTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Unit\Domains\Vault\ManageJournals\Services;
 
+use App\Domains\Vault\ManageJournals\Services\UpdatePost;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Journal;
@@ -9,7 +10,6 @@ use App\Models\Post;
 use App\Models\PostSection;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageJournals\Services\UpdatePost;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalCreateViewHelperTest.php b/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalCreateViewHelperTest.php
index d52789be8..889240b0d 100644
--- a/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalCreateViewHelperTest.php
+++ b/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalCreateViewHelperTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Unit\Domains\Vault\ManageJournals\Web\ViewHelpers;
 
+use App\Domains\Vault\ManageJournals\Web\ViewHelpers\JournalCreateViewHelper;
 use App\Models\Vault;
-use App\Vault\ManageJournals\Web\ViewHelpers\JournalCreateViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalIndexViewHelperTest.php b/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalIndexViewHelperTest.php
index f9a7f9f29..308279913 100644
--- a/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalIndexViewHelperTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Vault\ManageJournals\Web\ViewHelpers;
 
+use App\Domains\Vault\ManageJournals\Web\ViewHelpers\JournalIndexViewHelper;
 use App\Models\Journal;
 use App\Models\Post;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageJournals\Web\ViewHelpers\JournalIndexViewHelper;
 use Carbon\Carbon;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalShowViewHelperTest.php b/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalShowViewHelperTest.php
index 26c8bf2c3..34c5ccf4a 100644
--- a/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalShowViewHelperTest.php
+++ b/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/JournalShowViewHelperTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Domains\Vault\ManageJournals\Web\ViewHelpers;
 
+use App\Domains\Vault\ManageJournals\Web\ViewHelpers\JournalShowViewHelper;
 use App\Models\Journal;
 use App\Models\Post;
 use App\Models\User;
-use App\Vault\ManageJournals\Web\ViewHelpers\JournalShowViewHelper;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
 
diff --git a/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/PostCreateViewHelperTest.php b/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/PostCreateViewHelperTest.php
index 53ac36945..55520e9c9 100644
--- a/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/PostCreateViewHelperTest.php
+++ b/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/PostCreateViewHelperTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Vault\ManageJournals\Web\ViewHelpers;
 
+use App\Domains\Vault\ManageJournals\Web\ViewHelpers\PostCreateViewHelper;
 use App\Models\Journal;
 use App\Models\PostTemplate;
 use App\Models\PostTemplateSection;
 use App\Models\Vault;
-use App\Vault\ManageJournals\Web\ViewHelpers\PostCreateViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/PostEditViewHelperTest.php b/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/PostEditViewHelperTest.php
index a2d50bbfa..39243a2d2 100644
--- a/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/PostEditViewHelperTest.php
+++ b/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/PostEditViewHelperTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Vault\ManageJournals\Web\ViewHelpers;
 
+use App\Domains\Vault\ManageJournals\Web\ViewHelpers\PostEditViewHelper;
 use App\Models\Journal;
 use App\Models\Post;
 use App\Models\PostSection;
 use App\Models\Vault;
-use App\Vault\ManageJournals\Web\ViewHelpers\PostEditViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/PostShowViewHelperTest.php b/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/PostShowViewHelperTest.php
index b35ea6bd4..b89cb31e0 100644
--- a/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/PostShowViewHelperTest.php
+++ b/tests/Unit/Domains/Vault/ManageJournals/Web/ViewHelpers/PostShowViewHelperTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Vault\ManageJournals\Web\ViewHelpers;
 
+use App\Domains\Vault\ManageJournals\Web\ViewHelpers\PostShowViewHelper;
 use App\Models\Journal;
 use App\Models\Post;
 use App\Models\PostSection;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageJournals\Web\ViewHelpers\PostShowViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Vault/ManageTasks/Web/ViewHelpers/VaultTasksIndexViewHelperTest.php b/tests/Unit/Domains/Vault/ManageTasks/Web/ViewHelpers/VaultTasksIndexViewHelperTest.php
index d1a0f75a4..e003ce606 100644
--- a/tests/Unit/Domains/Vault/ManageTasks/Web/ViewHelpers/VaultTasksIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Vault/ManageTasks/Web/ViewHelpers/VaultTasksIndexViewHelperTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Vault\ManageTasks\Web\ViewHelpers;
 
+use App\Domains\Vault\ManageTasks\Web\ViewHelpers\VaultTasksIndexViewHelper;
 use App\Models\Contact;
 use App\Models\ContactTask;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageTasks\Web\ViewHelpers\VaultTasksIndexViewHelper;
 use Carbon\Carbon;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Domains/Vault/ManageVault/Services/CreateVaultTest.php b/tests/Unit/Domains/Vault/ManageVault/Services/CreateVaultTest.php
index 0a4a6542f..0f68efcfb 100644
--- a/tests/Unit/Domains/Vault/ManageVault/Services/CreateVaultTest.php
+++ b/tests/Unit/Domains/Vault/ManageVault/Services/CreateVaultTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVault\Services;
 
+use App\Domains\Vault\ManageVault\Services\CreateVault;
 use App\Models\Account;
 use App\Models\Contact;
 use App\Models\ContactImportantDate;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageVault\Services\CreateVault;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Vault/ManageVault/Services/DestroyVaultTest.php b/tests/Unit/Domains/Vault/ManageVault/Services/DestroyVaultTest.php
index 548342f3b..b3faf9145 100644
--- a/tests/Unit/Domains/Vault/ManageVault/Services/DestroyVaultTest.php
+++ b/tests/Unit/Domains/Vault/ManageVault/Services/DestroyVaultTest.php
@@ -2,13 +2,13 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVault\Services;
 
+use App\Domains\Vault\ManageVault\Services\DestroyVault;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
 use App\Models\File;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageVault\Services\DestroyVault;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Event;
diff --git a/tests/Unit/Domains/Vault/ManageVault/Services/UpdateVaultTest.php b/tests/Unit/Domains/Vault/ManageVault/Services/UpdateVaultTest.php
index 5c64bb430..465406afa 100644
--- a/tests/Unit/Domains/Vault/ManageVault/Services/UpdateVaultTest.php
+++ b/tests/Unit/Domains/Vault/ManageVault/Services/UpdateVaultTest.php
@@ -2,11 +2,11 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVault\Services;
 
+use App\Domains\Vault\ManageVault\Services\UpdateVault;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageVault\Services\UpdateVault;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Vault/ManageVault/Web/ViewHelpers/VaultCreateViewHelperTest.php b/tests/Unit/Domains/Vault/ManageVault/Web/ViewHelpers/VaultCreateViewHelperTest.php
index 70d7bf634..94344da91 100644
--- a/tests/Unit/Domains/Vault/ManageVault/Web/ViewHelpers/VaultCreateViewHelperTest.php
+++ b/tests/Unit/Domains/Vault/ManageVault/Web/ViewHelpers/VaultCreateViewHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVault\Web\ViewHelpers;
 
-use App\Vault\ManageVault\Web\ViewHelpers\VaultCreateViewHelper;
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultCreateViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Vault/ManageVault/Web/ViewHelpers/VaultIndexViewHelperTest.php b/tests/Unit/Domains/Vault/ManageVault/Web/ViewHelpers/VaultIndexViewHelperTest.php
index 889604e8a..5d6024140 100644
--- a/tests/Unit/Domains/Vault/ManageVault/Web/ViewHelpers/VaultIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Vault/ManageVault/Web/ViewHelpers/VaultIndexViewHelperTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVault\Web\ViewHelpers;
 
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use App\Models\Contact;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Vault/ManageVault/Web/ViewHelpers/VaultReminderIndexViewHelperTest.php b/tests/Unit/Domains/Vault/ManageVault/Web/ViewHelpers/VaultReminderIndexViewHelperTest.php
index a0f45ee6b..cbae75af2 100644
--- a/tests/Unit/Domains/Vault/ManageVault/Web/ViewHelpers/VaultReminderIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Vault/ManageVault/Web/ViewHelpers/VaultReminderIndexViewHelperTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVault\Web\ViewHelpers;
 
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultReminderIndexViewHelper;
 use App\Models\Contact;
 use App\Models\ContactReminder;
 use App\Models\User;
 use App\Models\UserNotificationChannel;
 use App\Models\Vault;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultReminderIndexViewHelper;
 use Carbon\Carbon;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Domains/Vault/ManageVault/Web/ViewHelpers/VaultShowViewHelperTest.php b/tests/Unit/Domains/Vault/ManageVault/Web/ViewHelpers/VaultShowViewHelperTest.php
index 01a5a1cc7..6f716cbab 100644
--- a/tests/Unit/Domains/Vault/ManageVault/Web/ViewHelpers/VaultShowViewHelperTest.php
+++ b/tests/Unit/Domains/Vault/ManageVault/Web/ViewHelpers/VaultShowViewHelperTest.php
@@ -2,13 +2,13 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVault\Web\ViewHelpers;
 
+use App\Domains\Vault\ManageVault\Web\ViewHelpers\VaultShowViewHelper;
 use App\Models\Contact;
 use App\Models\ContactReminder;
 use App\Models\ContactTask;
 use App\Models\User;
 use App\Models\UserNotificationChannel;
 use App\Models\Vault;
-use App\Vault\ManageVault\Web\ViewHelpers\VaultShowViewHelper;
 use Carbon\Carbon;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Domains/Vault/ManageVaultImportantDateTypes/Services/CreateContactImportantDateTypeTest.php b/tests/Unit/Domains/Vault/ManageVaultImportantDateTypes/Services/CreateContactImportantDateTypeTest.php
index a0e64d713..4105ef165 100644
--- a/tests/Unit/Domains/Vault/ManageVaultImportantDateTypes/Services/CreateContactImportantDateTypeTest.php
+++ b/tests/Unit/Domains/Vault/ManageVaultImportantDateTypes/Services/CreateContactImportantDateTypeTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVaultImportantDateTypes\Services;
 
+use App\Domains\Vault\ManageVaultImportantDateTypes\Services\CreateContactImportantDateType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\ContactImportantDateType;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageVaultImportantDateTypes\Services\CreateContactImportantDateType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Vault/ManageVaultImportantDateTypes/Services/DestroyContactImportantDateTypeTest.php b/tests/Unit/Domains/Vault/ManageVaultImportantDateTypes/Services/DestroyContactImportantDateTypeTest.php
index 6a5fba15d..4b3c3b396 100644
--- a/tests/Unit/Domains/Vault/ManageVaultImportantDateTypes/Services/DestroyContactImportantDateTypeTest.php
+++ b/tests/Unit/Domains/Vault/ManageVaultImportantDateTypes/Services/DestroyContactImportantDateTypeTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVaultImportantDateTypes\Services;
 
+use App\Domains\Vault\ManageVaultImportantDateTypes\Services\DestroyContactImportantDateType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\ContactImportantDateType;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageVaultImportantDateTypes\Services\DestroyContactImportantDateType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Vault/ManageVaultImportantDateTypes/Services/UpdateContactImportantDateTypeTest.php b/tests/Unit/Domains/Vault/ManageVaultImportantDateTypes/Services/UpdateContactImportantDateTypeTest.php
index 2e53c618f..796807640 100644
--- a/tests/Unit/Domains/Vault/ManageVaultImportantDateTypes/Services/UpdateContactImportantDateTypeTest.php
+++ b/tests/Unit/Domains/Vault/ManageVaultImportantDateTypes/Services/UpdateContactImportantDateTypeTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVaultImportantDateTypes\Services;
 
+use App\Domains\Vault\ManageVaultImportantDateTypes\Services\UpdateContactImportantDateType;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\ContactImportantDateType;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageVaultImportantDateTypes\Services\UpdateContactImportantDateType;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Vault/ManageVaultImportantDateTypes/Web/ViewHelpers/VaultImportantDateTypesViewHelperTest.php b/tests/Unit/Domains/Vault/ManageVaultImportantDateTypes/Web/ViewHelpers/VaultImportantDateTypesViewHelperTest.php
index 6bc78fb63..8426345ad 100644
--- a/tests/Unit/Domains/Vault/ManageVaultImportantDateTypes/Web/ViewHelpers/VaultImportantDateTypesViewHelperTest.php
+++ b/tests/Unit/Domains/Vault/ManageVaultImportantDateTypes/Web/ViewHelpers/VaultImportantDateTypesViewHelperTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVaultImportantDateTypes\Web\ViewHelpers;
 
+use App\Domains\Vault\ManageVaultImportantDateTypes\Web\ViewHelpers\VaultImportantDateTypesViewHelper;
 use App\Models\ContactImportantDateType;
 use App\Models\Vault;
-use App\Vault\ManageVaultImportantDateTypes\Web\ViewHelpers\VaultImportantDateTypesViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/ChangeVaultAccessTest.php b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/ChangeVaultAccessTest.php
index 694ac92e8..9f19bf25d 100644
--- a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/ChangeVaultAccessTest.php
+++ b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/ChangeVaultAccessTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVaultSettings\Services;
 
+use App\Domains\Vault\ManageVaultSettings\Services\ChangeVaultAccess;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageVaultSettings\Services\ChangeVaultAccess;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/CreateLabelTest.php b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/CreateLabelTest.php
index 6f280c01d..3bc9a65b6 100644
--- a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/CreateLabelTest.php
+++ b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/CreateLabelTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVaultSettings\Services;
 
+use App\Domains\Vault\ManageVaultSettings\Services\CreateLabel;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Label;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageVaultSettings\Services\CreateLabel;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/CreateTagTest.php b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/CreateTagTest.php
index b8e0eb513..fc617cf45 100644
--- a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/CreateTagTest.php
+++ b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/CreateTagTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVaultSettings\Services;
 
+use App\Domains\Vault\ManageVaultSettings\Services\CreateTag;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Tag;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageVaultSettings\Services\CreateTag;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/DestroyLabelTest.php b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/DestroyLabelTest.php
index e6dae8cb4..7ab3ccddd 100644
--- a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/DestroyLabelTest.php
+++ b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/DestroyLabelTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVaultSettings\Services;
 
+use App\Domains\Vault\ManageVaultSettings\Services\DestroyLabel;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Label;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageVaultSettings\Services\DestroyLabel;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/DestroyTagTest.php b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/DestroyTagTest.php
index 2bb332ade..a57003c23 100644
--- a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/DestroyTagTest.php
+++ b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/DestroyTagTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVaultSettings\Services;
 
+use App\Domains\Vault\ManageVaultSettings\Services\DestroyTag;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Tag;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageVaultSettings\Services\DestroyTag;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/GrantVaultAccessToUserTest.php b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/GrantVaultAccessToUserTest.php
index 8599916f6..71b05c2fe 100644
--- a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/GrantVaultAccessToUserTest.php
+++ b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/GrantVaultAccessToUserTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVaultSettings\Services;
 
+use App\Domains\Vault\ManageVaultSettings\Services\GrantVaultAccessToUser;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Exceptions\SameUserException;
 use App\Models\Account;
@@ -10,7 +11,6 @@ use App\Models\ContactReminder;
 use App\Models\User;
 use App\Models\UserNotificationChannel;
 use App\Models\Vault;
-use App\Vault\ManageVaultSettings\Services\GrantVaultAccessToUser;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/RemoveVaultAccessTest.php b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/RemoveVaultAccessTest.php
index 8f56cbc94..8c55db581 100644
--- a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/RemoveVaultAccessTest.php
+++ b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/RemoveVaultAccessTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVaultSettings\Services;
 
+use App\Domains\Vault\ManageVaultSettings\Services\RemoveVaultAccess;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Contact;
@@ -9,7 +10,6 @@ use App\Models\ContactReminder;
 use App\Models\User;
 use App\Models\UserNotificationChannel;
 use App\Models\Vault;
-use App\Vault\ManageVaultSettings\Services\RemoveVaultAccess;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
diff --git a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/UpdateLabelTest.php b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/UpdateLabelTest.php
index 0cbbfcb81..90fd37623 100644
--- a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/UpdateLabelTest.php
+++ b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/UpdateLabelTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVaultSettings\Services;
 
+use App\Domains\Vault\ManageVaultSettings\Services\UpdateLabel;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Label;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageVaultSettings\Services\UpdateLabel;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/UpdateTagTest.php b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/UpdateTagTest.php
index 22a85c30d..076ed6cc1 100644
--- a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/UpdateTagTest.php
+++ b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/UpdateTagTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVaultSettings\Services;
 
+use App\Domains\Vault\ManageVaultSettings\Services\UpdateTag;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Tag;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageVaultSettings\Services\UpdateTag;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/UpdateVaultDefaultTemplateTest.php b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/UpdateVaultDefaultTemplateTest.php
index 012ce3a27..94f5c16a7 100644
--- a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/UpdateVaultDefaultTemplateTest.php
+++ b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/UpdateVaultDefaultTemplateTest.php
@@ -2,12 +2,12 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVaultSettings\Services;
 
+use App\Domains\Vault\ManageVaultSettings\Services\UpdateVaultDefaultTemplate;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Models\Account;
 use App\Models\Template;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageVaultSettings\Services\UpdateVaultDefaultTemplate;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Validation\ValidationException;
diff --git a/tests/Unit/Domains/Vault/ManageVaultSettings/Web/ViewHelpers/VaultSettingsIndexViewHelperTest.php b/tests/Unit/Domains/Vault/ManageVaultSettings/Web/ViewHelpers/VaultSettingsIndexViewHelperTest.php
index 5683676c8..cd2ba8213 100644
--- a/tests/Unit/Domains/Vault/ManageVaultSettings/Web/ViewHelpers/VaultSettingsIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Vault/ManageVaultSettings/Web/ViewHelpers/VaultSettingsIndexViewHelperTest.php
@@ -2,13 +2,13 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVaultSettings\Web\ViewHelpers;
 
+use App\Domains\Vault\ManageVaultSettings\Web\ViewHelpers\VaultSettingsIndexViewHelper;
 use App\Models\Contact;
 use App\Models\Label;
 use App\Models\Tag;
 use App\Models\Template;
 use App\Models\User;
 use App\Models\Vault;
-use App\Vault\ManageVaultSettings\Web\ViewHelpers\VaultSettingsIndexViewHelper;
 use function env;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\TestCase;
diff --git a/tests/Unit/Domains/Vault/Search/Web/ViewHelpers/VaultMostConsultedViewHelperTest.php b/tests/Unit/Domains/Vault/Search/Web/ViewHelpers/VaultMostConsultedViewHelperTest.php
index 1b7493842..e6e2dfc83 100644
--- a/tests/Unit/Domains/Vault/Search/Web/ViewHelpers/VaultMostConsultedViewHelperTest.php
+++ b/tests/Unit/Domains/Vault/Search/Web/ViewHelpers/VaultMostConsultedViewHelperTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Unit\Domains\Vault\Search\Web\ViewHelpers;
 
+use App\Domains\Vault\Search\Web\ViewHelpers\VaultMostConsultedViewHelper;
 use App\Models\Contact;
 use App\Models\User;
-use App\Vault\Search\Web\ViewHelpers\VaultMostConsultedViewHelper;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\DB;
 use Tests\TestCase;