diff --git a/app/components/app/patient/entry-form.vue b/app/components/app/patient/entry-form.vue
index bd128248..55efeadb 100644
--- a/app/components/app/patient/entry-form.vue
+++ b/app/components/app/patient/entry-form.vue
@@ -4,9 +4,9 @@ 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 * as DE from '~/components/pub/my-ui/doc-entry'
 
+import { InputBase, FileField as FileUpload } from '~/components/pub/my-ui/form'
 import { SelectBirthPlace } from '~/components/app/person/fields'
 import {
   InputName,
@@ -24,7 +24,6 @@ import {
   SelectMaritalStatus,
   SelectReligion,
 } from './fields'
-import * as DE from '~/components/pub/my-ui/doc-entry'
 
 const props = defineProps<{
   schema: any
diff --git a/app/components/pub/my-ui/form/file-field.vue b/app/components/pub/my-ui/form/file-field.vue
index 31885a6f..332d2e88 100644
--- a/app/components/pub/my-ui/form/file-field.vue
+++ b/app/components/pub/my-ui/form/file-field.vue
@@ -1,8 +1,5 @@
 <script setup lang="ts">
 import type { FormErrors } from '~/types/error'
-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 { Input } from '~/components/pub/ui/input'
 import { cn } from '~/lib/utils'
 
@@ -62,7 +59,7 @@ async function onFileChange(event: Event, handleChange: (value: any) => void) {
               @change="onFileChange($event, handleChange)"
               type="file"
               :disabled="isDisabled"
-              v-bind="{ onBlur: componentField.onBlur }" 
+              v-bind="{ onBlur: componentField.onBlur }"
               :placeholder="placeholder"
               :class="cn('focus:border-primary focus:ring-2 focus:ring-primary focus:ring-offset-0')"
             />
diff --git a/app/components/pub/my-ui/form/index.ts b/app/components/pub/my-ui/form/index.ts
new file mode 100644
index 00000000..d6ef5a99
--- /dev/null
+++ b/app/components/pub/my-ui/form/index.ts
@@ -0,0 +1,9 @@
+export { default as Block } from './block.vue'
+export { default as FieldGroup } from './field-group.vue'
+export { default as Field } from './field.vue'
+export { default as FileField } from './file-field.vue'
+export { default as InputBase } from './input-base.vue'
+export { default as Label } from './label.vue'
+export { default as Select } from './select.vue'
+export { default as TextAreaInput } from './text-area-input.vue'
+export { default as TextCaptcha } from './text-captcha.vue'