diff --git a/app/Http/Controllers/Api/V1/ApiController.php b/app/Http/Controllers/Api/V1/ApiController.php
index bcfc6e9..d424357 100644
--- a/app/Http/Controllers/Api/V1/ApiController.php
+++ b/app/Http/Controllers/Api/V1/ApiController.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Api\V1;
 
 use App\Http\Controllers\Controller;
-use App\Models\Members\User;
+use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
diff --git a/app/Http/Middleware/ApiKeyMiddleware.php b/app/Http/Middleware/ApiKeyMiddleware.php
index ef031c1..52682db 100644
--- a/app/Http/Middleware/ApiKeyMiddleware.php
+++ b/app/Http/Middleware/ApiKeyMiddleware.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Middleware;
 
-use App\Models\Members\User;
+use App\Models\User;
 use Closure;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Http\Request;
diff --git a/app/Http/Responses/CustomLoginResponse.php b/app/Http/Responses/CustomLoginResponse.php
index 1ac3409..6ef2c48 100644
--- a/app/Http/Responses/CustomLoginResponse.php
+++ b/app/Http/Responses/CustomLoginResponse.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Responses;
 
-use App\Models\Members\User;
+use App\Models\User;
 use Illuminate\Support\Facades\Session;
 use Laravel\Fortify\Contracts\LoginResponse as LoginResponseContract;
 
diff --git a/app/Models/Members/UserMenuPermission.php b/app/Models/Members/UserMenuPermission.php
index 078db39..2ed1ee2 100644
--- a/app/Models/Members/UserMenuPermission.php
+++ b/app/Models/Members/UserMenuPermission.php
@@ -3,6 +3,7 @@
 namespace App\Models\Members;
 
 use App\Models\Commons\Menu;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Model;
 
 class UserMenuPermission extends Model
diff --git a/app/Models/Members/UserRole.php b/app/Models/Members/UserRole.php
index e683dc1..2436c18 100644
--- a/app/Models/Members/UserRole.php
+++ b/app/Models/Members/UserRole.php
@@ -4,6 +4,7 @@
 
 use App\Models\Commons\Role;
 use App\Models\Tenants\Tenant;
+use App\Models\User;
 use App\Traits\BelongsToTenant;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
diff --git a/app/Models/Members/UserTenant.php b/app/Models/Members/UserTenant.php
index 05777b4..a2e6ef1 100644
--- a/app/Models/Members/UserTenant.php
+++ b/app/Models/Members/UserTenant.php
@@ -3,6 +3,7 @@
 namespace App\Models\Members;
 
 use App\Models\Tenants\Tenant;
+use App\Models\User;
 use App\Traits\BelongsToTenant;
 use App\Traits\ModelTrait;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Models/Tenants/Tenant.php b/app/Models/Tenants/Tenant.php
index c6f0ce5..cf7c871 100644
--- a/app/Models/Tenants/Tenant.php
+++ b/app/Models/Tenants/Tenant.php
@@ -4,9 +4,9 @@
 
 use App\Models\Commons\Role;
 use App\Models\File;
-use App\Models\Members\User;
 use App\Models\Members\UserRole;
 use App\Models\Members\UserTenant;
+use App\Models\User;
 use App\Traits\ModelTrait;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
diff --git a/app/Models/Members/User.php b/app/Models/User.php
similarity index 91%
rename from app/Models/Members/User.php
rename to app/Models/User.php
index acd343e..dafe03f 100644
--- a/app/Models/Members/User.php
+++ b/app/Models/User.php
@@ -1,9 +1,11 @@
 <?php
 
-namespace App\Models\Members;
+namespace App\Models;
 
+use App\Models\Commons\File;
 use App\Models\Commons\Role;
-use App\Models\File;
+use App\Models\Members\UserRole;
+use App\Models\Members\UserTenant;
 use App\Traits\ModelTrait;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Auth\User as Authenticatable;
diff --git a/app/Services/AdminPermissionService.php b/app/Services/AdminPermissionService.php
index a7c56c8..2fe40a5 100644
--- a/app/Services/AdminPermissionService.php
+++ b/app/Services/AdminPermissionService.php
@@ -2,8 +2,8 @@
 
 namespace App\Services;
 
-use App\Models\Members\User;
 use App\Models\SiteAdmin;
+use App\Models\User;
 use Illuminate\Support\Facades\DB;
 
 class AdminPermissionService
diff --git a/app/Services/MemberService.php b/app/Services/MemberService.php
index 3a78199..d64b8ba 100644
--- a/app/Services/MemberService.php
+++ b/app/Services/MemberService.php
@@ -3,7 +3,7 @@
 namespace App\Services;
 
 use App\Helpers\ApiResponse;
-use App\Models\Members\User;
+use App\Models\User;
 use Illuminate\Support\Facades\DB;
 
 class MemberService
diff --git a/config/auth.php b/config/auth.php
index 6d03f6a..674c6cf 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -62,7 +62,7 @@
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => env('AUTH_MODEL', \App\Models\Members\User::class),
+            'model' => env('AUTH_MODEL', \App\Models\User::class),
         ],
 
         // 'users' => [
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 818f993..ea955ad 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -2,15 +2,15 @@
 
 namespace Database\Factories;
 
-use App\Models\Members\User;
 use App\Models\Team;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
 use Laravel\Jetstream\Features;
 
 /**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Members\User>
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\User>
  */
 class UserFactory extends Factory
 {
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index 9a05b4d..a39fe4d 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -2,7 +2,7 @@
 
 namespace Database\Seeders;
 
-use App\Models\Members\User;
+use App\Models\User;
 use Illuminate\Database\Seeder;
 
 // use Illuminate\Database\Console\Seeds\WithoutModelEvents;
diff --git a/tests/Feature/ApiTokenPermissionsTest.php b/tests/Feature/ApiTokenPermissionsTest.php
index bcb5a82..b15bdbd 100644
--- a/tests/Feature/ApiTokenPermissionsTest.php
+++ b/tests/Feature/ApiTokenPermissionsTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\Members\User;
+use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Str;
 use Laravel\Jetstream\Features;
diff --git a/tests/Feature/AuthenticationTest.php b/tests/Feature/AuthenticationTest.php
index db371d2..7bfcae2 100644
--- a/tests/Feature/AuthenticationTest.php
+++ b/tests/Feature/AuthenticationTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\Members\User;
+use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
diff --git a/tests/Feature/BrowserSessionsTest.php b/tests/Feature/BrowserSessionsTest.php
index c5f7755..770c435 100644
--- a/tests/Feature/BrowserSessionsTest.php
+++ b/tests/Feature/BrowserSessionsTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\Members\User;
+use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Jetstream\Http\Livewire\LogoutOtherBrowserSessionsForm;
 use Livewire\Livewire;
diff --git a/tests/Feature/CreateApiTokenTest.php b/tests/Feature/CreateApiTokenTest.php
index cc1ef61..fab69d9 100644
--- a/tests/Feature/CreateApiTokenTest.php
+++ b/tests/Feature/CreateApiTokenTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\Members\User;
+use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Jetstream\Features;
 use Laravel\Jetstream\Http\Livewire\ApiTokenManager;
diff --git a/tests/Feature/DeleteAccountTest.php b/tests/Feature/DeleteAccountTest.php
index e2f55f6..561d692 100644
--- a/tests/Feature/DeleteAccountTest.php
+++ b/tests/Feature/DeleteAccountTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\Members\User;
+use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Jetstream\Features;
 use Laravel\Jetstream\Http\Livewire\DeleteUserForm;
diff --git a/tests/Feature/DeleteApiTokenTest.php b/tests/Feature/DeleteApiTokenTest.php
index cedc01b..1903e17 100644
--- a/tests/Feature/DeleteApiTokenTest.php
+++ b/tests/Feature/DeleteApiTokenTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\Members\User;
+use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Str;
 use Laravel\Jetstream\Features;
diff --git a/tests/Feature/EmailVerificationTest.php b/tests/Feature/EmailVerificationTest.php
index 2fa8eeb..5d3e336 100644
--- a/tests/Feature/EmailVerificationTest.php
+++ b/tests/Feature/EmailVerificationTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\Members\User;
+use App\Models\User;
 use Illuminate\Auth\Events\Verified;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Event;
diff --git a/tests/Feature/PasswordConfirmationTest.php b/tests/Feature/PasswordConfirmationTest.php
index abb4f95..34c860a 100644
--- a/tests/Feature/PasswordConfirmationTest.php
+++ b/tests/Feature/PasswordConfirmationTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\Members\User;
+use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
diff --git a/tests/Feature/PasswordResetTest.php b/tests/Feature/PasswordResetTest.php
index 90aac0f..a30e8cd 100644
--- a/tests/Feature/PasswordResetTest.php
+++ b/tests/Feature/PasswordResetTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\Members\User;
+use App\Models\User;
 use Illuminate\Auth\Notifications\ResetPassword;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Notification;
diff --git a/tests/Feature/ProfileInformationTest.php b/tests/Feature/ProfileInformationTest.php
index 15656c2..ce1a8e7 100644
--- a/tests/Feature/ProfileInformationTest.php
+++ b/tests/Feature/ProfileInformationTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\Members\User;
+use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Jetstream\Http\Livewire\UpdateProfileInformationForm;
 use Livewire\Livewire;
diff --git a/tests/Feature/TwoFactorAuthenticationSettingsTest.php b/tests/Feature/TwoFactorAuthenticationSettingsTest.php
index 3775ba7..1321659 100644
--- a/tests/Feature/TwoFactorAuthenticationSettingsTest.php
+++ b/tests/Feature/TwoFactorAuthenticationSettingsTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\Members\User;
+use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Fortify\Features;
 use Laravel\Jetstream\Http\Livewire\TwoFactorAuthenticationForm;
diff --git a/tests/Feature/UpdatePasswordTest.php b/tests/Feature/UpdatePasswordTest.php
index 4fda1b2..57dbe2d 100644
--- a/tests/Feature/UpdatePasswordTest.php
+++ b/tests/Feature/UpdatePasswordTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Models\Members\User;
+use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Hash;
 use Laravel\Jetstream\Http\Livewire\UpdatePasswordForm;