diff --git a/app/components/app/patient/entry-form.vue b/app/components/app/patient/entry-form.vue
index a83189c2..c7f5f954 100644
--- a/app/components/app/patient/entry-form.vue
+++ b/app/components/app/patient/entry-form.vue
@@ -2,25 +2,27 @@
 import type { FormErrors } from '~/types/error'
 import { toTypedSchema } from '@vee-validate/zod'
 import { Form } from '~/components/pub/ui/form'
+
+// components
 import InputBase from '~/components/pub/my-ui/form/input-base.vue'
 import FileUpload from '~/components/pub/my-ui/form/file-field.vue'
-import InputName from './_common/input-name.vue'
-import RadioCommunicationBarrier from './_common/radio-communication-barrier.vue'
-import RadioDisability from './_common/radio-disability.vue'
-import SelectGender from './_common/select-gender.vue'
-import RadioNationality from './_common/radio-nationality.vue'
-import RadioNewborn from './_common/radio-newborn.vue'
 import SelectBirthPlace from '~/components/app/person/_common/select-birth-place.vue'
-import SelectDisability from './_common/select-disability.vue'
-import SelectDob from './_common/select-dob.vue'
-import SelectEducation from './_common/select-education.vue'
-import SelectEthnicity from './_common/select-ethnicity.vue'
-import SelectJob from './_common/select-job.vue'
-import SelectLanguage from './_common/select-lang.vue'
-import SelectMaritalStatus from './_common/select-marital-status.vue'
-import SelectReligion from './_common/select-religion.vue'
-import Separator from '~/components/pub/ui/separator/Separator.vue'
-
+import {
+  InputName,
+  RadioCommunicationBarrier,
+  RadioDisability,
+  SelectGender,
+  RadioNationality,
+  RadioNewborn,
+  SelectDisability,
+  SelectDob,
+  SelectEducation,
+  SelectEthnicity,
+  SelectJob,
+  SelectLang as SelectLanguage,
+  SelectMaritalStatus,
+  SelectReligion,
+} from './fields'
 import * as DE from '~/components/pub/my-ui/doc-entry'
 
 const props = defineProps<{
@@ -51,8 +53,11 @@ defineExpose({
     validation-mode="onSubmit"
     :initial-values="initialValues ? initialValues : {}"
   >
-    <p class="text-sm 2xl:text-base mb-2 2xl:mb-3 font-semibold">Data Diri Pasien</p>
-    <DE.Block :col-count="4" :cell-flex="false">
+    <p class="mb-2 text-sm font-semibold 2xl:mb-3 2xl:text-base">Data Diri Pasien</p>
+    <DE.Block
+      :col-count="4"
+      :cell-flex="false"
+    >
       <InputBase
         field-name="identityNumber"
         label="No. KTP"
@@ -188,8 +193,11 @@ defineExpose({
 
     <div class="h-6"></div>
 
-    <p class="text-sm 2xl:text-base mb-2 2xl:mb-3 font-semibold">Dokumen Identitas</p>
-    <DE.Block :col-count="2" :cell-flex="false">
+    <p class="mb-2 text-sm font-semibold 2xl:mb-3 2xl:text-base">Dokumen Identitas</p>
+    <DE.Block
+      :col-count="2"
+      :cell-flex="false"
+    >
       <FileUpload
         field-name="identityCardFile"
         label="Dokumen KTP"
diff --git a/app/components/app/patient/fields/index.ts b/app/components/app/patient/fields/index.ts
new file mode 100644
index 00000000..a55d6e58
--- /dev/null
+++ b/app/components/app/patient/fields/index.ts
@@ -0,0 +1,16 @@
+export { default as InputFile } from './input-file.vue'
+export { default as InputName } from './input-name.vue'
+export { default as RadioCommunicationBarrier } from './radio-communication-barrier.vue'
+export { default as RadioDisability } from './radio-disability.vue'
+export { default as RadioGender } from './radio-gender.vue'
+export { default as RadioNationality } from './radio-nationality.vue'
+export { default as RadioNewborn } from './radio-newborn.vue'
+export { default as SelectDisability } from './select-disability.vue'
+export { default as SelectDob } from './select-dob.vue'
+export { default as SelectEducation } from './select-education.vue'
+export { default as SelectEthnicity } from './select-ethnicity.vue'
+export { default as SelectGender } from './select-gender.vue'
+export { default as SelectJob } from './select-job.vue'
+export { default as SelectLang } from './select-lang.vue'
+export { default as SelectMaritalStatus } from './select-marital-status.vue'
+export { default as SelectReligion } from './select-religion.vue'
diff --git a/app/components/app/patient/_common/input-file.vue b/app/components/app/patient/fields/input-file.vue
similarity index 100%
rename from app/components/app/patient/_common/input-file.vue
rename to app/components/app/patient/fields/input-file.vue
diff --git a/app/components/app/patient/_common/input-name.vue b/app/components/app/patient/fields/input-name.vue
similarity index 100%
rename from app/components/app/patient/_common/input-name.vue
rename to app/components/app/patient/fields/input-name.vue
diff --git a/app/components/app/patient/_common/radio-communication-barrier.vue b/app/components/app/patient/fields/radio-communication-barrier.vue
similarity index 100%
rename from app/components/app/patient/_common/radio-communication-barrier.vue
rename to app/components/app/patient/fields/radio-communication-barrier.vue
diff --git a/app/components/app/patient/_common/radio-disability.vue b/app/components/app/patient/fields/radio-disability.vue
similarity index 100%
rename from app/components/app/patient/_common/radio-disability.vue
rename to app/components/app/patient/fields/radio-disability.vue
diff --git a/app/components/app/patient/_common/radio-gender.vue b/app/components/app/patient/fields/radio-gender.vue
similarity index 100%
rename from app/components/app/patient/_common/radio-gender.vue
rename to app/components/app/patient/fields/radio-gender.vue
diff --git a/app/components/app/patient/_common/radio-nationality.vue b/app/components/app/patient/fields/radio-nationality.vue
similarity index 100%
rename from app/components/app/patient/_common/radio-nationality.vue
rename to app/components/app/patient/fields/radio-nationality.vue
diff --git a/app/components/app/patient/_common/radio-newborn.vue b/app/components/app/patient/fields/radio-newborn.vue
similarity index 100%
rename from app/components/app/patient/_common/radio-newborn.vue
rename to app/components/app/patient/fields/radio-newborn.vue
diff --git a/app/components/app/patient/_common/select-disability.vue b/app/components/app/patient/fields/select-disability.vue
similarity index 100%
rename from app/components/app/patient/_common/select-disability.vue
rename to app/components/app/patient/fields/select-disability.vue
diff --git a/app/components/app/patient/_common/select-dob.vue b/app/components/app/patient/fields/select-dob.vue
similarity index 100%
rename from app/components/app/patient/_common/select-dob.vue
rename to app/components/app/patient/fields/select-dob.vue
diff --git a/app/components/app/patient/_common/select-education.vue b/app/components/app/patient/fields/select-education.vue
similarity index 100%
rename from app/components/app/patient/_common/select-education.vue
rename to app/components/app/patient/fields/select-education.vue
diff --git a/app/components/app/patient/_common/select-ethnicity.vue b/app/components/app/patient/fields/select-ethnicity.vue
similarity index 100%
rename from app/components/app/patient/_common/select-ethnicity.vue
rename to app/components/app/patient/fields/select-ethnicity.vue
diff --git a/app/components/app/patient/_common/select-gender.vue b/app/components/app/patient/fields/select-gender.vue
similarity index 100%
rename from app/components/app/patient/_common/select-gender.vue
rename to app/components/app/patient/fields/select-gender.vue
diff --git a/app/components/app/patient/_common/select-job.vue b/app/components/app/patient/fields/select-job.vue
similarity index 100%
rename from app/components/app/patient/_common/select-job.vue
rename to app/components/app/patient/fields/select-job.vue
diff --git a/app/components/app/patient/_common/select-lang.vue b/app/components/app/patient/fields/select-lang.vue
similarity index 100%
rename from app/components/app/patient/_common/select-lang.vue
rename to app/components/app/patient/fields/select-lang.vue
diff --git a/app/components/app/patient/_common/select-marital-status.vue b/app/components/app/patient/fields/select-marital-status.vue
similarity index 100%
rename from app/components/app/patient/_common/select-marital-status.vue
rename to app/components/app/patient/fields/select-marital-status.vue
diff --git a/app/components/app/patient/_common/select-religion.vue b/app/components/app/patient/fields/select-religion.vue
similarity index 100%
rename from app/components/app/patient/_common/select-religion.vue
rename to app/components/app/patient/fields/select-religion.vue
diff --git a/app/components/app/person/family-parents-form.vue b/app/components/app/person/family-parents-form.vue
index fc87ce45..f6c8198f 100644
--- a/app/components/app/person/family-parents-form.vue
+++ b/app/components/app/person/family-parents-form.vue
@@ -3,7 +3,7 @@ import type { PersonFamilyFormData as FamilyData } from '~/schemas/person-family
 import type { FormErrors } from '~/types/error'
 import { toTypedSchema } from '@vee-validate/zod'
 import { FieldArray } from 'vee-validate'
-import SelectEducation from '~/components/app/patient/_common/select-education.vue'
+import SelectEducation from '~/components/app/patient/fields/select-education.vue'
 import InputBase from '~/components/pub/my-ui/form/input-base.vue'
 import RadioParentsInput from './_common/radio-parents-input.vue'
 import { Form } from '~/components/pub/ui/form'
@@ -65,7 +65,7 @@ defineExpose({
     <div>
       <p
         v-if="props.title"
-        class="text-sm 2xl:text-base mb-2 2xl:mb-3 font-semibold"
+        class="mb-2 text-sm font-semibold 2xl:mb-3 2xl:text-base"
       >
         {{ props.title }}
       </p>