diff --git a/src/components/pages/production/project-flock/ProjectFlockTable.tsx b/src/components/pages/production/project-flock/ProjectFlockTable.tsx
index 5521fdbf..e8280fa8 100644
--- a/src/components/pages/production/project-flock/ProjectFlockTable.tsx
+++ b/src/components/pages/production/project-flock/ProjectFlockTable.tsx
@@ -34,7 +34,7 @@ import StatusBadge from '@/components/helper/StatusBadge';
 import PopoverButton from '@/components/popover/PopoverButton';
 import PopoverContent from '@/components/popover/PopoverContent';
 import ProjectFlockConfirmationModal from './ProjectFlockConfirmationModal';
-import { useProjectFlockStore } from '@/stores/project-flock/project-flock.store';
+import { useProjectFlockStore } from '@/stores/production/project-flock/project-flock.store';
 import { ProjectFlockFormValues } from './form/ProjectFlockForm.schema';
 
 const RowOptionsMenu = ({
diff --git a/src/components/pages/production/project-flock/form/ProjectFlockForm.tsx b/src/components/pages/production/project-flock/form/ProjectFlockForm.tsx
index d56550a6..57cde405 100644
--- a/src/components/pages/production/project-flock/form/ProjectFlockForm.tsx
+++ b/src/components/pages/production/project-flock/form/ProjectFlockForm.tsx
@@ -52,7 +52,7 @@ import Table from '@/components/Table';
 import { ColumnDef } from '@tanstack/react-table';
 import StatusBadge from '@/components/helper/StatusBadge';
 import { getUniqueFormikErrors } from '@/lib/formik-helper';
-import { useProjectFlockStore } from '@/stores/project-flock/project-flock.store';
+import { useProjectFlockStore } from '@/stores/production/project-flock/project-flock.store';
 
 interface ProjectFlockFormProps {
   formType?: 'add' | 'edit' | 'detail';
diff --git a/src/components/pages/production/uniformity/UniformityTable.tsx b/src/components/pages/production/uniformity/UniformityTable.tsx
index 39112b47..3473967e 100644
--- a/src/components/pages/production/uniformity/UniformityTable.tsx
+++ b/src/components/pages/production/uniformity/UniformityTable.tsx
@@ -26,7 +26,7 @@ import ConfirmationModal from '@/components/modal/ConfirmationModal';
 import toast from 'react-hot-toast';
 import UniformityTableSkeleton from '@/components/pages/production/uniformity/skeleton/UniformityTableSkeleton';
 import RequirePermission from '@/components/helper/RequirePermission';
-import { useUniformityStore } from '@/stores/uniformity/uniformity.store';
+import { useUniformityStore } from '@/stores/production/uniformity/uniformity.store';
 import FloatingActionsButton from '@/components/FloatingActionsButton';
 import Modal from '@/components/Modal';
 import SelectInput, {
diff --git a/src/components/pages/production/uniformity/form/UniformityForm.tsx b/src/components/pages/production/uniformity/form/UniformityForm.tsx
index 8ab62d85..33b649c4 100644
--- a/src/components/pages/production/uniformity/form/UniformityForm.tsx
+++ b/src/components/pages/production/uniformity/form/UniformityForm.tsx
@@ -7,7 +7,7 @@ import { Icon } from '@iconify/react';
 import { toast } from 'react-hot-toast';
 import DrawerHeader from '@/components/helper/drawer/DrawerHeader';
 import { useUiStore } from '@/stores/ui/ui.store';
-import { useUniformityStore } from '@/stores/uniformity/uniformity.store';
+import { useUniformityStore } from '@/stores/production/uniformity/uniformity.store';
 import Button from '@/components/Button';
 import DateInput from '@/components/input/DateInput';
 
diff --git a/src/components/pages/production/uniformity/form/UniformityPreviewForm.tsx b/src/components/pages/production/uniformity/form/UniformityPreviewForm.tsx
index 3cc120fd..3ca24952 100644
--- a/src/components/pages/production/uniformity/form/UniformityPreviewForm.tsx
+++ b/src/components/pages/production/uniformity/form/UniformityPreviewForm.tsx
@@ -7,7 +7,7 @@ import Button from '@/components/Button';
 import Tooltip from '@/components/Tooltip';
 import DrawerHeader from '@/components/helper/drawer/DrawerHeader';
 import { useUiStore } from '@/stores/ui/ui.store';
-import { useUniformityStore } from '@/stores/uniformity/uniformity.store';
+import { useUniformityStore } from '@/stores/production/uniformity/uniformity.store';
 import RequirePermission from '@/components/helper/RequirePermission';
 import Table from '@/components/Table';
 import {
diff --git a/src/components/pages/production/uniformity/form/UniformityResultForm.tsx b/src/components/pages/production/uniformity/form/UniformityResultForm.tsx
index eaf51103..108cb4f8 100644
--- a/src/components/pages/production/uniformity/form/UniformityResultForm.tsx
+++ b/src/components/pages/production/uniformity/form/UniformityResultForm.tsx
@@ -7,7 +7,7 @@ import Button from '@/components/Button';
 import Tooltip from '@/components/Tooltip';
 import DrawerHeader from '@/components/helper/drawer/DrawerHeader';
 import { useUiStore } from '@/stores/ui/ui.store';
-import { useUniformityStore } from '@/stores/uniformity/uniformity.store';
+import { useUniformityStore } from '@/stores/production/uniformity/uniformity.store';
 import RequirePermission from '@/components/helper/RequirePermission';
 import Table from '@/components/Table';
 import { useRouter } from 'next/navigation';
diff --git a/src/components/pages/report/finance/FinanceTabs.tsx b/src/components/pages/report/finance/FinanceTabs.tsx
index ffb0d3f1..84d610a5 100644
--- a/src/components/pages/report/finance/FinanceTabs.tsx
+++ b/src/components/pages/report/finance/FinanceTabs.tsx
@@ -4,7 +4,7 @@ import { useState } from 'react';
 import Tabs from '@/components/Tabs';
 import CustomerPaymentTab from '@/components/pages/report/finance/tab/CustomerPaymentTab';
 import DebtSupplierTab from '@/components/pages/report/finance/tab/DebtSupplierTab';
-import { useFinanceTabStore } from '@/stores/finance-tab/finance-tab.store';
+import { useFinanceTabStore } from '@/stores/report/finance-tab/finance-tab.store';
 
 const FinanceTabs = () => {
   const [activeTabId, setActiveTabId] = useState<string>('1');
diff --git a/src/components/pages/report/finance/tab/CustomerPaymentTab.tsx b/src/components/pages/report/finance/tab/CustomerPaymentTab.tsx
index 3680a41c..03b41e10 100644
--- a/src/components/pages/report/finance/tab/CustomerPaymentTab.tsx
+++ b/src/components/pages/report/finance/tab/CustomerPaymentTab.tsx
@@ -36,7 +36,7 @@ import {
 } from '@/components/pages/report/finance/filter/CustomerPaymentFilter';
 import { generateCustomerPaymentExcel } from '@/components/pages/report/finance/export/CustomerPaymentExportXLSX';
 import { generateCustomerPaymentPDF } from '@/components/pages/report/finance/export/CustomerPaymentExportPDF';
-import { useFinanceTabStore } from '@/stores/finance-tab/finance-tab.store';
+import { useFinanceTabStore } from '@/stores/report/finance-tab/finance-tab.store';
 import CustomerSupplierSkeleton from '@/components/pages/report/finance/skeleton/CustomerSupplierSkeleton';
 import { OptionType } from '@/components/table/TableRowSizeSelector';
 import { Color } from '@/types/theme';
diff --git a/src/components/pages/report/finance/tab/DebtSupplierTab.tsx b/src/components/pages/report/finance/tab/DebtSupplierTab.tsx
index 5e7781bf..bd71f02a 100644
--- a/src/components/pages/report/finance/tab/DebtSupplierTab.tsx
+++ b/src/components/pages/report/finance/tab/DebtSupplierTab.tsx
@@ -33,7 +33,7 @@ import { Color } from '@/types/theme';
 import { Supplier } from '@/types/api/master-data/supplier';
 import SelectInputCheckbox from '@/components/input/SelectInputCheckbox';
 import SelectInputRadio from '@/components/input/SelectInputRadio';
-import { useFinanceTabStore } from '@/stores/finance-tab/finance-tab.store';
+import { useFinanceTabStore } from '@/stores/report/finance-tab/finance-tab.store';
 import StatusBadge from '@/components/helper/StatusBadge';
 import DebtSupplierSkeleton from '@/components/pages/report/finance/skeleton/DebtSupplierSkeleton';
 
diff --git a/src/components/pages/report/logistic-stock/LogisticStockTabs.tsx b/src/components/pages/report/logistic-stock/LogisticStockTabs.tsx
index f06e63dc..6996db55 100644
--- a/src/components/pages/report/logistic-stock/LogisticStockTabs.tsx
+++ b/src/components/pages/report/logistic-stock/LogisticStockTabs.tsx
@@ -3,7 +3,7 @@
 import { useState } from 'react';
 import Tabs from '@/components/Tabs';
 import PurchasesPerSupplierTab from '@/components/pages/report/logistic-stock/tab/PurchasesPerSupplierTab';
-import { useLogisticStockTabStore } from '@/stores/logistic-stock-tab/logistic-stock-tab.store';
+import { useLogisticStockTabStore } from '@/stores/report/logistic-stock-tab/logistic-stock-tab.store';
 
 const LogisticStockTabs = () => {
   const [activeTabId, setActiveTabId] = useState<string>('1');
diff --git a/src/components/pages/report/logistic-stock/tab/PurchasesPerSupplierTab.tsx b/src/components/pages/report/logistic-stock/tab/PurchasesPerSupplierTab.tsx
index 23fb067e..f9251f4a 100644
--- a/src/components/pages/report/logistic-stock/tab/PurchasesPerSupplierTab.tsx
+++ b/src/components/pages/report/logistic-stock/tab/PurchasesPerSupplierTab.tsx
@@ -32,7 +32,7 @@ import {
 } from '@/components/pages/report/logistic-stock/filter/PurchasesPerSupplierFilter';
 import SelectInputCheckbox from '@/components/input/SelectInputCheckbox';
 import SelectInputRadio from '@/components/input/SelectInputRadio';
-import { useLogisticStockTabStore } from '@/stores/logistic-stock-tab/logistic-stock-tab.store';
+import { useLogisticStockTabStore } from '@/stores/report/logistic-stock-tab/logistic-stock-tab.store';
 import PurchasePerSupplierSkeleton from '@/components/pages/report/logistic-stock/skeleton/PurchasePerSupplierSkeleton';
 
 interface PurchasesPerSupplierTabProps {
diff --git a/src/components/pages/report/marketing/MarketingTabs.tsx b/src/components/pages/report/marketing/MarketingTabs.tsx
index de449f9c..d07c7d1b 100644
--- a/src/components/pages/report/marketing/MarketingTabs.tsx
+++ b/src/components/pages/report/marketing/MarketingTabs.tsx
@@ -4,7 +4,7 @@ import { useState } from 'react';
 import Tabs from '@/components/Tabs';
 import DailyMarketingReportContent from '@/components/pages/report/marketing/tab/DailyMarketingTab';
 import HppPerKandangTab from '@/components/pages/report/marketing/tab/HppPerKandangTab';
-import { useMarketingTabStore } from '@/stores/marketing-tab/marketing-tab.store';
+import { useMarketingTabStore } from '@/stores/report/marketing-tab/marketing-tab.store';
 
 const MarketingReportContent = () => {
   const [activeTabId, setActiveTabId] = useState<string>('1');
diff --git a/src/components/pages/report/marketing/tab/DailyMarketingTab.tsx b/src/components/pages/report/marketing/tab/DailyMarketingTab.tsx
index a687fdf5..9c03de7a 100644
--- a/src/components/pages/report/marketing/tab/DailyMarketingTab.tsx
+++ b/src/components/pages/report/marketing/tab/DailyMarketingTab.tsx
@@ -37,7 +37,7 @@ import {
 import SelectInput from '@/components/input/SelectInput';
 import Modal, { useModal } from '@/components/Modal';
 import { cn } from '@/lib/helper';
-import { useMarketingTabStore } from '@/stores/marketing-tab/marketing-tab.store';
+import { useMarketingTabStore } from '@/stores/report/marketing-tab/marketing-tab.store';
 import DailyMarketingReportSkeleton from '@/components/pages/report/marketing/skeleton/DailyMarketingSkeleton';
 import { useEffect as useEffectHook } from 'react';
 import { httpClient } from '@/services/http/client';
diff --git a/src/components/pages/report/marketing/tab/HppPerKandangTab.tsx b/src/components/pages/report/marketing/tab/HppPerKandangTab.tsx
index 514edcb9..0650c19a 100644
--- a/src/components/pages/report/marketing/tab/HppPerKandangTab.tsx
+++ b/src/components/pages/report/marketing/tab/HppPerKandangTab.tsx
@@ -33,7 +33,7 @@ import SelectInputCheckbox from '@/components/input/SelectInputCheckbox';
 import SelectInputRadio from '@/components/input/SelectInputRadio';
 import Modal, { useModal } from '@/components/Modal';
 import { cn } from '@/lib/helper';
-import { useMarketingTabStore } from '@/stores/marketing-tab/marketing-tab.store';
+import { useMarketingTabStore } from '@/stores/report/marketing-tab/marketing-tab.store';
 import HppPerKandangSkeleton from '@/components/pages/report/marketing/skeleton/HppPerKandangSkeleton';
 import { useEffect as useEffectHook } from 'react';
 
diff --git a/src/stores/project-flock/project-flock.store.ts b/src/stores/production/project-flock/project-flock.store.ts
similarity index 79%
rename from src/stores/project-flock/project-flock.store.ts
rename to src/stores/production/project-flock/project-flock.store.ts
index 61efcb97..97402132 100644
--- a/src/stores/project-flock/project-flock.store.ts
+++ b/src/stores/production/project-flock/project-flock.store.ts
@@ -2,7 +2,7 @@
 
 import { create } from 'zustand';
 import { devtools } from 'zustand/middleware';
-import { createProjectFlockSlice } from '@/stores/project-flock/slices/project-flock.slice';
+import { createProjectFlockSlice } from '@/stores/production/project-flock/slices/project-flock.slice';
 import { ProjectFlockSlice } from '@/types/stores';
 
 export type ProjectFlockStore = ProjectFlockSlice;
diff --git a/src/stores/project-flock/slices/project-flock.slice.ts b/src/stores/production/project-flock/slices/project-flock.slice.ts
similarity index 100%
rename from src/stores/project-flock/slices/project-flock.slice.ts
rename to src/stores/production/project-flock/slices/project-flock.slice.ts
diff --git a/src/stores/uniformity/slices/uniformity.slice.ts b/src/stores/production/uniformity/slices/uniformity.slice.ts
similarity index 100%
rename from src/stores/uniformity/slices/uniformity.slice.ts
rename to src/stores/production/uniformity/slices/uniformity.slice.ts
diff --git a/src/stores/uniformity/uniformity.store.ts b/src/stores/production/uniformity/uniformity.store.ts
similarity index 80%
rename from src/stores/uniformity/uniformity.store.ts
rename to src/stores/production/uniformity/uniformity.store.ts
index c8d759d6..740d10b6 100644
--- a/src/stores/uniformity/uniformity.store.ts
+++ b/src/stores/production/uniformity/uniformity.store.ts
@@ -2,7 +2,7 @@
 
 import { create } from 'zustand';
 import { devtools } from 'zustand/middleware';
-import { createUniformitySlice } from '@/stores/uniformity/slices/uniformity.slice';
+import { createUniformitySlice } from '@/stores/production/uniformity/slices/uniformity.slice';
 import { UniformitySlice } from '@/types/stores';
 
 export type UniformityStore = UniformitySlice;
diff --git a/src/stores/finance-tab/finance-tab.store.ts b/src/stores/report/finance-tab/finance-tab.store.ts
similarity index 100%
rename from src/stores/finance-tab/finance-tab.store.ts
rename to src/stores/report/finance-tab/finance-tab.store.ts
diff --git a/src/stores/logistic-stock-tab/logistic-stock-tab.store.ts b/src/stores/report/logistic-stock-tab/logistic-stock-tab.store.ts
similarity index 100%
rename from src/stores/logistic-stock-tab/logistic-stock-tab.store.ts
rename to src/stores/report/logistic-stock-tab/logistic-stock-tab.store.ts
diff --git a/src/stores/marketing-tab/marketing-tab.store.ts b/src/stores/report/marketing-tab/marketing-tab.store.ts
similarity index 100%
rename from src/stores/marketing-tab/marketing-tab.store.ts
rename to src/stores/report/marketing-tab/marketing-tab.store.ts