diff --git a/resources/js/pages/admin/manage/cuttings/Create.vue b/resources/js/pages/admin/manage/cuttings/Create.vue
index bcc9aa0..4278d94 100644
--- a/resources/js/pages/admin/manage/cuttings/Create.vue
+++ b/resources/js/pages/admin/manage/cuttings/Create.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { Head, Link } from '@inertiajs/vue3';
 import { ArrowLeft } from '@lucide/vue';
-import CuttingPosForm from '@/components/admin/manage/cuttings/CuttingPosForm.vue';
+import CuttingPosForm from './form/CuttingPosForm.vue';
 import { Button } from '@/components/ui/button';
 import AdminLayout from '@/layouts/AdminLayout.vue';
 import type { CuttingProductCatalogItem, CuttingRawMaterialCatalogItem } from '@/types/cutting';
diff --git a/resources/js/pages/admin/manage/cuttings/Edit.vue b/resources/js/pages/admin/manage/cuttings/Edit.vue
index 7ec1318..15de0f7 100644
--- a/resources/js/pages/admin/manage/cuttings/Edit.vue
+++ b/resources/js/pages/admin/manage/cuttings/Edit.vue
@@ -2,7 +2,7 @@
 import { Head, Link } from '@inertiajs/vue3';
 import { ArrowLeft } from '@lucide/vue';
 import { computed } from 'vue';
-import CuttingPosForm from '@/components/admin/manage/cuttings/CuttingPosForm.vue';
+import CuttingPosForm from './form/CuttingPosForm.vue';
 import { Button } from '@/components/ui/button';
 import AdminLayout from '@/layouts/AdminLayout.vue';
 import type {
diff --git a/resources/js/pages/admin/manage/cuttings/Index.vue b/resources/js/pages/admin/manage/cuttings/Index.vue
index 93d4073..9fdfbf9 100644
--- a/resources/js/pages/admin/manage/cuttings/Index.vue
+++ b/resources/js/pages/admin/manage/cuttings/Index.vue
@@ -2,8 +2,8 @@
 import { Head, Link } from '@inertiajs/vue3';
 import { Plus } from '@lucide/vue';
 import { computed, ref, watch } from 'vue';
-import CuttingGroupedTable from '@/components/admin/manage/cuttings/CuttingGroupedTable.vue';
-import CuttingInProgressSection from '@/components/admin/manage/cuttings/CuttingInProgressSection.vue';
+import CuttingGroupedTable from './table/CuttingGroupedTable.vue';
+import CuttingInProgressSection from './table/CuttingInProgressSection.vue';
 import { Button } from '@/components/ui/button';
 import { Card, CardContent } from '@/components/ui/card';
 import { useCan } from '@/composables/useCan';
diff --git a/resources/js/components/admin/manage/cuttings/CuttingPosForm.vue b/resources/js/pages/admin/manage/cuttings/form/CuttingPosForm.vue
similarity index 99%
rename from resources/js/components/admin/manage/cuttings/CuttingPosForm.vue
rename to resources/js/pages/admin/manage/cuttings/form/CuttingPosForm.vue
index 7394e35..9841768 100644
--- a/resources/js/components/admin/manage/cuttings/CuttingPosForm.vue
+++ b/resources/js/pages/admin/manage/cuttings/form/CuttingPosForm.vue
@@ -3,8 +3,8 @@ import { useForm } from '@inertiajs/vue3';
 import { Minus, Plus, Save, Scissors, Search, Trash2 } from '@lucide/vue';
 import { computed, ref, watch } from 'vue';
 import { toast } from 'vue-sonner';
-import PosCatalogCard from '@/components/admin/manage/PosCatalogCard.vue';
-import PosCatalogVariantThumb from '@/components/admin/manage/PosCatalogVariantThumb.vue';
+import PosCatalogCard from '../../shared/PosCatalogCard.vue';
+import PosCatalogVariantThumb from '../../shared/PosCatalogVariantThumb.vue';
 import { DecimalInput } from '@/components/form/decimal-input';
 import { NumberInput } from '@/components/form/number-input';
 import { RupiahInput } from '@/components/form/rupiah-input';
diff --git a/resources/js/components/admin/manage/cuttings/CuttingCompletedSection.vue b/resources/js/pages/admin/manage/cuttings/table/CuttingCompletedSection.vue
similarity index 98%
rename from resources/js/components/admin/manage/cuttings/CuttingCompletedSection.vue
rename to resources/js/pages/admin/manage/cuttings/table/CuttingCompletedSection.vue
index 4583ef0..543d8fa 100644
--- a/resources/js/components/admin/manage/cuttings/CuttingCompletedSection.vue
+++ b/resources/js/pages/admin/manage/cuttings/table/CuttingCompletedSection.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { Check, ChevronDown } from '@lucide/vue';
 import { computed, ref } from 'vue';
-import DataTableActions from '@/components/admin/manage/cuttings/data-table-actions.vue';
+import DataTableActions from './data-table-actions.vue';
 import { Badge } from '@/components/ui/badge';
 import { Card, CardContent } from '@/components/ui/card';
 import {
diff --git a/resources/js/components/admin/manage/cuttings/CuttingGroupedTable.vue b/resources/js/pages/admin/manage/cuttings/table/CuttingGroupedTable.vue
similarity index 99%
rename from resources/js/components/admin/manage/cuttings/CuttingGroupedTable.vue
rename to resources/js/pages/admin/manage/cuttings/table/CuttingGroupedTable.vue
index db24820..7c38fab 100644
--- a/resources/js/components/admin/manage/cuttings/CuttingGroupedTable.vue
+++ b/resources/js/pages/admin/manage/cuttings/table/CuttingGroupedTable.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { Link } from '@inertiajs/vue3';
 import { computed } from 'vue';
-import DataTableActions from '@/components/admin/manage/cuttings/data-table-actions.vue';
+import DataTableActions from './data-table-actions.vue';
 import DataTableToolbar from '@/components/data-table/DataTableToolbar.vue';
 import { Badge } from '@/components/ui/badge';
 import { Button } from '@/components/ui/button';
diff --git a/resources/js/components/admin/manage/cuttings/CuttingInProgressSection.vue b/resources/js/pages/admin/manage/cuttings/table/CuttingInProgressSection.vue
similarity index 98%
rename from resources/js/components/admin/manage/cuttings/CuttingInProgressSection.vue
rename to resources/js/pages/admin/manage/cuttings/table/CuttingInProgressSection.vue
index 191112b..2b6532f 100644
--- a/resources/js/components/admin/manage/cuttings/CuttingInProgressSection.vue
+++ b/resources/js/pages/admin/manage/cuttings/table/CuttingInProgressSection.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ChevronDown, Scissors } from '@lucide/vue';
 import { computed, ref } from 'vue';
-import DataTableActions from '@/components/admin/manage/cuttings/data-table-actions.vue';
+import DataTableActions from './data-table-actions.vue';
 import { Badge } from '@/components/ui/badge';
 import { Card, CardContent } from '@/components/ui/card';
 import {
diff --git a/resources/js/components/admin/manage/cuttings/data-table-actions.vue b/resources/js/pages/admin/manage/cuttings/table/data-table-actions.vue
similarity index 100%
rename from resources/js/components/admin/manage/cuttings/data-table-actions.vue
rename to resources/js/pages/admin/manage/cuttings/table/data-table-actions.vue
diff --git a/resources/js/pages/admin/manage/orders/Create.vue b/resources/js/pages/admin/manage/orders/Create.vue
index 72f6f93..11e004c 100644
--- a/resources/js/pages/admin/manage/orders/Create.vue
+++ b/resources/js/pages/admin/manage/orders/Create.vue
@@ -2,7 +2,7 @@
 import { Head, Link } from '@inertiajs/vue3';
 import { ArrowLeft } from '@lucide/vue';
 import { ref } from 'vue';
-import OrderPosForm from '@/components/admin/manage/orders/OrderPosForm.vue';
+import OrderPosForm from './form/OrderPosForm.vue';
 import { Button } from '@/components/ui/button';
 import AdminLayout from '@/layouts/AdminLayout.vue';
 import type { EnumOption, OrderCartItem, OrderCatalogItem, SelectOption } from '@/types/order';
diff --git a/resources/js/pages/admin/manage/orders/Edit.vue b/resources/js/pages/admin/manage/orders/Edit.vue
index 7fa9cbf..22e36a6 100644
--- a/resources/js/pages/admin/manage/orders/Edit.vue
+++ b/resources/js/pages/admin/manage/orders/Edit.vue
@@ -2,7 +2,7 @@
 import { Head, Link } from '@inertiajs/vue3';
 import { ArrowLeft } from '@lucide/vue';
 import { computed, ref } from 'vue';
-import OrderPosForm from '@/components/admin/manage/orders/OrderPosForm.vue';
+import OrderPosForm from './form/OrderPosForm.vue';
 import { Button } from '@/components/ui/button';
 import AdminLayout from '@/layouts/AdminLayout.vue';
 import type { EnumOption, OrderCatalogItem, OrderEditItem, SelectOption } from '@/types/order';
diff --git a/resources/js/pages/admin/manage/orders/Index.vue b/resources/js/pages/admin/manage/orders/Index.vue
index 50da52d..d02a9ee 100644
--- a/resources/js/pages/admin/manage/orders/Index.vue
+++ b/resources/js/pages/admin/manage/orders/Index.vue
@@ -3,8 +3,8 @@ import { Head, Link, usePage } from '@inertiajs/vue3';
 import { Plus } from '@lucide/vue';
 import { computed, onMounted, ref, watch } from 'vue';
 import { toast } from 'vue-sonner';
-import OrderGroupedTable from '@/components/admin/manage/orders/OrderGroupedTable.vue';
-import ThermalPrinterConnectButton from '@/components/admin/manage/orders/ThermalPrinterConnectButton.vue';
+import OrderGroupedTable from './table/OrderGroupedTable.vue';
+import ThermalPrinterConnectButton from './form/ThermalPrinterConnectButton.vue';
 import { Button } from '@/components/ui/button';
 import { Card, CardContent } from '@/components/ui/card';
 import { useCan } from '@/composables/useCan';
diff --git a/resources/js/pages/admin/manage/orders/Show.vue b/resources/js/pages/admin/manage/orders/Show.vue
index 9a2da05..6bfa2f6 100644
--- a/resources/js/pages/admin/manage/orders/Show.vue
+++ b/resources/js/pages/admin/manage/orders/Show.vue
@@ -17,7 +17,7 @@ import {
 } from '@lucide/vue';
 import { computed, ref } from 'vue';
 import { toast } from 'vue-sonner';
-import OrderPrintButton from '@/components/admin/manage/orders/OrderPrintButton.vue';
+import OrderPrintButton from './form/OrderPrintButton.vue';
 import ConfirmDialog from '@/components/ConfirmDialog.vue';
 import { Badge } from '@/components/ui/badge';
 import { Button } from '@/components/ui/button';
diff --git a/resources/js/components/admin/manage/orders/CustomerQuickCreateModal.vue b/resources/js/pages/admin/manage/orders/form/CustomerQuickCreateModal.vue
similarity index 100%
rename from resources/js/components/admin/manage/orders/CustomerQuickCreateModal.vue
rename to resources/js/pages/admin/manage/orders/form/CustomerQuickCreateModal.vue
diff --git a/resources/js/components/admin/manage/orders/OrderPosForm.vue b/resources/js/pages/admin/manage/orders/form/OrderPosForm.vue
similarity index 99%
rename from resources/js/components/admin/manage/orders/OrderPosForm.vue
rename to resources/js/pages/admin/manage/orders/form/OrderPosForm.vue
index 605dd4e..57b3918 100644
--- a/resources/js/components/admin/manage/orders/OrderPosForm.vue
+++ b/resources/js/pages/admin/manage/orders/form/OrderPosForm.vue
@@ -3,9 +3,9 @@ import { useForm, usePage } from '@inertiajs/vue3';
 import { Minus, Plus, Save, Search, ShoppingCart, Trash2 } from '@lucide/vue';
 import { computed, ref, watch } from 'vue';
 import { toast } from 'vue-sonner';
-import CustomerQuickCreateModal from '@/components/admin/manage/orders/CustomerQuickCreateModal.vue';
-import PosCatalogCard from '@/components/admin/manage/PosCatalogCard.vue';
-import PosCatalogVariantThumb from '@/components/admin/manage/PosCatalogVariantThumb.vue';
+import CustomerQuickCreateModal from './CustomerQuickCreateModal.vue';
+import PosCatalogCard from '../../shared/PosCatalogCard.vue';
+import PosCatalogVariantThumb from '../../shared/PosCatalogVariantThumb.vue';
 import { NumberInput } from '@/components/form/number-input';
 import { RupiahInput } from '@/components/form/rupiah-input';
 import { Button } from '@/components/ui/button';
diff --git a/resources/js/components/admin/manage/orders/OrderPrintButton.vue b/resources/js/pages/admin/manage/orders/form/OrderPrintButton.vue
similarity index 100%
rename from resources/js/components/admin/manage/orders/OrderPrintButton.vue
rename to resources/js/pages/admin/manage/orders/form/OrderPrintButton.vue
diff --git a/resources/js/components/admin/manage/orders/ThermalPrinterConnectButton.vue b/resources/js/pages/admin/manage/orders/form/ThermalPrinterConnectButton.vue
similarity index 100%
rename from resources/js/components/admin/manage/orders/ThermalPrinterConnectButton.vue
rename to resources/js/pages/admin/manage/orders/form/ThermalPrinterConnectButton.vue
diff --git a/resources/js/components/admin/manage/orders/OrderGroupedTable.vue b/resources/js/pages/admin/manage/orders/table/OrderGroupedTable.vue
similarity index 99%
rename from resources/js/components/admin/manage/orders/OrderGroupedTable.vue
rename to resources/js/pages/admin/manage/orders/table/OrderGroupedTable.vue
index a69ec3d..f61700b 100644
--- a/resources/js/components/admin/manage/orders/OrderGroupedTable.vue
+++ b/resources/js/pages/admin/manage/orders/table/OrderGroupedTable.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { Link } from '@inertiajs/vue3';
 import { computed } from 'vue';
-import DataTableActions from '@/components/admin/manage/orders/data-table-actions.vue';
+import DataTableActions from './data-table-actions.vue';
 import { formatRupiah } from '@/lib/rupiah';
 import DataTableToolbar from '@/components/data-table/DataTableToolbar.vue';
 import { Badge } from '@/components/ui/badge';
diff --git a/resources/js/components/admin/manage/orders/data-table-actions.vue b/resources/js/pages/admin/manage/orders/table/data-table-actions.vue
similarity index 98%
rename from resources/js/components/admin/manage/orders/data-table-actions.vue
rename to resources/js/pages/admin/manage/orders/table/data-table-actions.vue
index 539f623..ea469b5 100644
--- a/resources/js/components/admin/manage/orders/data-table-actions.vue
+++ b/resources/js/pages/admin/manage/orders/table/data-table-actions.vue
@@ -3,7 +3,7 @@ import { Link, router } from '@inertiajs/vue3';
 import { Check, Eye, Pencil, Send, Trash2, X } from '@lucide/vue';
 import { computed, ref } from 'vue';
 import { toast } from 'vue-sonner';
-import OrderPrintButton from '@/components/admin/manage/orders/OrderPrintButton.vue';
+import OrderPrintButton from '../form/OrderPrintButton.vue';
 import ConfirmDialog from '@/components/ConfirmDialog.vue';
 import { Button } from '@/components/ui/button';
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
diff --git a/resources/js/pages/admin/manage/purchases/Create.vue b/resources/js/pages/admin/manage/purchases/Create.vue
index 312991c..e7a2716 100644
--- a/resources/js/pages/admin/manage/purchases/Create.vue
+++ b/resources/js/pages/admin/manage/purchases/Create.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { Head, Link } from '@inertiajs/vue3';
 import { ArrowLeft } from '@lucide/vue';
-import PurchasePosForm from '@/components/admin/manage/purchases/PurchasePosForm.vue';
+import PurchasePosForm from './form/PurchasePosForm.vue';
 import { Button } from '@/components/ui/button';
 import AdminLayout from '@/layouts/AdminLayout.vue';
 import type { PurchaseCartItem, PurchaseCatalogItem, SelectOption } from '@/types/purchase';
diff --git a/resources/js/pages/admin/manage/purchases/Edit.vue b/resources/js/pages/admin/manage/purchases/Edit.vue
index 18e7a29..d0a9220 100644
--- a/resources/js/pages/admin/manage/purchases/Edit.vue
+++ b/resources/js/pages/admin/manage/purchases/Edit.vue
@@ -2,7 +2,7 @@
 import { Head, Link } from '@inertiajs/vue3';
 import { ArrowLeft } from '@lucide/vue';
 import { computed } from 'vue';
-import PurchasePosForm from '@/components/admin/manage/purchases/PurchasePosForm.vue';
+import PurchasePosForm from './form/PurchasePosForm.vue';
 import { Button } from '@/components/ui/button';
 import AdminLayout from '@/layouts/AdminLayout.vue';
 import type { PurchaseCatalogItem, PurchaseEditItem, SelectOption } from '@/types/purchase';
diff --git a/resources/js/pages/admin/manage/purchases/Index.vue b/resources/js/pages/admin/manage/purchases/Index.vue
index cd0ca80..cf347b1 100644
--- a/resources/js/pages/admin/manage/purchases/Index.vue
+++ b/resources/js/pages/admin/manage/purchases/Index.vue
@@ -2,7 +2,7 @@
 import { Head, Link } from '@inertiajs/vue3';
 import { Plus } from '@lucide/vue';
 import { computed, ref, watch } from 'vue';
-import PurchaseGroupedTable from '@/components/admin/manage/purchases/PurchaseGroupedTable.vue';
+import PurchaseGroupedTable from './table/PurchaseGroupedTable.vue';
 import { Button } from '@/components/ui/button';
 import { Card, CardContent } from '@/components/ui/card';
 import { useCan } from '@/composables/useCan';
diff --git a/resources/js/components/admin/manage/purchases/PurchasePosForm.vue b/resources/js/pages/admin/manage/purchases/form/PurchasePosForm.vue
similarity index 99%
rename from resources/js/components/admin/manage/purchases/PurchasePosForm.vue
rename to resources/js/pages/admin/manage/purchases/form/PurchasePosForm.vue
index 8a894cf..aa088ad 100644
--- a/resources/js/components/admin/manage/purchases/PurchasePosForm.vue
+++ b/resources/js/pages/admin/manage/purchases/form/PurchasePosForm.vue
@@ -3,8 +3,8 @@ import { useForm } from '@inertiajs/vue3';
 import { Minus, Plus, Save, Search, ShoppingCart, Trash2 } from '@lucide/vue';
 import { computed, ref, watch } from 'vue';
 import { toast } from 'vue-sonner';
-import PosCatalogCard from '@/components/admin/manage/PosCatalogCard.vue';
-import PosCatalogVariantThumb from '@/components/admin/manage/PosCatalogVariantThumb.vue';
+import PosCatalogCard from '../../shared/PosCatalogCard.vue';
+import PosCatalogVariantThumb from '../../shared/PosCatalogVariantThumb.vue';
 import { DecimalInput } from '@/components/form/decimal-input';
 import { ImageUploadField } from '@/components/form/image-upload-field';
 import { RupiahInput } from '@/components/form/rupiah-input';
diff --git a/resources/js/components/admin/manage/purchases/PurchaseGroupedTable.vue b/resources/js/pages/admin/manage/purchases/table/PurchaseGroupedTable.vue
similarity index 98%
rename from resources/js/components/admin/manage/purchases/PurchaseGroupedTable.vue
rename to resources/js/pages/admin/manage/purchases/table/PurchaseGroupedTable.vue
index dc9cf3a..f248205 100644
--- a/resources/js/components/admin/manage/purchases/PurchaseGroupedTable.vue
+++ b/resources/js/pages/admin/manage/purchases/table/PurchaseGroupedTable.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { Link } from '@inertiajs/vue3';
 import { computed } from 'vue';
-import DataTableActions from '@/components/admin/manage/purchases/data-table-actions.vue';
+import DataTableActions from './data-table-actions.vue';
 import DataTableToolbar from '@/components/data-table/DataTableToolbar.vue';
 import MediaThumbnailCell from '@/components/media/MediaThumbnailCell.vue';
 import { Badge } from '@/components/ui/badge';
diff --git a/resources/js/components/admin/manage/purchases/data-table-actions.vue b/resources/js/pages/admin/manage/purchases/table/data-table-actions.vue
similarity index 100%
rename from resources/js/components/admin/manage/purchases/data-table-actions.vue
rename to resources/js/pages/admin/manage/purchases/table/data-table-actions.vue
diff --git a/resources/js/components/admin/manage/PosCatalogCard.vue b/resources/js/pages/admin/manage/shared/PosCatalogCard.vue
similarity index 100%
rename from resources/js/components/admin/manage/PosCatalogCard.vue
rename to resources/js/pages/admin/manage/shared/PosCatalogCard.vue
diff --git a/resources/js/components/admin/manage/PosCatalogVariantThumb.vue b/resources/js/pages/admin/manage/shared/PosCatalogVariantThumb.vue
similarity index 100%
rename from resources/js/components/admin/manage/PosCatalogVariantThumb.vue
rename to resources/js/pages/admin/manage/shared/PosCatalogVariantThumb.vue
diff --git a/resources/js/components/admin/master/MasterOutOfStockCatalogSection.vue b/resources/js/pages/admin/master/products/form/MasterOutOfStockCatalogSection.vue
similarity index 96%
rename from resources/js/components/admin/master/MasterOutOfStockCatalogSection.vue
rename to resources/js/pages/admin/master/products/form/MasterOutOfStockCatalogSection.vue
index 6e09aba..4d50156 100644
--- a/resources/js/components/admin/master/MasterOutOfStockCatalogSection.vue
+++ b/resources/js/pages/admin/master/products/form/MasterOutOfStockCatalogSection.vue
@@ -2,8 +2,8 @@
 import { router } from '@inertiajs/vue3';
 import { ChevronDown, PackageX, TriangleAlert } from '@lucide/vue';
 import { computed, ref } from 'vue';
-import PosCatalogCard from '@/components/admin/manage/PosCatalogCard.vue';
-import PosCatalogVariantThumb from '@/components/admin/manage/PosCatalogVariantThumb.vue';
+import PosCatalogCard from '@/pages/admin/manage/shared/PosCatalogCard.vue';
+import PosCatalogVariantThumb from '@/pages/admin/manage/shared/PosCatalogVariantThumb.vue';
 import { Badge } from '@/components/ui/badge';
 import { Card, CardContent } from '@/components/ui/card';
 import {
diff --git a/resources/js/pages/admin/system/activity-logs/Index.vue b/resources/js/pages/admin/system/activity-logs/Index.vue
index 34780d5..c720205 100644
--- a/resources/js/pages/admin/system/activity-logs/Index.vue
+++ b/resources/js/pages/admin/system/activity-logs/Index.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { Head } from '@inertiajs/vue3';
 import { computed, ref, watch } from 'vue';
-import ActivityLogDetailModal from '@/components/admin/system/activity-logs/ActivityLogDetailModal.vue';
-import { createColumns } from '@/components/admin/system/activity-logs/columns';
+import ActivityLogDetailModal from './table/ActivityLogDetailModal.vue';
+import { createColumns } from './table/columns';
 import { DataTable } from '@/components/data-table';
 import { Card, CardContent } from '@/components/ui/card';
 import { useDataTableQuery, useDataTableQuerySync } from '@/composables/useDataTableQuery';
diff --git a/resources/js/components/admin/system/activity-logs/ActivityLogDetailModal.vue b/resources/js/pages/admin/system/activity-logs/table/ActivityLogDetailModal.vue
similarity index 100%
rename from resources/js/components/admin/system/activity-logs/ActivityLogDetailModal.vue
rename to resources/js/pages/admin/system/activity-logs/table/ActivityLogDetailModal.vue
diff --git a/resources/js/components/admin/system/activity-logs/columns.ts b/resources/js/pages/admin/system/activity-logs/table/columns.ts
similarity index 94%
rename from resources/js/components/admin/system/activity-logs/columns.ts
rename to resources/js/pages/admin/system/activity-logs/table/columns.ts
index 415884e..165eca6 100644
--- a/resources/js/components/admin/system/activity-logs/columns.ts
+++ b/resources/js/pages/admin/system/activity-logs/table/columns.ts
@@ -1,6 +1,6 @@
 import type { ColumnDef } from '@tanstack/vue-table';
 import { h } from 'vue';
-import DataTableActions from '@/components/admin/system/activity-logs/data-table-actions.vue';
+import DataTableActions from './data-table-actions.vue';
 import { DataTableColumnHeader } from '@/components/data-table';
 import type { ActivityLogListItem } from '@/types/activity-log';
 
diff --git a/resources/js/components/admin/system/activity-logs/data-table-actions.vue b/resources/js/pages/admin/system/activity-logs/table/data-table-actions.vue
similarity index 100%
rename from resources/js/components/admin/system/activity-logs/data-table-actions.vue
rename to resources/js/pages/admin/system/activity-logs/table/data-table-actions.vue
diff --git a/resources/js/pages/admin/system/setting/Index.vue b/resources/js/pages/admin/system/setting/Index.vue
index c7d51cb..42814fe 100644
--- a/resources/js/pages/admin/system/setting/Index.vue
+++ b/resources/js/pages/admin/system/setting/Index.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import { Head } from '@inertiajs/vue3';
 import { ref } from 'vue';
-import HomepageSection from '@/components/admin/setting/HomepageSection.vue';
-import HrSection from '@/components/admin/setting/HrSection.vue';
-import MarketplaceSection from '@/components/admin/setting/MarketplaceSection.vue';
-import SocialMediaSection from '@/components/admin/setting/SocialMediaSection.vue';
-import SystemSection from '@/components/admin/setting/SystemSection.vue';
+import HomepageSection from './form/HomepageSection.vue';
+import HrSection from './form/HrSection.vue';
+import MarketplaceSection from './form/MarketplaceSection.vue';
+import SocialMediaSection from './form/SocialMediaSection.vue';
+import SystemSection from './form/SystemSection.vue';
 import SettingLayout from '@/layouts/SettingLayout.vue';
 import type {
     HomepageSettingsData,
diff --git a/resources/js/components/admin/setting/HomepageSection.vue b/resources/js/pages/admin/system/setting/form/HomepageSection.vue
similarity index 100%
rename from resources/js/components/admin/setting/HomepageSection.vue
rename to resources/js/pages/admin/system/setting/form/HomepageSection.vue
diff --git a/resources/js/components/admin/setting/HrSection.vue b/resources/js/pages/admin/system/setting/form/HrSection.vue
similarity index 100%
rename from resources/js/components/admin/setting/HrSection.vue
rename to resources/js/pages/admin/system/setting/form/HrSection.vue
diff --git a/resources/js/components/admin/setting/MarketplaceFeeField.vue b/resources/js/pages/admin/system/setting/form/MarketplaceFeeField.vue
similarity index 100%
rename from resources/js/components/admin/setting/MarketplaceFeeField.vue
rename to resources/js/pages/admin/system/setting/form/MarketplaceFeeField.vue
diff --git a/resources/js/components/admin/setting/MarketplaceSection.vue b/resources/js/pages/admin/system/setting/form/MarketplaceSection.vue
similarity index 99%
rename from resources/js/components/admin/setting/MarketplaceSection.vue
rename to resources/js/pages/admin/system/setting/form/MarketplaceSection.vue
index e925fcb..b2f3510 100644
--- a/resources/js/components/admin/setting/MarketplaceSection.vue
+++ b/resources/js/pages/admin/system/setting/form/MarketplaceSection.vue
@@ -3,7 +3,7 @@ import { useForm } from '@inertiajs/vue3';
 import { Save, ShoppingBag, Store } from '@lucide/vue';
 import { ref } from 'vue';
 import { toast } from 'vue-sonner';
-import MarketplaceFeeField from '@/components/admin/setting/MarketplaceFeeField.vue';
+import MarketplaceFeeField from './MarketplaceFeeField.vue';
 import { Button } from '@/components/ui/button';
 import {
     Card,
diff --git a/resources/js/components/admin/setting/SocialMediaSection.vue b/resources/js/pages/admin/system/setting/form/SocialMediaSection.vue
similarity index 100%
rename from resources/js/components/admin/setting/SocialMediaSection.vue
rename to resources/js/pages/admin/system/setting/form/SocialMediaSection.vue
diff --git a/resources/js/components/admin/setting/SystemSection.vue b/resources/js/pages/admin/system/setting/form/SystemSection.vue
similarity index 100%
rename from resources/js/components/admin/setting/SystemSection.vue
rename to resources/js/pages/admin/system/setting/form/SystemSection.vue