diff --git a/app/components/app/material/entry-form.vue b/app/components/app/material/entry-form.vue
index d670f60c..81951d91 100644
--- a/app/components/app/material/entry-form.vue
+++ b/app/components/app/material/entry-form.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-// helpers
-import { toTypedSchema } from '@vee-validate/zod'
-import { useForm } from 'vee-validate'
 // types
 import type z from 'zod'
 import type { MaterialFormData } from '~/schemas/material'
+// helpers
+import { toTypedSchema } from '@vee-validate/zod'
+import { useForm } from 'vee-validate'
 // components
 import Label from '~/components/pub/custom-ui/form/label.vue'
 
@@ -79,9 +79,9 @@ const onSubmit = handleSubmit(async (values) => {
       <Label for="uom">Satuan</Label>
       <Select
         id="uom"
+        v-model="uom"
         icon-name="i-lucide-chevron-down"
         placeholder="Pilih satuan"
-        v-model="uom"
         v-bind="uomAttrs"
         :items="uoms"
         :disabled="isLoading"
@@ -95,9 +95,9 @@ const onSubmit = handleSubmit(async (values) => {
       <Label for="item">Item</Label>
       <Select
         id="item"
+        v-model="item"
         icon-name="i-lucide-chevron-down"
         placeholder="Pilih item"
-        v-model="item"
         v-bind="itemAttrs"
         :items="items"
         :disabled="isLoading"
@@ -111,8 +111,8 @@ const onSubmit = handleSubmit(async (values) => {
       <Label for="stock">Stok</Label>
       <Input
         id="stock"
-        type="number"
         v-model="stock"
+        type="number"
         v-bind="stockAttrs"
         :disabled="isLoading"
         :class="{ 'border-red-500': errors.stock }"
diff --git a/app/components/app/material/list-cfg.ts b/app/components/app/material/list-cfg.ts
index b6ed7f4e..a2a9f54c 100644
--- a/app/components/app/material/list-cfg.ts
+++ b/app/components/app/material/list-cfg.ts
@@ -3,7 +3,6 @@ import type {
   KeyLabel,
   RecComponent,
   RecStrFuncComponent,
-  RecStrFuncUnknown,
   Th,
 } from '~/components/pub/custom-ui/data/types'
 import { defineAsyncComponent } from 'vue'
diff --git a/app/components/flow/device/entry.vue b/app/components/content/device/entry.vue
similarity index 100%
rename from app/components/flow/device/entry.vue
rename to app/components/content/device/entry.vue
index d53afb5c..79a5b022 100644
--- a/app/components/flow/device/entry.vue
+++ b/app/components/content/device/entry.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import Action from '~/components/pub/custom-ui/nav-footer/ba-dr-su.vue'
 import { z, ZodError } from 'zod'
+import Action from '~/components/pub/custom-ui/nav-footer/ba-dr-su.vue'
 
 const errors = ref({})
 const data = ref({
diff --git a/app/components/flow/device/list.vue b/app/components/content/device/list.vue
similarity index 100%
rename from app/components/flow/device/list.vue
rename to app/components/content/device/list.vue
diff --git a/app/components/flow/division/entry.ts b/app/components/content/division/entry.ts
similarity index 100%
rename from app/components/flow/division/entry.ts
rename to app/components/content/division/entry.ts
diff --git a/app/components/flow/division/list.vue b/app/components/content/division/list.vue
similarity index 100%
rename from app/components/flow/division/list.vue
rename to app/components/content/division/list.vue
diff --git a/app/components/flow/installation/entry.ts b/app/components/content/installation/entry.ts
similarity index 100%
rename from app/components/flow/installation/entry.ts
rename to app/components/content/installation/entry.ts
diff --git a/app/components/flow/installation/list.vue b/app/components/content/installation/list.vue
similarity index 100%
rename from app/components/flow/installation/list.vue
rename to app/components/content/installation/list.vue
diff --git a/app/components/flow/material/entry.vue b/app/components/content/material/entry.vue
similarity index 74%
rename from app/components/flow/material/entry.vue
rename to app/components/content/material/entry.vue
index a6219d03..50d68455 100644
--- a/app/components/flow/material/entry.vue
+++ b/app/components/content/material/entry.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 // types
-import { MaterialSchema, type MaterialFormData } from '~/schemas/material'
+import type { MaterialFormData } from '~/schemas/material'
+import { MaterialSchema } from '~/schemas/material'
 
 const isLoading = ref(false)
 const uoms = [
@@ -28,12 +29,6 @@ async function onSubmit(data: MaterialFormData) {
     <Icon name="i-lucide-panel-bottom" class="me-2" />
     <span class="font-semibold">Tambah</span> Perlengkapan (BMHP)
   </div>
-  <AppMaterialEntryForm
-    :is-loading="isLoading"
-    :schema="MaterialSchema"
-    :uoms="uoms"
-    :items="items"
-    @back="onBack"
-    @submit="onSubmit"
-  />
+  <AppMaterialEntryForm :is-loading="isLoading" :schema="MaterialSchema" :uoms="uoms" :items="items" @back="onBack"
+    @submit="onSubmit" />
 </template>
diff --git a/app/components/flow/material/list.vue b/app/components/content/material/list.vue
similarity index 100%
rename from app/components/flow/material/list.vue
rename to app/components/content/material/list.vue
diff --git a/app/components/flow/unit/entry.ts b/app/components/content/unit/entry.ts
similarity index 100%
rename from app/components/flow/unit/entry.ts
rename to app/components/content/unit/entry.ts
diff --git a/app/components/flow/unit/list.vue b/app/components/content/unit/list.vue
similarity index 100%
rename from app/components/flow/unit/list.vue
rename to app/components/content/unit/list.vue
diff --git a/app/pages/(features)/satusehat/[id]/detail.vue b/app/pages/(features)/integration/satusehat/[id]/detail.vue
similarity index 93%
rename from app/pages/(features)/satusehat/[id]/detail.vue
rename to app/pages/(features)/integration/satusehat/[id]/detail.vue
index c1014755..88d0e796 100644
--- a/app/pages/(features)/satusehat/[id]/detail.vue
+++ b/app/pages/(features)/integration/satusehat/[id]/detail.vue
@@ -1,9 +1,9 @@
-<script setup lang="ts">
-definePageMeta({
-  roles: ['sys', 'doc'],
-})
-</script>
-
-<template>
-  <div>detail satusehat</div>
-</template>
+<script setup lang="ts">
+definePageMeta({
+  roles: ['sys', 'doc'],
+})
+</script>
+
+<template>
+  <div>detail satusehat</div>
+</template>
diff --git a/app/pages/(features)/satusehat/[id]/edit.vue b/app/pages/(features)/integration/satusehat/[id]/edit.vue
similarity index 93%
rename from app/pages/(features)/satusehat/[id]/edit.vue
rename to app/pages/(features)/integration/satusehat/[id]/edit.vue
index 351fe46e..7df3c6a2 100644
--- a/app/pages/(features)/satusehat/[id]/edit.vue
+++ b/app/pages/(features)/integration/satusehat/[id]/edit.vue
@@ -1,9 +1,9 @@
-<script setup lang="ts">
-definePageMeta({
-  roles: ['sys', 'doc'],
-})
-</script>
-
-<template>
-  <div>edit satusehat</div>
-</template>
+<script setup lang="ts">
+definePageMeta({
+  roles: ['sys', 'doc'],
+})
+</script>
+
+<template>
+  <div>edit satusehat</div>
+</template>
diff --git a/app/pages/(features)/satusehat/add.vue b/app/pages/(features)/integration/satusehat/add.vue
similarity index 100%
rename from app/pages/(features)/satusehat/add.vue
rename to app/pages/(features)/integration/satusehat/add.vue
diff --git a/app/pages/(features)/satusehat/index.vue b/app/pages/(features)/integration/satusehat/index.vue
similarity index 100%
rename from app/pages/(features)/satusehat/index.vue
rename to app/pages/(features)/integration/satusehat/index.vue
diff --git a/app/pages/(features)/org-src/division/index.vue b/app/pages/(features)/org-src/division/index.vue
index aa674b28..7595239a 100644
--- a/app/pages/(features)/org-src/division/index.vue
+++ b/app/pages/(features)/org-src/division/index.vue
@@ -34,7 +34,7 @@ const canRead = true
 <template>
   <div>
     <div v-if="canRead">
-      <FlowDivisionList />
+      <ContentDivisionList />
     </div>
     <Error v-else :status-code="403" />
   </div>
diff --git a/app/pages/(features)/org-src/installation/index.vue b/app/pages/(features)/org-src/installation/index.vue
index 4131d387..09c8cdc5 100644
--- a/app/pages/(features)/org-src/installation/index.vue
+++ b/app/pages/(features)/org-src/installation/index.vue
@@ -34,7 +34,7 @@ const canRead = true
 <template>
   <div>
     <div v-if="canRead">
-      <FlowInstallationList />
+      <ContentInstallationList />
     </div>
     <Error v-else :status-code="403" />
   </div>
diff --git a/app/pages/(features)/org-src/unit/index.vue b/app/pages/(features)/org-src/unit/index.vue
index 801105eb..d6e30dfd 100644
--- a/app/pages/(features)/org-src/unit/index.vue
+++ b/app/pages/(features)/org-src/unit/index.vue
@@ -34,7 +34,7 @@ const canRead = true
 <template>
   <div>
     <div v-if="canRead">
-      <FlowUnitList />
+      <ContentUnitList />
     </div>
     <Error v-else :status-code="403" />
   </div>
diff --git a/app/pages/(features)/tools-equipment-src/device/add.vue b/app/pages/(features)/tools-equipment-src/device/add.vue
index 54f4baff..f258ce8e 100644
--- a/app/pages/(features)/tools-equipment-src/device/add.vue
+++ b/app/pages/(features)/tools-equipment-src/device/add.vue
@@ -35,7 +35,7 @@ const canCreate = hasCreateAccess(roleAccess)
 
 <template>
   <div v-if="canCreate">
-    <FlowDeviceEntry />
+    <ContentDeviceEntry />
   </div>
   <Error v-else :status-code="403" />
 </template>
diff --git a/app/pages/(features)/tools-equipment-src/device/index.vue b/app/pages/(features)/tools-equipment-src/device/index.vue
index 464e5558..98fe16df 100644
--- a/app/pages/(features)/tools-equipment-src/device/index.vue
+++ b/app/pages/(features)/tools-equipment-src/device/index.vue
@@ -33,7 +33,7 @@ const canRead = hasReadAccess(roleAccess)
 <template>
   <div>
     <div v-if="canRead">
-      <FlowDeviceList />
+      <ContentDeviceList />
     </div>
     <Error v-else :status-code="403" />
   </div>
diff --git a/app/pages/(features)/tools-equipment-src/equipment/add.vue b/app/pages/(features)/tools-equipment-src/equipment/add.vue
index 56803533..f8fe61a2 100644
--- a/app/pages/(features)/tools-equipment-src/equipment/add.vue
+++ b/app/pages/(features)/tools-equipment-src/equipment/add.vue
@@ -35,7 +35,7 @@ const canCreate = hasCreateAccess(roleAccess)
 
 <template>
   <div v-if="canCreate">
-    <FlowMaterialEntry />
+    <ContentMaterialEntry />
   </div>
   <Error v-else :status-code="403" />
 </template>
diff --git a/app/pages/(features)/tools-equipment-src/equipment/index.vue b/app/pages/(features)/tools-equipment-src/equipment/index.vue
index 503056cb..e1968876 100644
--- a/app/pages/(features)/tools-equipment-src/equipment/index.vue
+++ b/app/pages/(features)/tools-equipment-src/equipment/index.vue
@@ -33,7 +33,7 @@ const canRead = hasReadAccess(roleAccess)
 <template>
   <div>
     <div v-if="canRead">
-      <FlowMaterialList />
+      <ContentMaterialList />
     </div>
     <Error v-else :status-code="403" />
   </div>