diff --git a/src/app/(application)/division/page.tsx b/src/app/(application)/division/page.tsx
index acbd0f7..2e17ed4 100644
--- a/src/app/(application)/division/page.tsx
+++ b/src/app/(application)/division/page.tsx
@@ -1,12 +1,12 @@
 import { ViewFilter } from '@/module/_global';
-import { ListDivision, ViewCreateReport } from '@/module/division_new';
+import { CreateReport, ListDivision } from '@/module/division_new';
 import React from 'react';
 
 function Page({ searchParams }: { searchParams: { page: string } }) {
   if (searchParams.page == "filter")
     return <ViewFilter  linkFilter='division'/>
   if (searchParams.page == "report")
-    return <ViewCreateReport />
+    return <CreateReport />
   return (
     <ListDivision/>
   );
diff --git a/src/app/(application)/division/report/[id]/page.tsx b/src/app/(application)/division/report/[id]/page.tsx
index 0c48522..00ed1f0 100644
--- a/src/app/(application)/division/report/[id]/page.tsx
+++ b/src/app/(application)/division/report/[id]/page.tsx
@@ -1,8 +1,8 @@
-import { ViewReportDivision } from "@/module/division_new"
+import { ReportDivisionId } from "@/module/division_new"
 
 function Page() {
    return (
-      <ViewReportDivision/>
+      <ReportDivisionId />
    )
 }
 
diff --git a/src/module/division_new/index.ts b/src/module/division_new/index.ts
index aae0b28..8c60be3 100644
--- a/src/module/division_new/index.ts
+++ b/src/module/division_new/index.ts
@@ -19,25 +19,24 @@ import ViewDetailDivisionTask from "./_division_fitur/task/view/view_detail_divi
 import ViewDivisionTask from "./_division_fitur/task/view/view_division_task";
 import ViewUpdateProgressDivisionTask from "./_division_fitur/task/view/view_update_progress_division_task";
 import { apiDivision } from "./api/api_division";
-import CreateAdminDivision from "./components/create_admin_division";
-import CreateUsers from "./components/create_users";
-import ViewCreateReport from "./view/view_create_report";
-import ViewReportDivision from "./view/view_report_division";
-import ListDivision from './components/list_division';
-import CreateDivision from './components/create_division';
-import NavbarDetailDivision from './components/navbar_detail_division';
-import CarouselDivision from './components/carousel_division';
-import FeatureDetailDivision from './components/feature_detail_division';
-import ListTaskOnDetailDivision from './components/list_task';
-import ListDocumentOnDetailDivision from './components/list_document';
-import ListDiscussionOnDetailDivision from './components/list_discussion';
-import InformationDivision from './components/information_division';
-import CreateAnggotaDivision from './components/create_anggota_division';
-import EditDivision from './components/edit_division';
+import CreateAdminDivision from "./ui/create_admin_division";
+import CreateUsers from "./ui/create_users";
+import ListDivision from './ui/list_division';
+import CreateDivision from './ui/create_division';
+import NavbarDetailDivision from './ui/navbar_detail_division';
+import CarouselDivision from './ui/carousel_division';
+import FeatureDetailDivision from './ui/feature_detail_division';
+import ListTaskOnDetailDivision from './ui/list_task';
+import ListDocumentOnDetailDivision from './ui/list_document';
+import ListDiscussionOnDetailDivision from './ui/list_discussion';
+import InformationDivision from './ui/information_division';
+import CreateAnggotaDivision from './ui/create_anggota_division';
+import EditDivision from './ui/edit_division';
+import CreateReport from './ui/create_report';
+import ReportDivisionId from './ui/report_division_id';
 
 export { CreateUsers };
 export { CreateAdminDivision };
-export { ViewCreateReport };
 export { ViewDivisionTask };
 export { ViewDetailDivisionTask };
 export { ViewUpdateProgressDivisionTask };
@@ -56,7 +55,6 @@ export { ViewCreateDiscussion };
 export { ViewDetailDiscussion };
 export { ViewEditDiscussion };
 export { ViewDocumentDivision };
-export { ViewReportDivision };
 export { apiDivision }
 export { apiDiscussion }
 export type { IFormDivision, IFormMemberDivision, IFormFixDivision, IDataDivison, IDataMemberDivision }
@@ -71,3 +69,5 @@ export { ListDiscussionOnDetailDivision }
 export { InformationDivision }
 export { CreateAnggotaDivision }
 export { EditDivision }
+export { CreateReport }
+export { ReportDivisionId }
diff --git a/src/module/division_new/components/carousel_division.tsx b/src/module/division_new/ui/carousel_division.tsx
similarity index 100%
rename from src/module/division_new/components/carousel_division.tsx
rename to src/module/division_new/ui/carousel_division.tsx
diff --git a/src/module/division_new/components/create_admin_division.tsx b/src/module/division_new/ui/create_admin_division.tsx
similarity index 100%
rename from src/module/division_new/components/create_admin_division.tsx
rename to src/module/division_new/ui/create_admin_division.tsx
diff --git a/src/module/division_new/components/create_anggota_division.tsx b/src/module/division_new/ui/create_anggota_division.tsx
similarity index 100%
rename from src/module/division_new/components/create_anggota_division.tsx
rename to src/module/division_new/ui/create_anggota_division.tsx
diff --git a/src/module/division_new/components/create_division.tsx b/src/module/division_new/ui/create_division.tsx
similarity index 100%
rename from src/module/division_new/components/create_division.tsx
rename to src/module/division_new/ui/create_division.tsx
diff --git a/src/module/division_new/components/create_report.tsx b/src/module/division_new/ui/create_report.tsx
similarity index 100%
rename from src/module/division_new/components/create_report.tsx
rename to src/module/division_new/ui/create_report.tsx
diff --git a/src/module/division_new/components/create_users.tsx b/src/module/division_new/ui/create_users.tsx
similarity index 100%
rename from src/module/division_new/components/create_users.tsx
rename to src/module/division_new/ui/create_users.tsx
diff --git a/src/module/division_new/components/discussion_report.tsx b/src/module/division_new/ui/discussion_report.tsx
similarity index 100%
rename from src/module/division_new/components/discussion_report.tsx
rename to src/module/division_new/ui/discussion_report.tsx
diff --git a/src/module/division_new/components/drawer_detail_division.tsx b/src/module/division_new/ui/drawer_detail_division.tsx
similarity index 100%
rename from src/module/division_new/components/drawer_detail_division.tsx
rename to src/module/division_new/ui/drawer_detail_division.tsx
diff --git a/src/module/division_new/components/drawer_division.tsx b/src/module/division_new/ui/drawer_division.tsx
similarity index 100%
rename from src/module/division_new/components/drawer_division.tsx
rename to src/module/division_new/ui/drawer_division.tsx
diff --git a/src/module/division_new/components/echart_bar_report.tsx b/src/module/division_new/ui/echart_bar_report.tsx
similarity index 100%
rename from src/module/division_new/components/echart_bar_report.tsx
rename to src/module/division_new/ui/echart_bar_report.tsx
diff --git a/src/module/division_new/components/echart_pai_report.tsx b/src/module/division_new/ui/echart_pai_report.tsx
similarity index 100%
rename from src/module/division_new/components/echart_pai_report.tsx
rename to src/module/division_new/ui/echart_pai_report.tsx
diff --git a/src/module/division_new/components/edit_division.tsx b/src/module/division_new/ui/edit_division.tsx
similarity index 100%
rename from src/module/division_new/components/edit_division.tsx
rename to src/module/division_new/ui/edit_division.tsx
diff --git a/src/module/division_new/components/event_report.tsx b/src/module/division_new/ui/event_report.tsx
similarity index 100%
rename from src/module/division_new/components/event_report.tsx
rename to src/module/division_new/ui/event_report.tsx
diff --git a/src/module/division_new/components/feature_detail_division.tsx b/src/module/division_new/ui/feature_detail_division.tsx
similarity index 100%
rename from src/module/division_new/components/feature_detail_division.tsx
rename to src/module/division_new/ui/feature_detail_division.tsx
diff --git a/src/module/division_new/components/information_division.tsx b/src/module/division_new/ui/information_division.tsx
similarity index 100%
rename from src/module/division_new/components/information_division.tsx
rename to src/module/division_new/ui/information_division.tsx
diff --git a/src/module/division_new/components/list_discussion.tsx b/src/module/division_new/ui/list_discussion.tsx
similarity index 100%
rename from src/module/division_new/components/list_discussion.tsx
rename to src/module/division_new/ui/list_discussion.tsx
diff --git a/src/module/division_new/components/list_division.tsx b/src/module/division_new/ui/list_division.tsx
similarity index 100%
rename from src/module/division_new/components/list_division.tsx
rename to src/module/division_new/ui/list_division.tsx
diff --git a/src/module/division_new/components/list_document.tsx b/src/module/division_new/ui/list_document.tsx
similarity index 100%
rename from src/module/division_new/components/list_document.tsx
rename to src/module/division_new/ui/list_document.tsx
diff --git a/src/module/division_new/components/list_task.tsx b/src/module/division_new/ui/list_task.tsx
similarity index 100%
rename from src/module/division_new/components/list_task.tsx
rename to src/module/division_new/ui/list_task.tsx
diff --git a/src/module/division_new/components/navbar_admin_division.tsx b/src/module/division_new/ui/navbar_admin_division.tsx
similarity index 100%
rename from src/module/division_new/components/navbar_admin_division.tsx
rename to src/module/division_new/ui/navbar_admin_division.tsx
diff --git a/src/module/division_new/components/navbar_create_users.tsx b/src/module/division_new/ui/navbar_create_users.tsx
similarity index 100%
rename from src/module/division_new/components/navbar_create_users.tsx
rename to src/module/division_new/ui/navbar_create_users.tsx
diff --git a/src/module/division_new/components/navbar_detail_division.tsx b/src/module/division_new/ui/navbar_detail_division.tsx
similarity index 100%
rename from src/module/division_new/components/navbar_detail_division.tsx
rename to src/module/division_new/ui/navbar_detail_division.tsx
diff --git a/src/module/division_new/components/report_division_id.tsx b/src/module/division_new/ui/report_division_id.tsx
similarity index 100%
rename from src/module/division_new/components/report_division_id.tsx
rename to src/module/division_new/ui/report_division_id.tsx
diff --git a/src/module/division_new/view/view_create_report.tsx b/src/module/division_new/view/view_create_report.tsx
deleted file mode 100644
index 9ae381b..0000000
--- a/src/module/division_new/view/view_create_report.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import React from 'react';
-import CreateReport from '../components/create_report';
-
-export default function ViewCreateReport() {
-  return (
-    <CreateReport/>
-  );
-}
-
diff --git a/src/module/division_new/view/view_report_division.tsx b/src/module/division_new/view/view_report_division.tsx
deleted file mode 100644
index 63f98a1..0000000
--- a/src/module/division_new/view/view_report_division.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import React from 'react';
-import ReportDivisionId from '../components/report_division_id';
-
-export default function ViewReportDivision() {
-  return (
-    <ReportDivisionId/>
-  );
-}
-