diff --git a/src/components/Common/UI/FieldCaption/FieldCaption.module.scss b/src/components/Common/FieldCaption/FieldCaption.module.scss
similarity index 100%
rename from src/components/Common/UI/FieldCaption/FieldCaption.module.scss
rename to src/components/Common/FieldCaption/FieldCaption.module.scss
diff --git a/src/components/Common/UI/FieldCaption/FieldCaption.stories.tsx b/src/components/Common/FieldCaption/FieldCaption.stories.tsx
similarity index 100%
rename from src/components/Common/UI/FieldCaption/FieldCaption.stories.tsx
rename to src/components/Common/FieldCaption/FieldCaption.stories.tsx
diff --git a/src/components/Common/UI/FieldCaption/FieldCaption.tsx b/src/components/Common/FieldCaption/FieldCaption.tsx
similarity index 94%
rename from src/components/Common/UI/FieldCaption/FieldCaption.tsx
rename to src/components/Common/FieldCaption/FieldCaption.tsx
index 6f1774e6..75af4f3e 100644
--- a/src/components/Common/UI/FieldCaption/FieldCaption.tsx
+++ b/src/components/Common/FieldCaption/FieldCaption.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from 'react-i18next'
 import classNames from 'classnames'
-import { VisuallyHidden } from '../../VisuallyHidden'
+import { VisuallyHidden } from '../VisuallyHidden'
 import styles from './FieldCaption.module.scss'
 
 export interface FieldCaptionProps {
diff --git a/src/components/Common/UI/FieldCaption/index.ts b/src/components/Common/FieldCaption/index.ts
similarity index 100%
rename from src/components/Common/UI/FieldCaption/index.ts
rename to src/components/Common/FieldCaption/index.ts
diff --git a/src/components/Common/UI/FieldDescription/FieldDescription.module.scss b/src/components/Common/FieldDescription/FieldDescription.module.scss
similarity index 100%
rename from src/components/Common/UI/FieldDescription/FieldDescription.module.scss
rename to src/components/Common/FieldDescription/FieldDescription.module.scss
diff --git a/src/components/Common/UI/FieldDescription/FieldDescription.stories.tsx b/src/components/Common/FieldDescription/FieldDescription.stories.tsx
similarity index 100%
rename from src/components/Common/UI/FieldDescription/FieldDescription.stories.tsx
rename to src/components/Common/FieldDescription/FieldDescription.stories.tsx
diff --git a/src/components/Common/UI/FieldDescription/FieldDescription.tsx b/src/components/Common/FieldDescription/FieldDescription.tsx
similarity index 100%
rename from src/components/Common/UI/FieldDescription/FieldDescription.tsx
rename to src/components/Common/FieldDescription/FieldDescription.tsx
diff --git a/src/components/Common/UI/FieldDescription/index.ts b/src/components/Common/FieldDescription/index.ts
similarity index 100%
rename from src/components/Common/UI/FieldDescription/index.ts
rename to src/components/Common/FieldDescription/index.ts
diff --git a/src/components/Common/UI/FieldErrorMessage/FieldErrorMessage.module.scss b/src/components/Common/FieldErrorMessage/FieldErrorMessage.module.scss
similarity index 100%
rename from src/components/Common/UI/FieldErrorMessage/FieldErrorMessage.module.scss
rename to src/components/Common/FieldErrorMessage/FieldErrorMessage.module.scss
diff --git a/src/components/Common/UI/FieldErrorMessage/FieldErrorMessage.stories.tsx b/src/components/Common/FieldErrorMessage/FieldErrorMessage.stories.tsx
similarity index 100%
rename from src/components/Common/UI/FieldErrorMessage/FieldErrorMessage.stories.tsx
rename to src/components/Common/FieldErrorMessage/FieldErrorMessage.stories.tsx
diff --git a/src/components/Common/UI/FieldErrorMessage/FieldErrorMessage.tsx b/src/components/Common/FieldErrorMessage/FieldErrorMessage.tsx
similarity index 100%
rename from src/components/Common/UI/FieldErrorMessage/FieldErrorMessage.tsx
rename to src/components/Common/FieldErrorMessage/FieldErrorMessage.tsx
diff --git a/src/components/Common/UI/FieldErrorMessage/index.ts b/src/components/Common/FieldErrorMessage/index.ts
similarity index 100%
rename from src/components/Common/UI/FieldErrorMessage/index.ts
rename to src/components/Common/FieldErrorMessage/index.ts
diff --git a/src/components/Common/UI/FieldLayout/FieldLayout.module.scss b/src/components/Common/FieldLayout/FieldLayout.module.scss
similarity index 100%
rename from src/components/Common/UI/FieldLayout/FieldLayout.module.scss
rename to src/components/Common/FieldLayout/FieldLayout.module.scss
diff --git a/src/components/Common/UI/FieldLayout/FieldLayout.stories.tsx b/src/components/Common/FieldLayout/FieldLayout.stories.tsx
similarity index 100%
rename from src/components/Common/UI/FieldLayout/FieldLayout.stories.tsx
rename to src/components/Common/FieldLayout/FieldLayout.stories.tsx
diff --git a/src/components/Common/UI/FieldLayout/FieldLayout.test.tsx b/src/components/Common/FieldLayout/FieldLayout.test.tsx
similarity index 100%
rename from src/components/Common/UI/FieldLayout/FieldLayout.test.tsx
rename to src/components/Common/FieldLayout/FieldLayout.test.tsx
diff --git a/src/components/Common/UI/FieldLayout/FieldLayout.tsx b/src/components/Common/FieldLayout/FieldLayout.tsx
similarity index 100%
rename from src/components/Common/UI/FieldLayout/FieldLayout.tsx
rename to src/components/Common/FieldLayout/FieldLayout.tsx
diff --git a/src/components/Common/UI/FieldLayout/FieldLayoutTypes.ts b/src/components/Common/FieldLayout/FieldLayoutTypes.ts
similarity index 100%
rename from src/components/Common/UI/FieldLayout/FieldLayoutTypes.ts
rename to src/components/Common/FieldLayout/FieldLayoutTypes.ts
diff --git a/src/components/Common/UI/FieldLayout/index.ts b/src/components/Common/FieldLayout/index.ts
similarity index 100%
rename from src/components/Common/UI/FieldLayout/index.ts
rename to src/components/Common/FieldLayout/index.ts
diff --git a/src/components/Common/UI/Fieldset/Fieldset.module.scss b/src/components/Common/Fieldset/Fieldset.module.scss
similarity index 100%
rename from src/components/Common/UI/Fieldset/Fieldset.module.scss
rename to src/components/Common/Fieldset/Fieldset.module.scss
diff --git a/src/components/Common/UI/Fieldset/Fieldset.stories.tsx b/src/components/Common/Fieldset/Fieldset.stories.tsx
similarity index 100%
rename from src/components/Common/UI/Fieldset/Fieldset.stories.tsx
rename to src/components/Common/Fieldset/Fieldset.stories.tsx
diff --git a/src/components/Common/UI/Fieldset/Fieldset.test.tsx b/src/components/Common/Fieldset/Fieldset.test.tsx
similarity index 100%
rename from src/components/Common/UI/Fieldset/Fieldset.test.tsx
rename to src/components/Common/Fieldset/Fieldset.test.tsx
diff --git a/src/components/Common/UI/Fieldset/Fieldset.tsx b/src/components/Common/Fieldset/Fieldset.tsx
similarity index 100%
rename from src/components/Common/UI/Fieldset/Fieldset.tsx
rename to src/components/Common/Fieldset/Fieldset.tsx
diff --git a/src/components/Common/UI/Fieldset/index.ts b/src/components/Common/Fieldset/index.ts
similarity index 100%
rename from src/components/Common/UI/Fieldset/index.ts
rename to src/components/Common/Fieldset/index.ts
diff --git a/src/components/Common/UI/HorizontalFieldLayout/HorizontalFieldLayout.module.scss b/src/components/Common/HorizontalFieldLayout/HorizontalFieldLayout.module.scss
similarity index 100%
rename from src/components/Common/UI/HorizontalFieldLayout/HorizontalFieldLayout.module.scss
rename to src/components/Common/HorizontalFieldLayout/HorizontalFieldLayout.module.scss
diff --git a/src/components/Common/UI/HorizontalFieldLayout/HorizontalFieldLayout.stories.tsx b/src/components/Common/HorizontalFieldLayout/HorizontalFieldLayout.stories.tsx
similarity index 100%
rename from src/components/Common/UI/HorizontalFieldLayout/HorizontalFieldLayout.stories.tsx
rename to src/components/Common/HorizontalFieldLayout/HorizontalFieldLayout.stories.tsx
diff --git a/src/components/Common/UI/HorizontalFieldLayout/HorizontalFieldLayout.tsx b/src/components/Common/HorizontalFieldLayout/HorizontalFieldLayout.tsx
similarity index 96%
rename from src/components/Common/UI/HorizontalFieldLayout/HorizontalFieldLayout.tsx
rename to src/components/Common/HorizontalFieldLayout/HorizontalFieldLayout.tsx
index 53488c45..d3c6c610 100644
--- a/src/components/Common/UI/HorizontalFieldLayout/HorizontalFieldLayout.tsx
+++ b/src/components/Common/HorizontalFieldLayout/HorizontalFieldLayout.tsx
@@ -1,5 +1,5 @@
 import classNames from 'classnames'
-import { VisuallyHidden } from '../../VisuallyHidden'
+import { VisuallyHidden } from '../VisuallyHidden'
 import { FieldErrorMessage } from '../FieldErrorMessage'
 import { FieldDescription } from '../FieldDescription'
 import styles from './HorizontalFieldLayout.module.scss'
diff --git a/src/components/Common/UI/HorizontalFieldLayout/HorizontalFieldLayoutTypes.ts b/src/components/Common/HorizontalFieldLayout/HorizontalFieldLayoutTypes.ts
similarity index 100%
rename from src/components/Common/UI/HorizontalFieldLayout/HorizontalFieldLayoutTypes.ts
rename to src/components/Common/HorizontalFieldLayout/HorizontalFieldLayoutTypes.ts
diff --git a/src/components/Common/UI/HorizontalFieldLayout/index.ts b/src/components/Common/HorizontalFieldLayout/index.ts
similarity index 100%
rename from src/components/Common/UI/HorizontalFieldLayout/index.ts
rename to src/components/Common/HorizontalFieldLayout/index.ts
diff --git a/src/components/Common/UI/Checkbox/Checkbox.tsx b/src/components/Common/UI/Checkbox/Checkbox.tsx
index adb2be92..2a737ecf 100644
--- a/src/components/Common/UI/Checkbox/Checkbox.tsx
+++ b/src/components/Common/UI/Checkbox/Checkbox.tsx
@@ -1,8 +1,8 @@
 import type { ChangeEvent } from 'react'
 import { useFieldIds } from '../hooks/useFieldIds'
-import { HorizontalFieldLayout } from '../HorizontalFieldLayout'
 import styles from './Checkbox.module.scss'
 import type { CheckboxProps } from './CheckboxTypes'
+import { HorizontalFieldLayout } from '@/components/Common/HorizontalFieldLayout'
 import IconChecked from '@/assets/icons/checkbox.svg?react'
 
 export const Checkbox = ({
diff --git a/src/components/Common/UI/Checkbox/CheckboxTypes.ts b/src/components/Common/UI/Checkbox/CheckboxTypes.ts
index 7afe47ba..25a2b570 100644
--- a/src/components/Common/UI/Checkbox/CheckboxTypes.ts
+++ b/src/components/Common/UI/Checkbox/CheckboxTypes.ts
@@ -1,5 +1,5 @@
 import type { InputHTMLAttributes, Ref } from 'react'
-import type { SharedHorizontalFieldLayoutProps } from '../HorizontalFieldLayout/HorizontalFieldLayoutTypes'
+import type { SharedHorizontalFieldLayoutProps } from '@/components/Common/HorizontalFieldLayout/HorizontalFieldLayoutTypes'
 
 export interface CheckboxProps
   extends SharedHorizontalFieldLayoutProps,
diff --git a/src/components/Common/UI/CheckboxGroup/CheckboxGroup.tsx b/src/components/Common/UI/CheckboxGroup/CheckboxGroup.tsx
index 0124c1af..e1e34950 100644
--- a/src/components/Common/UI/CheckboxGroup/CheckboxGroup.tsx
+++ b/src/components/Common/UI/CheckboxGroup/CheckboxGroup.tsx
@@ -9,10 +9,10 @@ import {
 import { useCheckboxGroupItem } from 'react-aria'
 import type { AriaCheckboxProps } from 'react-aria'
 import type React from 'react'
-import { Fieldset } from '../Fieldset'
 import { Checkbox } from '../Checkbox'
 import styles from './CheckboxGroup.module.scss'
 import type { CheckboxGroupProps } from './CheckboxGroupTypes'
+import { Fieldset } from '@/components/Common/Fieldset'
 import { useForkRef } from '@/hooks/useForkRef/useForkRef'
 
 // Checkbox implementation specific to React Aria to get our checkbox to connect
diff --git a/src/components/Common/UI/CheckboxGroup/CheckboxGroupTypes.ts b/src/components/Common/UI/CheckboxGroup/CheckboxGroupTypes.ts
index bba5d58a..b6110ce0 100644
--- a/src/components/Common/UI/CheckboxGroup/CheckboxGroupTypes.ts
+++ b/src/components/Common/UI/CheckboxGroup/CheckboxGroupTypes.ts
@@ -1,5 +1,5 @@
 import type { FieldsetHTMLAttributes, Ref } from 'react'
-import type { SharedFieldLayoutProps } from '../FieldLayout/FieldLayoutTypes'
+import type { SharedFieldLayoutProps } from '@/components/Common/FieldLayout/FieldLayoutTypes'
 
 export type CheckboxGroupOption = {
   label: React.ReactNode
diff --git a/src/components/Common/UI/ComboBox/ComboBox.tsx b/src/components/Common/UI/ComboBox/ComboBox.tsx
index 396910cb..dea10fa1 100644
--- a/src/components/Common/UI/ComboBox/ComboBox.tsx
+++ b/src/components/Common/UI/ComboBox/ComboBox.tsx
@@ -10,10 +10,10 @@ import {
 import { useTranslation } from 'react-i18next'
 import { useMemo } from 'react'
 import classNames from 'classnames'
-import { FieldLayout } from '../FieldLayout'
 import { useFieldIds } from '../hooks/useFieldIds'
 import styles from './ComboBox.module.scss'
 import type { ComboBoxProps } from './ComboBoxTypes'
+import { FieldLayout } from '@/components/Common/FieldLayout'
 import { useTheme } from '@/contexts/ThemeProvider'
 import AlertCircle from '@/assets/icons/alert-circle.svg?react'
 import CaretDown from '@/assets/icons/caret-down.svg?react'
diff --git a/src/components/Common/UI/ComboBox/ComboBoxTypes.ts b/src/components/Common/UI/ComboBox/ComboBoxTypes.ts
index e8f61289..b1c58dc5 100644
--- a/src/components/Common/UI/ComboBox/ComboBoxTypes.ts
+++ b/src/components/Common/UI/ComboBox/ComboBoxTypes.ts
@@ -1,5 +1,5 @@
 import type { InputHTMLAttributes, Ref, FocusEvent } from 'react'
-import type { SharedFieldLayoutProps } from '../FieldLayout/FieldLayoutTypes'
+import type { SharedFieldLayoutProps } from '@/components/Common/FieldLayout/FieldLayoutTypes'
 
 export interface ComboBoxOption {
   label: string
diff --git a/src/components/Common/UI/DatePicker/DatePicker.tsx b/src/components/Common/UI/DatePicker/DatePicker.tsx
index fb6524ea..54f378f2 100644
--- a/src/components/Common/UI/DatePicker/DatePicker.tsx
+++ b/src/components/Common/UI/DatePicker/DatePicker.tsx
@@ -15,10 +15,10 @@ import {
 import { useTranslation } from 'react-i18next'
 import classNames from 'classnames'
 import { parseDate } from '@internationalized/date'
-import { FieldLayout } from '../FieldLayout'
 import { useFieldIds } from '../hooks/useFieldIds'
 import styles from './DatePicker.module.scss'
 import type { DatePickerProps } from './DatePickerTypes'
+import { FieldLayout } from '@/components/Common/FieldLayout'
 import { useTheme } from '@/contexts/ThemeProvider'
 import CaretDown from '@/assets/icons/caret-down.svg?react'
 import CaretRight from '@/assets/icons/caret-right.svg?react'
diff --git a/src/components/Common/UI/DatePicker/DatePickerTypes.ts b/src/components/Common/UI/DatePicker/DatePickerTypes.ts
index 676dcc87..12a53950 100644
--- a/src/components/Common/UI/DatePicker/DatePickerTypes.ts
+++ b/src/components/Common/UI/DatePicker/DatePickerTypes.ts
@@ -1,5 +1,5 @@
 import type { InputHTMLAttributes, Ref, FocusEvent } from 'react'
-import type { SharedFieldLayoutProps } from '../FieldLayout/FieldLayoutTypes'
+import type { SharedFieldLayoutProps } from '@/components/Common/FieldLayout/FieldLayoutTypes'
 
 export interface DatePickerProps
   extends SharedFieldLayoutProps,
diff --git a/src/components/Common/UI/NumberInput/NumberInput.tsx b/src/components/Common/UI/NumberInput/NumberInput.tsx
index 600d9a3f..33da933f 100644
--- a/src/components/Common/UI/NumberInput/NumberInput.tsx
+++ b/src/components/Common/UI/NumberInput/NumberInput.tsx
@@ -1,11 +1,11 @@
 import { useMemo } from 'react'
 import { Group, NumberField as AriaNumberField } from 'react-aria-components'
 import classNames from 'classnames'
-import { FieldLayout } from '../FieldLayout'
 import { Input } from '../Input'
 import { useFieldIds } from '../hooks/useFieldIds'
 import styles from './NumberInput.module.scss'
 import type { NumberInputProps } from './NumberInputTypes'
+import { FieldLayout } from '@/components/Common/FieldLayout'
 import { useLocale } from '@/contexts/LocaleProvider'
 
 export function NumberInput({
diff --git a/src/components/Common/UI/NumberInput/NumberInputTypes.ts b/src/components/Common/UI/NumberInput/NumberInputTypes.ts
index b76d3d87..e848e894 100644
--- a/src/components/Common/UI/NumberInput/NumberInputTypes.ts
+++ b/src/components/Common/UI/NumberInput/NumberInputTypes.ts
@@ -1,6 +1,6 @@
 import type { FocusEventHandler, InputHTMLAttributes, Ref } from 'react'
-import type { SharedFieldLayoutProps } from '../FieldLayout/FieldLayoutTypes'
 import type { InputProps } from '../Input/InputTypes'
+import type { SharedFieldLayoutProps } from '@/components/Common/FieldLayout/FieldLayoutTypes'
 
 export interface NumberInputProps
   extends SharedFieldLayoutProps,
diff --git a/src/components/Common/UI/Radio/Radio.tsx b/src/components/Common/UI/Radio/Radio.tsx
index b830725a..5d98adb7 100644
--- a/src/components/Common/UI/Radio/Radio.tsx
+++ b/src/components/Common/UI/Radio/Radio.tsx
@@ -1,9 +1,9 @@
 import type { ChangeEvent } from 'react'
 import classNames from 'classnames'
 import { useFieldIds } from '../hooks/useFieldIds'
-import { HorizontalFieldLayout } from '../HorizontalFieldLayout'
 import styles from './Radio.module.scss'
 import type { RadioProps } from './RadioTypes'
+import { HorizontalFieldLayout } from '@/components/Common/HorizontalFieldLayout'
 
 export const Radio = ({
   name,
diff --git a/src/components/Common/UI/Radio/RadioTypes.ts b/src/components/Common/UI/Radio/RadioTypes.ts
index ba7095f5..d9236e69 100644
--- a/src/components/Common/UI/Radio/RadioTypes.ts
+++ b/src/components/Common/UI/Radio/RadioTypes.ts
@@ -1,5 +1,5 @@
 import type { InputHTMLAttributes, Ref } from 'react'
-import type { SharedHorizontalFieldLayoutProps } from '../HorizontalFieldLayout/HorizontalFieldLayoutTypes'
+import type { SharedHorizontalFieldLayoutProps } from '@/components/Common/HorizontalFieldLayout/HorizontalFieldLayoutTypes'
 
 export interface RadioProps
   extends SharedHorizontalFieldLayoutProps,
diff --git a/src/components/Common/UI/RadioGroup/RadioGroup.tsx b/src/components/Common/UI/RadioGroup/RadioGroup.tsx
index 73f80827..c29914c7 100644
--- a/src/components/Common/UI/RadioGroup/RadioGroup.tsx
+++ b/src/components/Common/UI/RadioGroup/RadioGroup.tsx
@@ -9,10 +9,10 @@ import {
 import { useRadio } from 'react-aria'
 import type { AriaRadioProps } from 'react-aria'
 import type React from 'react'
-import { Fieldset } from '../Fieldset'
 import { Radio } from '../Radio'
 import styles from './RadioGroup.module.scss'
 import type { RadioGroupProps } from './RadioGroupTypes'
+import { Fieldset } from '@/components/Common/Fieldset'
 import { useForkRef } from '@/hooks/useForkRef/useForkRef'
 
 // Radio implementation specific to React Aria to get our radio to connect
diff --git a/src/components/Common/UI/RadioGroup/RadioGroupTypes.ts b/src/components/Common/UI/RadioGroup/RadioGroupTypes.ts
index 57ce46a1..813271ba 100644
--- a/src/components/Common/UI/RadioGroup/RadioGroupTypes.ts
+++ b/src/components/Common/UI/RadioGroup/RadioGroupTypes.ts
@@ -1,5 +1,5 @@
 import type { FieldsetHTMLAttributes, Ref } from 'react'
-import type { SharedFieldLayoutProps } from '../FieldLayout/FieldLayoutTypes'
+import type { SharedFieldLayoutProps } from '@/components/Common/FieldLayout/FieldLayoutTypes'
 
 export type RadioGroupOption = {
   label: React.ReactNode
diff --git a/src/components/Common/UI/Select/Select.tsx b/src/components/Common/UI/Select/Select.tsx
index 9631e9a1..8c1c242e 100644
--- a/src/components/Common/UI/Select/Select.tsx
+++ b/src/components/Common/UI/Select/Select.tsx
@@ -11,9 +11,9 @@ import { useTranslation } from 'react-i18next'
 import { useMemo } from 'react'
 import classNames from 'classnames'
 import { useFieldIds } from '../hooks/useFieldIds'
-import { FieldLayout } from '../FieldLayout'
 import styles from './Select.module.scss'
 import type { SelectProps } from './SelectTypes'
+import { FieldLayout } from '@/components/Common/FieldLayout'
 import CaretDown from '@/assets/icons/caret-down.svg?react'
 import AlertCircle from '@/assets/icons/alert-circle.svg?react'
 import { useTheme } from '@/contexts/ThemeProvider'
diff --git a/src/components/Common/UI/Select/SelectTypes.ts b/src/components/Common/UI/Select/SelectTypes.ts
index 3eeb7ef8..8673398a 100644
--- a/src/components/Common/UI/Select/SelectTypes.ts
+++ b/src/components/Common/UI/Select/SelectTypes.ts
@@ -1,5 +1,5 @@
 import type { FocusEvent, Ref, SelectHTMLAttributes } from 'react'
-import type { SharedFieldLayoutProps } from '../FieldLayout/FieldLayoutTypes'
+import type { SharedFieldLayoutProps } from '@/components/Common/FieldLayout/FieldLayoutTypes'
 
 export interface SelectOption {
   value: string
diff --git a/src/components/Common/UI/Switch/Switch.tsx b/src/components/Common/UI/Switch/Switch.tsx
index 56275a34..c86e5ed9 100644
--- a/src/components/Common/UI/Switch/Switch.tsx
+++ b/src/components/Common/UI/Switch/Switch.tsx
@@ -2,9 +2,9 @@ import { Switch as _Switch } from 'react-aria-components'
 import classNames from 'classnames'
 import { useRef, useEffect } from 'react'
 import { useFieldIds } from '../hooks/useFieldIds'
-import { HorizontalFieldLayout } from '../HorizontalFieldLayout'
 import styles from './Switch.module.scss'
 import type { SwitchProps } from './SwitchTypes'
+import { HorizontalFieldLayout } from '@/components/Common/HorizontalFieldLayout'
 
 export function Switch({
   name,
diff --git a/src/components/Common/UI/Switch/SwitchTypes.ts b/src/components/Common/UI/Switch/SwitchTypes.ts
index 8020d0ec..f02e46c2 100644
--- a/src/components/Common/UI/Switch/SwitchTypes.ts
+++ b/src/components/Common/UI/Switch/SwitchTypes.ts
@@ -1,5 +1,5 @@
 import type { FocusEvent, InputHTMLAttributes, Ref } from 'react'
-import type { SharedHorizontalFieldLayoutProps } from '../HorizontalFieldLayout/HorizontalFieldLayoutTypes'
+import type { SharedHorizontalFieldLayoutProps } from '@/components/Common/HorizontalFieldLayout/HorizontalFieldLayoutTypes'
 
 export interface SwitchProps
   extends SharedHorizontalFieldLayoutProps,
diff --git a/src/components/Common/UI/TextInput/TextInput.tsx b/src/components/Common/UI/TextInput/TextInput.tsx
index 697df840..56364dd6 100644
--- a/src/components/Common/UI/TextInput/TextInput.tsx
+++ b/src/components/Common/UI/TextInput/TextInput.tsx
@@ -1,8 +1,8 @@
 import type { ChangeEvent } from 'react'
-import { FieldLayout } from '../FieldLayout'
 import { Input } from '../Input'
 import { useFieldIds } from '../hooks/useFieldIds'
 import type { TextInputProps } from './TextInputTypes'
+import { FieldLayout } from '@/components/Common/FieldLayout'
 
 export function TextInput({
   name,
diff --git a/src/components/Common/UI/TextInput/TextInputTypes.ts b/src/components/Common/UI/TextInput/TextInputTypes.ts
index f21a14e4..ef2f1fc1 100644
--- a/src/components/Common/UI/TextInput/TextInputTypes.ts
+++ b/src/components/Common/UI/TextInput/TextInputTypes.ts
@@ -1,6 +1,6 @@
 import type { Ref, InputHTMLAttributes } from 'react'
-import type { SharedFieldLayoutProps } from '../FieldLayout/FieldLayoutTypes'
 import type { InputProps } from '../Input/InputTypes'
+import type { SharedFieldLayoutProps } from '@/components/Common/FieldLayout/FieldLayoutTypes'
 
 export interface TextInputProps
   extends SharedFieldLayoutProps,