diff --git a/resources/js/pages/admin/master/customers/Index.vue b/resources/js/pages/admin/master/customers/Index.vue
index 3b12d31..7296ecb 100644
--- a/resources/js/pages/admin/master/customers/Index.vue
+++ b/resources/js/pages/admin/master/customers/Index.vue
@@ -2,8 +2,8 @@
 import { Head } from '@inertiajs/vue3';
 import { Plus } from '@lucide/vue';
 import { computed, ref, watch } from 'vue';
-import { createColumns } from '@/components/admin/master/customers/columns';
-import CustomerFormModal from '@/components/admin/master/customers/CustomerFormModal.vue';
+import { createColumns } from './table/columns';
+import CustomerFormModal from './form/CustomerFormModal.vue';
 import { DataTable } from '@/components/data-table';
 import { Button } from '@/components/ui/button';
 import { Card, CardContent } from '@/components/ui/card';
diff --git a/resources/js/components/admin/master/customers/CustomerFormModal.vue b/resources/js/pages/admin/master/customers/form/CustomerFormModal.vue
similarity index 99%
rename from resources/js/components/admin/master/customers/CustomerFormModal.vue
rename to resources/js/pages/admin/master/customers/form/CustomerFormModal.vue
index 64d75f1..6f87b8b 100644
--- a/resources/js/components/admin/master/customers/CustomerFormModal.vue
+++ b/resources/js/pages/admin/master/customers/form/CustomerFormModal.vue
@@ -24,7 +24,7 @@ import { Textarea } from '@/components/ui/textarea';
 import { useFormDialog } from '@/composables/useFormDialog';
 import { FIELD_LIMITS } from '@/lib/field-limits';
 import { formErrors } from '@/lib/form';
-import type { CustomerFormData, CustomerListItem } from '@/types/customers';
+import type { CustomerFormData, CustomerListItem } from '@/types/customer';
 
 const open = defineModel<boolean>('open', { default: false });
 
diff --git a/resources/js/components/admin/master/customers/columns.ts b/resources/js/pages/admin/master/customers/table/columns.ts
similarity index 92%
rename from resources/js/components/admin/master/customers/columns.ts
rename to resources/js/pages/admin/master/customers/table/columns.ts
index 43cd647..30b5739 100644
--- a/resources/js/components/admin/master/customers/columns.ts
+++ b/resources/js/pages/admin/master/customers/table/columns.ts
@@ -1,7 +1,7 @@
 import type { ColumnDef } from '@tanstack/vue-table';
 import { h } from 'vue';
-import DataTableActions from '@/components/admin/master/customers/data-table-actions.vue';
 import { DataTableColumnHeader } from '@/components/data-table';
+import DataTableActions from './data-table-actions.vue';
 import type { CustomerListItem } from '@/types/customer';
 
 export function createColumns(onEdit: (customer: CustomerListItem) => void): ColumnDef<CustomerListItem>[] {
diff --git a/resources/js/components/admin/master/customers/data-table-actions.vue b/resources/js/pages/admin/master/customers/table/data-table-actions.vue
similarity index 100%
rename from resources/js/components/admin/master/customers/data-table-actions.vue
rename to resources/js/pages/admin/master/customers/table/data-table-actions.vue
diff --git a/resources/js/types/customers.ts b/resources/js/types/customer.ts
similarity index 100%
rename from resources/js/types/customers.ts
rename to resources/js/types/customer.ts