diff --git a/app/Livewire/RoleForm.php b/app/Livewire/Admin/RoleForm.php
similarity index 98%
rename from app/Livewire/RoleForm.php
rename to app/Livewire/Admin/RoleForm.php
index 3a48dc3..43c5649 100644
--- a/app/Livewire/RoleForm.php
+++ b/app/Livewire/Admin/RoleForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Admin;
 
 use Livewire\Component;
 use Livewire\Attributes\Layout;
diff --git a/app/Livewire/RolePermissionManager.php b/app/Livewire/Admin/RolePermissionManager.php
similarity index 97%
rename from app/Livewire/RolePermissionManager.php
rename to app/Livewire/Admin/RolePermissionManager.php
index 532649a..109432f 100644
--- a/app/Livewire/RolePermissionManager.php
+++ b/app/Livewire/Admin/RolePermissionManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Admin;
 
 use Livewire\Component;
 use Livewire\Attributes\Layout;
@@ -102,7 +102,7 @@ class RolePermissionManager extends Component
 
     public function render()
     {
-        return view('livewire.role-permission-manager', [
+        return view('livewire.roles.role-permission-manager', [
             'roles'       => Role::with('permissions')->orderBy('name')->get(),
             'permissions' => Permission::orderBy('name')->get(),
         ]);
diff --git a/app/Livewire/RoleTable.php b/app/Livewire/Admin/RoleTable.php
similarity index 99%
rename from app/Livewire/RoleTable.php
rename to app/Livewire/Admin/RoleTable.php
index f2f595d..7e1e443 100644
--- a/app/Livewire/RoleTable.php
+++ b/app/Livewire/Admin/RoleTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Admin;
 
 use Rappasoft\LaravelLivewireTables\DataTableComponent;
 use Rappasoft\LaravelLivewireTables\Views\Column;
diff --git a/app/Livewire/RoleView.php b/app/Livewire/Admin/RoleView.php
similarity index 99%
rename from app/Livewire/RoleView.php
rename to app/Livewire/Admin/RoleView.php
index c33cede..5010288 100644
--- a/app/Livewire/RoleView.php
+++ b/app/Livewire/Admin/RoleView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Admin;
 
 use Livewire\Component;
 use Livewire\Attributes\Layout;
diff --git a/app/Livewire/LanguageSwitcher.php b/app/Livewire/Common/LanguageSwitcher.php
similarity index 91%
rename from app/Livewire/LanguageSwitcher.php
rename to app/Livewire/Common/LanguageSwitcher.php
index ab14b36..47cbb38 100644
--- a/app/Livewire/LanguageSwitcher.php
+++ b/app/Livewire/Common/LanguageSwitcher.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Common;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\App;
@@ -38,6 +38,6 @@ class LanguageSwitcher extends Component
 
     public function render()
     {
-        return view('livewire.language-switcher');
+        return view('livewire.common.language-switcher');
     }
 }
\ No newline at end of file
diff --git a/app/Livewire/NotificationBell.php b/app/Livewire/Common/NotificationBell.php
similarity index 90%
rename from app/Livewire/NotificationBell.php
rename to app/Livewire/Common/NotificationBell.php
index ae694c9..a4dd1af 100644
--- a/app/Livewire/NotificationBell.php
+++ b/app/Livewire/Common/NotificationBell.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Common;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Auth;
@@ -37,6 +37,6 @@ class NotificationBell extends Component
 
     public function render()
     {
-        return view('livewire.notification-bell');
+        return view('livewire.common.notification-bell');
     }
 }
diff --git a/app/Livewire/CompanyForm.php b/app/Livewire/Companies/CompanyForm.php
similarity index 97%
rename from app/Livewire/CompanyForm.php
rename to app/Livewire/Companies/CompanyForm.php
index 43326c0..d9c3970 100644
--- a/app/Livewire/CompanyForm.php
+++ b/app/Livewire/Companies/CompanyForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Companies;
 
 use Livewire\Component;
 use Livewire\WithFileUploads;
@@ -101,6 +101,6 @@ class CompanyForm extends Component
 
     public function render()
     {
-        return view('livewire.company-form');
+        return view('livewire.companies.company-form');
     }
 }
diff --git a/app/Livewire/CompanyManagement.php b/app/Livewire/Companies/CompanyManagement.php
similarity index 95%
rename from app/Livewire/CompanyManagement.php
rename to app/Livewire/Companies/CompanyManagement.php
index 54b1731..ec44bc7 100644
--- a/app/Livewire/CompanyManagement.php
+++ b/app/Livewire/Companies/CompanyManagement.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Companies;
 
 use Livewire\Component;
 use Livewire\Attributes\Layout;
@@ -62,6 +62,6 @@ class CompanyManagement extends Component
 
     public function render()
     {
-        return view('livewire.company-management');
+        return view('livewire.companies.company-management');
     }
 }
diff --git a/app/Livewire/CompanyTable.php b/app/Livewire/Companies/CompanyTable.php
similarity index 99%
rename from app/Livewire/CompanyTable.php
rename to app/Livewire/Companies/CompanyTable.php
index ebada74..695583f 100644
--- a/app/Livewire/CompanyTable.php
+++ b/app/Livewire/Companies/CompanyTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Companies;
 
 use Rappasoft\LaravelLivewireTables\DataTableComponent;
 use Rappasoft\LaravelLivewireTables\Views\Column;
diff --git a/app/Livewire/CompanyView.php b/app/Livewire/Companies/CompanyView.php
similarity index 98%
rename from app/Livewire/CompanyView.php
rename to app/Livewire/Companies/CompanyView.php
index 4f37b5a..51ba887 100644
--- a/app/Livewire/CompanyView.php
+++ b/app/Livewire/Companies/CompanyView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Companies;
 
 use Livewire\Component;
 use Livewire\Attributes\Layout;
@@ -152,6 +152,6 @@ class CompanyView extends Component
 
     public function render()
     {
-        return view('livewire.company-view');
+        return view('livewire.companies.company-view');
     }
 }
diff --git a/app/Livewire/TemplateManager.php b/app/Livewire/Inspections/TemplateManager.php
similarity index 99%
rename from app/Livewire/TemplateManager.php
rename to app/Livewire/Inspections/TemplateManager.php
index 6d54708..4975159 100644
--- a/app/Livewire/TemplateManager.php
+++ b/app/Livewire/Inspections/TemplateManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Inspections;
 
 use Livewire\Component;
 use Livewire\WithFileUploads;
@@ -430,6 +430,6 @@ class TemplateManager extends Component
 
     public function render()
     {
-        return view('livewire.template-manager');
+        return view('livewire.inspections.template-manager');
     }
 }
diff --git a/app/Livewire/IssueChecklistManager.php b/app/Livewire/Issues/IssueChecklistManager.php
similarity index 98%
rename from app/Livewire/IssueChecklistManager.php
rename to app/Livewire/Issues/IssueChecklistManager.php
index 8484742..abb337e 100644
--- a/app/Livewire/IssueChecklistManager.php
+++ b/app/Livewire/Issues/IssueChecklistManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Issues;
 
 use App\Models\IssueChecklistTemplate;
 use App\Models\Project;
diff --git a/app/Livewire/IssueDetail.php b/app/Livewire/Issues/IssueDetail.php
similarity index 99%
rename from app/Livewire/IssueDetail.php
rename to app/Livewire/Issues/IssueDetail.php
index 139d12f..295d75b 100644
--- a/app/Livewire/IssueDetail.php
+++ b/app/Livewire/Issues/IssueDetail.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Issues;
 
 use App\Models\Issue;
 use App\Models\IssueChecklistTemplate;
diff --git a/app/Livewire/IssueForm.php b/app/Livewire/Issues/IssueForm.php
similarity index 99%
rename from app/Livewire/IssueForm.php
rename to app/Livewire/Issues/IssueForm.php
index 69c6d11..ef88866 100644
--- a/app/Livewire/IssueForm.php
+++ b/app/Livewire/Issues/IssueForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Issues;
 
 use App\Models\Issue;
 use App\Models\Project;
diff --git a/app/Livewire/IssueManager.php b/app/Livewire/Issues/IssueManager.php
similarity index 98%
rename from app/Livewire/IssueManager.php
rename to app/Livewire/Issues/IssueManager.php
index 730d133..9d60694 100644
--- a/app/Livewire/IssueManager.php
+++ b/app/Livewire/Issues/IssueManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Issues;
 
 use Livewire\Component;
 use Livewire\Attributes\Layout;
diff --git a/app/Livewire/IssueTable.php b/app/Livewire/Issues/IssueTable.php
similarity index 99%
rename from app/Livewire/IssueTable.php
rename to app/Livewire/Issues/IssueTable.php
index 35f0f95..1706fe2 100644
--- a/app/Livewire/IssueTable.php
+++ b/app/Livewire/Issues/IssueTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Issues;
 
 use App\Models\Issue;
 use Illuminate\Database\Eloquent\Builder;
diff --git a/app/Livewire/LayerManager.php b/app/Livewire/Layers/LayerManager.php
similarity index 99%
rename from app/Livewire/LayerManager.php
rename to app/Livewire/Layers/LayerManager.php
index e541dc8..1ff59c2 100644
--- a/app/Livewire/LayerManager.php
+++ b/app/Livewire/Layers/LayerManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Layers;
 
 use Livewire\Component;
 use Livewire\WithFileUploads;
diff --git a/app/Livewire/MediaManager.php b/app/Livewire/Media/MediaManager.php
similarity index 98%
rename from app/Livewire/MediaManager.php
rename to app/Livewire/Media/MediaManager.php
index 565a2f7..22c92c7 100644
--- a/app/Livewire/MediaManager.php
+++ b/app/Livewire/Media/MediaManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Media;
 
 use Livewire\Component;
 use Livewire\WithFileUploads;
@@ -160,7 +160,7 @@ class MediaManager extends Component
 
     public function render()
     {
-        return view('livewire.media-manager', [
+        return view('livewire.media.media-manager', [
             'entityName' => class_basename($this->entity) . ': ' . ($this->entity->name ?? $this->entity->id),
             'images' => $this->mediaItems->filter(fn($m) => $m->is_image),
             'documents' => $this->mediaItems->filter(fn($m) => !$m->is_image),
diff --git a/app/Livewire/PhaseGantt.php b/app/Livewire/Phases/PhaseGantt.php
similarity index 99%
rename from app/Livewire/PhaseGantt.php
rename to app/Livewire/Phases/PhaseGantt.php
index 2862b03..5580d60 100644
--- a/app/Livewire/PhaseGantt.php
+++ b/app/Livewire/Phases/PhaseGantt.php
@@ -1,5 +1,5 @@
 <?php
-namespace App\Livewire;
+namespace App\Livewire\Phases;
 use Livewire\Component;
 use Livewire\Attributes\Layout;
 use App\Models\Project;
diff --git a/app/Livewire/PhaseList.php b/app/Livewire/Phases/PhaseList.php
similarity index 98%
rename from app/Livewire/PhaseList.php
rename to app/Livewire/Phases/PhaseList.php
index f284cf7..6b5bddf 100644
--- a/app/Livewire/PhaseList.php
+++ b/app/Livewire/Phases/PhaseList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Phases;
 
 use App\Models\Phase;
 use App\Models\Project;
@@ -137,6 +137,6 @@ class PhaseList extends Component
 
     public function render()
     {
-        return view('livewire.phase-list');
+        return view('livewire.phases.phase-list');
     }
 }
diff --git a/app/Livewire/PhaseProgress.php b/app/Livewire/Phases/PhaseProgress.php
similarity index 91%
rename from app/Livewire/PhaseProgress.php
rename to app/Livewire/Phases/PhaseProgress.php
index 0990166..c1c9b2e 100644
--- a/app/Livewire/PhaseProgress.php
+++ b/app/Livewire/Phases/PhaseProgress.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Phases;
 
 use Livewire\Component;
 use Livewire\Attributes\Layout;
@@ -37,6 +37,6 @@ class PhaseProgress extends Component
 
     public function render()
     {
-        return view('livewire.phase-progress');
+        return view('livewire.phases.phase-progress');
     }
 }
\ No newline at end of file
diff --git a/app/Livewire/PhaseTable.php b/app/Livewire/Phases/PhaseTable.php
similarity index 99%
rename from app/Livewire/PhaseTable.php
rename to app/Livewire/Phases/PhaseTable.php
index c794fac..80e6d2f 100644
--- a/app/Livewire/PhaseTable.php
+++ b/app/Livewire/Phases/PhaseTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Phases;
 
 use App\Models\Phase;
 use App\Models\Project;
diff --git a/app/Livewire/ProjectCompanies.php b/app/Livewire/Projects/ProjectCompanies.php
similarity index 94%
rename from app/Livewire/ProjectCompanies.php
rename to app/Livewire/Projects/ProjectCompanies.php
index f91f634..5262449 100644
--- a/app/Livewire/ProjectCompanies.php
+++ b/app/Livewire/Projects/ProjectCompanies.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Projects;
 
 use App\Models\Company;
 use App\Models\Project;
@@ -56,7 +56,7 @@ class ProjectCompanies extends Component
 
     public function render()
     {
-        return view('livewire.project-companies', [
+        return view('livewire.projects.project-companies', [
             'roles' => ProjectCompaniesTable::ROLES,
         ]);
     }
diff --git a/app/Livewire/ProjectCompaniesTable.php b/app/Livewire/Projects/ProjectCompaniesTable.php
similarity index 99%
rename from app/Livewire/ProjectCompaniesTable.php
rename to app/Livewire/Projects/ProjectCompaniesTable.php
index bf1ad8d..716320f 100644
--- a/app/Livewire/ProjectCompaniesTable.php
+++ b/app/Livewire/Projects/ProjectCompaniesTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Projects;
 
 use App\Models\Company;
 use Illuminate\Database\Eloquent\Builder;
diff --git a/app/Livewire/ProjectDashboard.php b/app/Livewire/Projects/ProjectDashboard.php
similarity index 99%
rename from app/Livewire/ProjectDashboard.php
rename to app/Livewire/Projects/ProjectDashboard.php
index a4d84ff..6b73f07 100644
--- a/app/Livewire/ProjectDashboard.php
+++ b/app/Livewire/Projects/ProjectDashboard.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Projects;
 
 use Livewire\Component;
 use Livewire\Attributes\Layout;
diff --git a/app/Livewire/ProjectForm.php b/app/Livewire/Projects/ProjectForm.php
similarity index 99%
rename from app/Livewire/ProjectForm.php
rename to app/Livewire/Projects/ProjectForm.php
index 8b6c399..c1fe282 100644
--- a/app/Livewire/ProjectForm.php
+++ b/app/Livewire/Projects/ProjectForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Projects;
 
 use Livewire\Component;
 use Livewire\Attributes\Layout;
diff --git a/app/Livewire/ProjectList.php b/app/Livewire/Projects/ProjectList.php
similarity index 96%
rename from app/Livewire/ProjectList.php
rename to app/Livewire/Projects/ProjectList.php
index 4b5ff40..5cf3620 100644
--- a/app/Livewire/ProjectList.php
+++ b/app/Livewire/Projects/ProjectList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Projects;
 
 use Livewire\Component;
 use Livewire\WithPagination;
diff --git a/app/Livewire/ProjectMap.php b/app/Livewire/Projects/ProjectMap.php
similarity index 99%
rename from app/Livewire/ProjectMap.php
rename to app/Livewire/Projects/ProjectMap.php
index ed4886b..8ca2fa3 100644
--- a/app/Livewire/ProjectMap.php
+++ b/app/Livewire/Projects/ProjectMap.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Projects;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Auth;
diff --git a/app/Livewire/ProjectTable.php b/app/Livewire/Projects/ProjectTable.php
similarity index 99%
rename from app/Livewire/ProjectTable.php
rename to app/Livewire/Projects/ProjectTable.php
index 9231dc9..e96d539 100644
--- a/app/Livewire/ProjectTable.php
+++ b/app/Livewire/Projects/ProjectTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Projects;
 
 use Rappasoft\LaravelLivewireTables\DataTableComponent;
 use Rappasoft\LaravelLivewireTables\Views\Column;
diff --git a/app/Livewire/ProjectUsers.php b/app/Livewire/Projects/ProjectUsers.php
similarity index 94%
rename from app/Livewire/ProjectUsers.php
rename to app/Livewire/Projects/ProjectUsers.php
index 112a3f5..18f09df 100644
--- a/app/Livewire/ProjectUsers.php
+++ b/app/Livewire/Projects/ProjectUsers.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Projects;
 
 use App\Models\Project;
 use App\Models\User;
@@ -56,7 +56,7 @@ class ProjectUsers extends Component
 
     public function render()
     {
-        return view('livewire.project-users', [
+        return view('livewire.projects.project-users', [
             'roles' => ProjectUsersTable::ROLES,
         ]);
     }
diff --git a/app/Livewire/ProjectUsersTable.php b/app/Livewire/Projects/ProjectUsersTable.php
similarity index 99%
rename from app/Livewire/ProjectUsersTable.php
rename to app/Livewire/Projects/ProjectUsersTable.php
index c7feb36..37f6def 100644
--- a/app/Livewire/ProjectUsersTable.php
+++ b/app/Livewire/Projects/ProjectUsersTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Projects;
 
 use App\Models\User;
 use Illuminate\Database\Eloquent\Builder;
diff --git a/app/Livewire/AdminUsers.php b/app/Livewire/Users/AdminUsers.php
similarity index 93%
rename from app/Livewire/AdminUsers.php
rename to app/Livewire/Users/AdminUsers.php
index af19670..5e0f0d0 100644
--- a/app/Livewire/AdminUsers.php
+++ b/app/Livewire/Users/AdminUsers.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Users;
 
 use Livewire\Component;
 use App\Models\User;
@@ -41,6 +41,6 @@ class AdminUsers extends Component
 
     public function render()
     {
-        return view('livewire.admin-users');
+        return view('livewire.users.admin-users');
     }
 }
diff --git a/app/Livewire/UserForm.php b/app/Livewire/Users/UserForm.php
similarity index 98%
rename from app/Livewire/UserForm.php
rename to app/Livewire/Users/UserForm.php
index bf8f073..c42e066 100644
--- a/app/Livewire/UserForm.php
+++ b/app/Livewire/Users/UserForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Users;
 
 use Livewire\Component;
 use Livewire\Attributes\Layout;
@@ -173,6 +173,6 @@ class UserForm extends Component
 
     public function render()
     {
-        return view('livewire.user-form');
+        return view('livewire.users.user-form');
     }
 }
diff --git a/app/Livewire/UserTable.php b/app/Livewire/Users/UserTable.php
similarity index 99%
rename from app/Livewire/UserTable.php
rename to app/Livewire/Users/UserTable.php
index ea16382..4d2b4bd 100644
--- a/app/Livewire/UserTable.php
+++ b/app/Livewire/Users/UserTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Users;
 
 use Rappasoft\LaravelLivewireTables\DataTableComponent;
 use Rappasoft\LaravelLivewireTables\Views\Column;
diff --git a/app/Livewire/UserView.php b/app/Livewire/Users/UserView.php
similarity index 98%
rename from app/Livewire/UserView.php
rename to app/Livewire/Users/UserView.php
index 98d6182..5624507 100644
--- a/app/Livewire/UserView.php
+++ b/app/Livewire/Users/UserView.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\Users;
 
 use Livewire\Component;
 use Livewire\Attributes\Layout;
@@ -149,7 +149,7 @@ class UserView extends Component
                 return $i === false ? 999 : $i;
             });
 
-        return view('livewire.user-view', [
+        return view('livewire.users.user-view', [
             'grouped'     => $grouped,
             'directPerms' => $this->user->getDirectPermissions()->pluck('name')->toArray(),
             'rolePerms'   => $this->user->getPermissionsViaRoles()->pluck('name')->toArray(),
diff --git a/resources/views/admin/roles.blade.php b/resources/views/admin/roles.blade.php
index 19fe7cc..6b520c6 100644
--- a/resources/views/admin/roles.blade.php
+++ b/resources/views/admin/roles.blade.php
@@ -18,7 +18,7 @@
     <div class="py-12">
         <div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
             <div class="bg-white rounded-lg shadow p-6">
-                <livewire:role-table />
+                <livewire:admin.role-table />
             </div>
         </div>
     </div>
diff --git a/resources/views/admin/users.blade.php b/resources/views/admin/users.blade.php
index c9ac290..9301597 100644
--- a/resources/views/admin/users.blade.php
+++ b/resources/views/admin/users.blade.php
@@ -20,7 +20,7 @@
     <div class="py-12">
         <div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
             <div class="bg-white rounded-lg shadow p-6">
-                <livewire:user-table />
+                <livewire:users.user-table />
             </div>
         </div>
     </div>
diff --git a/resources/views/layouts/client.blade.php b/resources/views/layouts/client.blade.php
index c2f9be2..f1e2dba 100644
--- a/resources/views/layouts/client.blade.php
+++ b/resources/views/layouts/client.blade.php
@@ -84,7 +84,7 @@
                             </div>
                         </div>
                         <div class="hidden md:block">
-                            @livewire('language-switcher')
+                            @livewire('common.language-switcher')
                         </div>
                     </div>
                 </div>
diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php
index ff92e42..68d23bc 100644
--- a/resources/views/layouts/guest.blade.php
+++ b/resources/views/layouts/guest.blade.php
@@ -17,7 +17,7 @@
     <body class="font-sans text-gray-900 antialiased">
         <div class="min-h-screen flex flex-col sm:justify-center items-center pt-6 sm:pt-0 bg-gray-100">
             <div class="mb-4 text-center">
-                @livewire('language-switcher')
+                @livewire('common.language-switcher')
             </div>
             <div>
                 <a href="/" wire:navigate>
diff --git a/resources/views/livewire/language-switcher.blade.php b/resources/views/livewire/common/language-switcher.blade.php
similarity index 100%
rename from resources/views/livewire/language-switcher.blade.php
rename to resources/views/livewire/common/language-switcher.blade.php
diff --git a/resources/views/livewire/notification-bell.blade.php b/resources/views/livewire/common/notification-bell.blade.php
similarity index 100%
rename from resources/views/livewire/notification-bell.blade.php
rename to resources/views/livewire/common/notification-bell.blade.php
diff --git a/resources/views/livewire/company-form.blade.php b/resources/views/livewire/companies/company-form.blade.php
similarity index 100%
rename from resources/views/livewire/company-form.blade.php
rename to resources/views/livewire/companies/company-form.blade.php
diff --git a/resources/views/livewire/company-management.blade.php b/resources/views/livewire/companies/company-management.blade.php
similarity index 94%
rename from resources/views/livewire/company-management.blade.php
rename to resources/views/livewire/companies/company-management.blade.php
index d3eb7dd..dbba061 100644
--- a/resources/views/livewire/company-management.blade.php
+++ b/resources/views/livewire/companies/company-management.blade.php
@@ -21,7 +21,7 @@
                     {{ __('New Company') }}
                 </a>
             </div>
-            <livewire:company-table />
+            <livewire:companies.company-table />
         </div>
     </div>
 
diff --git a/resources/views/livewire/company-view.blade.php b/resources/views/livewire/companies/company-view.blade.php
similarity index 100%
rename from resources/views/livewire/company-view.blade.php
rename to resources/views/livewire/companies/company-view.blade.php
diff --git a/resources/views/livewire/template-manager.blade.php b/resources/views/livewire/inspections/template-manager.blade.php
similarity index 100%
rename from resources/views/livewire/template-manager.blade.php
rename to resources/views/livewire/inspections/template-manager.blade.php
diff --git a/resources/views/livewire/issues/issue-manager.blade.php b/resources/views/livewire/issues/issue-manager.blade.php
index 2897668..fae76df 100644
--- a/resources/views/livewire/issues/issue-manager.blade.php
+++ b/resources/views/livewire/issues/issue-manager.blade.php
@@ -60,5 +60,5 @@
     {{-- ================================================================
          ISSUES TABLE (Rappasoft)
     ================================================================ --}}
-    <livewire:issue-table :project-id="$project->id" :key="'issue-table-'.$project->id" />
+    <livewire:issues.issue-table :project-id="$project->id" :key="'issue-table-'.$project->id" />
 </div>
diff --git a/resources/views/livewire/layout/navigation.blade.php b/resources/views/livewire/layout/navigation.blade.php
index 3071626..ff34331 100644
--- a/resources/views/livewire/layout/navigation.blade.php
+++ b/resources/views/livewire/layout/navigation.blade.php
@@ -60,12 +60,12 @@ new class extends Component
 
             <!-- Language Switcher -->
             <div class="hidden sm:flex sm:items-center sm:ms-6">
-                @livewire('language-switcher')
+                @livewire('common.language-switcher')
             </div>
 
             <!-- Notification Bell -->
             <div class="hidden sm:flex sm:items-center sm:ms-2">
-                @livewire('notification-bell')
+                @livewire('common.notification-bell')
             </div>
 
             <!-- Settings Dropdown -->
@@ -127,7 +127,7 @@ new class extends Component
 
             <div class="mt-3 space-y-1">
                 <div class="mb-2 text-center text-sm">
-                    @livewire('language-switcher')
+                    @livewire('common.language-switcher')
                 </div>
                 <x-responsive-nav-link :href="route('profile')" wire:navigate>
                     {{ __('Profile') }}
diff --git a/resources/views/livewire/media-manager.blade.php b/resources/views/livewire/media/media-manager.blade.php
similarity index 100%
rename from resources/views/livewire/media-manager.blade.php
rename to resources/views/livewire/media/media-manager.blade.php
diff --git a/resources/views/livewire/phase-list.blade.php b/resources/views/livewire/phases/phase-list.blade.php
similarity index 98%
rename from resources/views/livewire/phase-list.blade.php
rename to resources/views/livewire/phases/phase-list.blade.php
index cff490b..76e0c4c 100644
--- a/resources/views/livewire/phase-list.blade.php
+++ b/resources/views/livewire/phases/phase-list.blade.php
@@ -12,7 +12,7 @@
     </div>
 
     {{-- Tabla Rappasoft de fases --}}
-    <livewire:phase-table :project-id="$project->id" :key="'phase-table-'.$project->id" />
+    <livewire:phases.phase-table :project-id="$project->id" :key="'phase-table-'.$project->id" />
 
     {{-- ================================================================
          MODAL crear / editar fase
diff --git a/resources/views/livewire/phase-progress.blade.php b/resources/views/livewire/phases/phase-progress.blade.php
similarity index 100%
rename from resources/views/livewire/phase-progress.blade.php
rename to resources/views/livewire/phases/phase-progress.blade.php
diff --git a/resources/views/livewire/project-companies.blade.php b/resources/views/livewire/projects/project-companies.blade.php
similarity index 91%
rename from resources/views/livewire/project-companies.blade.php
rename to resources/views/livewire/projects/project-companies.blade.php
index 45fe938..131a3bf 100644
--- a/resources/views/livewire/project-companies.blade.php
+++ b/resources/views/livewire/projects/project-companies.blade.php
@@ -25,5 +25,5 @@
     @endcan
 
     {{-- Tabla Rappasoft de empresas asignadas --}}
-    <livewire:project-companies-table :project-id="$project->id" :key="'project-companies-table-'.$project->id" />
+    <livewire:projects.project-companies-table :project-id="$project->id" :key="'project-companies-table-'.$project->id" />
 </div>
diff --git a/resources/views/livewire/projects/project-form.blade.php b/resources/views/livewire/projects/project-form.blade.php
index 3c06c25..7bba82b 100644
--- a/resources/views/livewire/projects/project-form.blade.php
+++ b/resources/views/livewire/projects/project-form.blade.php
@@ -21,13 +21,13 @@
                     @include('livewire.projects.partials.project-data-form')
                 </div>
                 <div x-show="tab==='phases'" x-cloak>
-                    <livewire:phase-list :project="$project" :key="'phases-'.$project->id" />
+                    <livewire:phases.phase-list :project="$project" :key="'phases-'.$project->id" />
                 </div>
                 <div x-show="tab==='users'" x-cloak>
-                    <livewire:project-users :project="$project" :key="'users-'.$project->id" />
+                    <livewire:projects.project-users :project="$project" :key="'users-'.$project->id" />
                 </div>
                 <div x-show="tab==='companies'" x-cloak>
-                    <livewire:project-companies :project="$project" :key="'companies-'.$project->id" />
+                    <livewire:projects.project-companies :project="$project" :key="'companies-'.$project->id" />
                 </div>
             </div>
         @else
diff --git a/resources/views/livewire/projects/project-map-editor-tab.blade.php b/resources/views/livewire/projects/project-map-editor-tab.blade.php
index 7a7eb2c..aaa21bd 100644
--- a/resources/views/livewire/projects/project-map-editor-tab.blade.php
+++ b/resources/views/livewire/projects/project-map-editor-tab.blade.php
@@ -30,7 +30,7 @@
                                 📎 {{ __("Files of element") }}
                             </summary>
                             <div class="p-2">
-                                @livewire('media-manager', [
+                                @livewire('media.media-manager', [
                                     'mediableType' => 'App\\Models\\Feature',
                                     'mediableId' => $selectedFeature->id,
                                 ], key('media-feature-' . $selectedFeature->id))
diff --git a/resources/views/livewire/projects/project-map.blade.php b/resources/views/livewire/projects/project-map.blade.php
index 57e33b9..8e74be5 100644
--- a/resources/views/livewire/projects/project-map.blade.php
+++ b/resources/views/livewire/projects/project-map.blade.php
@@ -181,7 +181,7 @@
                                 <x-heroicon-o-paper-clip class="w-4 h-4 inline" /> {{ __('Files of element') }}
                             </summary>
                             <div class="p-2">
-                                @livewire('media-manager', [
+                                @livewire('media.media-manager', [
                                     'mediableType' => 'App\\Models\\Feature',
                                     'mediableId' => $selectedFeature->id,
                                 ], key('media-feature-' . $selectedFeature->id))
@@ -351,7 +351,7 @@
                     @endif
                 @elseif($activeTab === 'issues')
                     <!-- Issues tab: render embedded IssueManager component -->
-                    @livewire('issue-manager', ['project' => $project], key('issues-tab-' . $project->id))
+                    @livewire('issues.issue-manager', ['project' => $project], key('issues-tab-' . $project->id))
                 @endif
             </div>
 
diff --git a/resources/views/livewire/project-users.blade.php b/resources/views/livewire/projects/project-users.blade.php
similarity index 92%
rename from resources/views/livewire/project-users.blade.php
rename to resources/views/livewire/projects/project-users.blade.php
index 41b1c33..70ef8d2 100644
--- a/resources/views/livewire/project-users.blade.php
+++ b/resources/views/livewire/projects/project-users.blade.php
@@ -25,5 +25,5 @@
     @endcan
 
     {{-- Tabla Rappasoft de usuarios asignados --}}
-    <livewire:project-users-table :project-id="$project->id" :key="'project-users-table-'.$project->id" />
+    <livewire:projects.project-users-table :project-id="$project->id" :key="'project-users-table-'.$project->id" />
 </div>
diff --git a/resources/views/livewire/role-permission-manager.blade.php b/resources/views/livewire/roles/role-permission-manager.blade.php
similarity index 100%
rename from resources/views/livewire/role-permission-manager.blade.php
rename to resources/views/livewire/roles/role-permission-manager.blade.php
diff --git a/resources/views/livewire/admin-users.blade.php b/resources/views/livewire/users/admin-users.blade.php
similarity index 100%
rename from resources/views/livewire/admin-users.blade.php
rename to resources/views/livewire/users/admin-users.blade.php
diff --git a/resources/views/livewire/user-form.blade.php b/resources/views/livewire/users/user-form.blade.php
similarity index 100%
rename from resources/views/livewire/user-form.blade.php
rename to resources/views/livewire/users/user-form.blade.php
diff --git a/resources/views/livewire/user-view.blade.php b/resources/views/livewire/users/user-view.blade.php
similarity index 88%
rename from resources/views/livewire/user-view.blade.php
rename to resources/views/livewire/users/user-view.blade.php
index 6145e31..aac97ec 100644
--- a/resources/views/livewire/user-view.blade.php
+++ b/resources/views/livewire/users/user-view.blade.php
@@ -320,6 +320,90 @@
                     </div>
                 </div>
 
+                {{-- Validez y estado --}}
+                <div class="card bg-base-100 shadow">
+                    <div class="card-body p-6">
+                        <h3 class="font-semibold text-base flex items-center gap-2 mb-4">
+                            <x-heroicon-o-calendar-days class="w-5 h-5 text-primary" />
+                            Validez de acceso
+                        </h3>
+                        <div class="space-y-3 text-sm">
+                            <div class="flex justify-between items-center py-2 border-b border-base-200">
+                                <span class="text-gray-500">Estado</span>
+                                <span class="badge {{ $statusBadge[0] }}">{{ $statusBadge[1] }}</span>
+                            </div>
+                            <div class="flex justify-between items-center py-2 border-b border-base-200">
+                                <span class="text-gray-500">Válido desde</span>
+                                <span class="font-medium">
+                                    {{ $user->valid_from ? $user->valid_from->format('d/m/Y') : '—  (sin límite)' }}
+                                </span>
+                            </div>
+                            <div class="flex justify-between items-center py-2 border-b border-base-200">
+                                <span class="text-gray-500">Válido hasta</span>
+                                <span class="font-medium {{ isset($isExpired) && $isExpired ? 'text-error font-bold' : '' }}">
+                                    {{ $user->valid_until ? $user->valid_until->format('d/m/Y') : '—  (sin límite)' }}
+                                </span>
+                            </div>
+                            <div class="flex justify-between items-center py-2">
+                                <span class="text-gray-500">Email verificado</span>
+                                @if($user->email_verified_at)
+                                    <span class="flex items-center gap-1 text-success text-xs font-medium">
+                                        <x-heroicon-o-check-circle class="w-4 h-4" />
+                                        {{ $user->email_verified_at->format('d/m/Y') }}
+                                    </span>
+                                @else
+                                    <span class="text-warning text-xs flex items-center gap-1">
+                                        <x-heroicon-o-clock class="w-4 h-4" />
+                                        Pendiente
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                {{-- Empresa --}}
+                @if($user->company)
+                <div class="card bg-base-100 shadow md:col-span-2">
+                    <div class="card-body p-6">
+                        <h3 class="font-semibold text-base flex items-center gap-2 mb-3">
+                            <x-heroicon-o-building-office-2 class="w-5 h-5 text-primary" />
+                            Empresa
+                        </h3>
+                        <div class="flex items-center gap-4">
+                            @if($user->company->logo_path && \Illuminate\Support\Facades\Storage::disk('public')->exists($user->company->logo_path))
+                                <img src="{{ \Illuminate\Support\Facades\Storage::disk('public')->url($user->company->logo_path) }}"
+                                    class="w-14 h-14 object-contain border border-base-300 rounded-lg" alt="" />
+                            @else
+                                <div class="w-14 h-14 bg-base-200 rounded-lg flex items-center justify-center">
+                                    <x-heroicon-o-building-office class="w-7 h-7 opacity-30" />
+                                </div>
+                            @endif
+                            <div>
+                                <p class="font-semibold">{{ $user->company->name }}</p>
+                                @if($user->company->apodo)
+                                    <p class="text-sm text-gray-500">{{ $user->company->apodo }}</p>
+                                @endif
+                                @if($user->company->email)
+                                    <p class="text-xs text-gray-400">{{ $user->company->email }}</p>
+                                @endif
+                            </div>
+                            @php
+                                $typeBadge = match($user->company->type) {
+                                    'owner'         => ['badge-success',  'Promotor'],
+                                    'constructor'   => ['badge-primary',  'Constructor'],
+                                    'subcontractor' => ['badge-secondary','Subcontratista'],
+                                    'consultant'    => ['badge-info',     'Consultor'],
+                                    'supplier'      => ['badge-warning',  'Proveedor'],
+                                    default         => ['badge-ghost',    'Otro'],
+                                };
+                            @endphp
+                            <span class="badge {{ $typeBadge[0] }} ml-auto">{{ $typeBadge[1] }}</span>
+                        </div>
+                    </div>
+                </div>
+                @endif
+
                 {{-- Permisos directos del usuario --}}
                 <div class="card bg-base-100 shadow md:col-span-2">
                     <div class="card-body p-6">
diff --git a/resources/views/projects/index.blade.php b/resources/views/projects/index.blade.php
index 598abad..d359a62 100644
--- a/resources/views/projects/index.blade.php
+++ b/resources/views/projects/index.blade.php
@@ -22,7 +22,7 @@
             @endif
 
             <div class="bg-white rounded-xl shadow p-6">
-                <livewire:project-table />
+                <livewire:projects.project-table />
             </div>
         </div>
     </div>
diff --git a/resources/views/projects/map.blade.php b/resources/views/projects/map.blade.php
index 9bd8c1b..074a148 100644
--- a/resources/views/projects/map.blade.php
+++ b/resources/views/projects/map.blade.php
@@ -1,5 +1,5 @@
 <x-app-layout>
     <div class="relative">
-        <livewire:project-map :project="$project" />
+        <livewire:projects.project-map :project="$project" />
     </div>
 </x-app-layout>
\ No newline at end of file
diff --git a/resources/views/projects/media.blade.php b/resources/views/projects/media.blade.php
index e5f2a4b..62050ac 100644
--- a/resources/views/projects/media.blade.php
+++ b/resources/views/projects/media.blade.php
@@ -11,7 +11,7 @@
                 <a href="{{ route('projects.map', $project) }}" class="btn btn-outline btn-sm">← {{ __('Back to map') }}</a>
             </div>
 
-            @livewire('media-manager', [
+            @livewire('media.media-manager', [
                 'mediableType' => 'App\Models\Project',
                 'mediableId' => $project->id,
             ])
diff --git a/routes/web.php b/routes/web.php
index 29a3c46..a5f9a93 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -4,10 +4,10 @@ use App\Http\Controllers\ProfileController;
 use App\Livewire\Reports\ReportsDashboard;
 use App\Http\Controllers\ProjectController;
 use App\Http\Controllers\OfflineSyncController;
-use App\Livewire\ProjectMap;
-use App\Livewire\ProjectList;
-use App\Livewire\PhaseProgress;
-use App\Livewire\PhaseGantt;
+use App\Livewire\Projects\ProjectMap;
+use App\Livewire\Projects\ProjectList;
+use App\Livewire\Phases\PhaseProgress;
+use App\Livewire\Phases\PhaseGantt;
 use App\Http\Controllers\ProjectReportController;
 use Illuminate\Support\Facades\Route;
 
@@ -97,8 +97,8 @@ Route::get('/reports/dashboard', ReportsDashboard::class)->name('reports.dashboa
     // Gestión de proyectos
     // ------------------------------------------------------------
     // Create/Edit handled by unified Livewire component
-    Route::get('/projects/create',           \App\Livewire\ProjectForm::class)->name('projects.create');
-    Route::get('/projects/{project}/edit',   \App\Livewire\ProjectForm::class)->name('projects.edit');
+    Route::get('/projects/create',           \App\Livewire\Projects\ProjectForm::class)->name('projects.create');
+    Route::get('/projects/{project}/edit',   \App\Livewire\Projects\ProjectForm::class)->name('projects.edit');
     Route::resource('projects', ProjectController::class)->except(['create', 'edit']);
     // Ruta personalizada para ver el mapa de un proyecto específico
     Route::get('/projects/{project}/map', [ProjectController::class, 'map'])->name('projects.map');
@@ -111,21 +111,21 @@ Route::get('/reports/dashboard', ReportsDashboard::class)->name('reports.dashboa
     })->name('projects.templates')->middleware('can:edit projects');
     
     // Rutas para el LayerManager:
-    Route::get('/projects/{project}/phases/{phase}/layers/manage', \App\Livewire\LayerManager::class)->name('layers.manage');
+    Route::get('/projects/{project}/phases/{phase}/layers/manage', \App\Livewire\Layers\LayerManager::class)->name('layers.manage');
 
     // Cronograma Gantt y reporte del proyecto
     Route::get('/projects/{project}/gantt', PhaseGantt::class)->name('projects.gantt');
     Route::get('/projects/{project}/report', [ProjectReportController::class, 'show'])->name('projects.report');
 
     // Issues del proyecto
-    Route::get('/projects/{project}/issues', \App\Livewire\IssueManager::class)->name('projects.issues');
-    Route::get('/projects/{project}/issues/create', \App\Livewire\IssueForm::class)->name('projects.issues.create');
-    Route::get('/projects/{project}/issues/checklists', \App\Livewire\IssueChecklistManager::class)->name('projects.issues.checklists');
-    Route::get('/projects/{project}/issues/{issue}', \App\Livewire\IssueDetail::class)->name('projects.issues.show');
-    Route::get('/projects/{project}/issues/{issue}/edit', \App\Livewire\IssueForm::class)->name('projects.issues.edit');
+    Route::get('/projects/{project}/issues', \App\Livewire\Issues\IssueManager::class)->name('projects.issues');
+    Route::get('/projects/{project}/issues/create', \App\Livewire\Issues\IssueForm::class)->name('projects.issues.create');
+    Route::get('/projects/{project}/issues/checklists', \App\Livewire\Issues\IssueChecklistManager::class)->name('projects.issues.checklists');
+    Route::get('/projects/{project}/issues/{issue}', \App\Livewire\Issues\IssueDetail::class)->name('projects.issues.show');
+    Route::get('/projects/{project}/issues/{issue}/edit', \App\Livewire\Issues\IssueForm::class)->name('projects.issues.edit');
 
     // Dashboard por proyecto
-    Route::get('/projects/{project}/dashboard', \App\Livewire\ProjectDashboard::class)->name('projects.dashboard');
+    Route::get('/projects/{project}/dashboard', \App\Livewire\Projects\ProjectDashboard::class)->name('projects.dashboard');
 
     // Cliente: portal cliente
     Route::middleware(['auth', 'role:client'])->prefix('client')->name('client.')->group(function () {
@@ -137,24 +137,24 @@ Route::get('/reports/dashboard', ReportsDashboard::class)->name('reports.dashboa
     // Admin: gestión de usuarios y roles (cada ruta protegida por su permiso)
     Route::prefix('admin')->name('admin.')->group(function () {
         Route::get('/users',              function () { return view('admin.users'); })->middleware('can:view users')->name('users');
-        Route::get('/users/create',       \App\Livewire\UserForm::class)->middleware('can:create users')->name('users.create');
-        Route::get('/users/{user}',       \App\Livewire\UserView::class)->middleware('can:view users')->name('users.show');
-        Route::get('/users/{user}/edit',  \App\Livewire\UserForm::class)->middleware('can:edit users')->name('users.edit');
+        Route::get('/users/create',       \App\Livewire\Users\UserForm::class)->middleware('can:create users')->name('users.create');
+        Route::get('/users/{user}',       \App\Livewire\Users\UserView::class)->middleware('can:view users')->name('users.show');
+        Route::get('/users/{user}/edit',  \App\Livewire\Users\UserForm::class)->middleware('can:edit users')->name('users.edit');
         Route::get('/roles',               function () { return view('admin.roles'); })->middleware('can:manage roles')->name('roles');
-        Route::get('/roles/create',        \App\Livewire\RoleForm::class)->middleware('can:manage roles')->name('roles.create');
-        Route::get('/roles/{role}/edit',   \App\Livewire\RoleForm::class)->middleware('can:manage roles')->name('roles.edit');
-        Route::get('/roles/{role}',        \App\Livewire\RoleView::class)->middleware('can:manage roles')->name('roles.show');
-        Route::get('/permissions',         \App\Livewire\RolePermissionManager::class)->middleware('can:manage roles')->name('permissions');
+        Route::get('/roles/create',        \App\Livewire\Admin\RoleForm::class)->middleware('can:manage roles')->name('roles.create');
+        Route::get('/roles/{role}/edit',   \App\Livewire\Admin\RoleForm::class)->middleware('can:manage roles')->name('roles.edit');
+        Route::get('/roles/{role}',        \App\Livewire\Admin\RoleView::class)->middleware('can:manage roles')->name('roles.show');
+        Route::get('/permissions',         \App\Livewire\Admin\RolePermissionManager::class)->middleware('can:manage roles')->name('permissions');
     });
 
     // Gestor de medios
     Route::get('/projects/{project}/media', function (\App\Models\Project $project) {
         return view('projects.media', compact('project'));
     })->name('projects.media');
-    Route::get('/companies',                    \App\Livewire\CompanyManagement::class)->name('companies.manage');
-    Route::get('/companies/create',             \App\Livewire\CompanyForm::class)->name('companies.create');
-    Route::get('/companies/{company}',          \App\Livewire\CompanyView::class)->name('companies.show');
-    Route::get('/companies/{company}/edit',     \App\Livewire\CompanyForm::class)->name('companies.edit');
+    Route::get('/companies',                    \App\Livewire\Companies\CompanyManagement::class)->name('companies.manage');
+    Route::get('/companies/create',             \App\Livewire\Companies\CompanyForm::class)->name('companies.create');
+    Route::get('/companies/{company}',          \App\Livewire\Companies\CompanyView::class)->name('companies.show');
+    Route::get('/companies/{company}/edit',     \App\Livewire\Companies\CompanyForm::class)->name('companies.edit');
 
     // ------------------------------------------------------------
     // Sincronización offline (para trabajadores en campo)
diff --git a/tests/Feature/IssuesEnhancementsTest.php b/tests/Feature/IssuesEnhancementsTest.php
index c20fe42..869a0d6 100644
--- a/tests/Feature/IssuesEnhancementsTest.php
+++ b/tests/Feature/IssuesEnhancementsTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Feature;
 
-use App\Livewire\IssueChecklistManager;
-use App\Livewire\IssueDetail;
-use App\Livewire\IssueForm;
+use App\Livewire\Issues\IssueChecklistManager;
+use App\Livewire\Issues\IssueDetail;
+use App\Livewire\Issues\IssueForm;
 use App\Models\Feature;
 use App\Models\Issue;
 use App\Models\IssueChecklistTemplate;
diff --git a/tests/Feature/IssuesTablePageTest.php b/tests/Feature/IssuesTablePageTest.php
index 6891112..530374f 100644
--- a/tests/Feature/IssuesTablePageTest.php
+++ b/tests/Feature/IssuesTablePageTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature;
 
-use App\Livewire\IssueManager;
-use App\Livewire\IssueTable;
+use App\Livewire\Issues\IssueManager;
+use App\Livewire\Issues\IssueTable;
 use App\Models\Issue;
 use App\Models\Project;
 use App\Models\User;
diff --git a/tests/Feature/PhaseManagementTest.php b/tests/Feature/PhaseManagementTest.php
index 28aacda..4cd66ec 100644
--- a/tests/Feature/PhaseManagementTest.php
+++ b/tests/Feature/PhaseManagementTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature;
 
-use App\Livewire\PhaseList;
-use App\Livewire\PhaseTable;
+use App\Livewire\Phases\PhaseList;
+use App\Livewire\Phases\PhaseTable;
 use App\Models\Phase;
 use App\Models\Project;
 use App\Models\User;
diff --git a/tests/Feature/ProjectAssignmentsTest.php b/tests/Feature/ProjectAssignmentsTest.php
index 7d2c6c3..ccdc70a 100644
--- a/tests/Feature/ProjectAssignmentsTest.php
+++ b/tests/Feature/ProjectAssignmentsTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Feature;
 
-use App\Livewire\ProjectCompanies;
-use App\Livewire\ProjectCompaniesTable;
-use App\Livewire\ProjectUsers;
-use App\Livewire\ProjectUsersTable;
+use App\Livewire\Projects\ProjectCompanies;
+use App\Livewire\Projects\ProjectCompaniesTable;
+use App\Livewire\Projects\ProjectUsers;
+use App\Livewire\Projects\ProjectUsersTable;
 use App\Models\Company;
 use App\Models\Project;
 use App\Models\User;
diff --git a/tests/Feature/UserLocaleTest.php b/tests/Feature/UserLocaleTest.php
index cfa34f8..efda61f 100644
--- a/tests/Feature/UserLocaleTest.php
+++ b/tests/Feature/UserLocaleTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature;
 
-use App\Livewire\UserForm;
+use App\Livewire\Users\UserForm;
 use App\Models\Company;
 use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;