diff --git a/app/components/app/patient/entry-form.vue b/app/components/app/patient/entry-form.vue
index c7f5f954..bd128248 100644
--- a/app/components/app/patient/entry-form.vue
+++ b/app/components/app/patient/entry-form.vue
@@ -6,7 +6,8 @@ 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 SelectBirthPlace from '~/components/app/person/_common/select-birth-place.vue'
+
+import { SelectBirthPlace } from '~/components/app/person/fields'
 import {
   InputName,
   RadioCommunicationBarrier,
diff --git a/app/components/app/person/fields/index.ts b/app/components/app/person/fields/index.ts
new file mode 100644
index 00000000..f87c17bd
--- /dev/null
+++ b/app/components/app/person/fields/index.ts
@@ -0,0 +1,2 @@
+export { default as RadioParentsInput } from './radio-parents-input.vue'
+export { default as SelectBirthPlace } from './select-birth-place.vue'
diff --git a/app/components/app/person/_common/radio-parents-input.vue b/app/components/app/person/fields/radio-parents-input.vue
similarity index 100%
rename from app/components/app/person/_common/radio-parents-input.vue
rename to app/components/app/person/fields/radio-parents-input.vue
diff --git a/app/components/app/person/_common/select-birth-place.vue b/app/components/app/person/fields/select-birth-place.vue
similarity index 82%
rename from app/components/app/person/_common/select-birth-place.vue
rename to app/components/app/person/fields/select-birth-place.vue
index dd61a69f..8fdf8bf4 100644
--- a/app/components/app/person/_common/select-birth-place.vue
+++ b/app/components/app/person/fields/select-birth-place.vue
@@ -1,9 +1,6 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
 import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
-import FieldGroup from '~/components/pub/my-ui/form/field-group.vue'
-import Field from '~/components/pub/my-ui/form/field.vue'
-import Label from '~/components/pub/my-ui/form/label.vue'
 import { cn } from '~/lib/utils'
 
 import * as DE from '~/components/pub/my-ui/doc-entry'
@@ -52,11 +49,21 @@ onMounted(() => {
 
 <template>
   <DE.Cell :class="cn('select-field-group', fieldGroupClass, containerClass)">
-    <DE.Label :label-for="fieldName" :is-required="isRequired">
+    <DE.Label
+      :label-for="fieldName"
+      :is-required="isRequired"
+    >
       Tempat Lahir
     </DE.Label>
-    <DE.Field :id="fieldName" :errors="errors" :class="cn('select-field-wrapper')">
-      <FormField v-slot="{ componentField }" :name="fieldName">
+    <DE.Field
+      :id="fieldName"
+      :errors="errors"
+      :class="cn('select-field-wrapper')"
+    >
+      <FormField
+        v-slot="{ componentField }"
+        :name="fieldName"
+      >
         <FormItem>
           <FormControl>
             <Combobox