diff --git a/packages/ui-informed/src/controls/CheckboxControl.stories.tsx b/packages/ui-informed/src/controls/checkbox/Checkbox.stories.tsx
similarity index 69%
rename from packages/ui-informed/src/controls/CheckboxControl.stories.tsx
rename to packages/ui-informed/src/controls/checkbox/Checkbox.stories.tsx
index 97974d7..a3ef494 100644
--- a/packages/ui-informed/src/controls/CheckboxControl.stories.tsx
+++ b/packages/ui-informed/src/controls/checkbox/Checkbox.stories.tsx
@@ -1,10 +1,10 @@
 import type { Meta, StoryObj } from '@storybook/react';
 
-import { CheckboxControl } from './CheckboxControl';
-import { Form } from '..';
+import { Checkbox } from './Checkbox';
+import { Form } from '../..';
 
-const meta: Meta<typeof CheckboxControl> = {
-  component: CheckboxControl,
+const meta: Meta<typeof Checkbox> = {
+  component: Checkbox,
   tags: ['autodocs'],
   title: 'Controls/CheckboxControl',
   args: {
@@ -25,7 +25,7 @@ const meta: Meta<typeof CheckboxControl> = {
 
 export default meta;
 
-type Story = StoryObj<typeof CheckboxControl>;
+type Story = StoryObj<typeof Checkbox>;
 
 export const Basic: Story = {
   args: {},
diff --git a/packages/ui-informed/src/controls/CheckboxControl.tsx b/packages/ui-informed/src/controls/checkbox/Checkbox.tsx
similarity index 74%
rename from packages/ui-informed/src/controls/CheckboxControl.tsx
rename to packages/ui-informed/src/controls/checkbox/Checkbox.tsx
index 78e66b3..6d400aa 100644
--- a/packages/ui-informed/src/controls/CheckboxControl.tsx
+++ b/packages/ui-informed/src/controls/checkbox/Checkbox.tsx
@@ -1,21 +1,21 @@
-import { Checkbox } from '@utima/ui';
+import { Checkbox as CheckboxUI } from '@utima/ui';
 import type { ComponentProps } from 'react';
 
-import { FormControl } from './formControl/FormControl';
+import { FormControl } from '../../formControl/FormControl';
 
-type CheckboxControlProps = Omit<ComponentProps<typeof FormControl>, 'render'>;
+type CheckboxProps = Omit<ComponentProps<typeof FormControl>, 'render'>;
 
 /**
  * CheckboxControl component that is controlled by Informed. It is a wrapped in the
  * `FormControl` component, which provides the necessary props for Informed to
  * work along with label and error message handling.
  */
-export function CheckboxControl({ ...restProps }: CheckboxControlProps) {
+export function Checkbox({ ...restProps }: CheckboxProps) {
   return (
     <FormControl
       {...restProps}
       render={({ field: { ref, userProps, fieldApi, fieldState } }) => (
-        <Checkbox
+        <CheckboxUI
           ref={ref}
           value={fieldState.value as any} // TODO: correct type
           onCheckedChange={value => {
diff --git a/packages/ui-informed/src/controls/InputControl.stories.tsx b/packages/ui-informed/src/controls/input/Input.stories.tsx
similarity index 72%
rename from packages/ui-informed/src/controls/InputControl.stories.tsx
rename to packages/ui-informed/src/controls/input/Input.stories.tsx
index 67149e1..0fef88f 100644
--- a/packages/ui-informed/src/controls/InputControl.stories.tsx
+++ b/packages/ui-informed/src/controls/input/Input.stories.tsx
@@ -1,10 +1,10 @@
 import type { Meta, StoryObj } from '@storybook/react';
 
-import { InputControl } from './InputControl';
-import { Form } from '..';
+import { Input } from './Input';
+import { Form } from '../..';
 
-const meta: Meta<typeof InputControl> = {
-  component: InputControl,
+const meta: Meta<typeof Input> = {
+  component: Input,
   tags: ['autodocs'],
   title: 'Controls/InputControl',
   args: {
@@ -26,7 +26,7 @@ const meta: Meta<typeof InputControl> = {
 
 export default meta;
 
-type Story = StoryObj<typeof InputControl>;
+type Story = StoryObj<typeof Input>;
 
 export const Basic: Story = {
   args: {},
diff --git a/packages/ui-informed/src/controls/InputControl.tsx b/packages/ui-informed/src/controls/input/Input.tsx
similarity index 76%
rename from packages/ui-informed/src/controls/InputControl.tsx
rename to packages/ui-informed/src/controls/input/Input.tsx
index 387b112..a8e9b66 100644
--- a/packages/ui-informed/src/controls/InputControl.tsx
+++ b/packages/ui-informed/src/controls/input/Input.tsx
@@ -1,7 +1,7 @@
-import { Input } from '@utima/ui';
+import { Input as InputUI } from '@utima/ui';
 import type { ComponentProps } from 'react';
 
-import { FormControl } from './formControl/FormControl';
+import { FormControl } from '../../formControl/FormControl';
 
 type InputControlProps = Omit<ComponentProps<typeof FormControl>, 'render'>;
 
@@ -10,16 +10,13 @@ type InputControlProps = Omit<ComponentProps<typeof FormControl>, 'render'>;
  * `FormControl` component, which provides the necessary props for Informed to
  * work along with label and error message handling.
  */
-export function InputControl({
-  type = 'text',
-  ...restProps
-}: InputControlProps) {
+export function Input({ type = 'text', ...restProps }: InputControlProps) {
   return (
     <FormControl
       {...restProps}
       type={type}
       render={({ field: { ref, userProps, informed, fieldState } }) => (
-        <Input
+        <InputUI
           ref={ref}
           variant={fieldState.showError ? 'danger' : 'default'}
           type={type}
diff --git a/packages/ui-informed/src/controls/SelectControl.stories.tsx b/packages/ui-informed/src/controls/select/Select.stories.tsx
similarity index 82%
rename from packages/ui-informed/src/controls/SelectControl.stories.tsx
rename to packages/ui-informed/src/controls/select/Select.stories.tsx
index 4612bd8..9f95366 100644
--- a/packages/ui-informed/src/controls/SelectControl.stories.tsx
+++ b/packages/ui-informed/src/controls/select/Select.stories.tsx
@@ -1,8 +1,8 @@
 import type { Meta, StoryObj } from '@storybook/react';
 import { SelectItem } from '@utima/ui';
 
-import { SelectControl } from './SelectControl';
-import { Form } from '..';
+import { Select } from './Select';
+import { Form } from '../..';
 
 function SelectItems() {
   const items = [
@@ -22,8 +22,8 @@ function SelectItems() {
   );
 }
 
-const meta: Meta<typeof SelectControl> = {
-  component: SelectControl,
+const meta: Meta<typeof Select> = {
+  component: Select,
   tags: ['autodocs'],
   title: 'Controls/SelectControl',
   args: {
@@ -46,7 +46,7 @@ const meta: Meta<typeof SelectControl> = {
 
 export default meta;
 
-type Story = StoryObj<typeof SelectControl>;
+type Story = StoryObj<typeof Select>;
 
 export const Basic: Story = {
   args: {},
diff --git a/packages/ui-informed/src/controls/SelectControl.tsx b/packages/ui-informed/src/controls/select/Select.tsx
similarity index 86%
rename from packages/ui-informed/src/controls/SelectControl.tsx
rename to packages/ui-informed/src/controls/select/Select.tsx
index c46b285..345cd81 100644
--- a/packages/ui-informed/src/controls/SelectControl.tsx
+++ b/packages/ui-informed/src/controls/select/Select.tsx
@@ -1,7 +1,7 @@
-import { Select } from '@utima/ui';
+import { Select as SelectUI } from '@utima/ui';
 import type { ComponentProps } from 'react';
 
-import { FormControl } from './formControl/FormControl';
+import { FormControl } from '../../formControl/FormControl';
 
 type SelectControlProps = Omit<ComponentProps<typeof FormControl>, 'render'>;
 
@@ -10,7 +10,7 @@ type SelectControlProps = Omit<ComponentProps<typeof FormControl>, 'render'>;
  * `FormControl` component, which provides the necessary props for Informed to
  * work along with label and error message handling.
  */
-export function SelectControl({
+export function Select({
   type = 'text',
   children,
   ...restProps
@@ -23,7 +23,7 @@ export function SelectControl({
         const { type, disabled, readOnly, ...restProps } = userProps;
 
         return (
-          <Select
+          <SelectUI
             ref={ref}
             size='md'
             value={fieldState.value as string}
@@ -35,7 +35,7 @@ export function SelectControl({
             {...restProps}
           >
             {children}
-          </Select>
+          </SelectUI>
         );
       }}
     />
diff --git a/packages/ui-informed/src/controls/TextAreaControl.stories.tsx b/packages/ui-informed/src/controls/textArea/TextArea.stories.tsx
similarity index 70%
rename from packages/ui-informed/src/controls/TextAreaControl.stories.tsx
rename to packages/ui-informed/src/controls/textArea/TextArea.stories.tsx
index 5331ce9..a67c47f 100644
--- a/packages/ui-informed/src/controls/TextAreaControl.stories.tsx
+++ b/packages/ui-informed/src/controls/textArea/TextArea.stories.tsx
@@ -1,10 +1,10 @@
 import type { Meta, StoryObj } from '@storybook/react';
 
-import { TextAreaControl } from './TextAreaControl';
-import { Form } from '..';
+import { TextArea } from './TextArea';
+import { Form } from '../..';
 
-const meta: Meta<typeof TextAreaControl> = {
-  component: TextAreaControl,
+const meta: Meta<typeof TextArea> = {
+  component: TextArea,
   tags: ['autodocs'],
   title: 'Controls/TextAreaControl',
   args: {
@@ -26,7 +26,7 @@ const meta: Meta<typeof TextAreaControl> = {
 
 export default meta;
 
-type Story = StoryObj<typeof TextAreaControl>;
+type Story = StoryObj<typeof TextArea>;
 
 export const Basic: Story = {
   args: {},
diff --git a/packages/ui-informed/src/controls/TextAreaControl.tsx b/packages/ui-informed/src/controls/textArea/TextArea.tsx
similarity index 77%
rename from packages/ui-informed/src/controls/TextAreaControl.tsx
rename to packages/ui-informed/src/controls/textArea/TextArea.tsx
index 52228f9..484fb7c 100644
--- a/packages/ui-informed/src/controls/TextAreaControl.tsx
+++ b/packages/ui-informed/src/controls/textArea/TextArea.tsx
@@ -1,7 +1,7 @@
-import { TextArea } from '@utima/ui';
+import { TextArea as TextAreaUI } from '@utima/ui';
 import type { ComponentProps } from 'react';
 
-import { FormControl } from './formControl/FormControl';
+import { FormControl } from '../../formControl/FormControl';
 
 export type TextAreaControlProps = Omit<
   ComponentProps<typeof FormControl>,
@@ -13,16 +13,13 @@ export type TextAreaControlProps = Omit<
  * `FormControl` component, which provides the necessary props for Informed to
  * work along with label and error message handling.
  */
-export function TextAreaControl({
-  rows = 4,
-  ...restProps
-}: TextAreaControlProps) {
+export function TextArea({ rows = 4, ...restProps }: TextAreaControlProps) {
   return (
     <FormControl
       type='text'
       {...restProps}
       render={({ field: { ref, userProps, informed, fieldState } }) => (
-        <TextArea
+        <TextAreaUI
           ref={ref}
           rows={rows}
           variant={fieldState.showError ? 'danger' : 'default'}
diff --git a/packages/ui-informed/src/form/index.ts b/packages/ui-informed/src/form/index.ts
index e1f5cab..6df46c9 100644
--- a/packages/ui-informed/src/form/index.ts
+++ b/packages/ui-informed/src/form/index.ts
@@ -3,8 +3,8 @@
  * to allow for dot notation imports.
  */
 export { Form as Root } from './Form';
-export { CheckboxControl as Checkbox } from '../controls/CheckboxControl';
-export { InputControl as Input } from '../controls/InputControl';
-export { SelectControl as Select } from '../controls/SelectControl';
-export { SelectItem as SelectItem } from '@utima/ui';
-export { TextAreaControl as TextArea } from '../controls/TextAreaControl';
+export { Checkbox } from '../controls/checkbox/Checkbox';
+export { Input } from '../controls/input/Input';
+export { Select } from '../controls/select/Select';
+export { SelectItem } from '@utima/ui';
+export { TextArea } from '../controls/textArea/TextArea';
diff --git a/packages/ui-informed/src/controls/formControl/FormControl.tsx b/packages/ui-informed/src/formControl/FormControl.tsx
similarity index 95%
rename from packages/ui-informed/src/controls/formControl/FormControl.tsx
rename to packages/ui-informed/src/formControl/FormControl.tsx
index d5318e2..2412e9d 100644
--- a/packages/ui-informed/src/controls/formControl/FormControl.tsx
+++ b/packages/ui-informed/src/formControl/FormControl.tsx
@@ -8,8 +8,8 @@ import type { ZodType } from 'zod';
 
 import { FormInfo } from './FormInfo';
 import { FormMessage } from './FormMessage';
-import { useFormContext } from '../../form/useFormContext';
-import { zodResolver, getFieldZodObject } from '../../zodUtils';
+import { useFormContext } from '../form/useFormContext';
+import { zodResolver, getFieldZodObject } from '../zodUtils';
 
 const formItemStyles = cva('flex flex-1 gap-2', {
   variants: {
diff --git a/packages/ui-informed/src/controls/formControl/FormInfo.tsx b/packages/ui-informed/src/formControl/FormInfo.tsx
similarity index 100%
rename from packages/ui-informed/src/controls/formControl/FormInfo.tsx
rename to packages/ui-informed/src/formControl/FormInfo.tsx
diff --git a/packages/ui-informed/src/controls/formControl/FormMessage.tsx b/packages/ui-informed/src/formControl/FormMessage.tsx
similarity index 100%
rename from packages/ui-informed/src/controls/formControl/FormMessage.tsx
rename to packages/ui-informed/src/formControl/FormMessage.tsx
diff --git a/packages/ui-informed/src/index.ts b/packages/ui-informed/src/index.ts
index 62d5ab7..3763efe 100644
--- a/packages/ui-informed/src/index.ts
+++ b/packages/ui-informed/src/index.ts
@@ -6,15 +6,15 @@ export * as FormWithControls from './form';
 /**
  * FormControl
  */
-export { FormControl } from './controls/formControl/FormControl';
+export { FormControl } from './formControl/FormControl';
 
 /**
  * Controls
  */
-export { CheckboxControl } from './controls/CheckboxControl';
-export { InputControl } from './controls/InputControl';
-export { SelectControl } from './controls/SelectControl';
-export { TextAreaControl } from './controls/TextAreaControl';
+export { Checkbox } from './controls/checkbox/Checkbox';
+export { Input } from './controls/input/Input';
+export { Select } from './controls/select/Select';
+export { TextArea } from './controls/textArea/TextArea';
 
 /**
  * Form
@@ -29,3 +29,8 @@ export {
   useDefaultSubmitActions,
   type TypedFormState,
 } from './form/useDefaultSubmitActions';
+
+/**
+ * ZodUtils
+ */
+export { isZodError, zodResolver, getFieldZodObject } from './zodUtils';