diff --git a/app/Livewire/Datatable/Studio/Catalog/BottlesTable.php b/app/Livewire/Datatable/Catalog/BottlesTable.php
similarity index 99%
rename from app/Livewire/Datatable/Studio/Catalog/BottlesTable.php
rename to app/Livewire/Datatable/Catalog/BottlesTable.php
index b7fda45..33215cf 100644
--- a/app/Livewire/Datatable/Studio/Catalog/BottlesTable.php
+++ b/app/Livewire/Datatable/Catalog/BottlesTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable\Studio\Catalog;
+namespace App\Livewire\Datatable\Catalog;
 
 use App\Models\Bottle;
 use App\Models\PriceRequest;
diff --git a/app/Livewire/Datatable/Studio/Catalog/BrandsTable.php b/app/Livewire/Datatable/Catalog/BrandsTable.php
similarity index 98%
rename from app/Livewire/Datatable/Studio/Catalog/BrandsTable.php
rename to app/Livewire/Datatable/Catalog/BrandsTable.php
index f458480..d2f38fe 100644
--- a/app/Livewire/Datatable/Studio/Catalog/BrandsTable.php
+++ b/app/Livewire/Datatable/Catalog/BrandsTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable\Studio\Catalog;
+namespace App\Livewire\Datatable\Catalog;
 
 use App\Models\Brand;
 use App\Traits\Datatable\WithConfiguration;
diff --git a/app/Livewire/Datatable/Studio/Catalog/CategoriesTable.php b/app/Livewire/Datatable/Catalog/CategoriesTable.php
similarity index 98%
rename from app/Livewire/Datatable/Studio/Catalog/CategoriesTable.php
rename to app/Livewire/Datatable/Catalog/CategoriesTable.php
index c5693a8..8f08fba 100644
--- a/app/Livewire/Datatable/Studio/Catalog/CategoriesTable.php
+++ b/app/Livewire/Datatable/Catalog/CategoriesTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable\Studio\Catalog;
+namespace App\Livewire\Datatable\Catalog;
 
 use App\Models\Category;
 use App\Traits\Datatable\WithConfiguration;
diff --git a/app/Livewire/Datatable/Studio/Catalog/PerfumesTable.php b/app/Livewire/Datatable/Catalog/PerfumesTable.php
similarity index 97%
rename from app/Livewire/Datatable/Studio/Catalog/PerfumesTable.php
rename to app/Livewire/Datatable/Catalog/PerfumesTable.php
index fdfe1ff..919657d 100644
--- a/app/Livewire/Datatable/Studio/Catalog/PerfumesTable.php
+++ b/app/Livewire/Datatable/Catalog/PerfumesTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable\Studio\Catalog;
+namespace App\Livewire\Datatable\Catalog;
 
 use App\Models\Perfume;
 use App\Models\PriceRequest;
@@ -146,10 +146,7 @@ public function builder(): Builder
             'perfumes.name',
             'concentration',
             'cost_price',
-            'sale_price',
-            'base_notes',
-            'middle_notes',
-            'top_notes'
+            'sale_price'
         )
             ->with([
                 'categories',
diff --git a/app/Livewire/Datatable/Studio/Catalog/ProductsTable.php b/app/Livewire/Datatable/Catalog/ProductsTable.php
similarity index 99%
rename from app/Livewire/Datatable/Studio/Catalog/ProductsTable.php
rename to app/Livewire/Datatable/Catalog/ProductsTable.php
index 53941df..042dadc 100644
--- a/app/Livewire/Datatable/Studio/Catalog/ProductsTable.php
+++ b/app/Livewire/Datatable/Catalog/ProductsTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable\Studio\Catalog;
+namespace App\Livewire\Datatable\Catalog;
 
 use App\Models\PriceRequest;
 use App\Models\Product;
diff --git a/app/Livewire/Datatable/Studio/Feature/ChooseUsTable.php b/app/Livewire/Datatable/Feature/ChooseUsTable.php
similarity index 98%
rename from app/Livewire/Datatable/Studio/Feature/ChooseUsTable.php
rename to app/Livewire/Datatable/Feature/ChooseUsTable.php
index 260a2f1..48b3f6e 100644
--- a/app/Livewire/Datatable/Studio/Feature/ChooseUsTable.php
+++ b/app/Livewire/Datatable/Feature/ChooseUsTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable\Studio\Feature;
+namespace App\Livewire\Datatable\Feature;
 
 use App\Models\ChooseUs;
 use App\Traits\Datatable\WithConfiguration;
diff --git a/app/Livewire/Datatable/Studio/Feature/PerfumeFeaturesTable.php b/app/Livewire/Datatable/Feature/PerfumeFeaturesTable.php
similarity index 98%
rename from app/Livewire/Datatable/Studio/Feature/PerfumeFeaturesTable.php
rename to app/Livewire/Datatable/Feature/PerfumeFeaturesTable.php
index 581c77b..3ef6f31 100644
--- a/app/Livewire/Datatable/Studio/Feature/PerfumeFeaturesTable.php
+++ b/app/Livewire/Datatable/Feature/PerfumeFeaturesTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable\Studio\Feature;
+namespace App\Livewire\Datatable\Feature;
 
 use App\Models\PerfumeFeature;
 use App\Traits\Datatable\WithConfiguration;
diff --git a/app/Livewire/Datatable/Studio/Finance/ExpensesTable.php b/app/Livewire/Datatable/Finance/ExpensesTable.php
similarity index 92%
rename from app/Livewire/Datatable/Studio/Finance/ExpensesTable.php
rename to app/Livewire/Datatable/Finance/ExpensesTable.php
index 49cdace..1717548 100644
--- a/app/Livewire/Datatable/Studio/Finance/ExpensesTable.php
+++ b/app/Livewire/Datatable/Finance/ExpensesTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable\Studio\Finance;
+namespace App\Livewire\Datatable\Finance;
 
 use App\Models\Expense;
 use App\Traits\Datatable\WithAppendColumn;
@@ -64,7 +64,7 @@ public function columns(): array
 
     public function builder(): Builder
     {
-        return Expense::select('expenses.*')
+        return Expense::select('expenses.id', 'expenses.user_id', 'expenses.outlet_id', 'expenses.description', 'expenses.amount', 'expenses.created_at')
             ->whereIn('outlet_id', auth()->user()->outlets->pluck('id')->toArray())
             ->with(['outlet', 'user', 'user.employee']);
     }
diff --git a/app/Livewire/Datatable/Studio/Finance/PayrollsTable.php b/app/Livewire/Datatable/Finance/PayrollsTable.php
similarity index 91%
rename from app/Livewire/Datatable/Studio/Finance/PayrollsTable.php
rename to app/Livewire/Datatable/Finance/PayrollsTable.php
index caaf0d5..1b7971d 100644
--- a/app/Livewire/Datatable/Studio/Finance/PayrollsTable.php
+++ b/app/Livewire/Datatable/Finance/PayrollsTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable\Studio\Finance;
+namespace App\Livewire\Datatable\Finance;
 
 use App\Enums\SalaryAdjustmentType;
 use App\Models\Payroll;
@@ -92,7 +92,18 @@ public function columns(): array
 
     public function builder(): Builder
     {
-        return Payroll::select('payrolls.*')
+        return Payroll::select(
+            'payrolls.id',
+            'payrolls.user_id',
+            'period_month',
+            'base_salary',
+            'bonus',
+            'deduction',
+            'total_salary',
+            'is_paid',
+            'paid_at',
+            'payrolls.created_at'
+        )
             ->where('period_month', '!=', now()->format('Y-m'))
             ->with(['user', 'user.employee']);
     }
diff --git a/app/Livewire/Datatable/Studio/Information/BroadcastsTable.php b/app/Livewire/Datatable/Information/BroadcastsTable.php
similarity index 97%
rename from app/Livewire/Datatable/Studio/Information/BroadcastsTable.php
rename to app/Livewire/Datatable/Information/BroadcastsTable.php
index 08626ee..ed644cf 100644
--- a/app/Livewire/Datatable/Studio/Information/BroadcastsTable.php
+++ b/app/Livewire/Datatable/Information/BroadcastsTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable\Studio\Information;
+namespace App\Livewire\Datatable\Information;
 
 use App\Models\Broadcast;
 use App\Traits\Datatable\WithAppendColumn;
diff --git a/app/Livewire/Datatable/Studio/Information/FaqsTable.php b/app/Livewire/Datatable/Information/FaqsTable.php
similarity index 98%
rename from app/Livewire/Datatable/Studio/Information/FaqsTable.php
rename to app/Livewire/Datatable/Information/FaqsTable.php
index 0ff8f17..f3c0ecf 100644
--- a/app/Livewire/Datatable/Studio/Information/FaqsTable.php
+++ b/app/Livewire/Datatable/Information/FaqsTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable\Studio\Information;
+namespace App\Livewire\Datatable\Information;
 
 use App\Models\Faq;
 use App\Traits\Datatable\WithConfiguration;
diff --git a/app/Livewire/Datatable/Studio/Information/PriceRequestsTable.php b/app/Livewire/Datatable/Information/PriceRequestsTable.php
similarity index 98%
rename from app/Livewire/Datatable/Studio/Information/PriceRequestsTable.php
rename to app/Livewire/Datatable/Information/PriceRequestsTable.php
index 6cb7d00..19b5f1a 100644
--- a/app/Livewire/Datatable/Studio/Information/PriceRequestsTable.php
+++ b/app/Livewire/Datatable/Information/PriceRequestsTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable\Studio\Information;
+namespace App\Livewire\Datatable\Information;
 
 use App\Enums\PriceRequestStatus;
 use App\Models\PriceRequest;
diff --git a/app/Livewire/Datatable/Studio/Loyalty/CustomersTable.php b/app/Livewire/Datatable/Loyalty/CustomersTable.php
similarity index 98%
rename from app/Livewire/Datatable/Studio/Loyalty/CustomersTable.php
rename to app/Livewire/Datatable/Loyalty/CustomersTable.php
index aa51117..62313c0 100644
--- a/app/Livewire/Datatable/Studio/Loyalty/CustomersTable.php
+++ b/app/Livewire/Datatable/Loyalty/CustomersTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable\Studio\Loyalty;
+namespace App\Livewire\Datatable\Loyalty;
 
 use App\Models\Customer;
 use App\Traits\Datatable\WithAppendColumn;
diff --git a/app/Livewire/Datatable/Studio/Loyalty/VouchersTable.php b/app/Livewire/Datatable/Loyalty/VouchersTable.php
similarity index 95%
rename from app/Livewire/Datatable/Studio/Loyalty/VouchersTable.php
rename to app/Livewire/Datatable/Loyalty/VouchersTable.php
index fea06c2..34a68a0 100644
--- a/app/Livewire/Datatable/Studio/Loyalty/VouchersTable.php
+++ b/app/Livewire/Datatable/Loyalty/VouchersTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable\Studio\Loyalty;
+namespace App\Livewire\Datatable\Loyalty;
 
 use App\Models\Voucher;
 use App\Traits\Datatable\WithAppendColumn;
@@ -135,6 +135,6 @@ public function columns(): array
 
     public function builder(): Builder
     {
-        return Voucher::select('id', 'name', 'code', 'min_purchase', 'discount_amount', 'max_discount', 'quota', 'available_count', 'limit_per_user', 'start_date', 'end_date', 'type', 'created_at')->with('outlets');
+        return Voucher::select('id', 'name', 'code', 'tags', 'min_purchase', 'discount_amount', 'max_discount', 'quota', 'available_count', 'limit_per_user', 'start_date', 'end_date', 'type', 'created_at')->with('outlets');
     }
 }
diff --git a/app/Livewire/Datatable/Studio/Manage/ArticlesTable.php b/app/Livewire/Datatable/Manage/ArticlesTable.php
similarity index 92%
rename from app/Livewire/Datatable/Studio/Manage/ArticlesTable.php
rename to app/Livewire/Datatable/Manage/ArticlesTable.php
index 9931aef..03bb2ab 100644
--- a/app/Livewire/Datatable/Studio/Manage/ArticlesTable.php
+++ b/app/Livewire/Datatable/Manage/ArticlesTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable\Studio\Manage;
+namespace App\Livewire\Datatable\Manage;
 
 use App\Models\Article;
 use App\Traits\Datatable\WithAppendColumn;
@@ -61,6 +61,6 @@ public function columns(): array
 
     public function builder(): Builder
     {
-        return Article::select('articles.id', 'title', 'articles.status')->with(['author', 'author.employee']);
+        return Article::select('articles.id', 'author_id', 'title', 'articles.status', 'published_at')->with(['author', 'author.employee']);
     }
 }
diff --git a/app/Livewire/Datatable/Studio/Manage/OrdersTable.php b/app/Livewire/Datatable/Manage/OrdersTable.php
similarity index 99%
rename from app/Livewire/Datatable/Studio/Manage/OrdersTable.php
rename to app/Livewire/Datatable/Manage/OrdersTable.php
index 36695ef..aacff67 100644
--- a/app/Livewire/Datatable/Studio/Manage/OrdersTable.php
+++ b/app/Livewire/Datatable/Manage/OrdersTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable\Studio\Manage;
+namespace App\Livewire\Datatable\Manage;
 
 use App\Models\Order;
 use App\Traits\Datatable\WithAppendColumn;
diff --git a/app/Livewire/Datatable/Studio/Manage/PurchasesTable.php b/app/Livewire/Datatable/Manage/PurchasesTable.php
similarity index 94%
rename from app/Livewire/Datatable/Studio/Manage/PurchasesTable.php
rename to app/Livewire/Datatable/Manage/PurchasesTable.php
index 7f94c7c..daef45b 100644
--- a/app/Livewire/Datatable/Studio/Manage/PurchasesTable.php
+++ b/app/Livewire/Datatable/Manage/PurchasesTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable\Studio\Manage;
+namespace App\Livewire\Datatable\Manage;
 
 use App\Models\Purchase;
 use App\Traits\Datatable\WithAppendColumn;
@@ -78,6 +78,6 @@ public function columns(): array
 
     public function builder(): Builder
     {
-        return Purchase::select('purchases.id', 'invoice_number', 'purchase_date', 'total')->with('outlet');
+        return Purchase::select('purchases.id', 'outlet_id', 'invoice_number', 'purchase_date', 'total')->with('outlet');
     }
 }
diff --git a/app/Livewire/Datatable/Studio/Manage/StockOpnameTable.php b/app/Livewire/Datatable/Manage/StockOpnameTable.php
similarity index 93%
rename from app/Livewire/Datatable/Studio/Manage/StockOpnameTable.php
rename to app/Livewire/Datatable/Manage/StockOpnameTable.php
index d80f567..9ae2d78 100644
--- a/app/Livewire/Datatable/Studio/Manage/StockOpnameTable.php
+++ b/app/Livewire/Datatable/Manage/StockOpnameTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable\Studio\Manage;
+namespace App\Livewire\Datatable\Manage;
 
 use App\Models\StockOpname;
 use App\Traits\Datatable\WithAppendColumn;
@@ -49,7 +49,7 @@ public function columns(): array
 
     public function builder(): Builder
     {
-        return StockOpname::select('stock_opname.id', 'period_month')
+        return StockOpname::select('stock_opname.id', 'outlet_id', 'period_month')
             ->where('period_month', '!=', now()->format('Y-m'))
             ->with('outlet');
     }
diff --git a/resources/views/livewire/studio/catalog/bottle/index.blade.php b/resources/views/livewire/studio/catalog/bottle/index.blade.php
index 6663fd6..6c9641e 100644
--- a/resources/views/livewire/studio/catalog/bottle/index.blade.php
+++ b/resources/views/livewire/studio/catalog/bottle/index.blade.php
@@ -22,7 +22,7 @@ class="text-sm">
             </flux:callout.text>
         </flux:callout>
 
-        <livewire:datatable.studio.catalog.bottles-table />
+        <livewire:datatable.catalog.bottles-table />
     </div>
 
     @include('components.modals.confirmation', [
diff --git a/resources/views/livewire/studio/catalog/brands.blade.php b/resources/views/livewire/studio/catalog/brands.blade.php
index bcee7d5..5b06ab3 100644
--- a/resources/views/livewire/studio/catalog/brands.blade.php
+++ b/resources/views/livewire/studio/catalog/brands.blade.php
@@ -15,7 +15,7 @@
     </div>
 
     <div class="mt-6">
-        <livewire:datatable.studio.catalog.brands-table />
+        <livewire:datatable.catalog.brands-table />
     </div>
 
     @include('components.modals.confirmation', [
diff --git a/resources/views/livewire/studio/catalog/categories.blade.php b/resources/views/livewire/studio/catalog/categories.blade.php
index 60f2b23..6f414a7 100644
--- a/resources/views/livewire/studio/catalog/categories.blade.php
+++ b/resources/views/livewire/studio/catalog/categories.blade.php
@@ -15,7 +15,7 @@
     </div>
 
     <div class="mt-6">
-        <livewire:datatable.studio.catalog.categories-table />
+        <livewire:datatable.catalog.categories-table />
     </div>
 
     @include('components.modals.confirmation', [
diff --git a/resources/views/livewire/studio/catalog/perfume/index.blade.php b/resources/views/livewire/studio/catalog/perfume/index.blade.php
index 63bc75f..553448f 100644
--- a/resources/views/livewire/studio/catalog/perfume/index.blade.php
+++ b/resources/views/livewire/studio/catalog/perfume/index.blade.php
@@ -22,7 +22,7 @@ class="text-sm">
             </flux:callout.text>
         </flux:callout>
 
-        <livewire:datatable.studio.catalog.perfumes-table />
+        <livewire:datatable.catalog.perfumes-table />
     </div>
 
     @include('components.modals.confirmation', [
diff --git a/resources/views/livewire/studio/catalog/product/index.blade.php b/resources/views/livewire/studio/catalog/product/index.blade.php
index 7783220..caf6592 100644
--- a/resources/views/livewire/studio/catalog/product/index.blade.php
+++ b/resources/views/livewire/studio/catalog/product/index.blade.php
@@ -22,7 +22,7 @@ class="text-sm">
             </flux:callout.text>
         </flux:callout>
 
-        <livewire:datatable.studio.catalog.products-table />
+        <livewire:datatable.catalog.products-table />
     </div>
 
     @include('components.modals.confirmation', [
diff --git a/resources/views/livewire/studio/feature/choose-us.blade.php b/resources/views/livewire/studio/feature/choose-us.blade.php
index a1c2cf1..4feec5f 100644
--- a/resources/views/livewire/studio/feature/choose-us.blade.php
+++ b/resources/views/livewire/studio/feature/choose-us.blade.php
@@ -16,7 +16,7 @@
     </div>
 
     <div class="mt-6">
-        <livewire:datatable.studio.feature.choose-us-table />
+        <livewire:datatable.feature.choose-us-table />
     </div>
 
     @include('components.modals.confirmation', [
@@ -27,7 +27,7 @@
         'buttonColor' => 'danger',
         'buttonText' => 'Ya, Hapus',
     ])
-    
+
     <flux:modal name="form-modal" class="w-[95%] max-w-sm md:max-w-xl mx-auto" @close="closeModal('form-modal')">
         <div class="p-4 space-y-6">
             <flux:heading size="lg">{{ $modalTitle }}</flux:heading>
diff --git a/resources/views/livewire/studio/feature/perfume-features.blade.php b/resources/views/livewire/studio/feature/perfume-features.blade.php
index 950b5dd..18cc80b 100644
--- a/resources/views/livewire/studio/feature/perfume-features.blade.php
+++ b/resources/views/livewire/studio/feature/perfume-features.blade.php
@@ -16,7 +16,7 @@
     </div>
 
     <div class="mt-6">
-        <livewire:datatable.studio.feature.perfume-features-table />
+        <livewire:datatable.feature.perfume-features-table />
     </div>
 
     @include('components.modals.confirmation', [
@@ -27,7 +27,7 @@
         'buttonColor' => 'danger',
         'buttonText' => 'Ya, Hapus',
     ])
-    
+
     <flux:modal name="form-modal" class="w-[95%] max-w-sm md:max-w-xl mx-auto" @close="closeModal('form-modal')">
         <div class="p-4 space-y-6">
             <flux:heading size="lg">{{ $modalTitle }}</flux:heading>
diff --git a/resources/views/livewire/studio/finance/expenses.blade.php b/resources/views/livewire/studio/finance/expenses.blade.php
index b4313ce..581cc2a 100644
--- a/resources/views/livewire/studio/finance/expenses.blade.php
+++ b/resources/views/livewire/studio/finance/expenses.blade.php
@@ -16,7 +16,7 @@
     </div>
 
     <div class="mt-6">
-        <livewire:datatable.studio.finance.expenses-table />
+        <livewire:datatable.finance.expenses-table />
     </div>
 
     @include('components.modals.confirmation', [
diff --git a/resources/views/livewire/studio/finance/payrolls.blade.php b/resources/views/livewire/studio/finance/payrolls.blade.php
index d0f8a4e..a349b4d 100644
--- a/resources/views/livewire/studio/finance/payrolls.blade.php
+++ b/resources/views/livewire/studio/finance/payrolls.blade.php
@@ -84,7 +84,7 @@ class="font-bold {{ $item->type->value == \App\Enums\SalaryAdjustmentType::DEDUC
             @endforeach
         </div>
 
-        <livewire:datatable.studio.finance.payrolls-table />
+        <livewire:datatable.finance.payrolls-table />
     </div>
 
     @include('components.modals.confirmation', [
diff --git a/resources/views/livewire/studio/information/broadcasts.blade.php b/resources/views/livewire/studio/information/broadcasts.blade.php
index a06da44..659a1c9 100644
--- a/resources/views/livewire/studio/information/broadcasts.blade.php
+++ b/resources/views/livewire/studio/information/broadcasts.blade.php
@@ -15,7 +15,7 @@
     </div>
 
     <div class="mt-6">
-        <livewire:datatable.studio.information.broadcasts-table />
+        <livewire:datatable.information.broadcasts-table />
     </div>
 
     @include('components.modals.confirmation', [
diff --git a/resources/views/livewire/studio/information/faqs.blade.php b/resources/views/livewire/studio/information/faqs.blade.php
index 108b988..437e55e 100644
--- a/resources/views/livewire/studio/information/faqs.blade.php
+++ b/resources/views/livewire/studio/information/faqs.blade.php
@@ -15,7 +15,7 @@
     </div>
 
     <div class="mt-6">
-        <livewire:datatable.studio.information.faqs-table />
+        <livewire:datatable.information.faqs-table />
     </div>
 
     @include('components.modals.confirmation', [
diff --git a/resources/views/livewire/studio/information/price-requests.blade.php b/resources/views/livewire/studio/information/price-requests.blade.php
index f7ca4b8..018436f 100644
--- a/resources/views/livewire/studio/information/price-requests.blade.php
+++ b/resources/views/livewire/studio/information/price-requests.blade.php
@@ -6,7 +6,7 @@
     </div>
 
     <div class="mt-6">
-        <livewire:datatable.studio.information.price-requests-table />
+        <livewire:datatable.information.price-requests-table />
     </div>
 
     @include('components.modals.confirmation', [
diff --git a/resources/views/livewire/studio/loyalty/customers.blade.php b/resources/views/livewire/studio/loyalty/customers.blade.php
index 1f93cc5..dc853d0 100644
--- a/resources/views/livewire/studio/loyalty/customers.blade.php
+++ b/resources/views/livewire/studio/loyalty/customers.blade.php
@@ -26,7 +26,7 @@
             </div>
         @endif
 
-        <livewire:datatable.studio.loyalty.customers-table />
+        <livewire:datatable.loyalty.customers-table />
     </div>
 
     @include('components.modals.confirmation', [
diff --git a/resources/views/livewire/studio/loyalty/voucher/index.blade.php b/resources/views/livewire/studio/loyalty/voucher/index.blade.php
index 5b29f1b..365dcd5 100644
--- a/resources/views/livewire/studio/loyalty/voucher/index.blade.php
+++ b/resources/views/livewire/studio/loyalty/voucher/index.blade.php
@@ -25,7 +25,7 @@ class="text-sm">
             </div>
         @endif
 
-        <livewire:datatable.studio.loyalty.vouchers-table />
+        <livewire:datatable.loyalty.vouchers-table />
     </div>
 
     @include('components.modals.confirmation', [
diff --git a/resources/views/livewire/studio/manage/article/index.blade.php b/resources/views/livewire/studio/manage/article/index.blade.php
index b3d67e1..ace5258 100644
--- a/resources/views/livewire/studio/manage/article/index.blade.php
+++ b/resources/views/livewire/studio/manage/article/index.blade.php
@@ -14,7 +14,7 @@ class="text-sm">
     </div>
 
     <div class="mt-6">
-        <livewire:datatable.studio.manage.articles-table />
+        <livewire:datatable.manage.articles-table />
     </div>
 
     @include('components.modals.confirmation', [
diff --git a/resources/views/livewire/studio/manage/order/index.blade.php b/resources/views/livewire/studio/manage/order/index.blade.php
index e9b62a9..2257160 100644
--- a/resources/views/livewire/studio/manage/order/index.blade.php
+++ b/resources/views/livewire/studio/manage/order/index.blade.php
@@ -17,7 +17,7 @@ class="text-sm">
     </div>
 
     <div class="mt-6">
-        <livewire:datatable.studio.manage.orders-table />
+        <livewire:datatable.manage.orders-table />
     </div>
 
     @include('components.modals.confirmation', [
diff --git a/resources/views/livewire/studio/manage/purchase/index.blade.php b/resources/views/livewire/studio/manage/purchase/index.blade.php
index a485ef0..02cb9c2 100644
--- a/resources/views/livewire/studio/manage/purchase/index.blade.php
+++ b/resources/views/livewire/studio/manage/purchase/index.blade.php
@@ -21,7 +21,7 @@ class="text-sm">
             </flux:callout.text>
         </flux:callout>
 
-        <livewire:datatable.studio.manage.purchases-table />
+        <livewire:datatable.manage.purchases-table />
     </div>
 
     @include('components.modals.confirmation', [
diff --git a/resources/views/livewire/studio/manage/stock-opname/index.blade.php b/resources/views/livewire/studio/manage/stock-opname/index.blade.php
index e43a3dc..39e2ce6 100644
--- a/resources/views/livewire/studio/manage/stock-opname/index.blade.php
+++ b/resources/views/livewire/studio/manage/stock-opname/index.blade.php
@@ -99,7 +99,7 @@
             @endforeach
         </div>
 
-        <livewire:datatable.studio.manage.stock-opname-table />
+        <livewire:datatable.manage.stock-opname-table />
     </div>
 
     @include('components.modals.confirmation', [
diff --git a/tests/Feature/Livewire/Datatable/Studio/Finance/ExpensesTableTest.php b/tests/Feature/Livewire/Datatable/Studio/Finance/ExpensesTableTest.php
deleted file mode 100644
index 81c6a82..0000000
--- a/tests/Feature/Livewire/Datatable/Studio/Finance/ExpensesTableTest.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-use App\Livewire\Datatable\Studio\Finance\ExpensesTable;
-use App\Models\Employee;
-use App\Models\Expense;
-use App\Models\Outlet;
-use App\Models\User;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Livewire\Livewire;
-
-uses(RefreshDatabase::class);
-
-beforeEach(function () {
-    // Setup Permissions if needed, though view might not need them strictly for data loading,
-    // but actions column does check permissions
-    $this->user = User::factory()->has(Employee::factory(), 'employee')->create();
-    $this->outlet = Outlet::factory()->create();
-    $this->user->outlets()->attach($this->outlet);
-
-    // Give permissions to view actions
-    // actions column checks: update expense, delete expense, or own data
-    // So for own data, no perm needed.
-});
-
-it('renders successfully', function () {
-    $this->actingAs($this->user);
-
-    Livewire::test(ExpensesTable::class)
-        ->assertStatus(200);
-});
-
-it('shows expenses from user outlets', function () {
-    $this->actingAs($this->user);
-
-    Expense::factory()->create([
-        'user_id' => $this->user->id,
-        'outlet_id' => $this->outlet->id,
-        'description' => 'My Expense',
-        'amount' => 50000,
-    ]);
-
-    Livewire::test(ExpensesTable::class)
-        ->assertSee('My Expense')
-        ->assertSee('50.000'); // Assuming currency formatting adds dot for thousands (ID)
-});
-
-it('does not show expenses from other outlets', function () {
-    $this->actingAs($this->user);
-
-    $otherOutlet = Outlet::factory()->create();
-    $otherUser = User::factory()->has(Employee::factory(), 'employee')->create();
-    $otherUser->outlets()->attach($otherOutlet);
-
-    Expense::factory()->create([
-        'user_id' => $otherUser->id,
-        'outlet_id' => $otherOutlet->id,
-        'description' => 'Other Expense',
-        'amount' => 100000,
-    ]);
-
-    Livewire::test(ExpensesTable::class)
-        ->assertDontSee('Other Expense');
-});
-
-it('can search by description', function () {
-    $this->actingAs($this->user);
-
-    Expense::factory()->create([
-        'user_id' => $this->user->id,
-        'outlet_id' => $this->outlet->id,
-        'description' => 'UniqueTerm',
-        'amount' => 12345,
-    ]);
-
-    Expense::factory()->create([
-        'user_id' => $this->user->id,
-        'outlet_id' => $this->outlet->id,
-        'description' => 'AnotherItem',
-        'amount' => 67890,
-    ]);
-
-    Livewire::test(ExpensesTable::class)
-        ->set('search', 'UniqueTerm') // Standard search property
-        ->assertSee('UniqueTerm')
-        ->assertDontSee('AnotherItem');
-});
-
-it('can search by amount', function () {
-    $this->actingAs($this->user);
-
-    Expense::factory()->create([
-        'user_id' => $this->user->id,
-        'outlet_id' => $this->outlet->id,
-        'description' => 'Exp1',
-        'amount' => 8888,
-    ]);
-
-    Expense::factory()->create([
-        'user_id' => $this->user->id,
-        'outlet_id' => $this->outlet->id,
-        'description' => 'Exp2',
-        'amount' => 9999,
-    ]);
-
-    Livewire::test(ExpensesTable::class)
-        ->set('search', '8888')
-        ->assertSee('Exp1')
-        ->assertDontSee('Exp2');
-});
-
-it('renders columns correctly', function () {
-    $this->actingAs($this->user);
-
-    Livewire::test(ExpensesTable::class)
-        ->assertSee('Pegawai')
-        ->assertSee('Keterangan')
-        ->assertSee('Jumlah')
-        ->assertSee('Outlet')
-        ->assertSee('Tanggal')
-        ->assertSee('Aksi');
-});