diff --git a/app/Console/Commands/Campaigns/ExportCommand.php b/app/Console/Commands/Campaigns/ExportCommand.php
index 793f8227af..fa010e381c 100644
--- a/app/Console/Commands/Campaigns/ExportCommand.php
+++ b/app/Console/Commands/Campaigns/ExportCommand.php
@@ -4,7 +4,7 @@
 
 use App\Models\Campaign;
 use App\Services\Campaign\ExportService;
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 
diff --git a/app/Console/Commands/Migrations/MigrateTutorials.php b/app/Console/Commands/Migrations/MigrateTutorials.php
index 13c336348b..692810cd3a 100644
--- a/app/Console/Commands/Migrations/MigrateTutorials.php
+++ b/app/Console/Commands/Migrations/MigrateTutorials.php
@@ -3,7 +3,7 @@
 namespace App\Console\Commands\Migrations;
 
 use App\Models\Users\Tutorial;
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 use Illuminate\Support\Str;
 
diff --git a/app/Console/Commands/Migrations/MigrateUserPreferences.php b/app/Console/Commands/Migrations/MigrateUserPreferences.php
index 949b44a955..52abdf89aa 100644
--- a/app/Console/Commands/Migrations/MigrateUserPreferences.php
+++ b/app/Console/Commands/Migrations/MigrateUserPreferences.php
@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands\Migrations;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 
 class MigrateUserPreferences extends Command
diff --git a/app/Console/Commands/Migrations/NewsletterSubCommand.php b/app/Console/Commands/Migrations/NewsletterSubCommand.php
index d511288d07..d291957bd4 100644
--- a/app/Console/Commands/Migrations/NewsletterSubCommand.php
+++ b/app/Console/Commands/Migrations/NewsletterSubCommand.php
@@ -3,7 +3,7 @@
 namespace App\Console\Commands\Migrations;
 
 use App\Services\NewsletterService;
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 
 class NewsletterSubCommand extends Command
diff --git a/app/Console/Commands/PurgeBots.php b/app/Console/Commands/PurgeBots.php
index 39b756b0bb..be28eb1747 100644
--- a/app/Console/Commands/PurgeBots.php
+++ b/app/Console/Commands/PurgeBots.php
@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Jobs\Users\DeleteUser;
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 use Illuminate\Support\Str;
diff --git a/app/Console/Commands/RegenerateDiscordToken.php b/app/Console/Commands/RegenerateDiscordToken.php
index 691a086dfc..6f7e5abedb 100644
--- a/app/Console/Commands/RegenerateDiscordToken.php
+++ b/app/Console/Commands/RegenerateDiscordToken.php
@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Services\DiscordService;
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use App\Models\UserApp;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/ResetUserPassword.php b/app/Console/Commands/ResetUserPassword.php
index 7b63ddbf1d..e205812fa3 100644
--- a/app/Console/Commands/ResetUserPassword.php
+++ b/app/Console/Commands/ResetUserPassword.php
@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Models\UserLog;
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
diff --git a/app/Console/Commands/SendNotification.php b/app/Console/Commands/SendNotification.php
index 13b12c82b5..f7a46eed2b 100644
--- a/app/Console/Commands/SendNotification.php
+++ b/app/Console/Commands/SendNotification.php
@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Notifications\Header;
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 
 class SendNotification extends Command
diff --git a/app/Console/Commands/Subscriptions/ExpiringCardCommand.php b/app/Console/Commands/Subscriptions/ExpiringCardCommand.php
index a489687278..e9ca552d56 100644
--- a/app/Console/Commands/Subscriptions/ExpiringCardCommand.php
+++ b/app/Console/Commands/Subscriptions/ExpiringCardCommand.php
@@ -4,7 +4,7 @@
 
 use App\Jobs\Emails\Subscriptions\ExpiringCardAlert;
 use App\Traits\HasJobLog;
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 
diff --git a/app/Console/Commands/Subscriptions/SubCleanupCommand.php b/app/Console/Commands/Subscriptions/SubCleanupCommand.php
index 92dca31170..86f93c7f8f 100644
--- a/app/Console/Commands/Subscriptions/SubCleanupCommand.php
+++ b/app/Console/Commands/Subscriptions/SubCleanupCommand.php
@@ -3,7 +3,7 @@
 namespace App\Console\Commands\Subscriptions;
 
 use App\Jobs\SubscriptionEndJob;
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 
 class SubCleanupCommand extends Command
diff --git a/app/Console/Commands/SyncUserRoles.php b/app/Console/Commands/SyncUserRoles.php
index 30d473b935..0aeb6cd2a2 100644
--- a/app/Console/Commands/SyncUserRoles.php
+++ b/app/Console/Commands/SyncUserRoles.php
@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Services\DiscordService;
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 
 class SyncUserRoles extends Command
diff --git a/app/Console/Commands/TestEmail.php b/app/Console/Commands/TestEmail.php
index e13c2524a9..d4369c132b 100644
--- a/app/Console/Commands/TestEmail.php
+++ b/app/Console/Commands/TestEmail.php
@@ -34,7 +34,7 @@ class TestEmail extends Command
     public function handle()
     {
         $userId = $this->argument('user');
-        $user = \App\User::findOrFail($userId);
+        $user = \App\Models\User::findOrFail($userId);
 
         $template = $this->argument('template');
         if ($template === 'welcome') {
diff --git a/app/Console/Commands/Tests/Mailerlite.php b/app/Console/Commands/Tests/Mailerlite.php
index 8d84b073a4..cced71e80d 100644
--- a/app/Console/Commands/Tests/Mailerlite.php
+++ b/app/Console/Commands/Tests/Mailerlite.php
@@ -3,7 +3,7 @@
 namespace App\Console\Commands\Tests;
 
 use App\Services\NewsletterService;
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
 
 class Mailerlite extends Command
diff --git a/app/Http/Controllers/Api/v1/Campaign/UserApiController.php b/app/Http/Controllers/Api/v1/Campaign/UserApiController.php
index 68bbb9e156..58ad70b52e 100644
--- a/app/Http/Controllers/Api/v1/Campaign/UserApiController.php
+++ b/app/Http/Controllers/Api/v1/Campaign/UserApiController.php
@@ -6,7 +6,7 @@
 use App\Http\Requests\API\UpdateUserRole;
 use App\Http\Resources\UserResource;
 use App\Models\Campaign;
-use App\User;
+use App\Models\User;
 use App\Services\Campaign\MemberService;
 
 class UserApiController extends ApiController
diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
index b965237797..b5a1502aa2 100644
--- a/app/Http/Controllers/Auth/AuthController.php
+++ b/app/Http/Controllers/Auth/AuthController.php
@@ -4,7 +4,7 @@
 
 use App\Http\Controllers\Controller;
 use App\Services\ReferralService;
-use App\User;
+use App\Models\User;
 use Exception;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 38fd84ee6d..da2a49949b 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -4,7 +4,7 @@
 
 use App\Http\Controllers\Controller;
 use App\Services\UserAuthenticatedService;
-use App\User;
+use App\Models\User;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index ea934f2574..65b0e9e4f6 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -5,7 +5,7 @@
 use App\Http\Controllers\Controller;
 use App\Rules\AccountEmail;
 use App\Rules\AccountName;
-use App\User;
+use App\Models\User;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
diff --git a/app/Http/Controllers/Billing/HistoryController.php b/app/Http/Controllers/Billing/HistoryController.php
index 4eee908548..87ac6d8bfe 100644
--- a/app/Http/Controllers/Billing/HistoryController.php
+++ b/app/Http/Controllers/Billing/HistoryController.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Billing;
 
 use App\Http\Controllers\Controller;
-use App\User;
+use App\Models\User;
 use Illuminate\Http\Request;
 
 class HistoryController extends Controller
diff --git a/app/Http/Controllers/InvitationController.php b/app/Http/Controllers/InvitationController.php
index a4e3b96375..9720688ece 100644
--- a/app/Http/Controllers/InvitationController.php
+++ b/app/Http/Controllers/InvitationController.php
@@ -4,7 +4,7 @@
 
 use App\Exceptions\RequireLoginException;
 use App\Services\InviteService;
-use App\User;
+use App\Models\User;
 use Exception;
 
 class InvitationController extends Controller
diff --git a/app/Http/Controllers/NotificationController.php b/app/Http/Controllers/NotificationController.php
index 466fcf3a2a..1c2709ed36 100644
--- a/app/Http/Controllers/NotificationController.php
+++ b/app/Http/Controllers/NotificationController.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Services\Layout\NavigationService;
-use App\User;
+use App\Models\User;
 
 class NotificationController extends Controller
 {
diff --git a/app/Http/Controllers/PasswordSecurityController.php b/app/Http/Controllers/PasswordSecurityController.php
index 6765eed9b6..0a0d35521d 100644
--- a/app/Http/Controllers/PasswordSecurityController.php
+++ b/app/Http/Controllers/PasswordSecurityController.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\Settings\UserEnableTfa;
-use App\User;
+use App\Models\User;
 use Illuminate\Http\Request;
 use PragmaRX\Google2FA\Google2FA;
 use App\Models\PasswordSecurity;
diff --git a/app/Http/Controllers/Settings/AppearanceController.php b/app/Http/Controllers/Settings/AppearanceController.php
index 704ca02289..9f66b4191d 100644
--- a/app/Http/Controllers/Settings/AppearanceController.php
+++ b/app/Http/Controllers/Settings/AppearanceController.php
@@ -50,7 +50,7 @@ public function update(StoreSettingsLayout $request)
         if ($request->ajax()) {
             return response()->json();
         }
-        /** @var \App\User $user */
+        /** @var \App\Models\User $user */
         $user = $request->user();
         $settingFields = $request->only([
             'editor', 'advanced_mentions', 'new_entity_workflow',
diff --git a/app/Http/Controllers/Settings/BoostController.php b/app/Http/Controllers/Settings/BoostController.php
index 674b8b51bb..cfdda6cf2f 100644
--- a/app/Http/Controllers/Settings/BoostController.php
+++ b/app/Http/Controllers/Settings/BoostController.php
@@ -5,7 +5,7 @@
 use App\Facades\CampaignCache;
 use App\Http\Controllers\Controller;
 use App\Models\Campaign;
-use App\User;
+use App\Models\User;
 
 class BoostController extends Controller
 {
diff --git a/app/Http/Controllers/Settings/PremiumController.php b/app/Http/Controllers/Settings/PremiumController.php
index b500f74fdb..35a89139ed 100644
--- a/app/Http/Controllers/Settings/PremiumController.php
+++ b/app/Http/Controllers/Settings/PremiumController.php
@@ -7,7 +7,7 @@
 use App\Http\Controllers\Controller;
 use App\Models\Campaign;
 use App\Services\Campaign\BoostService;
-use App\User;
+use App\Models\User;
 
 class PremiumController extends Controller
 {
diff --git a/app/Http/Controllers/Settings/ProfileController.php b/app/Http/Controllers/Settings/ProfileController.php
index 2081f38e34..641acc33dd 100644
--- a/app/Http/Controllers/Settings/ProfileController.php
+++ b/app/Http/Controllers/Settings/ProfileController.php
@@ -5,7 +5,7 @@
 use App\Http\Controllers\Controller;
 use App\Http\Requests\StoreBillingSettings;
 use App\Http\Requests\StoreSettingsProfile;
-use App\User;
+use App\Models\User;
 use Illuminate\Http\Request;
 
 class ProfileController extends Controller
diff --git a/app/Http/Controllers/Settings/SubscriptionApiController.php b/app/Http/Controllers/Settings/SubscriptionApiController.php
index 4cd4a65c4c..b055b261cc 100644
--- a/app/Http/Controllers/Settings/SubscriptionApiController.php
+++ b/app/Http/Controllers/Settings/SubscriptionApiController.php
@@ -5,7 +5,7 @@
 use App\Http\Requests\ValidateCoupon;
 use App\Services\Subscription\CouponService;
 use App\Services\SubscriptionService;
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
diff --git a/app/Http/Controllers/Settings/SubscriptionController.php b/app/Http/Controllers/Settings/SubscriptionController.php
index eea7fc8f24..d071db52ad 100644
--- a/app/Http/Controllers/Settings/SubscriptionController.php
+++ b/app/Http/Controllers/Settings/SubscriptionController.php
@@ -12,7 +12,7 @@
 use App\Services\SubscriptionUpgradeService;
 use App\Services\Users\CurrencyService;
 use App\Services\Users\EmailValidationService;
-use App\User;
+use App\Models\User;
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
diff --git a/app/Http/Controllers/User/ProfileController.php b/app/Http/Controllers/User/ProfileController.php
index 30322eaa85..61445d44bf 100644
--- a/app/Http/Controllers/User/ProfileController.php
+++ b/app/Http/Controllers/User/ProfileController.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\User;
 
 use App\Http\Controllers\Controller;
-use App\User;
+use App\Models\User;
 
 class ProfileController extends Controller
 {
diff --git a/app/Http/Controllers/WebhookController.php b/app/Http/Controllers/WebhookController.php
index dcbe504d3b..cd4404814b 100644
--- a/app/Http/Controllers/WebhookController.php
+++ b/app/Http/Controllers/WebhookController.php
@@ -8,7 +8,7 @@
 use App\Models\UserLog;
 use App\Services\Subscription\PaymentMethodService;
 use App\Services\SubscriptionService;
-use App\User;
+use App\Models\User;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Log;
 use Laravel\Cashier\Http\Controllers\WebhookController as CashierController;
diff --git a/app/Http/Middleware/LocaleChange.php b/app/Http/Middleware/LocaleChange.php
index 21b048ea5a..1545676fd3 100644
--- a/app/Http/Middleware/LocaleChange.php
+++ b/app/Http/Middleware/LocaleChange.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Middleware;
 
-use App\User;
+use App\Models\User;
 use Closure;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
diff --git a/app/Http/Resources/ProfileResource.php b/app/Http/Resources/ProfileResource.php
index b1878ed24e..1e7c6880a7 100644
--- a/app/Http/Resources/ProfileResource.php
+++ b/app/Http/Resources/ProfileResource.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Resources;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class ProfileResource extends JsonResource
diff --git a/app/Http/Resources/UserResource.php b/app/Http/Resources/UserResource.php
index c917a618cd..2d60f04474 100644
--- a/app/Http/Resources/UserResource.php
+++ b/app/Http/Resources/UserResource.php
@@ -3,7 +3,7 @@
 namespace App\Http\Resources;
 
 use App\Facades\CampaignLocalization;
-use App\User;
+use App\Models\User;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class UserResource extends JsonResource
diff --git a/app/Jobs/Campaigns/Export.php b/app/Jobs/Campaigns/Export.php
index b579eb8cfe..af42330608 100644
--- a/app/Jobs/Campaigns/Export.php
+++ b/app/Jobs/Campaigns/Export.php
@@ -6,7 +6,7 @@
 use App\Models\Campaign;
 use App\Models\CampaignExport;
 use App\Services\Campaign\ExportService;
-use App\User;
+use App\Models\User;
 use Exception;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/app/Jobs/Copyright/DeleteUserImage.php b/app/Jobs/Copyright/DeleteUserImage.php
index 1489ba6bdc..ee24179f6d 100644
--- a/app/Jobs/Copyright/DeleteUserImage.php
+++ b/app/Jobs/Copyright/DeleteUserImage.php
@@ -2,7 +2,7 @@
 
 namespace App\Jobs\Copyright;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
diff --git a/app/Jobs/DiscordRoleJob.php b/app/Jobs/DiscordRoleJob.php
index c70016fdd8..40cb21a1f2 100644
--- a/app/Jobs/DiscordRoleJob.php
+++ b/app/Jobs/DiscordRoleJob.php
@@ -3,7 +3,7 @@
 namespace App\Jobs;
 
 use App\Services\DiscordService;
-use App\User;
+use App\Models\User;
 use Exception;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/app/Jobs/Emails/MailSettingsChangeJob.php b/app/Jobs/Emails/MailSettingsChangeJob.php
index ba10d69acf..edbe29fd92 100644
--- a/app/Jobs/Emails/MailSettingsChangeJob.php
+++ b/app/Jobs/Emails/MailSettingsChangeJob.php
@@ -3,7 +3,7 @@
 namespace App\Jobs\Emails;
 
 use App\Services\NewsletterService;
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
diff --git a/app/Jobs/Emails/Purge/FirstWarningJob.php b/app/Jobs/Emails/Purge/FirstWarningJob.php
index 58ddbab4a0..3470ab5f6f 100644
--- a/app/Jobs/Emails/Purge/FirstWarningJob.php
+++ b/app/Jobs/Emails/Purge/FirstWarningJob.php
@@ -4,7 +4,7 @@
 
 use App\Mail\Purge\FirstWarning;
 use App\Models\UserLog;
-use App\User;
+use App\Models\User;
 use Exception;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/app/Jobs/Emails/Purge/SecondWarningJob.php b/app/Jobs/Emails/Purge/SecondWarningJob.php
index dee24d4562..8822f3e12d 100644
--- a/app/Jobs/Emails/Purge/SecondWarningJob.php
+++ b/app/Jobs/Emails/Purge/SecondWarningJob.php
@@ -4,7 +4,7 @@
 
 use App\Mail\Purge\SecondWarning;
 use App\Models\UserLog;
-use App\User;
+use App\Models\User;
 use Exception;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/app/Jobs/Emails/SubscriptionCancelEmailJob.php b/app/Jobs/Emails/SubscriptionCancelEmailJob.php
index 6a4cef4f43..9aabf02bff 100644
--- a/app/Jobs/Emails/SubscriptionCancelEmailJob.php
+++ b/app/Jobs/Emails/SubscriptionCancelEmailJob.php
@@ -4,7 +4,7 @@
 
 use App\Mail\Subscription\Admin\CancelledSubscriptionMail;
 use App\Mail\Subscription\User\CancelledUserSubscriptionMail;
-use App\User;
+use App\Models\User;
 use App\Models\UserLog;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/app/Jobs/Emails/SubscriptionCreatedEmailJob.php b/app/Jobs/Emails/SubscriptionCreatedEmailJob.php
index 202f91f01e..3ba721a3f6 100644
--- a/app/Jobs/Emails/SubscriptionCreatedEmailJob.php
+++ b/app/Jobs/Emails/SubscriptionCreatedEmailJob.php
@@ -4,7 +4,7 @@
 
 use App\Enums\PricingPeriod;
 use App\Mail\Subscription\Admin\NewSubscriptionMail;
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
diff --git a/app/Jobs/Emails/SubscriptionDeletedEmailJob.php b/app/Jobs/Emails/SubscriptionDeletedEmailJob.php
index 74d4182fc8..8d7383644e 100644
--- a/app/Jobs/Emails/SubscriptionDeletedEmailJob.php
+++ b/app/Jobs/Emails/SubscriptionDeletedEmailJob.php
@@ -3,7 +3,7 @@
 namespace App\Jobs\Emails;
 
 use App\Notifications\Header;
-use App\User;
+use App\Models\User;
 use App\Models\UserLog;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/app/Jobs/Emails/SubscriptionDowngradedEmailJob.php b/app/Jobs/Emails/SubscriptionDowngradedEmailJob.php
index c569f8e695..a8dbe3c679 100644
--- a/app/Jobs/Emails/SubscriptionDowngradedEmailJob.php
+++ b/app/Jobs/Emails/SubscriptionDowngradedEmailJob.php
@@ -3,7 +3,7 @@
 namespace App\Jobs\Emails;
 
 use App\Mail\Subscription\Admin\DowngradedSubscriptionMail;
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
diff --git a/app/Jobs/Emails/SubscriptionFailedEmailJob.php b/app/Jobs/Emails/SubscriptionFailedEmailJob.php
index fab14a4d04..62f24beef9 100644
--- a/app/Jobs/Emails/SubscriptionFailedEmailJob.php
+++ b/app/Jobs/Emails/SubscriptionFailedEmailJob.php
@@ -4,7 +4,7 @@
 
 use App\Mail\Subscription\User\FailedUserSubscriptionMail;
 use App\Notifications\Header;
-use App\User;
+use App\Models\User;
 use App\Models\UserLog;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/app/Jobs/Emails/Subscriptions/EmailValidationJob.php b/app/Jobs/Emails/Subscriptions/EmailValidationJob.php
index 88009abc9e..e574bce92c 100644
--- a/app/Jobs/Emails/Subscriptions/EmailValidationJob.php
+++ b/app/Jobs/Emails/Subscriptions/EmailValidationJob.php
@@ -4,7 +4,7 @@
 
 use App\Mail\Subscription\User\ValidationEmail;
 use App\Models\UserValidation;
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
diff --git a/app/Jobs/Emails/Subscriptions/ExpiringCardAlert.php b/app/Jobs/Emails/Subscriptions/ExpiringCardAlert.php
index db74a3c3ce..af49b2f08c 100644
--- a/app/Jobs/Emails/Subscriptions/ExpiringCardAlert.php
+++ b/app/Jobs/Emails/Subscriptions/ExpiringCardAlert.php
@@ -3,7 +3,7 @@
 namespace App\Jobs\Emails\Subscriptions;
 
 use App\Mail\Subscription\User\ExpiringCardEmail;
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
diff --git a/app/Jobs/Emails/Subscriptions/UpcomingYearlyAlert.php b/app/Jobs/Emails/Subscriptions/UpcomingYearlyAlert.php
index 4597283538..25d4bd73d3 100644
--- a/app/Jobs/Emails/Subscriptions/UpcomingYearlyAlert.php
+++ b/app/Jobs/Emails/Subscriptions/UpcomingYearlyAlert.php
@@ -3,7 +3,7 @@
 namespace App\Jobs\Emails\Subscriptions;
 
 use App\Mail\Subscription\User\UpcomingYearlyEmail;
-use App\User;
+use App\Models\User;
 use App\Models\UserLog;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/app/Jobs/Emails/Subscriptions/WelcomeSubscriptionEmailJob.php b/app/Jobs/Emails/Subscriptions/WelcomeSubscriptionEmailJob.php
index f8371358bb..06c11436d7 100644
--- a/app/Jobs/Emails/Subscriptions/WelcomeSubscriptionEmailJob.php
+++ b/app/Jobs/Emails/Subscriptions/WelcomeSubscriptionEmailJob.php
@@ -4,7 +4,7 @@
 
 use App\Mail\Subscription\User\NewSubscriberMail;
 use App\Models\Tier;
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
diff --git a/app/Jobs/Emails/WelcomeEmailJob.php b/app/Jobs/Emails/WelcomeEmailJob.php
index 9c717728c7..94a4e40f49 100644
--- a/app/Jobs/Emails/WelcomeEmailJob.php
+++ b/app/Jobs/Emails/WelcomeEmailJob.php
@@ -3,7 +3,7 @@
 namespace App\Jobs\Emails;
 
 use App\Mail\WelcomeEmail;
-use App\User;
+use App\Models\User;
 use Exception;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/app/Jobs/EntityWebhookJob.php b/app/Jobs/EntityWebhookJob.php
index f04ccc6429..d2310a3b7e 100644
--- a/app/Jobs/EntityWebhookJob.php
+++ b/app/Jobs/EntityWebhookJob.php
@@ -6,7 +6,7 @@
 use App\Models\Entity;
 use App\Models\Webhook;
 use App\Models\Campaign;
-use App\User;
+use App\Models\User;
 use App\Facades\CampaignLocalization;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/app/Jobs/SubscriptionEndJob.php b/app/Jobs/SubscriptionEndJob.php
index bce3923808..2ad75bd4a1 100644
--- a/app/Jobs/SubscriptionEndJob.php
+++ b/app/Jobs/SubscriptionEndJob.php
@@ -8,7 +8,7 @@
 use App\Models\UserLog;
 use App\Notifications\Header;
 use App\Services\DiscordService;
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
diff --git a/app/Jobs/TestWebhookJob.php b/app/Jobs/TestWebhookJob.php
index 6a6ce8a177..e4bf9b686f 100644
--- a/app/Jobs/TestWebhookJob.php
+++ b/app/Jobs/TestWebhookJob.php
@@ -5,7 +5,7 @@
 use App\Models\Entity;
 use App\Models\Webhook;
 use App\Models\Campaign;
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
diff --git a/app/Jobs/Users/DeleteUser.php b/app/Jobs/Users/DeleteUser.php
index 817c7168f8..86acf0ec8e 100644
--- a/app/Jobs/Users/DeleteUser.php
+++ b/app/Jobs/Users/DeleteUser.php
@@ -3,7 +3,7 @@
 namespace App\Jobs\Users;
 
 use App\Services\Users\CleanupService;
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
diff --git a/app/Jobs/Users/UpdateEmail.php b/app/Jobs/Users/UpdateEmail.php
index eae2ed984a..afbee55029 100644
--- a/app/Jobs/Users/UpdateEmail.php
+++ b/app/Jobs/Users/UpdateEmail.php
@@ -3,7 +3,7 @@
 namespace App\Jobs\Users;
 
 use App\Services\NewsletterService;
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
diff --git a/app/Listeners/UserEventSubscriber.php b/app/Listeners/UserEventSubscriber.php
index b6e1dabcc6..f12f312fe3 100644
--- a/app/Listeners/UserEventSubscriber.php
+++ b/app/Listeners/UserEventSubscriber.php
@@ -7,7 +7,7 @@
 use App\Services\InviteService;
 use App\Services\StarterService;
 use App\Services\Users\CampaignService;
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use Exception;
 
diff --git a/app/Mail/Purge/FirstWarning.php b/app/Mail/Purge/FirstWarning.php
index 59da5bbe97..4d14fdf30b 100644
--- a/app/Mail/Purge/FirstWarning.php
+++ b/app/Mail/Purge/FirstWarning.php
@@ -2,7 +2,7 @@
 
 namespace App\Mail\Purge;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Address;
diff --git a/app/Mail/Purge/SecondWarning.php b/app/Mail/Purge/SecondWarning.php
index da1dea0679..d774b811b7 100644
--- a/app/Mail/Purge/SecondWarning.php
+++ b/app/Mail/Purge/SecondWarning.php
@@ -2,7 +2,7 @@
 
 namespace App\Mail\Purge;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Address;
diff --git a/app/Mail/Subscription/Admin/CancelledSubscriptionMail.php b/app/Mail/Subscription/Admin/CancelledSubscriptionMail.php
index 4aed29891d..0b56018573 100644
--- a/app/Mail/Subscription/Admin/CancelledSubscriptionMail.php
+++ b/app/Mail/Subscription/Admin/CancelledSubscriptionMail.php
@@ -2,7 +2,7 @@
 
 namespace App\Mail\Subscription\Admin;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
diff --git a/app/Mail/Subscription/Admin/DowngradedSubscriptionMail.php b/app/Mail/Subscription/Admin/DowngradedSubscriptionMail.php
index f5592e8db6..ce13d00727 100644
--- a/app/Mail/Subscription/Admin/DowngradedSubscriptionMail.php
+++ b/app/Mail/Subscription/Admin/DowngradedSubscriptionMail.php
@@ -2,7 +2,7 @@
 
 namespace App\Mail\Subscription\Admin;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
diff --git a/app/Mail/Subscription/Admin/NewSubscriptionMail.php b/app/Mail/Subscription/Admin/NewSubscriptionMail.php
index 3da0012e7e..13f32eb718 100644
--- a/app/Mail/Subscription/Admin/NewSubscriptionMail.php
+++ b/app/Mail/Subscription/Admin/NewSubscriptionMail.php
@@ -3,7 +3,7 @@
 namespace App\Mail\Subscription\Admin;
 
 use App\Enums\PricingPeriod;
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
diff --git a/app/Mail/Subscription/User/CancelledUserSubscriptionMail.php b/app/Mail/Subscription/User/CancelledUserSubscriptionMail.php
index f3a1ac7a6b..e42cfd921a 100644
--- a/app/Mail/Subscription/User/CancelledUserSubscriptionMail.php
+++ b/app/Mail/Subscription/User/CancelledUserSubscriptionMail.php
@@ -2,7 +2,7 @@
 
 namespace App\Mail\Subscription\User;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
diff --git a/app/Mail/Subscription/User/ExpiringCardEmail.php b/app/Mail/Subscription/User/ExpiringCardEmail.php
index 7f35481f9b..c00d36dcb8 100644
--- a/app/Mail/Subscription/User/ExpiringCardEmail.php
+++ b/app/Mail/Subscription/User/ExpiringCardEmail.php
@@ -2,7 +2,7 @@
 
 namespace App\Mail\Subscription\User;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
diff --git a/app/Mail/Subscription/User/FailedUserSubscriptionMail.php b/app/Mail/Subscription/User/FailedUserSubscriptionMail.php
index 0e8be83fe8..34a93562f6 100644
--- a/app/Mail/Subscription/User/FailedUserSubscriptionMail.php
+++ b/app/Mail/Subscription/User/FailedUserSubscriptionMail.php
@@ -2,7 +2,7 @@
 
 namespace App\Mail\Subscription\User;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
diff --git a/app/Mail/Subscription/User/NewElementalSubscriptionMail.php b/app/Mail/Subscription/User/NewElementalSubscriptionMail.php
index eeb0edc7ea..48bd1589d0 100644
--- a/app/Mail/Subscription/User/NewElementalSubscriptionMail.php
+++ b/app/Mail/Subscription/User/NewElementalSubscriptionMail.php
@@ -2,7 +2,7 @@
 
 namespace App\Mail\Subscription\User;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
diff --git a/app/Mail/Subscription/User/NewSubscriberMail.php b/app/Mail/Subscription/User/NewSubscriberMail.php
index 0da5667ab2..919512e9bb 100644
--- a/app/Mail/Subscription/User/NewSubscriberMail.php
+++ b/app/Mail/Subscription/User/NewSubscriberMail.php
@@ -3,7 +3,7 @@
 namespace App\Mail\Subscription\User;
 
 use App\Models\Tier;
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
diff --git a/app/Mail/Subscription/User/UpcomingYearlyEmail.php b/app/Mail/Subscription/User/UpcomingYearlyEmail.php
index 2a8e96e419..28742f8b21 100644
--- a/app/Mail/Subscription/User/UpcomingYearlyEmail.php
+++ b/app/Mail/Subscription/User/UpcomingYearlyEmail.php
@@ -2,7 +2,7 @@
 
 namespace App\Mail\Subscription\User;
 
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
diff --git a/app/Mail/Subscription/User/ValidationEmail.php b/app/Mail/Subscription/User/ValidationEmail.php
index c29a958c90..e00618d67e 100644
--- a/app/Mail/Subscription/User/ValidationEmail.php
+++ b/app/Mail/Subscription/User/ValidationEmail.php
@@ -2,7 +2,7 @@
 
 namespace App\Mail\Subscription\User;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
diff --git a/app/Mail/WelcomeEmail.php b/app/Mail/WelcomeEmail.php
index a5a7cad2f9..efeba47b60 100644
--- a/app/Mail/WelcomeEmail.php
+++ b/app/Mail/WelcomeEmail.php
@@ -2,7 +2,7 @@
 
 namespace App\Mail;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
diff --git a/app/Models/AppRelease.php b/app/Models/AppRelease.php
index 8966b491c1..a549b7551a 100644
--- a/app/Models/AppRelease.php
+++ b/app/Models/AppRelease.php
@@ -3,7 +3,6 @@
 namespace App\Models;
 
 use App\Facades\UserCache;
-use App\User;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -39,7 +38,7 @@ class AppRelease extends Model
 
     public function author(): BelongsTo
     {
-        return $this->belongsTo('App\User', 'created_by');
+        return $this->belongsTo('App\Models\User', 'created_by');
     }
 
     /**
diff --git a/app/Models/Campaign.php b/app/Models/Campaign.php
index 4ba1d6cda3..6fa293c58e 100644
--- a/app/Models/Campaign.php
+++ b/app/Models/Campaign.php
@@ -14,7 +14,6 @@
 use App\Models\Concerns\Sanitizable;
 use App\Models\Relations\CampaignRelations;
 use App\Models\Scopes\CampaignScopes;
-use App\User;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Models/CampaignRole.php b/app/Models/CampaignRole.php
index 741d325fc0..5dca7bf1ce 100644
--- a/app/Models/CampaignRole.php
+++ b/app/Models/CampaignRole.php
@@ -71,7 +71,7 @@ public function campaign(): BelongsTo
     public function users(): HasMany
     {
         return $this->hasMany('App\Models\CampaignRoleUser', 'campaign_role_id');
-        //return $this->belongsToMany('App\User', 'campaign_role_users');
+        //return $this->belongsToMany('App\Models\User', 'campaign_role_users');
     }
 
     public function dashboardRoles(): HasMany
diff --git a/app/Models/CampaignUser.php b/app/Models/CampaignUser.php
index 499910bdc9..e26a23ff9f 100644
--- a/app/Models/CampaignUser.php
+++ b/app/Models/CampaignUser.php
@@ -4,7 +4,6 @@
 
 use App\Models\Concerns\HasUser;
 use App\Models\Concerns\Paginatable;
-use App\User;
 use Carbon\Carbon;
 use App\Models\Concerns\SortableTrait;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
diff --git a/app/Models/CommunityEvent.php b/app/Models/CommunityEvent.php
index 9551d70ac0..3c411ca5a6 100644
--- a/app/Models/CommunityEvent.php
+++ b/app/Models/CommunityEvent.php
@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\User;
 use App\Facades\Img;
 use App\Models\Scopes\CommunityEventScopes;
 use Carbon\Carbon;
diff --git a/app/Models/Concerns/Blameable.php b/app/Models/Concerns/Blameable.php
index cc1204dbe2..3c2a2e4c21 100644
--- a/app/Models/Concerns/Blameable.php
+++ b/app/Models/Concerns/Blameable.php
@@ -3,7 +3,7 @@
 namespace App\Models\Concerns;
 
 use App\Observers\BlameableObserver;
-use App\User;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -35,7 +35,7 @@ public static function bootBlameable(): void
      */
     public function creator(): BelongsTo
     {
-        return $this->belongsTo('App\User', 'created_by');
+        return $this->belongsTo('App\Models\User', 'created_by');
     }
 
     /**
@@ -43,7 +43,7 @@ public function creator(): BelongsTo
      */
     public function updater(): BelongsTo
     {
-        return $this->belongsTo('App\User', 'updated_by');
+        return $this->belongsTo('App\Models\User', 'updated_by');
     }
 
     /**
@@ -51,7 +51,7 @@ public function updater(): BelongsTo
      */
     public function remover(): BelongsTo
     {
-        return $this->belongsTo('App\User', 'deleted_by');
+        return $this->belongsTo('App\Models\User', 'deleted_by');
     }
 
 
diff --git a/app/Models/Concerns/HasUser.php b/app/Models/Concerns/HasUser.php
index e432470794..9473bcfbc2 100644
--- a/app/Models/Concerns/HasUser.php
+++ b/app/Models/Concerns/HasUser.php
@@ -2,7 +2,7 @@
 
 namespace App\Models\Concerns;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
diff --git a/app/Models/ConversationMessage.php b/app/Models/ConversationMessage.php
index ccd4a58042..a704c457d6 100644
--- a/app/Models/ConversationMessage.php
+++ b/app/Models/ConversationMessage.php
@@ -61,7 +61,7 @@ class ConversationMessage extends Model
      */
     public function creator(): BelongsTo
     {
-        return $this->belongsTo('App\User', 'created_by');
+        return $this->belongsTo('App\Models\User', 'created_by');
     }
 
     public function character(): BelongsTo
diff --git a/app/Models/ConversationParticipant.php b/app/Models/ConversationParticipant.php
index 21b24925fc..408a0ba40b 100644
--- a/app/Models/ConversationParticipant.php
+++ b/app/Models/ConversationParticipant.php
@@ -3,7 +3,6 @@
 namespace App\Models;
 
 use App\Models\Concerns\HasUser;
-use App\User;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -38,7 +37,7 @@ class ConversationParticipant extends Model
      */
     public function creator(): BelongsTo
     {
-        return $this->belongsTo('App\User', 'created_by');
+        return $this->belongsTo('App\Models\User', 'created_by');
     }
 
     public function character(): BelongsTo
diff --git a/app/Models/DiceRollResult.php b/app/Models/DiceRollResult.php
index 0f597da0f7..0a4565f10b 100644
--- a/app/Models/DiceRollResult.php
+++ b/app/Models/DiceRollResult.php
@@ -61,7 +61,7 @@ class DiceRollResult extends Model
      */
     public function creator(): BelongsTo
     {
-        return $this->belongsTo('App\User', 'created_by');
+        return $this->belongsTo('App\Models\User', 'created_by');
     }
 
     public function diceRoll(): BelongsTo
diff --git a/app/Models/EntityAbility.php b/app/Models/EntityAbility.php
index fff59e4907..f39834a111 100644
--- a/app/Models/EntityAbility.php
+++ b/app/Models/EntityAbility.php
@@ -71,7 +71,7 @@ public function ability(): BelongsTo
      */
     public function creator(): BelongsTo
     {
-        return $this->belongsTo('App\User', 'created_by');
+        return $this->belongsTo('App\Models\User', 'created_by');
     }
 
     /**
diff --git a/app/Models/EntityLog.php b/app/Models/EntityLog.php
index 80424b7a72..2a61cd8cb3 100644
--- a/app/Models/EntityLog.php
+++ b/app/Models/EntityLog.php
@@ -4,7 +4,6 @@
 
 use App\Http\Requests\HistoryRequest;
 use App\Models\Concerns\HasUser;
-use App\User;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\MassPrunable;
@@ -67,7 +66,7 @@ public function campaign(): BelongsTo
 
     public function impersonator(): BelongsTo
     {
-        return $this->belongsTo('App\User', 'impersonated_by');
+        return $this->belongsTo('App\Models\User', 'impersonated_by');
     }
 
     public function post(): BelongsTo
diff --git a/app/Models/Post.php b/app/Models/Post.php
index c1bf744a2b..bbd60fd0b6 100644
--- a/app/Models/Post.php
+++ b/app/Models/Post.php
@@ -11,7 +11,6 @@
 use App\Models\Concerns\Sanitizable;
 use App\Models\Concerns\SortableTrait;
 use App\Models\Concerns\Templatable;
-use App\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Models/QuestElement.php b/app/Models/QuestElement.php
index 66256708c1..63d9763664 100644
--- a/app/Models/QuestElement.php
+++ b/app/Models/QuestElement.php
@@ -9,7 +9,6 @@
 use App\Models\Concerns\HasVisibility;
 use App\Models\Concerns\Sanitizable;
 use App\Models\Concerns\SimpleSortableTrait;
-use App\User;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
diff --git a/app/Models/Referral.php b/app/Models/Referral.php
index 303d19c17f..456819707a 100644
--- a/app/Models/Referral.php
+++ b/app/Models/Referral.php
@@ -3,7 +3,6 @@
 namespace App\Models;
 
 use App\Models\Concerns\HasUser;
-use App\User;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
diff --git a/app/Models/Relations/CampaignRelations.php b/app/Models/Relations/CampaignRelations.php
index f0599fb31c..b650381b2f 100644
--- a/app/Models/Relations/CampaignRelations.php
+++ b/app/Models/Relations/CampaignRelations.php
@@ -42,7 +42,7 @@
 use App\Models\CampaignImport;
 use App\Models\Post;
 use App\Models\Webhook;
-use App\User;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -86,12 +86,12 @@ trait CampaignRelations
 
     public function users(): BelongsToMany
     {
-        return $this->belongsToMany('App\User', 'campaign_user')->using('App\Models\CampaignUser');
+        return $this->belongsToMany('App\Models\User', 'campaign_user')->using('App\Models\CampaignUser');
     }
 
     public function followers(): BelongsToMany
     {
-        return $this->belongsToMany('App\User', 'campaign_followers')->using(CampaignFollower::class);
+        return $this->belongsToMany('App\Models\User', 'campaign_followers')->using(CampaignFollower::class);
     }
 
     public function setting(): BelongsTo
diff --git a/app/Models/Relations/EntityRelations.php b/app/Models/Relations/EntityRelations.php
index b7f953918a..cdd0747e68 100644
--- a/app/Models/Relations/EntityRelations.php
+++ b/app/Models/Relations/EntityRelations.php
@@ -28,7 +28,7 @@
 use App\Models\Relation;
 use App\Models\Tag;
 use App\Models\Timeline;
-use App\User;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
diff --git a/app/Models/Role.php b/app/Models/Role.php
index f21428bb51..d1571d221b 100644
--- a/app/Models/Role.php
+++ b/app/Models/Role.php
@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\User;
 use Illuminate\Database\Eloquent\Model;
 
 /**
diff --git a/app/Models/Scopes/CampaignScopes.php b/app/Models/Scopes/CampaignScopes.php
index debd9cfaa7..f985d2ed13 100644
--- a/app/Models/Scopes/CampaignScopes.php
+++ b/app/Models/Scopes/CampaignScopes.php
@@ -4,7 +4,7 @@
 
 use App\Facades\Identity;
 use App\Models\Campaign;
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\JoinClause;
diff --git a/app/Models/Tier.php b/app/Models/Tier.php
index 176ab69fb7..2cd84d7a4c 100644
--- a/app/Models/Tier.php
+++ b/app/Models/Tier.php
@@ -3,7 +3,6 @@
 namespace App\Models;
 
 use App\Enums\PricingPeriod;
-use App\User;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\HasMany;
diff --git a/app/Models/TimelineElement.php b/app/Models/TimelineElement.php
index 719b9d3611..e64baacf3c 100644
--- a/app/Models/TimelineElement.php
+++ b/app/Models/TimelineElement.php
@@ -8,7 +8,6 @@
 use App\Models\Concerns\HasSuggestions;
 use App\Models\Concerns\HasVisibility;
 use App\Models\Concerns\Sanitizable;
-use App\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/User.php b/app/Models/User.php
similarity index 98%
rename from app/User.php
rename to app/Models/User.php
index bd34d9cdc1..bd4f6997a9 100644
--- a/app/User.php
+++ b/app/Models/User.php
@@ -1,22 +1,16 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use App\Facades\Identity;
 use App\Facades\PostCache;
 use App\Facades\SingleUserCache;
 use App\Facades\UserCache;
-use App\Models\AppRelease;
-use App\Models\Campaign;
 use App\Facades\CampaignLocalization;
-use App\Models\CampaignRole;
 use App\Models\Concerns\HasImage;
 use App\Models\Concerns\UserBoosters;
 use App\Models\Concerns\UserTokens;
-use App\Models\Pledge;
 use App\Models\Scopes\UserScope;
-use App\Models\UserLog;
-use App\Models\UserSetting;
 use App\Models\Relations\UserRelations;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
diff --git a/app/Models/UserSetting.php b/app/Models/UserSetting.php
index 86ea201f0c..3f03995ba9 100644
--- a/app/Models/UserSetting.php
+++ b/app/Models/UserSetting.php
@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\User;
 use Illuminate\Support\Arr;
 use Stevebauman\Purify\Facades\Purify;
 
diff --git a/app/Observers/UserObserver.php b/app/Observers/UserObserver.php
index 98a505da67..77cd75dc29 100644
--- a/app/Observers/UserObserver.php
+++ b/app/Observers/UserObserver.php
@@ -7,7 +7,7 @@
 use App\Jobs\Emails\WelcomeEmailJob;
 use App\Jobs\Users\UnsubscribeUser;
 use App\Jobs\Users\UpdateEmail;
-use App\User;
+use App\Models\User;
 use Exception;
 use Illuminate\Support\Facades\Hash;
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
diff --git a/app/Policies/BookmarkPolicy.php b/app/Policies/BookmarkPolicy.php
index df5f28f3d0..b2a50b7f55 100644
--- a/app/Policies/BookmarkPolicy.php
+++ b/app/Policies/BookmarkPolicy.php
@@ -3,7 +3,7 @@
 namespace App\Policies;
 
 use App\Facades\UserCache;
-use App\User;
+use App\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
 class BookmarkPolicy
diff --git a/app/Policies/CampaignBoostPolicy.php b/app/Policies/CampaignBoostPolicy.php
index dbcc68453a..46ed3e32bf 100644
--- a/app/Policies/CampaignBoostPolicy.php
+++ b/app/Policies/CampaignBoostPolicy.php
@@ -3,7 +3,7 @@
 namespace App\Policies;
 
 use App\Models\CampaignBoost;
-use App\User;
+use App\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
 class CampaignBoostPolicy
diff --git a/app/Policies/CampaignPluginPolicy.php b/app/Policies/CampaignPluginPolicy.php
index bfb895ede9..8ae1f00b46 100644
--- a/app/Policies/CampaignPluginPolicy.php
+++ b/app/Policies/CampaignPluginPolicy.php
@@ -4,7 +4,7 @@
 
 use App\Models\CampaignPlugin;
 use App\Traits\AdminPolicyTrait;
-use App\User;
+use App\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
 class CampaignPluginPolicy
diff --git a/app/Policies/CampaignPolicy.php b/app/Policies/CampaignPolicy.php
index fe323fce70..c3665b1654 100644
--- a/app/Policies/CampaignPolicy.php
+++ b/app/Policies/CampaignPolicy.php
@@ -8,7 +8,7 @@
 use App\Facades\UserCache;
 use App\Models\CampaignPermission;
 use App\Traits\AdminPolicyTrait;
-use App\User;
+use App\Models\User;
 use App\Models\Campaign;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
diff --git a/app/Policies/CampaignRolePolicy.php b/app/Policies/CampaignRolePolicy.php
index 248ce2480d..062f279a00 100644
--- a/app/Policies/CampaignRolePolicy.php
+++ b/app/Policies/CampaignRolePolicy.php
@@ -4,7 +4,7 @@
 
 use App\Facades\UserCache;
 use App\Models\Campaign;
-use App\User;
+use App\Models\User;
 use App\Models\CampaignRole;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
diff --git a/app/Policies/CampaignRoleUserPolicy.php b/app/Policies/CampaignRoleUserPolicy.php
index cdadb59b8c..c7bc5af132 100644
--- a/app/Policies/CampaignRoleUserPolicy.php
+++ b/app/Policies/CampaignRoleUserPolicy.php
@@ -5,7 +5,7 @@
 use App\Facades\UserCache;
 use App\Models\Campaign;
 use App\Traits\AdminPolicyTrait;
-use App\User;
+use App\Models\User;
 use App\Models\CampaignRoleUser;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
diff --git a/app/Policies/CampaignUserPolicy.php b/app/Policies/CampaignUserPolicy.php
index 2f0abceaa4..836bc8a82c 100644
--- a/app/Policies/CampaignUserPolicy.php
+++ b/app/Policies/CampaignUserPolicy.php
@@ -7,7 +7,7 @@
 use App\Models\Campaign;
 use App\Models\CampaignRoleUser;
 use App\Traits\AdminPolicyTrait;
-use App\User;
+use App\Models\User;
 use App\Models\CampaignUser;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
diff --git a/app/Policies/CharacterPolicy.php b/app/Policies/CharacterPolicy.php
index 133544845a..d8fc9983b8 100644
--- a/app/Policies/CharacterPolicy.php
+++ b/app/Policies/CharacterPolicy.php
@@ -3,7 +3,7 @@
 namespace App\Policies;
 
 use App\Facades\UserCache;
-use App\User;
+use App\Models\User;
 use App\Models\Character;
 
 class CharacterPolicy extends MiscPolicy
diff --git a/app/Policies/CommunityEventEntryPolicy.php b/app/Policies/CommunityEventEntryPolicy.php
index 819902a25c..31460d8b7e 100644
--- a/app/Policies/CommunityEventEntryPolicy.php
+++ b/app/Policies/CommunityEventEntryPolicy.php
@@ -3,7 +3,7 @@
 namespace App\Policies;
 
 use App\Models\CommunityEventEntry;
-use App\User;
+use App\Models\User;
 
 class CommunityEventEntryPolicy
 {
diff --git a/app/Policies/CommunityVotePolicy.php b/app/Policies/CommunityVotePolicy.php
index a38cd5fb3a..91f94bccb9 100644
--- a/app/Policies/CommunityVotePolicy.php
+++ b/app/Policies/CommunityVotePolicy.php
@@ -9,7 +9,7 @@
 namespace App\Policies;
 
 use App\Models\CommunityVote;
-use App\User;
+use App\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
 class CommunityVotePolicy
diff --git a/app/Policies/ConversationMessagePolicy.php b/app/Policies/ConversationMessagePolicy.php
index 31cfa0a3ef..aef924fda8 100644
--- a/app/Policies/ConversationMessagePolicy.php
+++ b/app/Policies/ConversationMessagePolicy.php
@@ -3,7 +3,7 @@
 namespace App\Policies;
 
 use App\Models\ConversationMessage;
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 
 class ConversationMessagePolicy
diff --git a/app/Policies/DiceRollPolicy.php b/app/Policies/DiceRollPolicy.php
index cdd697d0e6..b1c06cf0e1 100644
--- a/app/Policies/DiceRollPolicy.php
+++ b/app/Policies/DiceRollPolicy.php
@@ -2,7 +2,7 @@
 
 namespace App\Policies;
 
-use App\User;
+use App\Models\User;
 
 class DiceRollPolicy extends MiscPolicy
 {
diff --git a/app/Policies/DiceRollResultPolicy.php b/app/Policies/DiceRollResultPolicy.php
index d3ce573d34..ab07c76a2b 100644
--- a/app/Policies/DiceRollResultPolicy.php
+++ b/app/Policies/DiceRollResultPolicy.php
@@ -3,7 +3,7 @@
 namespace App\Policies;
 
 use App\Models\Campaign;
-use App\User;
+use App\Models\User;
 
 class DiceRollResultPolicy extends MiscPolicy
 {
diff --git a/app/Policies/EntityEventPolicy.php b/app/Policies/EntityEventPolicy.php
index 108136fbcc..5cb2e49cab 100644
--- a/app/Policies/EntityEventPolicy.php
+++ b/app/Policies/EntityEventPolicy.php
@@ -3,7 +3,7 @@
 namespace App\Policies;
 
 use App\Models\EntityEvent;
-use App\User;
+use App\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
 class EntityEventPolicy
diff --git a/app/Policies/EntityPolicy.php b/app/Policies/EntityPolicy.php
index e10165fd56..7ab0b67827 100644
--- a/app/Policies/EntityPolicy.php
+++ b/app/Policies/EntityPolicy.php
@@ -5,7 +5,7 @@
 use App\Facades\UserCache;
 use App\Models\Campaign;
 use App\Models\Entity;
-use App\User;
+use App\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
 class EntityPolicy
diff --git a/app/Policies/EventPolicy.php b/app/Policies/EventPolicy.php
index 69f39aeec0..6678032994 100644
--- a/app/Policies/EventPolicy.php
+++ b/app/Policies/EventPolicy.php
@@ -3,7 +3,7 @@
 namespace App\Policies;
 
 use App\Models\CampaignPermission;
-use App\User;
+use App\Models\User;
 
 class EventPolicy extends MiscPolicy
 {
diff --git a/app/Policies/FeaturePolicy.php b/app/Policies/FeaturePolicy.php
index 3bc6ff92b7..132851aae1 100644
--- a/app/Policies/FeaturePolicy.php
+++ b/app/Policies/FeaturePolicy.php
@@ -3,7 +3,7 @@
 namespace App\Policies;
 
 use App\Models\Feature;
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 
 class FeaturePolicy
diff --git a/app/Policies/ImagePolicy.php b/app/Policies/ImagePolicy.php
index ead0a59e45..011946a678 100644
--- a/app/Policies/ImagePolicy.php
+++ b/app/Policies/ImagePolicy.php
@@ -7,7 +7,7 @@
 use App\Models\Campaign;
 use App\Models\CampaignPermission;
 use App\Models\Image;
-use App\User;
+use App\Models\User;
 
 class ImagePolicy
 {
diff --git a/app/Policies/MapGroupPolicy.php b/app/Policies/MapGroupPolicy.php
index d69c79c323..f5a5749b2c 100644
--- a/app/Policies/MapGroupPolicy.php
+++ b/app/Policies/MapGroupPolicy.php
@@ -2,7 +2,7 @@
 
 namespace App\Policies;
 
-use App\User;
+use App\Models\User;
 use App\Models\MapGroup;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
diff --git a/app/Policies/MapLayerPolicy.php b/app/Policies/MapLayerPolicy.php
index cf821c2090..df9b75a64f 100644
--- a/app/Policies/MapLayerPolicy.php
+++ b/app/Policies/MapLayerPolicy.php
@@ -2,7 +2,7 @@
 
 namespace App\Policies;
 
-use App\User;
+use App\Models\User;
 use App\Models\MapLayer;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
diff --git a/app/Policies/MapMarkerPolicy.php b/app/Policies/MapMarkerPolicy.php
index 00ec5b2d74..1efa67d7e5 100644
--- a/app/Policies/MapMarkerPolicy.php
+++ b/app/Policies/MapMarkerPolicy.php
@@ -2,7 +2,7 @@
 
 namespace App\Policies;
 
-use App\User;
+use App\Models\User;
 use App\Models\MapMarker;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
diff --git a/app/Policies/MiscPolicy.php b/app/Policies/MiscPolicy.php
index 5863242183..27336c5e7e 100644
--- a/app/Policies/MiscPolicy.php
+++ b/app/Policies/MiscPolicy.php
@@ -10,7 +10,7 @@
 use App\Models\Entity;
 use App\Models\MiscModel;
 use App\Models\Post;
-use App\User;
+use App\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
 use Illuminate\Support\Facades\Auth;
 
diff --git a/app/Policies/OrganisationMemberPolicy.php b/app/Policies/OrganisationMemberPolicy.php
index f68c4e1cf7..00afd1842d 100644
--- a/app/Policies/OrganisationMemberPolicy.php
+++ b/app/Policies/OrganisationMemberPolicy.php
@@ -2,7 +2,7 @@
 
 namespace App\Policies;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
 class OrganisationMemberPolicy
diff --git a/app/Policies/OrganisationPolicy.php b/app/Policies/OrganisationPolicy.php
index 825ab2db14..52ae892abf 100644
--- a/app/Policies/OrganisationPolicy.php
+++ b/app/Policies/OrganisationPolicy.php
@@ -2,7 +2,7 @@
 
 namespace App\Policies;
 
-use App\User;
+use App\Models\User;
 use App\Models\Organisation;
 
 class OrganisationPolicy extends MiscPolicy
diff --git a/app/Policies/PluginPolicy.php b/app/Policies/PluginPolicy.php
index dd47b0292e..8bc181b799 100644
--- a/app/Policies/PluginPolicy.php
+++ b/app/Policies/PluginPolicy.php
@@ -5,7 +5,7 @@
 use App\Facades\UserCache;
 use App\Models\Plugin;
 use App\Traits\AdminPolicyTrait;
-use App\User;
+use App\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
 class PluginPolicy
diff --git a/app/Policies/RelationPolicy.php b/app/Policies/RelationPolicy.php
index ec13974b40..eb994804bd 100644
--- a/app/Policies/RelationPolicy.php
+++ b/app/Policies/RelationPolicy.php
@@ -4,7 +4,7 @@
 
 use App\Facades\CampaignLocalization;
 use App\Traits\AdminPolicyTrait;
-use App\User;
+use App\Models\User;
 use App\Models\Relation;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
diff --git a/app/Policies/TimelineEraPolicy.php b/app/Policies/TimelineEraPolicy.php
index 450959d907..01e4c42a4a 100644
--- a/app/Policies/TimelineEraPolicy.php
+++ b/app/Policies/TimelineEraPolicy.php
@@ -3,7 +3,7 @@
 namespace App\Policies;
 
 use App\Models\TimelineEra;
-use App\User;
+use App\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
 class TimelineEraPolicy
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 53031fc325..240e9fce8c 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -68,7 +68,7 @@
 use App\Models\Organisation;
 use App\Models\OrganisationMember;
 use App\Models\Webhook;
-use App\User;
+use App\Models\User;
 use Exception;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
diff --git a/app/Services/Account/DeletionService.php b/app/Services/Account/DeletionService.php
index 843e498502..e249e530be 100644
--- a/app/Services/Account/DeletionService.php
+++ b/app/Services/Account/DeletionService.php
@@ -4,7 +4,7 @@
 
 use App\Jobs\Users\DeleteUser;
 use App\Traits\UserAware;
-use App\User;
+use App\Models\User;
 
 class DeletionService
 {
diff --git a/app/Services/Api/ApiPermissionService.php b/app/Services/Api/ApiPermissionService.php
index 8aabe30df6..f9fbbf0e13 100644
--- a/app/Services/Api/ApiPermissionService.php
+++ b/app/Services/Api/ApiPermissionService.php
@@ -4,7 +4,7 @@
 
 use App\Models\CampaignPermission;
 use App\Models\MiscModel;
-use App\User;
+use App\Models\User;
 use App\Facades\EntityPermission;
 use App\Models\Campaign;
 use App\Models\Entity;
diff --git a/app/Services/Caches/SingleUserCacheService.php b/app/Services/Caches/SingleUserCacheService.php
index 89e45dfeff..a8c8dfb24e 100644
--- a/app/Services/Caches/SingleUserCacheService.php
+++ b/app/Services/Caches/SingleUserCacheService.php
@@ -8,7 +8,7 @@
 use Illuminate\Support\Facades\Log;
 
 /**
- * @property \App\User $user
+ * @property \App\Models\User $user
  */
 class SingleUserCacheService
 {
diff --git a/app/Services/Caches/UserCacheService.php b/app/Services/Caches/UserCacheService.php
index 2a33f39cd5..16671bff56 100644
--- a/app/Services/Caches/UserCacheService.php
+++ b/app/Services/Caches/UserCacheService.php
@@ -10,7 +10,7 @@
 use App\Services\Caches\Traits\User\TutorialCache;
 use App\Traits\CampaignAware;
 use App\Traits\UserAware;
-use App\User;
+use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 
diff --git a/app/Services/Campaign/MemberService.php b/app/Services/Campaign/MemberService.php
index 27b5190e15..148bf2fc69 100644
--- a/app/Services/Campaign/MemberService.php
+++ b/app/Services/Campaign/MemberService.php
@@ -10,7 +10,7 @@
 use App\Models\CampaignUser;
 use App\Traits\CampaignAware;
 use App\Traits\UserAware;
-use App\User;
+use App\Models\User;
 
 class MemberService
 {
diff --git a/app/Services/CommunityVoteService.php b/app/Services/CommunityVoteService.php
index b66d98c7b2..92af29033e 100644
--- a/app/Services/CommunityVoteService.php
+++ b/app/Services/CommunityVoteService.php
@@ -4,7 +4,7 @@
 
 use App\Models\CommunityVote;
 use App\Models\CommunityVoteBallot;
-use App\User;
+use App\Models\User;
 
 class CommunityVoteService
 {
diff --git a/app/Services/DiscordService.php b/app/Services/DiscordService.php
index 164f142615..cd33671182 100644
--- a/app/Services/DiscordService.php
+++ b/app/Services/DiscordService.php
@@ -3,7 +3,7 @@
 namespace App\Services;
 
 use App\Models\UserApp;
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use GuzzleHttp\Client;
 use App\Models\JobLog;
diff --git a/app/Services/Entity/PrivacyService.php b/app/Services/Entity/PrivacyService.php
index 7d5297a29f..d9035d1666 100644
--- a/app/Services/Entity/PrivacyService.php
+++ b/app/Services/Entity/PrivacyService.php
@@ -5,7 +5,7 @@
 use App\Models\CampaignPermission;
 use App\Models\CampaignRole;
 use App\Models\Entity;
-use App\User;
+use App\Models\User;
 
 class PrivacyService
 {
diff --git a/app/Services/IdentityManager.php b/app/Services/IdentityManager.php
index 25ecb93b36..cf83b06b4e 100644
--- a/app/Services/IdentityManager.php
+++ b/app/Services/IdentityManager.php
@@ -5,7 +5,7 @@
 use App\Models\CampaignUser;
 use App\Models\UserLog;
 use App\Traits\CampaignAware;
-use App\User;
+use App\Models\User;
 use Exception;
 use Illuminate\Foundation\Application;
 
diff --git a/app/Services/Maps/ChunkingService.php b/app/Services/Maps/ChunkingService.php
index 9d887d3f38..d9ff1cc146 100644
--- a/app/Services/Maps/ChunkingService.php
+++ b/app/Services/Maps/ChunkingService.php
@@ -4,7 +4,7 @@
 
 use App\Models\Map;
 use App\Notifications\Header;
-use App\User;
+use App\Models\User;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Intervention\Image\Facades\Image;
diff --git a/app/Services/Permissions/EntityPermission.php b/app/Services/Permissions/EntityPermission.php
index eb15c38aa7..2ee0afe9d5 100644
--- a/app/Services/Permissions/EntityPermission.php
+++ b/app/Services/Permissions/EntityPermission.php
@@ -8,7 +8,7 @@
 use App\Models\CampaignRole;
 use App\Models\Entity;
 use App\Models\MiscModel;
-use App\User;
+use App\Models\User;
 use Illuminate\Support\Collection;
 
 class EntityPermission
diff --git a/app/Services/Permissions/PermissionService.php b/app/Services/Permissions/PermissionService.php
index d9b6930e52..776b7bf577 100644
--- a/app/Services/Permissions/PermissionService.php
+++ b/app/Services/Permissions/PermissionService.php
@@ -9,7 +9,7 @@
 use App\Models\PostPermission;
 use App\Traits\CampaignAware;
 use App\Traits\UserAware;
-use App\User;
+use App\Models\User;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
diff --git a/app/Services/Subscribers/HallOfFameService.php b/app/Services/Subscribers/HallOfFameService.php
index eff85952af..7bd75759af 100644
--- a/app/Services/Subscribers/HallOfFameService.php
+++ b/app/Services/Subscribers/HallOfFameService.php
@@ -4,7 +4,7 @@
 
 use App\Models\Pledge;
 use App\Models\Role;
-use App\User;
+use App\Models\User;
 use Illuminate\Support\Arr;
 
 class HallOfFameService
diff --git a/app/Services/Subscription/PaymentMethodService.php b/app/Services/Subscription/PaymentMethodService.php
index e64845610d..244f901f84 100644
--- a/app/Services/Subscription/PaymentMethodService.php
+++ b/app/Services/Subscription/PaymentMethodService.php
@@ -2,7 +2,7 @@
 
 namespace App\Services\Subscription;
 
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use Laravel\Cashier\PaymentMethod;
 use Stripe\Card;
diff --git a/app/Services/TroubleshootingService.php b/app/Services/TroubleshootingService.php
index f683866f00..acc7113c23 100644
--- a/app/Services/TroubleshootingService.php
+++ b/app/Services/TroubleshootingService.php
@@ -7,7 +7,7 @@
 use App\Models\Campaign;
 use App\Traits\CampaignAware;
 use App\Traits\UserAware;
-use App\User;
+use App\Models\User;
 use Illuminate\Support\Str;
 
 class TroubleshootingService
diff --git a/app/Services/UserAuthenticatedService.php b/app/Services/UserAuthenticatedService.php
index e52cc1dc1e..fe3753804d 100644
--- a/app/Services/UserAuthenticatedService.php
+++ b/app/Services/UserAuthenticatedService.php
@@ -2,7 +2,7 @@
 
 namespace App\Services;
 
-use App\User;
+use App\Models\User;
 
 class UserAuthenticatedService
 {
diff --git a/app/Services/Users/PurgeService.php b/app/Services/Users/PurgeService.php
index 1d7e9ce3df..7727b53ca3 100644
--- a/app/Services/Users/PurgeService.php
+++ b/app/Services/Users/PurgeService.php
@@ -6,7 +6,7 @@
 use App\Jobs\Emails\Purge\SecondWarningJob;
 use App\Jobs\Users\DeleteUser;
 use App\Models\UserFlag;
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
 
diff --git a/app/Traits/AdminPolicyTrait.php b/app/Traits/AdminPolicyTrait.php
index 0978445447..75acaf1e5b 100644
--- a/app/Traits/AdminPolicyTrait.php
+++ b/app/Traits/AdminPolicyTrait.php
@@ -4,7 +4,7 @@
 
 use App\Facades\CampaignLocalization;
 use App\Models\CampaignRole;
-use App\User;
+use App\Models\User;
 
 trait AdminPolicyTrait
 {
diff --git a/app/Traits/UserAware.php b/app/Traits/UserAware.php
index 4e26180d36..741a32df31 100644
--- a/app/Traits/UserAware.php
+++ b/app/Traits/UserAware.php
@@ -2,7 +2,7 @@
 
 namespace App\Traits;
 
-use App\User;
+use App\Models\User;
 
 /**
  * Trait for user aware services
diff --git a/app/View/Components/Ad.php b/app/View/Components/Ad.php
index e1d4d2f7b2..850132e667 100644
--- a/app/View/Components/Ad.php
+++ b/app/View/Components/Ad.php
@@ -4,7 +4,7 @@
 
 use App\Facades\AdCache;
 use App\Models\Campaign;
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use Closure;
 use Illuminate\Contracts\View\View;
diff --git a/app/View/Components/Ads/Native.php b/app/View/Components/Ads/Native.php
index 494a0be0c7..ddafc3e2c9 100644
--- a/app/View/Components/Ads/Native.php
+++ b/app/View/Components/Ads/Native.php
@@ -5,7 +5,7 @@
 use App\Facades\AdCache;
 use App\Models\Ad;
 use App\Models\Campaign;
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use Closure;
 use Illuminate\Contracts\View\View;
diff --git a/config/auth.php b/config/auth.php
index 6350d0d825..42a9b1d0c6 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -67,7 +67,7 @@
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => App\User::class,
+            'model' => App\Models\User::class,
         ],
 
         // 'users' => [
diff --git a/config/blameable.php b/config/blameable.php
index ad1f5861f0..1514073524 100644
--- a/config/blameable.php
+++ b/config/blameable.php
@@ -30,7 +30,7 @@
     |
     */
 
-    'user' => App\User::class,
+    'user' => App\Models\User::class,
 
     /*
     |--------------------------------------------------------------------------
diff --git a/config/services.php b/config/services.php
index 4c07724e63..d855cb8319 100644
--- a/config/services.php
+++ b/config/services.php
@@ -32,7 +32,7 @@
 
     'stripe' => [
         'enabled' => !empty(env('STRIPE_KEY')) ? true : false,
-        'model' => App\User::class,
+        'model' => App\Models\User::class,
         'key' => env('STRIPE_KEY'),
         'secret' => env('STRIPE_SECRET'),
     ],
diff --git a/database/migrations/2024_08_27_175447_update_notifications_migrate_user_model.php b/database/migrations/2024_08_27_175447_update_notifications_migrate_user_model.php
new file mode 100644
index 0000000000..b2a299cc2e
--- /dev/null
+++ b/database/migrations/2024_08_27_175447_update_notifications_migrate_user_model.php
@@ -0,0 +1,22 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+return new class () extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Illuminate\Support\Facades\DB::table('notifications')
+            ->where('notifiable_type', 'App\\User')
+            ->update(['notifiable_type' => 'App\\Models\\User']);
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+    }
+};
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 9ed9afe70a..3bdb018bd6 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -13,7 +13,7 @@
 
     @if(config('auth.user_list'))
         <ul class="mb-2">
-            @foreach (\App\User::limit(5)->orderBy('last_login_at', 'desc')->get() as $user)
+            @foreach (\App\Models\User::limit(5)->orderBy('last_login_at', 'desc')->get() as $user)
                 <li>
                     <a href="{{ route('login-as-user', ['user' => $user]) }}" class="text-blue-500 hover:text-blue-900">
                         {!! $user->name !!} @if ($user->pledge) ({!! $user->pledge !!}) @endif
@@ -25,7 +25,7 @@
         <form method="GET" action="{{ route('login-as') }}" class="w-full">
             {{ csrf_field() }}
             <select id="user" name="user" class="rounded border p-2 w-full dark:bg-slate-800 dark:border-slate-500">
-                @foreach (\App\User::limit(30)->get() as $user)
+                @foreach (\App\Models\User::limit(30)->get() as $user)
                     <option value="{{ $user->id }}">{!! $user->name !!} @if ($user->pledge) ({!! $user->pledge !!}) @endif</option>
                 @endforeach
             </select>
diff --git a/resources/views/emails/subscriptions/changed/html.blade.php b/resources/views/emails/subscriptions/changed/html.blade.php
index 974900beeb..43cc7b655d 100644
--- a/resources/views/emails/subscriptions/changed/html.blade.php
+++ b/resources/views/emails/subscriptions/changed/html.blade.php
@@ -1,4 +1,4 @@
-<?php /** @var \App\User $user */?>
+<?php /** @var \App\Models\User $user */?>
     <!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/resources/views/emails/subscriptions/new/html.blade.php b/resources/views/emails/subscriptions/new/html.blade.php
index 9d037a88fd..0d749f75cd 100644
--- a/resources/views/emails/subscriptions/new/html.blade.php
+++ b/resources/views/emails/subscriptions/new/html.blade.php
@@ -1,4 +1,4 @@
-<?php /** @var \App\User $user */?>
+<?php /** @var \App\Models\User $user */?>
 <!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/resources/views/entities/pages/privacy/_body.blade.php b/resources/views/entities/pages/privacy/_body.blade.php
index 90859678dd..c85fdd9c5d 100644
--- a/resources/views/entities/pages/privacy/_body.blade.php
+++ b/resources/views/entities/pages/privacy/_body.blade.php
@@ -1,7 +1,7 @@
 <?php /**
  * @var \App\Models\Entity $entity
  * @var \App\Models\CampaignRole $role
- * @var \App\User $user
+ * @var \App\Models\User $user
  * */?>
 <x-grid type="1/1">
     <x-forms.field field="visibility" :label="__('entities/permissions.quick.field')">
diff --git a/resources/views/roadmap/index.blade.php b/resources/views/roadmap/index.blade.php
index 48f7fc80ed..c9f4106c49 100644
--- a/resources/views/roadmap/index.blade.php
+++ b/resources/views/roadmap/index.blade.php
@@ -1,4 +1,4 @@
-<?php /** @var \App\User $user */?>
+<?php /** @var \App\Models\User $user */?>
 @extends('layouts.front', [
     'title' => __('footer.roadmap'),
     'skipPerf' => true,
diff --git a/resources/views/settings/account.blade.php b/resources/views/settings/account.blade.php
index 6de907c6be..d1df630f7f 100644
--- a/resources/views/settings/account.blade.php
+++ b/resources/views/settings/account.blade.php
@@ -1,4 +1,4 @@
-<?php /** @var \App\User $user */?>
+<?php /** @var \App\Models\User $user */?>
 @extends('layouts.app', [
     'title' => __('settings.account.title'),
     'breadcrumbs' => false,
diff --git a/resources/views/settings/notifications.blade.php b/resources/views/settings/notifications.blade.php
index a8eab5fc26..058955b90d 100644
--- a/resources/views/settings/notifications.blade.php
+++ b/resources/views/settings/notifications.blade.php
@@ -1,4 +1,4 @@
-<?php /** @var \App\User $user */?>
+<?php /** @var \App\Models\User $user */?>
 @extends('layouts.app', [
     'title' => __('profiles.newsletter.title'),
     'breadcrumbs' => false,
diff --git a/resources/views/settings/profile.blade.php b/resources/views/settings/profile.blade.php
index b45e95bd94..943a1a2796 100644
--- a/resources/views/settings/profile.blade.php
+++ b/resources/views/settings/profile.blade.php
@@ -1,4 +1,4 @@
-<?php /** @var \App\User $user */?>
+<?php /** @var \App\Models\User $user */?>
 @extends('layouts.app', [
     'title' => __('settings.profile.title'),
     'breadcrumbs' => false,
diff --git a/resources/views/settings/subscription/_cancel.blade.php b/resources/views/settings/subscription/_cancel.blade.php
index 70faff1c9c..db8b27c909 100644
--- a/resources/views/settings/subscription/_cancel.blade.php
+++ b/resources/views/settings/subscription/_cancel.blade.php
@@ -1,4 +1,4 @@
-<?php /** @var \App\User $user */ ?>
+<?php /** @var \App\Models\User $user */ ?>
 @php
 dd('who is calling dis');
     $endDate = date($user->date_format, $user->upcomingInvoice()?->period_end);
diff --git a/resources/views/settings/subscription/_recap.blade.php b/resources/views/settings/subscription/_recap.blade.php
index a572448e50..29ab741e30 100644
--- a/resources/views/settings/subscription/_recap.blade.php
+++ b/resources/views/settings/subscription/_recap.blade.php
@@ -1,5 +1,5 @@
 <?php /**
- * @var \App\User $user
+ * @var \App\Models\User $user
  * @var \App\Models\TierPrice $current
  * */?>
 @php
diff --git a/resources/views/settings/subscription/cancellation/form.blade.php b/resources/views/settings/subscription/cancellation/form.blade.php
index 718bbd7d46..c029137b92 100644
--- a/resources/views/settings/subscription/cancellation/form.blade.php
+++ b/resources/views/settings/subscription/cancellation/form.blade.php
@@ -1,4 +1,4 @@
-<?php /** @var \App\User $user */ ?>
+<?php /** @var \App\Models\User $user */ ?>
 @php
     $endDate = $user->subscription('kanka')->upcomingInvoice()?->date();
 @endphp
diff --git a/resources/views/settings/subscription/change.blade.php b/resources/views/settings/subscription/change.blade.php
index ca61884afc..c69a2f6125 100644
--- a/resources/views/settings/subscription/change.blade.php
+++ b/resources/views/settings/subscription/change.blade.php
@@ -1,4 +1,4 @@
-<?php /** @var \App\User $user */ ?>
+<?php /** @var \App\Models\User $user */ ?>
 <x-dialog.header>
     {{ __('settings.subscription.change.title') }}
 </x-dialog.header>
diff --git a/resources/views/settings/subscription/change_blocked.blade.php b/resources/views/settings/subscription/change_blocked.blade.php
index 68391778d7..932b242267 100644
--- a/resources/views/settings/subscription/change_blocked.blade.php
+++ b/resources/views/settings/subscription/change_blocked.blade.php
@@ -1,4 +1,4 @@
-<?php /** @var \App\User $user */ ?>
+<?php /** @var \App\Models\User $user */ ?>
 <x-dialog.header>
     {{ __('settings.subscription.change.title') }}
 </x-dialog.header>
diff --git a/resources/views/settings/subscription/index.blade.php b/resources/views/settings/subscription/index.blade.php
index 0033eb7c82..693e2efd9d 100644
--- a/resources/views/settings/subscription/index.blade.php
+++ b/resources/views/settings/subscription/index.blade.php
@@ -2,7 +2,7 @@
  * @var \App\Models\CampaignBoost $boost
  * @var \App\Models\Campaign $campaign
  * @var \App\Services\SubscriptionService $service
- * @var \App\User $user
+ * @var \App\Models\User $user
  */
 
 ?>
diff --git a/resources/views/settings/subscription/tiers/actions/_elemental.blade.php b/resources/views/settings/subscription/tiers/actions/_elemental.blade.php
index 5ff39a9226..b980c29763 100644
--- a/resources/views/settings/subscription/tiers/actions/_elemental.blade.php
+++ b/resources/views/settings/subscription/tiers/actions/_elemental.blade.php
@@ -1,6 +1,6 @@
 @php
     /**
-     * @var \App\User $user
+     * @var \App\Models\User $user
      * @var \App\Models\Tier $tier
      */
 @endphp
diff --git a/resources/views/settings/subscription/tiers/actions/_owlbear.blade.php b/resources/views/settings/subscription/tiers/actions/_owlbear.blade.php
index 261b3966f6..51cff384ac 100644
--- a/resources/views/settings/subscription/tiers/actions/_owlbear.blade.php
+++ b/resources/views/settings/subscription/tiers/actions/_owlbear.blade.php
@@ -1,6 +1,6 @@
 @php
 /**
- * @var \App\User $user
+ * @var \App\Models\User $user
  * @var \App\Models\Tier $tier
  */
 @endphp
diff --git a/resources/views/settings/subscription/tiers/actions/_wyvern.blade.php b/resources/views/settings/subscription/tiers/actions/_wyvern.blade.php
index 3d459f1b1e..c93a26ef67 100644
--- a/resources/views/settings/subscription/tiers/actions/_wyvern.blade.php
+++ b/resources/views/settings/subscription/tiers/actions/_wyvern.blade.php
@@ -1,6 +1,6 @@
 @php
     /**
-     * @var \App\User $user
+     * @var \App\Models\User $user
      * @var \App\Models\Tier $tier
      */
 @endphp
diff --git a/resources/views/users/profile.blade.php b/resources/views/users/profile.blade.php
index 901f37e9ac..ffbc03eee5 100644
--- a/resources/views/users/profile.blade.php
+++ b/resources/views/users/profile.blade.php
@@ -1,4 +1,4 @@
-<?php /** @var \App\User $user */?>
+<?php /** @var \App\Models\User $user */?>
 @extends('layouts.front', [
     'title' => __('users/profile.title', ['name' => $user->displayName()]),
     'skipPerf' => true,
diff --git a/tests/TestCase.php b/tests/TestCase.php
index e3fecb0a1b..4baed2cb16 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -77,7 +77,7 @@ protected function setUp(): void
 
     public function asUser(bool $subscribed = false): self
     {
-        $user = \App\User::factory()->create();
+        $user = \App\Models\User::factory()->create();
         Passport::actingAs(
             $user,
             ['*']
@@ -105,7 +105,7 @@ public function asUser(bool $subscribed = false): self
 
     public function asPlayer(): self
     {
-        $user2 =  \App\User::factory()->create();
+        $user2 =  \App\Models\User::factory()->create();
         Passport::actingAs(
             $user2,
             ['*']
@@ -134,7 +134,7 @@ public function asPlayer(): self
 
     public function withMember(): self
     {
-        $user3 =  \App\User::factory()->create();
+        $user3 =  \App\Models\User::factory()->create();
 
         CampaignUser::create([
             'campaign_id' => 1,