diff --git a/app/components/app/equipment/entry-form.vue b/app/components/app/equipment/entry-form.vue
index 62f0f9cc..f54a8389 100644
--- a/app/components/app/equipment/entry-form.vue
+++ b/app/components/app/equipment/entry-form.vue
@@ -1,10 +1,15 @@
 <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'
+<<<<<<< HEAD:app/components/app/equipment/entry-form.vue
+=======
+// helpers
+import { toTypedSchema } from '@vee-validate/zod'
+import { useForm } from 'vee-validate'
+// components
+import Label from '~/components/pub/custom-ui/form/label.vue'
+>>>>>>> 266d5f740b15942ca7b8845c00573640fdc9a3b2:app/components/app/material/entry-form.vue
 
 interface Props {
   schema: z.ZodSchema<any>
@@ -94,9 +99,9 @@ function onCancelForm() {
       <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"
@@ -110,9 +115,9 @@ function onCancelForm() {
       <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"
@@ -126,8 +131,8 @@ function onCancelForm() {
       <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/equipment/list-cfg.ts b/app/components/app/equipment/list-cfg.ts
index b6ed7f4e..a2a9f54c 100644
--- a/app/components/app/equipment/list-cfg.ts
+++ b/app/components/app/equipment/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/content/material/entry.vue b/app/components/content/material/entry.vue
new file mode 100644
index 00000000..50d68455
--- /dev/null
+++ b/app/components/content/material/entry.vue
@@ -0,0 +1,34 @@
+<script setup lang="ts">
+// types
+import type { MaterialFormData } from '~/schemas/material'
+import { MaterialSchema } from '~/schemas/material'
+
+const isLoading = ref(false)
+const uoms = [
+  { value: 'uom-1', label: 'Satuan 1' },
+  { value: 'uom-2', label: 'Satuan 2' },
+  { value: 'uom-3', label: 'Satuan 3' },
+]
+const items = [
+  { value: 'item-1', label: 'Item 1' },
+  { value: 'item-2', label: 'Item 2' },
+  { value: 'item-3', label: 'Item 3' },
+]
+
+function onBack() {
+  navigateTo('/tools-equipment-src/equipment')
+}
+
+async function onSubmit(data: MaterialFormData) {
+  console.log(data)
+}
+</script>
+
+<template>
+  <div class="mb-5 border-b border-b-slate-300 pb-3 text-lg xl:text-xl">
+    <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" />
+</template>
diff --git a/app/components/content/material/list.vue b/app/components/content/material/list.vue
new file mode 100644
index 00000000..fa719f46
--- /dev/null
+++ b/app/components/content/material/list.vue
@@ -0,0 +1,65 @@
+<script setup lang="ts">
+import type { DataTableLoader } from '~/components/pub/base/data-table/type'
+import type { HeaderPrep, RefSearchNav } from '~/components/pub/custom-ui/data/types'
+import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
+
+const data = ref([])
+
+const refSearchNav: RefSearchNav = {
+  onClick: () => {
+    // open filter modal
+  },
+  onInput: (_val: string) => {
+    // filter patient list
+  },
+  onClear: () => {
+    // clear url param
+  },
+}
+
+const isLoading = reactive<DataTableLoader>({
+  isTableLoading: false,
+})
+
+const recId = ref<number>(0)
+const recAction = ref<string>('')
+const recItem = ref<any>(null)
+
+const headerPrep: HeaderPrep = {
+  title: 'Perlengkapan (BMHP)',
+  icon: 'i-lucide-panel-bottom',
+  addNav: {
+    label: 'Tambah',
+    onClick: () => navigateTo('/tools-equipment-src/equipment/add'),
+  },
+}
+
+async function getMaterialList() {
+  isLoading.dataListLoading = true
+
+  // const resp = await xfetch('/api/v1/material')
+  // if (resp.success) {
+  //   data.value = (resp.body as Record<string, any>).data
+  // }
+
+  isLoading.dataListLoading = false
+}
+
+onMounted(() => {
+  getMaterialList()
+})
+
+provide('rec_id', recId)
+provide('rec_action', recAction)
+provide('rec_item', recItem)
+provide('table_data_loader', isLoading)
+</script>
+
+<template>
+  <div class="rounded-md border p-4">
+    <Header :prep="{ ...headerPrep }" :ref-search-nav="refSearchNav" />
+    <div class="rounded-md border p-4">
+      <AppMaterialList v-if="!isLoading.dataListLoading" :data="data" />
+    </div>
+  </div>
+</template>
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
new file mode 100644
index 00000000..f8fe61a2
--- /dev/null
+++ b/app/pages/(features)/tools-equipment-src/equipment/add.vue
@@ -0,0 +1,41 @@
+<script setup lang="ts">
+import type { PagePermission } from '~/models/role'
+import Error from '~/components/pub/base/error/error.vue'
+import { PAGE_PERMISSIONS } from '~/lib/page-permission'
+
+definePageMeta({
+  middleware: ['rbac'],
+  roles: ['doctor', 'nurse', 'admisi', 'pharmacy', 'billing', 'management'],
+  title: 'Tambah User',
+  contentFrame: 'cf-full-width',
+})
+
+const route = useRoute()
+
+useHead({
+  title: () => route.meta.title as string,
+})
+
+const roleAccess: PagePermission = PAGE_PERMISSIONS['/doctor']
+
+const { checkRole, hasCreateAccess } = useRBAC()
+
+// Check if user has access to this page
+const hasAccess = checkRole(roleAccess)
+if (!hasAccess) {
+  throw createError({
+    statusCode: 403,
+    statusMessage: 'Access denied',
+  })
+}
+
+// Define permission-based computed properties
+const canCreate = hasCreateAccess(roleAccess)
+</script>
+
+<template>
+  <div v-if="canCreate">
+    <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 92061d83..7f774f20 100644
--- a/app/pages/(features)/tools-equipment-src/equipment/index.vue
+++ b/app/pages/(features)/tools-equipment-src/equipment/index.vue
@@ -33,7 +33,11 @@ const canRead = true // hasReadAccess(roleAccess)
 <template>
   <div>
     <div v-if="canRead">
+<<<<<<< HEAD
       <ContentEquipmentList />
+=======
+      <ContentMaterialList />
+>>>>>>> 266d5f740b15942ca7b8845c00573640fdc9a3b2
     </div>
     <Error v-else :status-code="403" />
   </div>