diff --git a/app/Livewire/Admin/AddClient.php b/app/Livewire/Admin/Client/AddClient.php
similarity index 92%
rename from app/Livewire/Admin/AddClient.php
rename to app/Livewire/Admin/Client/AddClient.php
index 7295d54..4ef7c0e 100644
--- a/app/Livewire/Admin/AddClient.php
+++ b/app/Livewire/Admin/Client/AddClient.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Admin;
+namespace App\Livewire\Admin\Client;
 
 use App\Models\Client;
 use App\Services\ClientService;
@@ -43,6 +43,6 @@ public function save(ClientService $clientService)
 
     public function render()
     {
-        return view('livewire.admin.add-client');
+        return view('livewire.admin.clients.add-client');
     }
 }
diff --git a/app/Livewire/Admin/DeleteClient.php b/app/Livewire/Admin/Client/DeleteClient.php
similarity index 87%
rename from app/Livewire/Admin/DeleteClient.php
rename to app/Livewire/Admin/Client/DeleteClient.php
index 64b6069..85b722f 100644
--- a/app/Livewire/Admin/DeleteClient.php
+++ b/app/Livewire/Admin/Client/DeleteClient.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Admin;
+namespace App\Livewire\Admin\Client;
 
 use Livewire\Component;
 use Livewire\Attributes\On;
@@ -18,7 +18,7 @@ public function deleteClient($payload)
             $deletedClient->delete();
         }
 
-        $this->dispatch('clientDeleted');
+        $this->dispatch('client-deleted');
         // (Opcional) Envia uma notificação de sucesso
         $this->dispatch('notify', message: 'Cliente excluído com sucesso!');
     }
diff --git a/app/Livewire/Admin/EditClient.php b/app/Livewire/Admin/Client/EditClient.php
similarity index 93%
rename from app/Livewire/Admin/EditClient.php
rename to app/Livewire/Admin/Client/EditClient.php
index 963a8bd..af9d250 100644
--- a/app/Livewire/Admin/EditClient.php
+++ b/app/Livewire/Admin/Client/EditClient.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Admin;
+namespace App\Livewire\Admin\Client;
 
 use App\Livewire\Forms\ClientForm;
 use App\Models\Client;
@@ -48,6 +48,6 @@ public function edit(ClientService $clientService)
     }
     public function render()
     {
-        return view('livewire.admin.edit-client');
+        return view('livewire.admin.clients.edit-client');
     }
 }
diff --git a/app/Livewire/Admin/ShowUsers.php b/app/Livewire/Admin/ShowUsers.php
deleted file mode 100644
index f6e8f66..0000000
--- a/app/Livewire/Admin/ShowUsers.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Livewire\Admin;
-
-use Livewire\Component;
-
-class ShowUsers extends Component
-{
-    public function render()
-    {
-        return view('livewire.admin.show-users');
-    }
-}
diff --git a/app/Livewire/Admin/CreateUser.php b/app/Livewire/Admin/User/CreateUser.php
similarity index 94%
rename from app/Livewire/Admin/CreateUser.php
rename to app/Livewire/Admin/User/CreateUser.php
index 02e7b00..9add896 100644
--- a/app/Livewire/Admin/CreateUser.php
+++ b/app/Livewire/Admin/User/CreateUser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Admin;
+namespace App\Livewire\Admin\User;
 
 use App\Services\UserService;
 use Illuminate\Support\Facades\Auth;
@@ -54,6 +54,6 @@ public function createUser(UserService $userService)
 
     public function render()
     {
-        return view('livewire.admin.create-user');
+        return view('livewire.admin.users.create-user');
     }
 }
diff --git a/app/Livewire/Admin/User/EditUser.php b/app/Livewire/Admin/User/EditUser.php
new file mode 100644
index 0000000..82edae1
--- /dev/null
+++ b/app/Livewire/Admin/User/EditUser.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Livewire\Admin\User\EditUser;
+
+use Livewire\Component;
+
+class EditUser extends Component
+{
+    public function render()
+    {
+        return view('livewire.admin.users.edit-user.php');
+    }
+}
diff --git a/app/Livewire/Admin/ShowClient.php b/app/Livewire/ShowClient.php
similarity index 76%
rename from app/Livewire/Admin/ShowClient.php
rename to app/Livewire/ShowClient.php
index 740c13a..8e29dba 100644
--- a/app/Livewire/Admin/ShowClient.php
+++ b/app/Livewire/ShowClient.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Admin;
+namespace App\Livewire\Admin\Client;
 
 use App\Models\Client;
 use Livewire\Component;
@@ -9,10 +9,9 @@
 class ShowClient extends Component
 {
 
-    #[On('clientDeleted')]
+    #[On('client-deleted')]
+    #[On('client-updated')]
     #[On('client-added')]
-    public function refreshClientList() {}
-
     public function render()
     {
         $clients = Client::all();
diff --git a/app/Livewire/ShowUsers.php b/app/Livewire/ShowUsers.php
new file mode 100644
index 0000000..13b104c
--- /dev/null
+++ b/app/Livewire/ShowUsers.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Livewire\Admin\User;
+
+use App\Models\User;
+use App\Services\UserService;
+use Livewire\Component;
+
+class ShowUsers extends Component
+{
+
+    public function show(UserService $userService)
+    {
+        $users = $userService->showUsers();
+        return view('livewire.admin.show-users', ['users' => $users]);
+    }
+    public function render()
+    {
+        return view('livewire.admin.show-users');
+    }
+}