diff --git a/app/Livewire/Datatable/BottlesTable.php b/app/Livewire/Datatable/Studio/Catalog/BottlesTable.php
similarity index 98%
rename from app/Livewire/Datatable/BottlesTable.php
rename to app/Livewire/Datatable/Studio/Catalog/BottlesTable.php
index 861459a..7a834bb 100644
--- a/app/Livewire/Datatable/BottlesTable.php
+++ b/app/Livewire/Datatable/Studio/Catalog/BottlesTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable;
+namespace App\Livewire\Datatable\Studio\Catalog;
 
 use App\Models\Bottle;
 use App\Traits\Datatable\WithConfiguration;
diff --git a/app/Livewire/Datatable/BrandsTable.php b/app/Livewire/Datatable/Studio/Catalog/BrandsTable.php
similarity index 98%
rename from app/Livewire/Datatable/BrandsTable.php
rename to app/Livewire/Datatable/Studio/Catalog/BrandsTable.php
index 85da79e..4487213 100644
--- a/app/Livewire/Datatable/BrandsTable.php
+++ b/app/Livewire/Datatable/Studio/Catalog/BrandsTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable;
+namespace App\Livewire\Datatable\Studio\Catalog;
 
 use App\Models\Brand;
 use App\Traits\Datatable\WithConfiguration;
diff --git a/app/Livewire/Datatable/CategoriesTable.php b/app/Livewire/Datatable/Studio/Catalog/CategoriesTable.php
similarity index 98%
rename from app/Livewire/Datatable/CategoriesTable.php
rename to app/Livewire/Datatable/Studio/Catalog/CategoriesTable.php
index 8575328..6bdcdad 100644
--- a/app/Livewire/Datatable/CategoriesTable.php
+++ b/app/Livewire/Datatable/Studio/Catalog/CategoriesTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable;
+namespace App\Livewire\Datatable\Studio\Catalog;
 
 use App\Models\Category;
 use App\Traits\Datatable\WithConfiguration;
diff --git a/app/Livewire/Datatable/PerfumesTable.php b/app/Livewire/Datatable/Studio/Catalog/PerfumesTable.php
similarity index 98%
rename from app/Livewire/Datatable/PerfumesTable.php
rename to app/Livewire/Datatable/Studio/Catalog/PerfumesTable.php
index 7f42f98..2a4e5ba 100644
--- a/app/Livewire/Datatable/PerfumesTable.php
+++ b/app/Livewire/Datatable/Studio/Catalog/PerfumesTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable;
+namespace App\Livewire\Datatable\Studio\Catalog;
 
 use App\Models\Perfume;
 use App\Traits\Datatable\WithAppendColumn;
diff --git a/app/Livewire/Datatable/ProductsTable.php b/app/Livewire/Datatable/Studio/Catalog/ProductsTable.php
similarity index 98%
rename from app/Livewire/Datatable/ProductsTable.php
rename to app/Livewire/Datatable/Studio/Catalog/ProductsTable.php
index 4b84587..d606370 100644
--- a/app/Livewire/Datatable/ProductsTable.php
+++ b/app/Livewire/Datatable/Studio/Catalog/ProductsTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable;
+namespace App\Livewire\Datatable\Studio\Catalog;
 
 use App\Models\Product;
 use App\Traits\Datatable\WithAppendColumn;
diff --git a/app/Livewire/Datatable/ExpensesTable.php b/app/Livewire/Datatable/Studio/Finance/ExpensesTable.php
similarity index 96%
rename from app/Livewire/Datatable/ExpensesTable.php
rename to app/Livewire/Datatable/Studio/Finance/ExpensesTable.php
index c33afb7..7673c71 100644
--- a/app/Livewire/Datatable/ExpensesTable.php
+++ b/app/Livewire/Datatable/Studio/Finance/ExpensesTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable;
+namespace App\Livewire\Datatable\Studio\Finance;
 
 use App\Models\Expense;
 use App\Traits\Datatable\WithConfiguration;
diff --git a/app/Livewire/Datatable/CustomersTable.php b/app/Livewire/Datatable/Studio/Loyalty/CustomersTable.php
similarity index 97%
rename from app/Livewire/Datatable/CustomersTable.php
rename to app/Livewire/Datatable/Studio/Loyalty/CustomersTable.php
index 556b301..c73053d 100644
--- a/app/Livewire/Datatable/CustomersTable.php
+++ b/app/Livewire/Datatable/Studio/Loyalty/CustomersTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable;
+namespace App\Livewire\Datatable\Studio\Loyalty;
 
 use App\Models\Customer;
 use App\Traits\Datatable\WithAppendColumn;
diff --git a/app/Livewire/Datatable/TiersTable.php b/app/Livewire/Datatable/Studio/Loyalty/TiersTable.php
similarity index 96%
rename from app/Livewire/Datatable/TiersTable.php
rename to app/Livewire/Datatable/Studio/Loyalty/TiersTable.php
index 6c3db99..979468b 100644
--- a/app/Livewire/Datatable/TiersTable.php
+++ b/app/Livewire/Datatable/Studio/Loyalty/TiersTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable;
+namespace App\Livewire\Datatable\Studio\Loyalty;
 
 use App\Models\Tier;
 use App\Traits\Datatable\WithAppendColumn;
diff --git a/app/Livewire/Datatable/VouchersTable.php b/app/Livewire/Datatable/Studio/Loyalty/VouchersTable.php
similarity index 98%
rename from app/Livewire/Datatable/VouchersTable.php
rename to app/Livewire/Datatable/Studio/Loyalty/VouchersTable.php
index 3e66f38..3a311f5 100644
--- a/app/Livewire/Datatable/VouchersTable.php
+++ b/app/Livewire/Datatable/Studio/Loyalty/VouchersTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable;
+namespace App\Livewire\Datatable\Studio\Loyalty;
 
 use App\Models\Voucher;
 use App\Traits\Datatable\WithAppendColumn;
diff --git a/app/Livewire/Datatable/OutletsTable.php b/app/Livewire/Datatable/Studio/Master/OutletsTable.php
similarity index 99%
rename from app/Livewire/Datatable/OutletsTable.php
rename to app/Livewire/Datatable/Studio/Master/OutletsTable.php
index a3ccae1..b9de82f 100644
--- a/app/Livewire/Datatable/OutletsTable.php
+++ b/app/Livewire/Datatable/Studio/Master/OutletsTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable;
+namespace App\Livewire\Datatable\Studio\Master;
 
 use App\Enums\Day;
 use App\Enums\OutletStatus;
diff --git a/app/Livewire/Datatable/UsersTable.php b/app/Livewire/Datatable/Studio/Master/UsersTable.php
similarity index 99%
rename from app/Livewire/Datatable/UsersTable.php
rename to app/Livewire/Datatable/Studio/Master/UsersTable.php
index 89273dd..40498cd 100644
--- a/app/Livewire/Datatable/UsersTable.php
+++ b/app/Livewire/Datatable/Studio/Master/UsersTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Datatable;
+namespace App\Livewire\Datatable\Studio\Master;
 
 use App\Enums\UserStatus;
 use App\Models\Employee;
diff --git a/app/Livewire/Forms/RegisterForm.php b/app/Livewire/Forms/Auth/RegisterForm.php
similarity index 99%
rename from app/Livewire/Forms/RegisterForm.php
rename to app/Livewire/Forms/Auth/RegisterForm.php
index b4c1f5b..36cc571 100644
--- a/app/Livewire/Forms/RegisterForm.php
+++ b/app/Livewire/Forms/Auth/RegisterForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms;
+namespace App\Livewire\Forms\Auth;
 
 use App\Enums\Gender;
 use App\Enums\UserStatus;
diff --git a/app/Livewire/Forms/BottleForm.php b/app/Livewire/Forms/Studio/Catalog/BottleForm.php
similarity index 98%
rename from app/Livewire/Forms/BottleForm.php
rename to app/Livewire/Forms/Studio/Catalog/BottleForm.php
index bce6c31..49986d0 100644
--- a/app/Livewire/Forms/BottleForm.php
+++ b/app/Livewire/Forms/Studio/Catalog/BottleForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms;
+namespace App\Livewire\Forms\Studio\Catalog;
 
 use App\Models\Bottle;
 use App\Rules\UnsignedInteger;
diff --git a/app/Livewire/Forms/BrandForm.php b/app/Livewire/Forms/Studio/Catalog/BrandForm.php
similarity index 98%
rename from app/Livewire/Forms/BrandForm.php
rename to app/Livewire/Forms/Studio/Catalog/BrandForm.php
index 4d24aab..17ba5d3 100644
--- a/app/Livewire/Forms/BrandForm.php
+++ b/app/Livewire/Forms/Studio/Catalog/BrandForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms;
+namespace App\Livewire\Forms\Studio\Catalog;
 
 use App\Models\Brand;
 use App\Traits\WithMediaHandler;
diff --git a/app/Livewire/Forms/CategoryForm.php b/app/Livewire/Forms/Studio/Catalog/CategoryForm.php
similarity index 98%
rename from app/Livewire/Forms/CategoryForm.php
rename to app/Livewire/Forms/Studio/Catalog/CategoryForm.php
index 4b1e612..b87c75f 100644
--- a/app/Livewire/Forms/CategoryForm.php
+++ b/app/Livewire/Forms/Studio/Catalog/CategoryForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms;
+namespace App\Livewire\Forms\Studio\Catalog;
 
 use App\Models\Category;
 use Illuminate\Validation\Rule;
diff --git a/app/Livewire/Forms/PerfumeForm.php b/app/Livewire/Forms/Studio/Catalog/PerfumeForm.php
similarity index 99%
rename from app/Livewire/Forms/PerfumeForm.php
rename to app/Livewire/Forms/Studio/Catalog/PerfumeForm.php
index 95c9cb2..6768047 100644
--- a/app/Livewire/Forms/PerfumeForm.php
+++ b/app/Livewire/Forms/Studio/Catalog/PerfumeForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms;
+namespace App\Livewire\Forms\Studio\Catalog;
 
 use App\Enums\Concentration;
 use App\Models\Perfume;
diff --git a/app/Livewire/Forms/ProductForm.php b/app/Livewire/Forms/Studio/Catalog/ProductForm.php
similarity index 98%
rename from app/Livewire/Forms/ProductForm.php
rename to app/Livewire/Forms/Studio/Catalog/ProductForm.php
index a7f6f91..c429392 100644
--- a/app/Livewire/Forms/ProductForm.php
+++ b/app/Livewire/Forms/Studio/Catalog/ProductForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms;
+namespace App\Livewire\Forms\Studio\Catalog;
 
 use App\Models\Product;
 use App\Rules\UnsignedInteger;
diff --git a/app/Livewire/Forms/ExpenseForm.php b/app/Livewire/Forms/Studio/Finance/ExpenseForm.php
similarity index 97%
rename from app/Livewire/Forms/ExpenseForm.php
rename to app/Livewire/Forms/Studio/Finance/ExpenseForm.php
index f2e854e..c38fd90 100644
--- a/app/Livewire/Forms/ExpenseForm.php
+++ b/app/Livewire/Forms/Studio/Finance/ExpenseForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms;
+namespace App\Livewire\Forms\Studio\Finance;
 
 use App\Models\Expense;
 use App\Rules\UnsignedInteger;
diff --git a/app/Livewire/Forms/CustomerForm.php b/app/Livewire/Forms/Studio/Loyalty/CustomerForm.php
similarity index 97%
rename from app/Livewire/Forms/CustomerForm.php
rename to app/Livewire/Forms/Studio/Loyalty/CustomerForm.php
index d6174c9..2e42354 100644
--- a/app/Livewire/Forms/CustomerForm.php
+++ b/app/Livewire/Forms/Studio/Loyalty/CustomerForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms;
+namespace App\Livewire\Forms\Studio\Loyalty;
 
 use App\Enums\Gender;
 use App\Models\Customer;
diff --git a/app/Livewire/Forms/TierForm.php b/app/Livewire/Forms/Studio/Loyalty/TierForm.php
similarity index 96%
rename from app/Livewire/Forms/TierForm.php
rename to app/Livewire/Forms/Studio/Loyalty/TierForm.php
index 7cff2dd..c26fa76 100644
--- a/app/Livewire/Forms/TierForm.php
+++ b/app/Livewire/Forms/Studio/Loyalty/TierForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms;
+namespace App\Livewire\Forms\Studio\Loyalty;
 
 use App\Models\Tier;
 use Livewire\Form;
diff --git a/app/Livewire/Forms/VoucherForm.php b/app/Livewire/Forms/Studio/Loyalty/VoucherForm.php
similarity index 99%
rename from app/Livewire/Forms/VoucherForm.php
rename to app/Livewire/Forms/Studio/Loyalty/VoucherForm.php
index 2fb2ea5..7e7ecfc 100644
--- a/app/Livewire/Forms/VoucherForm.php
+++ b/app/Livewire/Forms/Studio/Loyalty/VoucherForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms;
+namespace App\Livewire\Forms\Studio\Loyalty;
 
 use App\Enums\IsActive;
 use App\Enums\VoucherType;
diff --git a/app/Livewire/Forms/OutletForm.php b/app/Livewire/Forms/Studio/Master/OutletForm.php
similarity index 99%
rename from app/Livewire/Forms/OutletForm.php
rename to app/Livewire/Forms/Studio/Master/OutletForm.php
index a468590..ae91eea 100644
--- a/app/Livewire/Forms/OutletForm.php
+++ b/app/Livewire/Forms/Studio/Master/OutletForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms;
+namespace App\Livewire\Forms\Studio\Master;
 
 use App\Enums\Day;
 use App\Enums\OutletStatus;
diff --git a/app/Livewire/Forms/UserForm.php b/app/Livewire/Forms/Studio/Master/UserForm.php
similarity index 99%
rename from app/Livewire/Forms/UserForm.php
rename to app/Livewire/Forms/Studio/Master/UserForm.php
index bc92745..eab8cc9 100644
--- a/app/Livewire/Forms/UserForm.php
+++ b/app/Livewire/Forms/Studio/Master/UserForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms;
+namespace App\Livewire\Forms\Studio\Master;
 
 use App\Enums\Gender;
 use App\Enums\UserStatus;
diff --git a/app/Livewire/Forms/AccountForm.php b/app/Livewire/Forms/Studio/Setting/AccountForm.php
similarity index 96%
rename from app/Livewire/Forms/AccountForm.php
rename to app/Livewire/Forms/Studio/Setting/AccountForm.php
index 667a40e..16a8813 100644
--- a/app/Livewire/Forms/AccountForm.php
+++ b/app/Livewire/Forms/Studio/Setting/AccountForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms;
+namespace App\Livewire\Forms\Studio\Setting;
 
 use App\Models\User;
 use App\Traits\WithMediaHandler;
diff --git a/app/Livewire/Forms/PasswordForm.php b/app/Livewire/Forms/Studio/Setting/PasswordForm.php
similarity index 96%
rename from app/Livewire/Forms/PasswordForm.php
rename to app/Livewire/Forms/Studio/Setting/PasswordForm.php
index fbf00aa..6e1244e 100644
--- a/app/Livewire/Forms/PasswordForm.php
+++ b/app/Livewire/Forms/Studio/Setting/PasswordForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms;
+namespace App\Livewire\Forms\Studio\Setting;
 
 use App\Models\User;
 use App\Traits\WithMediaHandler;
diff --git a/app/Livewire/Forms/ProfileForm.php b/app/Livewire/Forms/Studio/Setting/ProfileForm.php
similarity index 97%
rename from app/Livewire/Forms/ProfileForm.php
rename to app/Livewire/Forms/Studio/Setting/ProfileForm.php
index db01e85..3e404e8 100644
--- a/app/Livewire/Forms/ProfileForm.php
+++ b/app/Livewire/Forms/Studio/Setting/ProfileForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms;
+namespace App\Livewire\Forms\Studio\Setting;
 
 use App\Enums\Gender;
 use App\Models\Employee;
diff --git a/app/Livewire/Studio/Catalog/Bottle/Create.php b/app/Livewire/Studio/Catalog/Bottle/Create.php
index 62e1803..c953a98 100644
--- a/app/Livewire/Studio/Catalog/Bottle/Create.php
+++ b/app/Livewire/Studio/Catalog/Bottle/Create.php
@@ -2,7 +2,7 @@
 
 namespace App\Livewire\Studio\Catalog\Bottle;
 
-use App\Livewire\Forms\BottleForm;
+use App\Livewire\Forms\Studio\Catalog\BottleForm;
 use App\Models\Outlet;
 use App\Traits\WithOutletSelector;
 use App\Traits\WithUpdatedData;
diff --git a/app/Livewire/Studio/Catalog/Bottle/Edit.php b/app/Livewire/Studio/Catalog/Bottle/Edit.php
index 2e34aaa..e8b146a 100644
--- a/app/Livewire/Studio/Catalog/Bottle/Edit.php
+++ b/app/Livewire/Studio/Catalog/Bottle/Edit.php
@@ -2,7 +2,7 @@
 
 namespace App\Livewire\Studio\Catalog\Bottle;
 
-use App\Livewire\Forms\BottleForm;
+use App\Livewire\Forms\Studio\Catalog\BottleForm;
 use App\Models\Bottle;
 use App\Models\Outlet;
 use App\Traits\WithOutletSelector;
diff --git a/app/Livewire/Studio/Catalog/Brand.php b/app/Livewire/Studio/Catalog/Brand.php
index b9308dd..740f2b1 100644
--- a/app/Livewire/Studio/Catalog/Brand.php
+++ b/app/Livewire/Studio/Catalog/Brand.php
@@ -2,7 +2,7 @@
 
 namespace App\Livewire\Studio\Catalog;
 
-use App\Livewire\Forms\BrandForm;
+use App\Livewire\Forms\Studio\Catalog\BrandForm;
 use App\Models\Brand as BrandModel;
 use App\Traits\WithCloseModal;
 use App\Traits\WithConfirmation;
diff --git a/app/Livewire/Studio/Catalog/Category.php b/app/Livewire/Studio/Catalog/Category.php
index a982fed..7b961d0 100644
--- a/app/Livewire/Studio/Catalog/Category.php
+++ b/app/Livewire/Studio/Catalog/Category.php
@@ -2,7 +2,7 @@
 
 namespace App\Livewire\Studio\Catalog;
 
-use App\Livewire\Forms\CategoryForm;
+use App\Livewire\Forms\Studio\Catalog\CategoryForm;
 use App\Models\Category as CategoryModel;
 use App\Traits\WithCloseModal;
 use App\Traits\WithConfirmation;
diff --git a/app/Livewire/Studio/Catalog/Perfume/Create.php b/app/Livewire/Studio/Catalog/Perfume/Create.php
index 6ffa25f..4581133 100644
--- a/app/Livewire/Studio/Catalog/Perfume/Create.php
+++ b/app/Livewire/Studio/Catalog/Perfume/Create.php
@@ -2,7 +2,7 @@
 
 namespace App\Livewire\Studio\Catalog\Perfume;
 
-use App\Livewire\Forms\PerfumeForm;
+use App\Livewire\Forms\Studio\Catalog\PerfumeForm;
 use App\Models\Brand;
 use App\Models\Category;
 use App\Models\Outlet;
diff --git a/app/Livewire/Studio/Catalog/Perfume/Edit.php b/app/Livewire/Studio/Catalog/Perfume/Edit.php
index 462a27a..66dd289 100644
--- a/app/Livewire/Studio/Catalog/Perfume/Edit.php
+++ b/app/Livewire/Studio/Catalog/Perfume/Edit.php
@@ -2,7 +2,7 @@
 
 namespace App\Livewire\Studio\Catalog\Perfume;
 
-use App\Livewire\Forms\PerfumeForm;
+use App\Livewire\Forms\Studio\Catalog\PerfumeForm;
 use App\Models\Brand;
 use App\Models\Category;
 use App\Models\Outlet;
diff --git a/app/Livewire/Studio/Catalog/Product/Create.php b/app/Livewire/Studio/Catalog/Product/Create.php
index 522f95a..a838094 100644
--- a/app/Livewire/Studio/Catalog/Product/Create.php
+++ b/app/Livewire/Studio/Catalog/Product/Create.php
@@ -2,7 +2,7 @@
 
 namespace App\Livewire\Studio\Catalog\Product;
 
-use App\Livewire\Forms\ProductForm;
+use App\Livewire\Forms\Studio\Catalog\ProductForm;
 use App\Models\Outlet;
 use App\Traits\WithOutletSelector;
 use App\Traits\WithUpdatedData;
diff --git a/app/Livewire/Studio/Catalog/Product/Edit.php b/app/Livewire/Studio/Catalog/Product/Edit.php
index bc4f0b9..7eabeb0 100644
--- a/app/Livewire/Studio/Catalog/Product/Edit.php
+++ b/app/Livewire/Studio/Catalog/Product/Edit.php
@@ -2,7 +2,7 @@
 
 namespace App\Livewire\Studio\Catalog\Product;
 
-use App\Livewire\Forms\ProductForm;
+use App\Livewire\Forms\Studio\Catalog\ProductForm;
 use App\Models\Outlet;
 use App\Models\Product;
 use App\Traits\WithOutletSelector;
diff --git a/app/Livewire/Studio/Finance/Expense.php b/app/Livewire/Studio/Finance/Expense.php
index 22b8fdb..d6afd73 100644
--- a/app/Livewire/Studio/Finance/Expense.php
+++ b/app/Livewire/Studio/Finance/Expense.php
@@ -2,7 +2,7 @@
 
 namespace App\Livewire\Studio\Finance;
 
-use App\Livewire\Forms\ExpenseForm;
+use App\Livewire\Forms\Studio\Finance\ExpenseForm;
 use App\Models\Expense as ExpenseModel;
 use App\Traits\WithCloseModal;
 use App\Traits\WithConfirmation;
diff --git a/app/Livewire/Studio/Loyalty/Customer.php b/app/Livewire/Studio/Loyalty/Customer.php
index a851f59..c3e826d 100644
--- a/app/Livewire/Studio/Loyalty/Customer.php
+++ b/app/Livewire/Studio/Loyalty/Customer.php
@@ -2,7 +2,7 @@
 
 namespace App\Livewire\Studio\Loyalty;
 
-use App\Livewire\Forms\CustomerForm;
+use App\Livewire\Forms\Studio\Loyalty\CustomerForm;
 use App\Models\Customer as CustomerModel;
 use App\Traits\WithCloseModal;
 use App\Traits\WithConfirmation;
diff --git a/app/Livewire/Studio/Loyalty/Tier.php b/app/Livewire/Studio/Loyalty/Tier.php
index f69a837..348cdf1 100644
--- a/app/Livewire/Studio/Loyalty/Tier.php
+++ b/app/Livewire/Studio/Loyalty/Tier.php
@@ -2,7 +2,7 @@
 
 namespace App\Livewire\Studio\Loyalty;
 
-use App\Livewire\Forms\TierForm;
+use App\Livewire\Forms\Studio\Loyalty\TierForm;
 use App\Models\Tier as TierModel;
 use App\Traits\WithCloseModal;
 use App\Traits\WithConfirmation;
diff --git a/app/Livewire/Studio/Loyalty/Voucher/Create.php b/app/Livewire/Studio/Loyalty/Voucher/Create.php
index a9ac311..31f3fcf 100644
--- a/app/Livewire/Studio/Loyalty/Voucher/Create.php
+++ b/app/Livewire/Studio/Loyalty/Voucher/Create.php
@@ -2,7 +2,7 @@
 
 namespace App\Livewire\Studio\Loyalty\Voucher;
 
-use App\Livewire\Forms\VoucherForm;
+use App\Livewire\Forms\Studio\Loyalty\VoucherForm;
 use App\Models\Outlet;
 use App\Traits\WithOutletSelector;
 use App\Traits\WithUpdatedData;
diff --git a/app/Livewire/Studio/Loyalty/Voucher/Edit.php b/app/Livewire/Studio/Loyalty/Voucher/Edit.php
index 95a6ee6..fa12f75 100644
--- a/app/Livewire/Studio/Loyalty/Voucher/Edit.php
+++ b/app/Livewire/Studio/Loyalty/Voucher/Edit.php
@@ -2,7 +2,7 @@
 
 namespace App\Livewire\Studio\Loyalty\Voucher;
 
-use App\Livewire\Forms\VoucherForm;
+use App\Livewire\Forms\Studio\Loyalty\VoucherForm;
 use App\Models\Outlet;
 use App\Models\Voucher;
 use App\Traits\WithOutletSelector;
diff --git a/app/Livewire/Studio/Master/Outlet/Create.php b/app/Livewire/Studio/Master/Outlet/Create.php
index b7b0859..0485f9e 100644
--- a/app/Livewire/Studio/Master/Outlet/Create.php
+++ b/app/Livewire/Studio/Master/Outlet/Create.php
@@ -3,7 +3,7 @@
 namespace App\Livewire\Studio\Master\Outlet;
 
 use App\Enums\Day;
-use App\Livewire\Forms\OutletForm;
+use App\Livewire\Forms\Studio\Master\OutletForm;
 use App\Traits\Outlet\WithFacilityHandler;
 use App\Traits\WithUpdatedData;
 use Flux\Flux;
diff --git a/app/Livewire/Studio/Master/Outlet/Edit.php b/app/Livewire/Studio/Master/Outlet/Edit.php
index 2fbda53..217b54f 100644
--- a/app/Livewire/Studio/Master/Outlet/Edit.php
+++ b/app/Livewire/Studio/Master/Outlet/Edit.php
@@ -3,7 +3,7 @@
 namespace App\Livewire\Studio\Master\Outlet;
 
 use App\Enums\Day;
-use App\Livewire\Forms\OutletForm;
+use App\Livewire\Forms\Studio\Master\OutletForm;
 use App\Models\Outlet;
 use App\Traits\Outlet\WithFacilityHandler;
 use App\Traits\WithUpdatedData;
diff --git a/app/Livewire/Studio/Master/User/Create.php b/app/Livewire/Studio/Master/User/Create.php
index 0ab5b69..6fc7088 100644
--- a/app/Livewire/Studio/Master/User/Create.php
+++ b/app/Livewire/Studio/Master/User/Create.php
@@ -2,7 +2,7 @@
 
 namespace App\Livewire\Studio\Master\User;
 
-use App\Livewire\Forms\UserForm;
+use App\Livewire\Forms\Studio\Master\UserForm;
 use App\Traits\WithUpdatedData;
 use Flux\Flux;
 use Livewire\Attributes\Title;
diff --git a/app/Livewire/Studio/Master/User/Edit.php b/app/Livewire/Studio/Master/User/Edit.php
index 869066f..9ef1425 100644
--- a/app/Livewire/Studio/Master/User/Edit.php
+++ b/app/Livewire/Studio/Master/User/Edit.php
@@ -2,7 +2,7 @@
 
 namespace App\Livewire\Studio\Master\User;
 
-use App\Livewire\Forms\UserForm;
+use App\Livewire\Forms\Studio\Master\UserForm;
 use App\Models\User;
 use App\Traits\WithUpdatedData;
 use Flux\Flux;
diff --git a/app/Livewire/Studio/Setting/Account.php b/app/Livewire/Studio/Setting/Account.php
index 5347614..8b150f7 100644
--- a/app/Livewire/Studio/Setting/Account.php
+++ b/app/Livewire/Studio/Setting/Account.php
@@ -2,7 +2,7 @@
 
 namespace App\Livewire\Studio\Setting;
 
-use App\Livewire\Forms\AccountForm;
+use App\Livewire\Forms\Studio\Setting\AccountForm;
 use App\Models\User;
 use App\Traits\WithUpdatedData;
 use Flux\Flux;
diff --git a/app/Livewire/Studio/Setting/Password.php b/app/Livewire/Studio/Setting/Password.php
index 03fa708..9e24fd0 100644
--- a/app/Livewire/Studio/Setting/Password.php
+++ b/app/Livewire/Studio/Setting/Password.php
@@ -2,7 +2,7 @@
 
 namespace App\Livewire\Studio\Setting;
 
-use App\Livewire\Forms\PasswordForm;
+use App\Livewire\Forms\Studio\Setting\PasswordForm;
 use App\Models\User;
 use App\Traits\WithUpdatedData;
 use Flux\Flux;
diff --git a/app/Livewire/Studio/Setting/Profile.php b/app/Livewire/Studio/Setting/Profile.php
index 7e1d3ae..4f65bd3 100644
--- a/app/Livewire/Studio/Setting/Profile.php
+++ b/app/Livewire/Studio/Setting/Profile.php
@@ -2,7 +2,7 @@
 
 namespace App\Livewire\Studio\Setting;
 
-use App\Livewire\Forms\ProfileForm;
+use App\Livewire\Forms\Studio\Setting\ProfileForm;
 use App\Models\Employee;
 use App\Traits\WithUpdatedData;
 use Flux\Flux;
diff --git a/app/Traits/Outlet/WithFacilityHandler.php b/app/Traits/Outlet/WithFacilityHandler.php
index ac9c43b..0788373 100644
--- a/app/Traits/Outlet/WithFacilityHandler.php
+++ b/app/Traits/Outlet/WithFacilityHandler.php
@@ -2,7 +2,7 @@
 
 namespace App\Traits\Outlet;
 
-use App\Livewire\Forms\OutletForm;
+use App\Livewire\Forms\Studio\Master\OutletForm;
 
 trait WithFacilityHandler
 {
diff --git a/resources/views/livewire/studio/catalog/bottle/index.blade.php b/resources/views/livewire/studio/catalog/bottle/index.blade.php
index 3c23062..c4d55d5 100644
--- a/resources/views/livewire/studio/catalog/bottle/index.blade.php
+++ b/resources/views/livewire/studio/catalog/bottle/index.blade.php
@@ -12,7 +12,7 @@ class="text-sm">
     </div>
 
     <div class="mt-6">
-        <livewire:datatable.bottles-table />
+        <livewire:datatable.studio.catalog.bottles-table />
     </div>
 
     @include('components.confirmation.delete')
diff --git a/resources/views/livewire/studio/catalog/brands.blade.php b/resources/views/livewire/studio/catalog/brands.blade.php
index 600bef2..70cae7a 100644
--- a/resources/views/livewire/studio/catalog/brands.blade.php
+++ b/resources/views/livewire/studio/catalog/brands.blade.php
@@ -13,7 +13,7 @@
     </div>
 
     <div class="mt-6">
-        <livewire:datatable.brands-table />
+        <livewire:datatable.studio.catalog.brands-table />
     </div>
 
     @include('components.confirmation.delete')
diff --git a/resources/views/livewire/studio/catalog/categories.blade.php b/resources/views/livewire/studio/catalog/categories.blade.php
index e4c47e7..de5b3f2 100644
--- a/resources/views/livewire/studio/catalog/categories.blade.php
+++ b/resources/views/livewire/studio/catalog/categories.blade.php
@@ -13,7 +13,7 @@
     </div>
 
     <div class="mt-6">
-        <livewire:datatable.categories-table />
+        <livewire:datatable.studio.catalog.categories-table />
     </div>
 
     @include('components.confirmation.delete')
diff --git a/resources/views/livewire/studio/catalog/perfume/index.blade.php b/resources/views/livewire/studio/catalog/perfume/index.blade.php
index cd438ae..f0cb07b 100644
--- a/resources/views/livewire/studio/catalog/perfume/index.blade.php
+++ b/resources/views/livewire/studio/catalog/perfume/index.blade.php
@@ -12,7 +12,7 @@ class="text-sm">
     </div>
 
     <div class="mt-6">
-        <livewire:datatable.perfumes-table />
+        <livewire:datatable.studio.catalog.perfumes-table />
     </div>
 
     @include('components.confirmation.delete')
diff --git a/resources/views/livewire/studio/catalog/product/index.blade.php b/resources/views/livewire/studio/catalog/product/index.blade.php
index 87c72ec..56efc2e 100644
--- a/resources/views/livewire/studio/catalog/product/index.blade.php
+++ b/resources/views/livewire/studio/catalog/product/index.blade.php
@@ -12,7 +12,7 @@ class="text-sm">
     </div>
 
     <div class="mt-6">
-        <livewire:datatable.products-table />
+        <livewire:datatable.studio.catalog.products-table />
     </div>
 
     @include('components.confirmation.delete')
diff --git a/resources/views/livewire/studio/finance/expenses.blade.php b/resources/views/livewire/studio/finance/expenses.blade.php
index 92d8648..4508bfe 100644
--- a/resources/views/livewire/studio/finance/expenses.blade.php
+++ b/resources/views/livewire/studio/finance/expenses.blade.php
@@ -13,7 +13,7 @@
     </div>
 
     <div class="mt-6">
-        <livewire:datatable.expenses-table />
+        <livewire:datatable.studio.finance.expenses-table />
     </div>
 
     @include('components.confirmation.delete')
diff --git a/resources/views/livewire/studio/loyalty/customers.blade.php b/resources/views/livewire/studio/loyalty/customers.blade.php
index b3c37e1..0ee4318 100644
--- a/resources/views/livewire/studio/loyalty/customers.blade.php
+++ b/resources/views/livewire/studio/loyalty/customers.blade.php
@@ -13,7 +13,7 @@
     </div>
 
     <div class="mt-6">
-        <livewire:datatable.customers-table />
+        <livewire:datatable.studio.loyalty.customers-table />
     </div>
 
     @include('components.confirmation.delete')
diff --git a/resources/views/livewire/studio/loyalty/tiers.blade.php b/resources/views/livewire/studio/loyalty/tiers.blade.php
index 789a473..96ec409 100644
--- a/resources/views/livewire/studio/loyalty/tiers.blade.php
+++ b/resources/views/livewire/studio/loyalty/tiers.blade.php
@@ -13,7 +13,7 @@
     </div>
 
     <div class="mt-6">
-        <livewire:datatable.tiers-table />
+        <livewire:datatable.studio.loyalty.tiers-table />
     </div>
 
     @include('components.confirmation.delete')
diff --git a/resources/views/livewire/studio/loyalty/voucher/index.blade.php b/resources/views/livewire/studio/loyalty/voucher/index.blade.php
index 340055a..c0f10f6 100644
--- a/resources/views/livewire/studio/loyalty/voucher/index.blade.php
+++ b/resources/views/livewire/studio/loyalty/voucher/index.blade.php
@@ -12,7 +12,7 @@ class="text-sm">
     </div>
 
     <div class="mt-6">
-        <livewire:datatable.vouchers-table />
+        <livewire:datatable.studio.loyalty.vouchers-table />
     </div>
 
     @include('components.confirmation.delete')
diff --git a/resources/views/livewire/studio/master/outlet/index.blade.php b/resources/views/livewire/studio/master/outlet/index.blade.php
index c8a43df..a604218 100644
--- a/resources/views/livewire/studio/master/outlet/index.blade.php
+++ b/resources/views/livewire/studio/master/outlet/index.blade.php
@@ -12,7 +12,7 @@ class="text-sm">
     </div>
 
     <div class="mt-6">
-        <livewire:datatable.outlets-table />
+        <livewire:datatable.studio.master.outlets-table />
     </div>
 
     @include('components.confirmation.delete')
diff --git a/resources/views/livewire/studio/master/user/index.blade.php b/resources/views/livewire/studio/master/user/index.blade.php
index af4287e..687992e 100644
--- a/resources/views/livewire/studio/master/user/index.blade.php
+++ b/resources/views/livewire/studio/master/user/index.blade.php
@@ -12,7 +12,7 @@ class="text-sm">
     </div>
 
     <div class="mt-6">
-        <livewire:datatable.users-table />
+        <livewire:datatable.studio.master.users-table />
     </div>
 
     @include('components.confirmation.delete')