diff --git a/src/components/Card.tsx b/src/components/Card.tsx
index d3ff80b1..ff4c35f2 100644
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -4,7 +4,7 @@ import { HTMLAttributes, ReactNode, useState } from 'react';
 
 import { cn } from '@/lib/helper';
 import Image from 'next/image';
-import Collapse from './Collapse';
+import Collapse from '@/components/Collapse';
 import { Icon } from '@iconify/react';
 
 export interface CardProps
diff --git a/src/components/pages/marketing/form/MarketingForm.schema.ts b/src/components/pages/marketing/form/MarketingForm.schema.ts
index 0c427a9a..d81cdb9c 100644
--- a/src/components/pages/marketing/form/MarketingForm.schema.ts
+++ b/src/components/pages/marketing/form/MarketingForm.schema.ts
@@ -6,7 +6,7 @@ import {
 import {
   DeliveryOrderProductFormValues,
   DeliveryOrderProductSchema,
-} from './repeater/delivery-order/DeliverOrderProduct.schema';
+} from '@/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.schema';
 
 type MarketingSchemaType = {
   customer_id: number | undefined;
diff --git a/src/components/pages/marketing/form/MarketingForm.tsx b/src/components/pages/marketing/form/MarketingForm.tsx
index cdc72d57..326eac72 100644
--- a/src/components/pages/marketing/form/MarketingForm.tsx
+++ b/src/components/pages/marketing/form/MarketingForm.tsx
@@ -8,7 +8,6 @@ import SelectInput, {
   OptionType,
   useSelect,
 } from '@/components/input/SelectInput';
-import TextArea from '@/components/input/TextArea';
 import Modal, { useModal } from '@/components/Modal';
 import { formatCurrency, formatDate } from '@/lib/helper';
 import {
@@ -31,23 +30,23 @@ import {
   DeliveryOrderSchema,
   SalesOrderFormValues,
   SalesOrderSchema,
-} from './MarketingForm.schema';
+} from '@/components/pages/marketing/form/MarketingForm.schema';
 import { isResponseError, isResponseSuccess } from '@/lib/api-helper';
 import {
   DeliveryOrderApi,
   MarketingApi,
   SalesOrderApi,
 } from '@/services/api/marketing/marketing';
-import { SalesOrderProductFormValues } from './repeater/sales-order/SalesOrderProduct.schema';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import toast from 'react-hot-toast';
 import { useRouter } from 'next/navigation';
-import SalesOrderProductTable from './table-view/SalesOrderProductTable';
-import SalesOrderProductForm from './repeater/sales-order/SalesOrderProductForm';
-import DeliveryOrderProductTable from './table-view/DeliveryOrderProductTable';
-import DeliveryOrderProductForm from './repeater/delivery-order/DeliverOrderProduct';
-import { DeliveryOrderProductFormValues } from './repeater/delivery-order/DeliverOrderProduct.schema';
 import DebouncedTextArea from '@/components/input/DebouncedTextArea';
+import SalesOrderProductTable from '@/components/pages/marketing/form/table-view/SalesOrderProductTable';
+import SalesOrderProductForm from '@/components/pages/marketing/form/repeater/sales-order/SalesOrderProductForm';
+import DeliveryOrderProductTable from '@/components/pages/marketing/form/table-view/DeliveryOrderProductTable';
+import DeliveryOrderProductForm from '@/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct';
+import { SalesOrderProductFormValues } from '@/components/pages/marketing/form/repeater/sales-order/SalesOrderProduct.schema';
+import { DeliveryOrderProductFormValues } from '@/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.schema';
 
 const MemoizedSalesOrderProductTable = memo(SalesOrderProductTable);
 const MemoizedSalesOrderProductForm = memo(SalesOrderProductForm);
diff --git a/src/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.tsx b/src/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.tsx
index 4fe4179f..2dae2da5 100644
--- a/src/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.tsx
+++ b/src/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.tsx
@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';
 import {
   DeliveryOrderProductFormValues,
   DeliveryOrderProductSchema,
-} from './DeliverOrderProduct.schema';
+} from '@/components/pages/marketing/form/repeater/delivery-order/DeliverOrderProduct.schema';
 import { useFormik } from 'formik';
 import Alert from '@/components/Alert';
 import Button from '@/components/Button';
diff --git a/src/components/pages/marketing/pdf/DeliveryOrderExport.tsx b/src/components/pages/marketing/pdf/DeliveryOrderExport.tsx
index c2b19660..46e85a23 100644
--- a/src/components/pages/marketing/pdf/DeliveryOrderExport.tsx
+++ b/src/components/pages/marketing/pdf/DeliveryOrderExport.tsx
@@ -3,10 +3,10 @@ import { BaseDeliveryOrder, Marketing } from '@/types/api/marketing/marketing';
 import { Icon } from '@iconify/react';
 import { Document, Image, Page, pdf, Text, View } from '@react-pdf/renderer';
 import { useMemo, useState } from 'react';
-import pdfStyles from './styles/MarketingPDFStyles';
 import { formatDate, formatNumber, formatVechicleNumber } from '@/lib/helper';
 import { format } from 'path';
 import { date } from 'yup';
+import pdfStyles from '@/components/pages/marketing/pdf/styles/MarketingPDFStyles';
 
 interface DeliveryOrderExportProps {
   data?: Marketing;
diff --git a/src/components/pages/marketing/pdf/SalesOrderExport.tsx b/src/components/pages/marketing/pdf/SalesOrderExport.tsx
index e7fa9a71..f9f0a6c5 100644
--- a/src/components/pages/marketing/pdf/SalesOrderExport.tsx
+++ b/src/components/pages/marketing/pdf/SalesOrderExport.tsx
@@ -3,8 +3,8 @@ import { Marketing } from '@/types/api/marketing/marketing';
 import { Icon } from '@iconify/react';
 import { Document, Image, Page, pdf, Text, View } from '@react-pdf/renderer';
 import { useMemo, useState } from 'react';
-import pdfStyles from './styles/MarketingPDFStyles';
 import { formatDate, formatNumber } from '@/lib/helper';
+import pdfStyles from '@/components/pages/marketing/pdf/styles/MarketingPDFStyles';
 
 interface SalesOrderExportProps {
   data?: Marketing;
diff --git a/src/components/pages/production/chickin/form/ChickinForm.tsx b/src/components/pages/production/chickin/form/ChickinForm.tsx
index 1f56459f..3029105a 100644
--- a/src/components/pages/production/chickin/form/ChickinForm.tsx
+++ b/src/components/pages/production/chickin/form/ChickinForm.tsx
@@ -7,13 +7,13 @@ import { formatNumber } from '@/lib/helper';
 import { Kandang } from '@/types/api/master-data/kandang';
 import { ProjectFlockKandang } from '@/types/api/production/project-flock-kandang';
 import Tabs from '@/components/Tabs';
-import ChickinFormView from './tabs/ChickinFormView';
-import ChickinLogsView from './tabs/ChickLogsView';
 import { useState } from 'react';
 import ApprovalSteps, {
   useApprovalSteps,
 } from '@/components/pages/ApprovalSteps';
 import { PROJECT_FLOCK_KANDANG_APPROVAL_LINE } from '@/config/approval-line';
+import ChickinFormView from '@/components/pages/production/chickin/form/tabs/ChickinFormView';
+import ChickinLogsView from '@/components/pages/production/chickin/form/tabs/ChickLogsView';
 const ChickinFormKandang = ({
   formType = 'add',
   initialValues,
diff --git a/src/components/pages/production/project-flock/form/ProjectFlockForm.tsx b/src/components/pages/production/project-flock/form/ProjectFlockForm.tsx
index 8162b8f8..ddf98941 100644
--- a/src/components/pages/production/project-flock/form/ProjectFlockForm.tsx
+++ b/src/components/pages/production/project-flock/form/ProjectFlockForm.tsx
@@ -29,13 +29,11 @@ import {
 } from '@/types/api/production/project-flock';
 import toast from 'react-hot-toast';
 import { Kandang } from '@/types/api/master-data/kandang';
-import Collapse from '@/components/Collapse';
 import { ProjectFlockApi } from '@/services/api/production/project-flock';
 import { BaseApiResponse } from '@/types/api/api-general';
 import { FLOCK_CATEGORY_OPTIONS } from '@/config/constant';
 import { useModal } from '@/components/Modal';
 import ConfirmationModal from '@/components/modal/ConfirmationModal';
-import ProjectFlockKandangTable from './ProjectFlockKandangTable';
 import ApprovalSteps, {
   useApprovalSteps,
 } from '@/components/pages/ApprovalSteps';
@@ -44,6 +42,7 @@ import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWith
 import NumberInput from '@/components/input/NumberInput';
 import Card from '@/components/Card';
 import { useUiStore } from '@/stores/ui/ui.store';
+import ProjectFlockKandangTable from '@/components/pages/production/project-flock/form/ProjectFlockKandangTable';
 
 interface ProjectFlockFormProps {
   formType?: 'add' | 'edit' | 'detail';
diff --git a/src/components/pages/production/recording/form/RecordingForm.tsx b/src/components/pages/production/recording/form/RecordingForm.tsx
index 5900c84a..52297258 100644
--- a/src/components/pages/production/recording/form/RecordingForm.tsx
+++ b/src/components/pages/production/recording/form/RecordingForm.tsx
@@ -48,7 +48,7 @@ import {
   getRecordingLayingFormInitialValues,
   UpdateRecordingGrowingFormSchema,
   UpdateRecordingLayingFormSchema,
-} from './RecordingForm.schema';
+} from '@/components/pages/production/recording/form/RecordingForm.schema';
 
 import { isResponseSuccess, isResponseError } from '@/lib/api-helper';
 import { formatDate, formatNumber } from '@/lib/helper';
diff --git a/src/components/pages/production/recording/grading/form/GradingForm.tsx b/src/components/pages/production/recording/grading/form/GradingForm.tsx
index 9c3ba37a..1e91c78d 100644
--- a/src/components/pages/production/recording/grading/form/GradingForm.tsx
+++ b/src/components/pages/production/recording/grading/form/GradingForm.tsx
@@ -28,7 +28,7 @@ import {
   RecordingGradingFormValues,
   UpdateRecordingGradingFormSchema,
   getRecordingGradingFormInitialValues,
-} from '../../form/RecordingForm.schema';
+} from '@/components/pages/production/recording/form/RecordingForm.schema';
 
 import { cn, formatDate } from '@/lib/helper';
 import toast from 'react-hot-toast';
diff --git a/src/components/pages/purchase/form/order/PurchaseOrderAcceptApprovalForm.tsx b/src/components/pages/purchase/form/order/PurchaseOrderAcceptApprovalForm.tsx
index 7909ade9..79762da9 100644
--- a/src/components/pages/purchase/form/order/PurchaseOrderAcceptApprovalForm.tsx
+++ b/src/components/pages/purchase/form/order/PurchaseOrderAcceptApprovalForm.tsx
@@ -18,7 +18,7 @@ import {
   PurchaseRequestAcceptApprovalFormDefaultValues,
   PurchaseRequestAcceptApprovalFormInitialValues,
   PurchaseRequestAcceptApprovalFormSchema,
-} from './PurchaseOrderForm.schema';
+} from '@/components/pages/purchase/form/order/PurchaseOrderForm.schema';
 import { isResponseError } from '@/lib/api-helper';
 import { PurchaseApi } from '@/services/api/purchase';
 import {
diff --git a/src/components/pages/purchase/form/order/PurchaseOrderStaffApprovalForm.tsx b/src/components/pages/purchase/form/order/PurchaseOrderStaffApprovalForm.tsx
index 63756ad9..69c3fd13 100644
--- a/src/components/pages/purchase/form/order/PurchaseOrderStaffApprovalForm.tsx
+++ b/src/components/pages/purchase/form/order/PurchaseOrderStaffApprovalForm.tsx
@@ -21,7 +21,7 @@ import {
   PurchaseRequestStaffApprovalFormInitialValues,
   PurchaseRequestStaffApprovalFormSchema,
   PurchaseStaffApprovalItemSchema,
-} from './PurchaseOrderForm.schema';
+} from '@/components/pages/purchase/form/order/PurchaseOrderForm.schema';
 import { isResponseError } from '@/lib/api-helper';
 import { formatNumber } from '@/lib/helper';
 import { PurchaseApi } from '@/services/api/purchase';
diff --git a/src/components/pages/purchase/form/request/PurchaseRequestForm.tsx b/src/components/pages/purchase/form/request/PurchaseRequestForm.tsx
index 7100b134..c8684b2a 100644
--- a/src/components/pages/purchase/form/request/PurchaseRequestForm.tsx
+++ b/src/components/pages/purchase/form/request/PurchaseRequestForm.tsx
@@ -22,7 +22,7 @@ import {
   PurchaseRequestFormValues,
   getPurchaseRequestFormInitialValues,
   UpdatePurchaseRequestFormSchema,
-} from './PurchaseRequestForm.schema';
+} from '@/components/pages/purchase/form/request/PurchaseRequestForm.schema';
 import {
   SupplierApi,
   AreaApi,
diff --git a/src/services/api/production.ts b/src/services/api/production.ts
index 4266f6b7..110a881c 100644
--- a/src/services/api/production.ts
+++ b/src/services/api/production.ts
@@ -1,4 +1,4 @@
-import { BaseApiService } from './base';
+import { BaseApiService } from '@/services/api/base';
 import { BaseApiResponse } from '@/types/api/api-general';
 import {
   CreateProjectFlockPayload,