diff --git a/packages/ui/package.json b/packages/ui/package.json
index ce2a5d524..b72a59209 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -16,8 +16,8 @@
   },
   "exports": {
     ".": "./src/index.ts",
-    "./components/animations": "./src/components/Animations/index.ts",
-    "./components/form": "./src/components/Form/index.ts",
+    "./components/animations": "./src/components/animations/index.ts",
+    "./components/form": "./src/components/form/index.ts",
     "./components/layouts": "./src/components/layouts/index.ts",
     "./*": "./*"
   },
diff --git a/packages/ui/src/components/Animations/index.ts b/packages/ui/src/components/Animations/index.ts
deleted file mode 100644
index 3414c2c77..000000000
--- a/packages/ui/src/components/Animations/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { default as BidirectionalTransition } from './BidirectionalTransition.vue'
-export { default as TransitionHorizontal } from './TransitionHorizontal.vue'
-export { default as TransitionVertical } from './TransitionVertical.vue'
diff --git a/packages/ui/src/components/Form/Field/index.ts b/packages/ui/src/components/Form/Field/index.ts
deleted file mode 100644
index 1e83c2973..000000000
--- a/packages/ui/src/components/Form/Field/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export { default as FieldCheckbox } from './FieldCheckbox.vue'
-export { default as FieldInput } from './FieldInput.vue'
-export { default as FieldKeyValues } from './FieldKeyValues.vue'
-export { default as FieldRange } from './FieldRange.vue'
-export { default as FieldSelect } from './FieldSelect.vue'
-export { default as FieldTextArea } from './FieldTextArea.vue'
-export { default as FieldValues } from './FieldValues.vue'
diff --git a/packages/ui/src/components/Form/Input/index.ts b/packages/ui/src/components/Form/Input/index.ts
deleted file mode 100644
index 740114ffc..000000000
--- a/packages/ui/src/components/Form/Input/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export { default as BasicInputFile } from './BasicInputFile.vue'
-export { default as Input } from './Input.vue'
-export { default as InputFile } from './InputFile.vue'
-export { default as InputKeyValue } from './InputKeyValue.vue'
diff --git a/packages/ui/src/components/Form/Radio/index.ts b/packages/ui/src/components/Form/Radio/index.ts
deleted file mode 100644
index a1fc2887e..000000000
--- a/packages/ui/src/components/Form/Radio/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as Radio } from './Radio.vue'
diff --git a/packages/ui/src/components/Form/Range/index.ts b/packages/ui/src/components/Form/Range/index.ts
deleted file mode 100644
index dd6a78c58..000000000
--- a/packages/ui/src/components/Form/Range/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { default as ColorHueRange } from './ColorHueRange.vue'
-export { default as Range } from './Range.vue'
-export { default as RoundRange } from './RoundRange.vue'
diff --git a/packages/ui/src/components/Form/Select/index.ts b/packages/ui/src/components/Form/Select/index.ts
deleted file mode 100644
index 279ca3503..000000000
--- a/packages/ui/src/components/Form/Select/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as Option } from './Option.vue'
-export { default as Select } from './Select.vue'
diff --git a/packages/ui/src/components/Form/SelectTab/index.ts b/packages/ui/src/components/Form/SelectTab/index.ts
deleted file mode 100644
index 82cad68eb..000000000
--- a/packages/ui/src/components/Form/SelectTab/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as SelectTab } from './SelectTab.vue'
diff --git a/packages/ui/src/components/Form/Textarea/index.ts b/packages/ui/src/components/Form/Textarea/index.ts
deleted file mode 100644
index c1c52be47..000000000
--- a/packages/ui/src/components/Form/Textarea/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as BasicTextarea } from './Basic.vue'
-export { default as Textarea } from './Textarea.vue'
diff --git a/packages/ui/src/components/Form/index.ts b/packages/ui/src/components/Form/index.ts
deleted file mode 100644
index d4016cf50..000000000
--- a/packages/ui/src/components/Form/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export * from './Checkbox'
-export * from './Combobox'
-export * from './Field'
-export * from './Input'
-export * from './Radio'
-export * from './Range'
-export * from './Select'
-export * from './SelectTab'
-export * from './Textarea'
diff --git a/packages/ui/src/components/Misc/index.ts b/packages/ui/src/components/Misc/index.ts
deleted file mode 100644
index c56451a24..000000000
--- a/packages/ui/src/components/Misc/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { default as Button } from './Button.vue'
-export { default as Callout } from './Callout.vue'
-export { default as DoubleCheckButton } from './DoubleCheckButton.vue'
diff --git a/packages/ui/src/components/animations/index.ts b/packages/ui/src/components/animations/index.ts
new file mode 100644
index 000000000..6fff9d1cc
--- /dev/null
+++ b/packages/ui/src/components/animations/index.ts
@@ -0,0 +1,9 @@
+export { default as TransitionBidirectional } from './transition-bidirectional.vue'
+export {
+  /**
+   * @deprecated Use TransitionBidirectional instead
+   */
+  default as BidirectionalTransition,
+} from './transition-bidirectional.vue'
+export { default as TransitionHorizontal } from './transition-horizontal.vue'
+export { default as TransitionVertical } from './transition-vertical.vue'
diff --git a/packages/ui/src/components/Animations/BidirectionalTransition.vue b/packages/ui/src/components/animations/transition-bidirectional.vue
similarity index 100%
rename from packages/ui/src/components/Animations/BidirectionalTransition.vue
rename to packages/ui/src/components/animations/transition-bidirectional.vue
diff --git a/packages/ui/src/components/Animations/TransitionHorizontal.vue b/packages/ui/src/components/animations/transition-horizontal.vue
similarity index 100%
rename from packages/ui/src/components/Animations/TransitionHorizontal.vue
rename to packages/ui/src/components/animations/transition-horizontal.vue
diff --git a/packages/ui/src/components/Animations/TransitionVertical.vue b/packages/ui/src/components/animations/transition-vertical.vue
similarity index 100%
rename from packages/ui/src/components/Animations/TransitionVertical.vue
rename to packages/ui/src/components/animations/transition-vertical.vue
diff --git a/packages/ui/src/components/Form/Checkbox/Checkbox.vue b/packages/ui/src/components/form/checkbox/checkbox.vue
similarity index 100%
rename from packages/ui/src/components/Form/Checkbox/Checkbox.vue
rename to packages/ui/src/components/form/checkbox/checkbox.vue
diff --git a/packages/ui/src/components/Form/Checkbox/index.ts b/packages/ui/src/components/form/checkbox/index.ts
similarity index 100%
rename from packages/ui/src/components/Form/Checkbox/index.ts
rename to packages/ui/src/components/form/checkbox/index.ts
diff --git a/packages/ui/src/components/Form/Combobox/Combobox.vue b/packages/ui/src/components/form/combobox/combobox.vue
similarity index 100%
rename from packages/ui/src/components/Form/Combobox/Combobox.vue
rename to packages/ui/src/components/form/combobox/combobox.vue
diff --git a/packages/ui/src/components/Form/Combobox/index.ts b/packages/ui/src/components/form/combobox/index.ts
similarity index 100%
rename from packages/ui/src/components/Form/Combobox/index.ts
rename to packages/ui/src/components/form/combobox/index.ts
diff --git a/packages/ui/src/components/Form/Field/FieldCheckbox.vue b/packages/ui/src/components/form/field/field-checkbox.vue
similarity index 93%
rename from packages/ui/src/components/Form/Field/FieldCheckbox.vue
rename to packages/ui/src/components/form/field/field-checkbox.vue
index 1e1a58454..91f1e236d 100644
--- a/packages/ui/src/components/Form/Field/FieldCheckbox.vue
+++ b/packages/ui/src/components/form/field/field-checkbox.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import Checkbox from '../Checkbox/Checkbox.vue'
+import { Checkbox } from '../checkbox'
 
 const props = defineProps<{
   label?: string
diff --git a/packages/ui/src/components/Form/Field/FieldInput.vue b/packages/ui/src/components/form/field/field-input.vue
similarity index 97%
rename from packages/ui/src/components/Form/Field/FieldInput.vue
rename to packages/ui/src/components/form/field/field-input.vue
index bd03a5797..cb4f3ccf9 100644
--- a/packages/ui/src/components/Form/Field/FieldInput.vue
+++ b/packages/ui/src/components/form/field/field-input.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import Input from '../Input/Input.vue'
+import { Input } from '../input'
 
 const props = withDefaults(defineProps<{
   label?: string
diff --git a/packages/ui/src/components/Form/Field/FieldKeyValues.vue b/packages/ui/src/components/form/field/field-key-values.vue
similarity index 97%
rename from packages/ui/src/components/Form/Field/FieldKeyValues.vue
rename to packages/ui/src/components/form/field/field-key-values.vue
index a8764863d..37006caac 100644
--- a/packages/ui/src/components/Form/Field/FieldKeyValues.vue
+++ b/packages/ui/src/components/form/field/field-key-values.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, watch } from 'vue'
 
-import InputKeyValue from '../Input/InputKeyValue.vue'
+import { InputKeyValue } from '../input'
 
 const props = defineProps<{
   label?: string
diff --git a/packages/ui/src/components/Form/Field/FieldRange.vue b/packages/ui/src/components/form/field/field-range.vue
similarity index 96%
rename from packages/ui/src/components/Form/Field/FieldRange.vue
rename to packages/ui/src/components/form/field/field-range.vue
index 4fa1c5b9f..bc6776328 100644
--- a/packages/ui/src/components/Form/Field/FieldRange.vue
+++ b/packages/ui/src/components/form/field/field-range.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import Range from '../Range/Range.vue'
+import { Range } from '../range'
 
 const props = withDefaults(defineProps<{
   min?: number
diff --git a/packages/ui/src/components/Form/Field/FieldSelect.vue b/packages/ui/src/components/form/field/field-select.vue
similarity index 98%
rename from packages/ui/src/components/Form/Field/FieldSelect.vue
rename to packages/ui/src/components/form/field/field-select.vue
index 268aa4627..753682cda 100644
--- a/packages/ui/src/components/Form/Field/FieldSelect.vue
+++ b/packages/ui/src/components/form/field/field-select.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Select } from '@proj-airi/ui'
+import { Select } from '../select'
 
 const props = withDefaults(defineProps<{
   label: string
diff --git a/packages/ui/src/components/Form/Field/FieldTextArea.vue b/packages/ui/src/components/form/field/field-text-area.vue
similarity index 95%
rename from packages/ui/src/components/Form/Field/FieldTextArea.vue
rename to packages/ui/src/components/form/field/field-text-area.vue
index 6fb29da80..73267d1e5 100644
--- a/packages/ui/src/components/Form/Field/FieldTextArea.vue
+++ b/packages/ui/src/components/form/field/field-text-area.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import Textarea from '../Textarea/Textarea.vue'
+import { Textarea } from '../textarea'
 
 const props = withDefaults(defineProps<{
   label?: string
diff --git a/packages/ui/src/components/Form/Field/FieldValues.vue b/packages/ui/src/components/form/field/field-values.vue
similarity index 97%
rename from packages/ui/src/components/Form/Field/FieldValues.vue
rename to packages/ui/src/components/form/field/field-values.vue
index 0e55f6a8f..469a9f48a 100644
--- a/packages/ui/src/components/Form/Field/FieldValues.vue
+++ b/packages/ui/src/components/form/field/field-values.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import Input from '../Input/Input.vue'
+import { Input } from '../input'
 
 const props = defineProps<{
   label?: string
diff --git a/packages/ui/src/components/form/field/index.ts b/packages/ui/src/components/form/field/index.ts
new file mode 100644
index 000000000..92b361c26
--- /dev/null
+++ b/packages/ui/src/components/form/field/index.ts
@@ -0,0 +1,7 @@
+export { default as FieldCheckbox } from './field-checkbox.vue'
+export { default as FieldInput } from './field-input.vue'
+export { default as FieldKeyValues } from './field-key-values.vue'
+export { default as FieldRange } from './field-range.vue'
+export { default as FieldSelect } from './field-select.vue'
+export { default as FieldTextArea } from './field-text-area.vue'
+export { default as FieldValues } from './field-values.vue'
diff --git a/packages/ui/src/components/form/index.ts b/packages/ui/src/components/form/index.ts
new file mode 100644
index 000000000..174d85e08
--- /dev/null
+++ b/packages/ui/src/components/form/index.ts
@@ -0,0 +1,9 @@
+export * from './checkbox'
+export * from './combobox'
+export * from './field'
+export * from './input'
+export * from './radio'
+export * from './range'
+export * from './select'
+export * from './select-tab'
+export * from './textarea'
diff --git a/packages/ui/src/components/Form/Input/BasicInputFile.vue b/packages/ui/src/components/form/input/basic-input-file.vue
similarity index 100%
rename from packages/ui/src/components/Form/Input/BasicInputFile.vue
rename to packages/ui/src/components/form/input/basic-input-file.vue
diff --git a/packages/ui/src/components/form/input/index.ts b/packages/ui/src/components/form/input/index.ts
new file mode 100644
index 000000000..9bd8171b7
--- /dev/null
+++ b/packages/ui/src/components/form/input/index.ts
@@ -0,0 +1,4 @@
+export { default as BasicInputFile } from './basic-input-file.vue'
+export { default as InputFile } from './input-file.vue'
+export { default as InputKeyValue } from './input-key-value.vue'
+export { default as Input } from './input.vue'
diff --git a/packages/ui/src/components/Form/Input/InputFile.vue b/packages/ui/src/components/form/input/input-file.vue
similarity index 100%
rename from packages/ui/src/components/Form/Input/InputFile.vue
rename to packages/ui/src/components/form/input/input-file.vue
diff --git a/packages/ui/src/components/Form/Input/InputKeyValue.vue b/packages/ui/src/components/form/input/input-key-value.vue
similarity index 100%
rename from packages/ui/src/components/Form/Input/InputKeyValue.vue
rename to packages/ui/src/components/form/input/input-key-value.vue
diff --git a/packages/ui/src/components/Form/Input/Input.vue b/packages/ui/src/components/form/input/input.vue
similarity index 100%
rename from packages/ui/src/components/Form/Input/Input.vue
rename to packages/ui/src/components/form/input/input.vue
diff --git a/packages/ui/src/components/form/radio/index.ts b/packages/ui/src/components/form/radio/index.ts
new file mode 100644
index 000000000..3d078ce06
--- /dev/null
+++ b/packages/ui/src/components/form/radio/index.ts
@@ -0,0 +1 @@
+export { default as Radio } from './radio.vue'
diff --git a/packages/ui/src/components/Form/Radio/Radio.vue b/packages/ui/src/components/form/radio/radio.vue
similarity index 100%
rename from packages/ui/src/components/Form/Radio/Radio.vue
rename to packages/ui/src/components/form/radio/radio.vue
diff --git a/packages/ui/src/components/Form/Range/ColorHueRange.vue b/packages/ui/src/components/form/range/color-hue-range.vue
similarity index 100%
rename from packages/ui/src/components/Form/Range/ColorHueRange.vue
rename to packages/ui/src/components/form/range/color-hue-range.vue
diff --git a/packages/ui/src/components/form/range/index.ts b/packages/ui/src/components/form/range/index.ts
new file mode 100644
index 000000000..c33ba786d
--- /dev/null
+++ b/packages/ui/src/components/form/range/index.ts
@@ -0,0 +1,3 @@
+export { default as ColorHueRange } from './color-hue-range.vue'
+export { default as Range } from './range.vue'
+export { default as RoundRange } from './round-range.vue'
diff --git a/packages/ui/src/components/Form/Range/Range.vue b/packages/ui/src/components/form/range/range.vue
similarity index 100%
rename from packages/ui/src/components/Form/Range/Range.vue
rename to packages/ui/src/components/form/range/range.vue
diff --git a/packages/ui/src/components/Form/Range/RoundRange.vue b/packages/ui/src/components/form/range/round-range.vue
similarity index 100%
rename from packages/ui/src/components/Form/Range/RoundRange.vue
rename to packages/ui/src/components/form/range/round-range.vue
diff --git a/packages/ui/src/components/form/select-tab/index.ts b/packages/ui/src/components/form/select-tab/index.ts
new file mode 100644
index 000000000..1b12263b0
--- /dev/null
+++ b/packages/ui/src/components/form/select-tab/index.ts
@@ -0,0 +1 @@
+export { default as SelectTab } from './select-tab.vue'
diff --git a/packages/ui/src/components/Form/SelectTab/SelectTab.vue b/packages/ui/src/components/form/select-tab/select-tab.vue
similarity index 100%
rename from packages/ui/src/components/Form/SelectTab/SelectTab.vue
rename to packages/ui/src/components/form/select-tab/select-tab.vue
diff --git a/packages/ui/src/components/form/select/index.ts b/packages/ui/src/components/form/select/index.ts
new file mode 100644
index 000000000..a2cd14ebe
--- /dev/null
+++ b/packages/ui/src/components/form/select/index.ts
@@ -0,0 +1,2 @@
+export { default as Option } from './option.vue'
+export { default as Select } from './select.vue'
diff --git a/packages/ui/src/components/Form/Select/Option.vue b/packages/ui/src/components/form/select/option.vue
similarity index 100%
rename from packages/ui/src/components/Form/Select/Option.vue
rename to packages/ui/src/components/form/select/option.vue
diff --git a/packages/ui/src/components/Form/Select/Select.vue b/packages/ui/src/components/form/select/select.vue
similarity index 93%
rename from packages/ui/src/components/Form/Select/Select.vue
rename to packages/ui/src/components/form/select/select.vue
index a0a60b847..67b8bb2f9 100644
--- a/packages/ui/src/components/Form/Select/Select.vue
+++ b/packages/ui/src/components/form/select/select.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { provide, ref } from 'vue'
 
-import Combobox from '../Combobox/Combobox.vue'
+import { Combobox } from '../combobox'
 
 const props = defineProps<{
   options?: { label: string, value: string | number }[]
diff --git a/packages/ui/src/components/Form/Textarea/Basic.vue b/packages/ui/src/components/form/textarea/basic-text-area.vue
similarity index 100%
rename from packages/ui/src/components/Form/Textarea/Basic.vue
rename to packages/ui/src/components/form/textarea/basic-text-area.vue
diff --git a/packages/ui/src/components/form/textarea/index.ts b/packages/ui/src/components/form/textarea/index.ts
new file mode 100644
index 000000000..744bcd92c
--- /dev/null
+++ b/packages/ui/src/components/form/textarea/index.ts
@@ -0,0 +1,2 @@
+export { default as BasicTextarea } from './basic-text-area.vue'
+export { default as Textarea } from './textarea.vue'
diff --git a/packages/ui/src/components/Form/Textarea/Textarea.vue b/packages/ui/src/components/form/textarea/textarea.vue
similarity index 92%
rename from packages/ui/src/components/Form/Textarea/Textarea.vue
rename to packages/ui/src/components/form/textarea/textarea.vue
index eda5d8318..3e67794a3 100644
--- a/packages/ui/src/components/Form/Textarea/Textarea.vue
+++ b/packages/ui/src/components/form/textarea/textarea.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import BasicTextarea from './Basic.vue'
+import BasicTextarea from './basic-text-area.vue'
 
 const modelValue = defineModel<string>({ default: '' })
 </script>
diff --git a/packages/ui/src/components/layouts/collapsible.vue b/packages/ui/src/components/layouts/collapsible.vue
index 2e9400ef3..4ae5d4e9b 100644
--- a/packages/ui/src/components/layouts/collapsible.vue
+++ b/packages/ui/src/components/layouts/collapsible.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup>
-import { TransitionVertical } from '@proj-airi/ui'
 import { watchEffect } from 'vue'
 
+import { TransitionVertical } from '../animations'
+
 const props = defineProps<{
   default?: boolean
   label?: string
diff --git a/packages/ui/src/components/Misc/Button.vue b/packages/ui/src/components/misc/button.vue
similarity index 97%
rename from packages/ui/src/components/Misc/Button.vue
rename to packages/ui/src/components/misc/button.vue
index 0a463735e..1852442f9 100644
--- a/packages/ui/src/components/Misc/Button.vue
+++ b/packages/ui/src/components/misc/button.vue
@@ -1,7 +1,8 @@
 <script setup lang="ts">
-import { BidirectionalTransition } from '@proj-airi/ui'
 import { computed } from 'vue'
 
+import { TransitionBidirectional } from '../animations'
+
 // Define button variants for better type safety and maintainability
 type ButtonVariant = 'primary' | 'secondary' | 'secondary-muted' | 'danger' | 'caution' | 'pure' | 'ghost'
 
@@ -157,7 +158,7 @@ const baseClasses = computed(() => {
     :class="baseClasses"
   >
     <div class="flex flex-row items-center justify-center gap-2">
-      <BidirectionalTransition
+      <TransitionBidirectional
         from-class="opacity-0 mr-0! w-0!"
         active-class="transition-[width,margin] ease-in-out overflow-hidden transition-100"
       >
@@ -165,7 +166,7 @@ const baseClasses = computed(() => {
           <div v-if="loading" class="i-svg-spinners:ring-resize h-4 w-4" />
           <div v-else-if="icon" class="h-4 w-4" :class="icon" />
         </div>
-      </BidirectionalTransition>
+      </TransitionBidirectional>
       <span v-if="label">{{ label }}</span>
       <slot v-else />
     </div>
diff --git a/packages/ui/src/components/Misc/Callout.vue b/packages/ui/src/components/misc/callout.vue
similarity index 100%
rename from packages/ui/src/components/Misc/Callout.vue
rename to packages/ui/src/components/misc/callout.vue
diff --git a/packages/ui/src/components/Misc/DoubleCheckButton.vue b/packages/ui/src/components/misc/double-check-button.vue
similarity index 100%
rename from packages/ui/src/components/Misc/DoubleCheckButton.vue
rename to packages/ui/src/components/misc/double-check-button.vue
diff --git a/packages/ui/src/components/misc/index.ts b/packages/ui/src/components/misc/index.ts
new file mode 100644
index 000000000..d5dcc3f71
--- /dev/null
+++ b/packages/ui/src/components/misc/index.ts
@@ -0,0 +1,3 @@
+export { default as Button } from './button.vue'
+export { default as Callout } from './callout.vue'
+export { default as DoubleCheckButton } from './double-check-button.vue'