diff --git a/app/Livewire/Forms/Tables/ActivityLogTable.php b/app/Livewire/Tables/ActivityLogTable.php
similarity index 99%
rename from app/Livewire/Forms/Tables/ActivityLogTable.php
rename to app/Livewire/Tables/ActivityLogTable.php
index 6c54fdd..8918a09 100644
--- a/app/Livewire/Forms/Tables/ActivityLogTable.php
+++ b/app/Livewire/Tables/ActivityLogTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms\Tables;
+namespace App\Livewire\Tables;
 
 use App\Models\ActivityLog;
 use Illuminate\Support\Carbon;
diff --git a/app/Livewire/Forms/Tables/ArtistTable.php b/app/Livewire/Tables/ArtistTable.php
similarity index 99%
rename from app/Livewire/Forms/Tables/ArtistTable.php
rename to app/Livewire/Tables/ArtistTable.php
index 27d6874..5ddcbea 100644
--- a/app/Livewire/Forms/Tables/ArtistTable.php
+++ b/app/Livewire/Tables/ArtistTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms\Tables;
+namespace App\Livewire\Tables;
 
 use App\Models\Artist;
 use App\Enums\ArtistCategory;
diff --git a/app/Livewire/Forms/Tables/BranchTable.php b/app/Livewire/Tables/BranchTable.php
similarity index 99%
rename from app/Livewire/Forms/Tables/BranchTable.php
rename to app/Livewire/Tables/BranchTable.php
index 5b57cf6..ff68231 100644
--- a/app/Livewire/Forms/Tables/BranchTable.php
+++ b/app/Livewire/Tables/BranchTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms\Tables;
+namespace App\Livewire\Tables;
 
 use App\Models\Branch;
 use Illuminate\Support\Carbon;
diff --git a/app/Livewire/Forms/Tables/MachineStatusTable.php b/app/Livewire/Tables/MachineStatusTable.php
similarity index 98%
rename from app/Livewire/Forms/Tables/MachineStatusTable.php
rename to app/Livewire/Tables/MachineStatusTable.php
index 08b7158..212c8ad 100644
--- a/app/Livewire/Forms/Tables/MachineStatusTable.php
+++ b/app/Livewire/Tables/MachineStatusTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms\Tables;
+namespace App\Livewire\Tables;
 
 use App\Models\MachineStatus;
 use Illuminate\Support\Carbon;
diff --git a/app/Livewire/Forms/Tables/RoleTable.php b/app/Livewire/Tables/RoleTable.php
similarity index 99%
rename from app/Livewire/Forms/Tables/RoleTable.php
rename to app/Livewire/Tables/RoleTable.php
index 776723d..2b7fa6e 100644
--- a/app/Livewire/Forms/Tables/RoleTable.php
+++ b/app/Livewire/Tables/RoleTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms\Tables;
+namespace App\Livewire\Tables;
 
 use Spatie\Permission\Models\Role;
 use Spatie\Permission\Models\Permission;
diff --git a/app/Livewire/Forms/Tables/RoomStatusLogTable.php b/app/Livewire/Tables/RoomStatusLogTable.php
similarity index 98%
rename from app/Livewire/Forms/Tables/RoomStatusLogTable.php
rename to app/Livewire/Tables/RoomStatusLogTable.php
index 1487514..4283ee5 100644
--- a/app/Livewire/Forms/Tables/RoomStatusLogTable.php
+++ b/app/Livewire/Tables/RoomStatusLogTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms\Tables;
+namespace App\Livewire\Tables;
 
 use App\Models\RoomStatusLog;
 use Illuminate\Support\Carbon;
diff --git a/app/Livewire/Forms/Tables/RoomTable.php b/app/Livewire/Tables/RoomTable.php
similarity index 99%
rename from app/Livewire/Forms/Tables/RoomTable.php
rename to app/Livewire/Tables/RoomTable.php
index 38f5376..98fe330 100644
--- a/app/Livewire/Forms/Tables/RoomTable.php
+++ b/app/Livewire/Tables/RoomTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms\Tables;
+namespace App\Livewire\Tables;
 
 use App\Models\Room;
 use App\Enums\RoomType;
diff --git a/app/Livewire/Forms/Tables/SongTable.php b/app/Livewire/Tables/SongTable.php
similarity index 99%
rename from app/Livewire/Forms/Tables/SongTable.php
rename to app/Livewire/Tables/SongTable.php
index eae7f78..f1020f3 100644
--- a/app/Livewire/Forms/Tables/SongTable.php
+++ b/app/Livewire/Tables/SongTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms\Tables;
+namespace App\Livewire\Tables;
 
 use App\Models\Song;
 use App\Models\SongLibraryCache;
diff --git a/app/Livewire/Forms/Tables/UserTable.php b/app/Livewire/Tables/UserTable.php
similarity index 99%
rename from app/Livewire/Forms/Tables/UserTable.php
rename to app/Livewire/Tables/UserTable.php
index 201c8bb..7b1823f 100644
--- a/app/Livewire/Forms/Tables/UserTable.php
+++ b/app/Livewire/Tables/UserTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms\Tables;
+namespace App\Livewire\Tables;
 
 use App\Models\User;
 use App\Enums\UserGender;
diff --git a/resources/views/livewire/admin/activity-log.blade.php b/resources/views/livewire/admin/activity-log.blade.php
index f04b202..4619394 100644
--- a/resources/views/livewire/admin/activity-log.blade.php
+++ b/resources/views/livewire/admin/activity-log.blade.php
@@ -1,4 +1,4 @@
 
 <x-layouts.admin>
-    <livewire:forms.tables.activity-log-table />
+    <livewire:tables.activity-log-table />
 </x-layouts.admin>
\ No newline at end of file
diff --git a/resources/views/livewire/admin/artists.blade.php b/resources/views/livewire/admin/artists.blade.php
index 35a0393..2e80bae 100644
--- a/resources/views/livewire/admin/artists.blade.php
+++ b/resources/views/livewire/admin/artists.blade.php
@@ -1,7 +1,7 @@
 
 <x-layouts.admin>
     <x-wireui:notifications/>
-    <livewire:forms.tables.artist-table />
+    <livewire:tables.artist-table />
     <livewire:forms.artist-form />
     <livewire:forms.artist-import-data />
 </x-layouts.admin>
\ No newline at end of file
diff --git a/resources/views/livewire/admin/branches.blade.php b/resources/views/livewire/admin/branches.blade.php
index 24eb182..7fa5b28 100644
--- a/resources/views/livewire/admin/branches.blade.php
+++ b/resources/views/livewire/admin/branches.blade.php
@@ -1,7 +1,7 @@
 
 <x-layouts.admin>
     <x-wireui:notifications/>
-    <livewire:forms.tables.branch-table />
+    <livewire:tables.branch-table />
     <livewire:forms.room-grid />
     <livewire:forms.branch-form />
     <livewire:forms.branch-import-data />
diff --git a/resources/views/livewire/admin/machine-status.blade.php b/resources/views/livewire/admin/machine-status.blade.php
index e7ee07e..2b6603b 100644
--- a/resources/views/livewire/admin/machine-status.blade.php
+++ b/resources/views/livewire/admin/machine-status.blade.php
@@ -1,3 +1,3 @@
 <x-layouts.admin>
-    <livewire:forms.tables.machine-status-table />
+    <livewire:tables.machine-status-table />
 </x-layouts.admin>
\ No newline at end of file
diff --git a/resources/views/livewire/admin/roles.blade.php b/resources/views/livewire/admin/roles.blade.php
index 57ac88f..6b5a159 100644
--- a/resources/views/livewire/admin/roles.blade.php
+++ b/resources/views/livewire/admin/roles.blade.php
@@ -1,6 +1,6 @@
 
 <x-layouts.admin>
     <x-wireui:notifications/>
-    <livewire:forms.tables.role-table />
+    <livewire:tables.role-table />
     <livewire:forms.role-form />
 </x-layouts.admin>
\ No newline at end of file
diff --git a/resources/views/livewire/admin/room-status-log.blade.php b/resources/views/livewire/admin/room-status-log.blade.php
index f99cd49..ee6b443 100644
--- a/resources/views/livewire/admin/room-status-log.blade.php
+++ b/resources/views/livewire/admin/room-status-log.blade.php
@@ -1,3 +1,3 @@
 <x-layouts.admin>
-    <livewire:forms.tables.room-status-log-table />
+    <livewire:tables.room-status-log-table />
 </x-layouts.admin>
\ No newline at end of file
diff --git a/resources/views/livewire/admin/rooms.blade.php b/resources/views/livewire/admin/rooms.blade.php
index a7fb514..adf91c9 100644
--- a/resources/views/livewire/admin/rooms.blade.php
+++ b/resources/views/livewire/admin/rooms.blade.php
@@ -1,7 +1,7 @@
 
 <x-layouts.admin>
     <x-wireui:notifications/>
-    <livewire:forms.tables.room-table/>
+    <livewire:tables.room-table/>
     <livewire:forms.room-form />
     <livewire:forms.modals.room-detail-modal />
 </x-layouts.admin>
\ No newline at end of file
diff --git a/resources/views/livewire/admin/songs.blade.php b/resources/views/livewire/admin/songs.blade.php
index 536d714..e07fce7 100644
--- a/resources/views/livewire/admin/songs.blade.php
+++ b/resources/views/livewire/admin/songs.blade.php
@@ -1,7 +1,7 @@
 
 <x-layouts.admin>
     <x-wireui:notifications/>
-    <livewire:forms.tables.song-table />
+    <livewire:tables.song-table />
     <livewire:forms.song-form />
     <livewire:forms.song-import-data />
 </x-layouts.admin>
\ No newline at end of file
diff --git a/resources/views/livewire/admin/users.blade.php b/resources/views/livewire/admin/users.blade.php
index d9b3988..2ee77c7 100644
--- a/resources/views/livewire/admin/users.blade.php
+++ b/resources/views/livewire/admin/users.blade.php
@@ -1,6 +1,6 @@
 
 <x-layouts.admin>
     <x-wireui:notifications/>
-    <livewire:forms.tables.user-table />
+    <livewire:tables.user-table />
     <livewire:forms.user-form />
 </x-layouts.admin>
\ No newline at end of file