diff --git a/app/Livewire/Forms/ActivityLogTable.php b/app/Livewire/Tables/ActivityLogTable.php
similarity index 99%
rename from app/Livewire/Forms/ActivityLogTable.php
rename to app/Livewire/Tables/ActivityLogTable.php
index 61a223b..c5a2b3c 100644
--- a/app/Livewire/Forms/ActivityLogTable.php
+++ b/app/Livewire/Tables/ActivityLogTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms;
+namespace App\Livewire\Tables;
 
 use App\Models\ActivityLog;
 use Illuminate\Support\Carbon;
diff --git a/app/Livewire/Forms/MachineStatusTable.php b/app/Livewire/Tables/MachineStatusTable.php
similarity index 98%
rename from app/Livewire/Forms/MachineStatusTable.php
rename to app/Livewire/Tables/MachineStatusTable.php
index 8441c0e..212c8ad 100644
--- a/app/Livewire/Forms/MachineStatusTable.php
+++ b/app/Livewire/Tables/MachineStatusTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms;
+namespace App\Livewire\Tables;
 
 use App\Models\MachineStatus;
 use Illuminate\Support\Carbon;
diff --git a/app/Livewire/Forms/RoomStatusLogTable.php b/app/Livewire/Tables/RoomStatusLogTable.php
similarity index 98%
rename from app/Livewire/Forms/RoomStatusLogTable.php
rename to app/Livewire/Tables/RoomStatusLogTable.php
index 045ace1..4283ee5 100644
--- a/app/Livewire/Forms/RoomStatusLogTable.php
+++ b/app/Livewire/Tables/RoomStatusLogTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms;
+namespace App\Livewire\Tables;
 
 use App\Models\RoomStatusLog;
 use Illuminate\Support\Carbon;
diff --git a/app/Livewire/Forms/RoomTable.php b/app/Livewire/Tables/RoomTable.php
similarity index 99%
rename from app/Livewire/Forms/RoomTable.php
rename to app/Livewire/Tables/RoomTable.php
index 6a9c82a..402c7f0 100644
--- a/app/Livewire/Forms/RoomTable.php
+++ b/app/Livewire/Tables/RoomTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms;
+namespace App\Livewire\Tables;
 
 use App\Models\Room;
 use App\Enums\RoomType;
diff --git a/app/Livewire/Forms/SongLibraryCacheTable.php b/app/Livewire/Tables/SongLibraryCacheTable.php
similarity index 99%
rename from app/Livewire/Forms/SongLibraryCacheTable.php
rename to app/Livewire/Tables/SongLibraryCacheTable.php
index d102bf8..8896be7 100644
--- a/app/Livewire/Forms/SongLibraryCacheTable.php
+++ b/app/Livewire/Tables/SongLibraryCacheTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms;
+namespace App\Livewire\Tables;
 
 use App\Models\SongLibraryCache;
 use Illuminate\Support\Carbon;
diff --git a/app/Livewire/Forms/UserTable.php b/app/Livewire/Tables/UserTable.php
similarity index 99%
rename from app/Livewire/Forms/UserTable.php
rename to app/Livewire/Tables/UserTable.php
index 15b8a12..cb635ac 100644
--- a/app/Livewire/Forms/UserTable.php
+++ b/app/Livewire/Tables/UserTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms;
+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 c8d4b75..0dd49ab 100644
--- a/resources/views/livewire/admin/activity-log.blade.php
+++ b/resources/views/livewire/admin/activity-log.blade.php
@@ -1,3 +1,3 @@
 <x-layouts.admin>
-    <livewire:forms.activity-log-table />
+    <livewire:tables.activity-log-table />
 </x-layouts.admin>
\ No newline at end of file
diff --git a/resources/views/livewire/admin/machine-status.blade.php b/resources/views/livewire/admin/machine-status.blade.php
index 6649302..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.machine-status-table />
+    <livewire:tables.machine-status-table />
 </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 c4f0ae6..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.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 547420c..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.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/song-library-cache.blade.php b/resources/views/livewire/admin/song-library-cache.blade.php
index 27f9fb6..1693021 100644
--- a/resources/views/livewire/admin/song-library-cache.blade.php
+++ b/resources/views/livewire/admin/song-library-cache.blade.php
@@ -1,3 +1,3 @@
 <x-layouts.admin>
-    <livewire:forms.song-library-cache-table />
+    <livewire:tables.song-library-cache-table />
 </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 76c0bad..f7c030a 100644
--- a/resources/views/livewire/admin/users.blade.php
+++ b/resources/views/livewire/admin/users.blade.php
@@ -1,3 +1,3 @@
 <x-layouts.admin>
-    <livewire:forms.user-table />
+    <livewire:tables.user-table />
 </x-layouts.admin>
\ No newline at end of file