diff --git a/src/components/pages/closing/ClosingDetail.tsx b/src/components/pages/closing/ClosingDetail.tsx
index c3c91a5a..51f7618d 100644
--- a/src/components/pages/closing/ClosingDetail.tsx
+++ b/src/components/pages/closing/ClosingDetail.tsx
@@ -6,17 +6,17 @@ import { Icon } from '@iconify/react';
 import Button from '@/components/Button';
 import Tabs from '@/components/Tabs';
 import ClosingGeneralInformationTable from '@/components/pages/closing/ClosingGeneralInformationTable';
-import ClosingSapronakTabContent from '@/components/pages/closing/ClosingSapronakTabContent';
-import ClosingProductionDataTabContent from '@/components/pages/closing/ClosingProductionDataTabContent';
+import ClosingSapronakTabContent from '@/components/pages/closing/tab/ClosingSapronakTabContent';
+import ClosingProductionDataTabContent from '@/components/pages/closing/tab/ClosingProductionDataTabContent';
 
 import {
   ClosingGeneralInformation,
   BaseClosingSales,
   ClosingHppExpedition,
 } from '@/types/api/closing';
-import ClosingSapronakCalculationTabContent from '@/components/pages/closing/ClosingSapronakCalculationTabContent';
-import ClosingOverheadTabContent from '@/components/pages/closing/ClosingOverheadTabContent';
-import ClosingFinanceTabContent from '@/components/pages/closing/ClosingFinanceTabContent';
+import ClosingSapronakCalculationTabContent from '@/components/pages/closing/tab/ClosingSapronakCalculationTabContent';
+import ClosingOverheadTabContent from '@/components/pages/closing/tab/ClosingOverheadTabContent';
+import ClosingFinanceTabContent from '@/components/pages/closing/tab/ClosingFinanceTabContent';
 import SalesReportTable from '@/components/pages/closing/sale/SalesReportTable';
 import HppExpeditionReportTable from './hpp-ekspedisi/HppExpeditionReportTable';
 import ClosingKandangList from '@/components/pages/closing/ClosingKandangList';
@@ -96,7 +96,7 @@ const ClosingDetail: React.FC<ClosingDetailProps> = ({
 
   return (
     <>
-      <section className='w-full max-w-7xl pb-16'>
+      <section className='w-full'>
         <header className='flex flex-col gap-4'>
           <Button
             href={
diff --git a/src/components/pages/closing/ClosingsTable.tsx b/src/components/pages/closing/ClosingsTable.tsx
index dc9609ac..2716932f 100644
--- a/src/components/pages/closing/ClosingsTable.tsx
+++ b/src/components/pages/closing/ClosingsTable.tsx
@@ -212,7 +212,7 @@ const ClosingsTable = () => {
 
   return (
     <>
-      <div className='w-full p-0 sm:p-4'>
+      <div className='w-full p-0'>
         <div className='flex flex-col gap-2 mb-4'>
           <div className='flex flex-col gap-2 mb-4'>
             <div className='w-full flex flex-col sm:flex-row justify-end items-end sm:items-center gap-4'>
diff --git a/src/components/pages/closing/ClosingFinanceTable.tsx b/src/components/pages/closing/finance/ClosingFinanceTable.tsx
similarity index 100%
rename from src/components/pages/closing/ClosingFinanceTable.tsx
rename to src/components/pages/closing/finance/ClosingFinanceTable.tsx
diff --git a/src/components/pages/closing/ClosingOverheadTable.tsx b/src/components/pages/closing/overhead/ClosingOverheadTable.tsx
similarity index 100%
rename from src/components/pages/closing/ClosingOverheadTable.tsx
rename to src/components/pages/closing/overhead/ClosingOverheadTable.tsx
diff --git a/src/components/pages/closing/ClosingSapronakCalculationTable.tsx b/src/components/pages/closing/sapronak-calculation/ClosingSapronakCalculationTable.tsx
similarity index 100%
rename from src/components/pages/closing/ClosingSapronakCalculationTable.tsx
rename to src/components/pages/closing/sapronak-calculation/ClosingSapronakCalculationTable.tsx
diff --git a/src/components/pages/closing/ClosingIncomingSapronaksSummaryTable.tsx b/src/components/pages/closing/sapronak/ClosingIncomingSapronaksSummaryTable.tsx
similarity index 100%
rename from src/components/pages/closing/ClosingIncomingSapronaksSummaryTable.tsx
rename to src/components/pages/closing/sapronak/ClosingIncomingSapronaksSummaryTable.tsx
diff --git a/src/components/pages/closing/ClosingIncomingSapronaksTable.tsx b/src/components/pages/closing/sapronak/ClosingIncomingSapronaksTable.tsx
similarity index 100%
rename from src/components/pages/closing/ClosingIncomingSapronaksTable.tsx
rename to src/components/pages/closing/sapronak/ClosingIncomingSapronaksTable.tsx
diff --git a/src/components/pages/closing/ClosingOutgoingSapronaksSummaryTable.tsx b/src/components/pages/closing/sapronak/ClosingOutgoingSapronaksSummaryTable.tsx
similarity index 100%
rename from src/components/pages/closing/ClosingOutgoingSapronaksSummaryTable.tsx
rename to src/components/pages/closing/sapronak/ClosingOutgoingSapronaksSummaryTable.tsx
diff --git a/src/components/pages/closing/ClosingOutgoingSapronaksTable.tsx b/src/components/pages/closing/sapronak/ClosingOutgoingSapronaksTable.tsx
similarity index 100%
rename from src/components/pages/closing/ClosingOutgoingSapronaksTable.tsx
rename to src/components/pages/closing/sapronak/ClosingOutgoingSapronaksTable.tsx
diff --git a/src/components/pages/closing/ClosingFinanceTabContent.tsx b/src/components/pages/closing/tab/ClosingFinanceTabContent.tsx
similarity index 77%
rename from src/components/pages/closing/ClosingFinanceTabContent.tsx
rename to src/components/pages/closing/tab/ClosingFinanceTabContent.tsx
index 92386178..41a67c1e 100644
--- a/src/components/pages/closing/ClosingFinanceTabContent.tsx
+++ b/src/components/pages/closing/tab/ClosingFinanceTabContent.tsx
@@ -1,4 +1,4 @@
-import ClosingFinanceTable from '@/components/pages/closing/ClosingFinanceTable';
+import ClosingFinanceTable from '@/components/pages/closing/finance/ClosingFinanceTable';
 
 const ClosingFinanceTabContent = ({
   projectFlockId,
diff --git a/src/components/pages/closing/ClosingOverheadTabContent.tsx b/src/components/pages/closing/tab/ClosingOverheadTabContent.tsx
similarity index 89%
rename from src/components/pages/closing/ClosingOverheadTabContent.tsx
rename to src/components/pages/closing/tab/ClosingOverheadTabContent.tsx
index e6b0cb5a..64833273 100644
--- a/src/components/pages/closing/ClosingOverheadTabContent.tsx
+++ b/src/components/pages/closing/tab/ClosingOverheadTabContent.tsx
@@ -1,4 +1,4 @@
-import ClosingOverheadTable from '@/components/pages/closing/ClosingOverheadTable';
+import ClosingOverheadTable from '@/components/pages/closing/overhead/ClosingOverheadTable';
 import { ClosingGeneralInformation } from '@/types/api/closing';
 import { ProjectFlockKandang } from '@/types/api/production/project-flock-kandang';
 
diff --git a/src/components/pages/closing/ClosingProductionDataTabContent.tsx b/src/components/pages/closing/tab/ClosingProductionDataTabContent.tsx
similarity index 100%
rename from src/components/pages/closing/ClosingProductionDataTabContent.tsx
rename to src/components/pages/closing/tab/ClosingProductionDataTabContent.tsx
diff --git a/src/components/pages/closing/ClosingSapronakCalculationTabContent.tsx b/src/components/pages/closing/tab/ClosingSapronakCalculationTabContent.tsx
similarity index 92%
rename from src/components/pages/closing/ClosingSapronakCalculationTabContent.tsx
rename to src/components/pages/closing/tab/ClosingSapronakCalculationTabContent.tsx
index b8add15b..cd93fcac 100644
--- a/src/components/pages/closing/ClosingSapronakCalculationTabContent.tsx
+++ b/src/components/pages/closing/tab/ClosingSapronakCalculationTabContent.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import ClosingSapronakCalculationTable from '@/components/pages/closing/ClosingSapronakCalculationTable';
+import ClosingSapronakCalculationTable from '@/components/pages/closing/sapronak-calculation/ClosingSapronakCalculationTable';
 import { ClosingGeneralInformation } from '@/types/api/closing';
 
 interface ClosingSapronakCalculationTabContentProps {
diff --git a/src/components/pages/closing/ClosingSapronakTabContent.tsx b/src/components/pages/closing/tab/ClosingSapronakTabContent.tsx
similarity index 77%
rename from src/components/pages/closing/ClosingSapronakTabContent.tsx
rename to src/components/pages/closing/tab/ClosingSapronakTabContent.tsx
index 03c3c984..f66ff739 100644
--- a/src/components/pages/closing/ClosingSapronakTabContent.tsx
+++ b/src/components/pages/closing/tab/ClosingSapronakTabContent.tsx
@@ -1,9 +1,9 @@
 'use client';
 
-import ClosingIncomingSapronaksTable from '@/components/pages/closing/ClosingIncomingSapronaksTable';
-import ClosingOutgoingSapronaksTable from '@/components/pages/closing/ClosingOutgoingSapronaksTable';
-import ClosingIncomingSapronaksSummaryTable from '@/components/pages/closing/ClosingIncomingSapronaksSummaryTable';
-import ClosingOutgoingSapronaksSummaryTable from './ClosingOutgoingSapronaksSummaryTable';
+import ClosingIncomingSapronaksTable from '@/components/pages/closing/sapronak/ClosingIncomingSapronaksTable';
+import ClosingOutgoingSapronaksTable from '@/components/pages/closing/sapronak/ClosingOutgoingSapronaksTable';
+import ClosingIncomingSapronaksSummaryTable from '@/components/pages/closing/sapronak/ClosingIncomingSapronaksSummaryTable';
+import ClosingOutgoingSapronaksSummaryTable from '../sapronak/ClosingOutgoingSapronaksSummaryTable';
 
 interface ClosingSapronakTableProps {
   projectFlockId?: number;