From 722475215d1f638d30313522f7f64ca0728be5b7 Mon Sep 17 00:00:00 2001
From: Richie <richie.phillips@proton.me>
Date: Fri, 22 May 2026 09:10:12 +1000
Subject: [PATCH] Reorganise components into atoms/molecules/organisms and fix
 Input icon colours

Moved all 17 components from ui/ into atomic design tiers: atoms (Button,
IconButton, Input, Textarea, Select, Checkbox, Radio, Switch, Badge, Tag,
Chip, Tooltip) and molecules (Alert, Accordion, Card, Dialog, Popover).
Updated all Storybook titles and cross-component imports. Changed Input
icons to primary-dark and replaced palette token references with semantic
tokens.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/components/{ui => atoms}/Badge/Badge.stories.tsx |  2 +-
 src/components/{ui => atoms}/Badge/Badge.tsx         |  0
 src/components/{ui => atoms}/Badge/index.ts          |  0
 .../{ui => atoms}/Button/Button.stories.tsx          |  2 +-
 src/components/{ui => atoms}/Button/Button.tsx       |  0
 src/components/{ui => atoms}/Button/index.ts         |  0
 .../{ui => atoms}/Checkbox/Checkbox.stories.tsx      |  2 +-
 src/components/{ui => atoms}/Checkbox/Checkbox.tsx   |  0
 src/components/{ui => atoms}/Checkbox/index.ts       |  0
 src/components/{ui => atoms}/Chip/Chip.stories.tsx   |  2 +-
 src/components/{ui => atoms}/Chip/Chip.tsx           |  0
 src/components/{ui => atoms}/Chip/index.ts           |  0
 .../{ui => atoms}/IconButton/IconButton.stories.tsx  |  2 +-
 .../{ui => atoms}/IconButton/IconButton.tsx          |  0
 src/components/{ui => atoms}/IconButton/index.ts     |  0
 src/components/{ui => atoms}/Input/Input.stories.tsx |  2 +-
 src/components/{ui => atoms}/Input/Input.tsx         | 12 ++++++------
 src/components/{ui => atoms}/Input/index.ts          |  0
 src/components/{ui => atoms}/Radio/Radio.stories.tsx |  2 +-
 src/components/{ui => atoms}/Radio/Radio.tsx         |  0
 src/components/{ui => atoms}/Radio/index.ts          |  0
 .../{ui => atoms}/Select/Select.stories.tsx          |  2 +-
 src/components/{ui => atoms}/Select/Select.tsx       |  0
 src/components/{ui => atoms}/Select/index.ts         |  0
 .../{ui => atoms}/Switch/Switch.stories.tsx          |  2 +-
 src/components/{ui => atoms}/Switch/Switch.tsx       |  0
 src/components/{ui => atoms}/Switch/index.ts         |  0
 src/components/{ui => atoms}/Tag/Tag.stories.tsx     |  2 +-
 src/components/{ui => atoms}/Tag/Tag.tsx             |  0
 src/components/{ui => atoms}/Tag/index.ts            |  0
 .../{ui => atoms}/Textarea/Textarea.stories.tsx      |  2 +-
 src/components/{ui => atoms}/Textarea/Textarea.tsx   |  0
 src/components/{ui => atoms}/Textarea/index.ts       |  0
 .../{ui => atoms}/Tooltip/Tooltip.stories.tsx        |  6 +++---
 src/components/{ui => atoms}/Tooltip/Tooltip.tsx     |  0
 src/components/{ui => atoms}/Tooltip/index.ts        |  0
 .../Accordion/Accordion.stories.tsx                  |  2 +-
 .../{ui => molecules}/Accordion/Accordion.tsx        |  0
 src/components/{ui => molecules}/Accordion/index.ts  |  0
 .../{ui => molecules}/Alert/Alert.stories.tsx        |  4 ++--
 src/components/{ui => molecules}/Alert/Alert.tsx     |  0
 src/components/{ui => molecules}/Alert/index.ts      |  0
 .../{ui => molecules}/Card/Card.stories.tsx          |  2 +-
 src/components/{ui => molecules}/Card/Card.tsx       |  0
 src/components/{ui => molecules}/Card/index.ts       |  0
 .../{ui => molecules}/Dialog/Dialog.stories.tsx      |  6 +++---
 src/components/{ui => molecules}/Dialog/Dialog.tsx   |  0
 src/components/{ui => molecules}/Dialog/index.ts     |  0
 .../{ui => molecules}/Popover/Popover.stories.tsx    | 10 +++++-----
 src/components/{ui => molecules}/Popover/Popover.tsx |  0
 src/components/{ui => molecules}/Popover/index.ts    |  0
 51 files changed, 32 insertions(+), 32 deletions(-)
 rename src/components/{ui => atoms}/Badge/Badge.stories.tsx (99%)
 rename src/components/{ui => atoms}/Badge/Badge.tsx (100%)
 rename src/components/{ui => atoms}/Badge/index.ts (100%)
 rename src/components/{ui => atoms}/Button/Button.stories.tsx (99%)
 rename src/components/{ui => atoms}/Button/Button.tsx (100%)
 rename src/components/{ui => atoms}/Button/index.ts (100%)
 rename src/components/{ui => atoms}/Checkbox/Checkbox.stories.tsx (99%)
 rename src/components/{ui => atoms}/Checkbox/Checkbox.tsx (100%)
 rename src/components/{ui => atoms}/Checkbox/index.ts (100%)
 rename src/components/{ui => atoms}/Chip/Chip.stories.tsx (99%)
 rename src/components/{ui => atoms}/Chip/Chip.tsx (100%)
 rename src/components/{ui => atoms}/Chip/index.ts (100%)
 rename src/components/{ui => atoms}/IconButton/IconButton.stories.tsx (99%)
 rename src/components/{ui => atoms}/IconButton/IconButton.tsx (100%)
 rename src/components/{ui => atoms}/IconButton/index.ts (100%)
 rename src/components/{ui => atoms}/Input/Input.stories.tsx (99%)
 rename src/components/{ui => atoms}/Input/Input.tsx (93%)
 rename src/components/{ui => atoms}/Input/index.ts (100%)
 rename src/components/{ui => atoms}/Radio/Radio.stories.tsx (99%)
 rename src/components/{ui => atoms}/Radio/Radio.tsx (100%)
 rename src/components/{ui => atoms}/Radio/index.ts (100%)
 rename src/components/{ui => atoms}/Select/Select.stories.tsx (99%)
 rename src/components/{ui => atoms}/Select/Select.tsx (100%)
 rename src/components/{ui => atoms}/Select/index.ts (100%)
 rename src/components/{ui => atoms}/Switch/Switch.stories.tsx (98%)
 rename src/components/{ui => atoms}/Switch/Switch.tsx (100%)
 rename src/components/{ui => atoms}/Switch/index.ts (100%)
 rename src/components/{ui => atoms}/Tag/Tag.stories.tsx (99%)
 rename src/components/{ui => atoms}/Tag/Tag.tsx (100%)
 rename src/components/{ui => atoms}/Tag/index.ts (100%)
 rename src/components/{ui => atoms}/Textarea/Textarea.stories.tsx (99%)
 rename src/components/{ui => atoms}/Textarea/Textarea.tsx (100%)
 rename src/components/{ui => atoms}/Textarea/index.ts (100%)
 rename src/components/{ui => atoms}/Tooltip/Tooltip.stories.tsx (96%)
 rename src/components/{ui => atoms}/Tooltip/Tooltip.tsx (100%)
 rename src/components/{ui => atoms}/Tooltip/index.ts (100%)
 rename src/components/{ui => molecules}/Accordion/Accordion.stories.tsx (99%)
 rename src/components/{ui => molecules}/Accordion/Accordion.tsx (100%)
 rename src/components/{ui => molecules}/Accordion/index.ts (100%)
 rename src/components/{ui => molecules}/Alert/Alert.stories.tsx (98%)
 rename src/components/{ui => molecules}/Alert/Alert.tsx (100%)
 rename src/components/{ui => molecules}/Alert/index.ts (100%)
 rename src/components/{ui => molecules}/Card/Card.stories.tsx (99%)
 rename src/components/{ui => molecules}/Card/Card.tsx (100%)
 rename src/components/{ui => molecules}/Card/index.ts (100%)
 rename src/components/{ui => molecules}/Dialog/Dialog.stories.tsx (98%)
 rename src/components/{ui => molecules}/Dialog/Dialog.tsx (100%)
 rename src/components/{ui => molecules}/Dialog/index.ts (100%)
 rename src/components/{ui => molecules}/Popover/Popover.stories.tsx (95%)
 rename src/components/{ui => molecules}/Popover/Popover.tsx (100%)
 rename src/components/{ui => molecules}/Popover/index.ts (100%)

diff --git a/src/components/ui/Badge/Badge.stories.tsx b/src/components/atoms/Badge/Badge.stories.tsx
similarity index 99%
rename from src/components/ui/Badge/Badge.stories.tsx
rename to src/components/atoms/Badge/Badge.stories.tsx
index f70995b..5111d98 100644
--- a/src/components/ui/Badge/Badge.stories.tsx
+++ b/src/components/atoms/Badge/Badge.stories.tsx
@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react-vite'
 import { Badge } from './Badge'
 
 const meta: Meta<typeof Badge> = {
-  title: 'UI/Badge',
+  title: 'Atoms/Badge',
   component: Badge,
   tags: ['autodocs'],
   argTypes: {
diff --git a/src/components/ui/Badge/Badge.tsx b/src/components/atoms/Badge/Badge.tsx
similarity index 100%
rename from src/components/ui/Badge/Badge.tsx
rename to src/components/atoms/Badge/Badge.tsx
diff --git a/src/components/ui/Badge/index.ts b/src/components/atoms/Badge/index.ts
similarity index 100%
rename from src/components/ui/Badge/index.ts
rename to src/components/atoms/Badge/index.ts
diff --git a/src/components/ui/Button/Button.stories.tsx b/src/components/atoms/Button/Button.stories.tsx
similarity index 99%
rename from src/components/ui/Button/Button.stories.tsx
rename to src/components/atoms/Button/Button.stories.tsx
index a338cd9..cd3816a 100644
--- a/src/components/ui/Button/Button.stories.tsx
+++ b/src/components/atoms/Button/Button.stories.tsx
@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react-vite'
 import { Button } from './Button'
 
 const meta: Meta<typeof Button> = {
-  title: 'UI/Button',
+  title: 'Atoms/Button',
   component: Button,
   tags: ['autodocs'],
   argTypes: {
diff --git a/src/components/ui/Button/Button.tsx b/src/components/atoms/Button/Button.tsx
similarity index 100%
rename from src/components/ui/Button/Button.tsx
rename to src/components/atoms/Button/Button.tsx
diff --git a/src/components/ui/Button/index.ts b/src/components/atoms/Button/index.ts
similarity index 100%
rename from src/components/ui/Button/index.ts
rename to src/components/atoms/Button/index.ts
diff --git a/src/components/ui/Checkbox/Checkbox.stories.tsx b/src/components/atoms/Checkbox/Checkbox.stories.tsx
similarity index 99%
rename from src/components/ui/Checkbox/Checkbox.stories.tsx
rename to src/components/atoms/Checkbox/Checkbox.stories.tsx
index d5b8712..04706a3 100644
--- a/src/components/ui/Checkbox/Checkbox.stories.tsx
+++ b/src/components/atoms/Checkbox/Checkbox.stories.tsx
@@ -3,7 +3,7 @@ import type { Meta, StoryObj } from '@storybook/react-vite'
 import { Checkbox } from './Checkbox'
 
 const meta: Meta<typeof Checkbox> = {
-  title: 'UI/Checkbox',
+  title: 'Atoms/Checkbox',
   component: Checkbox,
   tags: ['autodocs'],
   argTypes: {
diff --git a/src/components/ui/Checkbox/Checkbox.tsx b/src/components/atoms/Checkbox/Checkbox.tsx
similarity index 100%
rename from src/components/ui/Checkbox/Checkbox.tsx
rename to src/components/atoms/Checkbox/Checkbox.tsx
diff --git a/src/components/ui/Checkbox/index.ts b/src/components/atoms/Checkbox/index.ts
similarity index 100%
rename from src/components/ui/Checkbox/index.ts
rename to src/components/atoms/Checkbox/index.ts
diff --git a/src/components/ui/Chip/Chip.stories.tsx b/src/components/atoms/Chip/Chip.stories.tsx
similarity index 99%
rename from src/components/ui/Chip/Chip.stories.tsx
rename to src/components/atoms/Chip/Chip.stories.tsx
index 9cd38f2..b19fb19 100644
--- a/src/components/ui/Chip/Chip.stories.tsx
+++ b/src/components/atoms/Chip/Chip.stories.tsx
@@ -3,7 +3,7 @@ import type { Meta, StoryObj } from '@storybook/react-vite'
 import { Chip } from './Chip'
 
 const meta: Meta<typeof Chip> = {
-  title: 'UI/Chip',
+  title: 'Atoms/Chip',
   component: Chip,
   tags: ['autodocs'],
   argTypes: {
diff --git a/src/components/ui/Chip/Chip.tsx b/src/components/atoms/Chip/Chip.tsx
similarity index 100%
rename from src/components/ui/Chip/Chip.tsx
rename to src/components/atoms/Chip/Chip.tsx
diff --git a/src/components/ui/Chip/index.ts b/src/components/atoms/Chip/index.ts
similarity index 100%
rename from src/components/ui/Chip/index.ts
rename to src/components/atoms/Chip/index.ts
diff --git a/src/components/ui/IconButton/IconButton.stories.tsx b/src/components/atoms/IconButton/IconButton.stories.tsx
similarity index 99%
rename from src/components/ui/IconButton/IconButton.stories.tsx
rename to src/components/atoms/IconButton/IconButton.stories.tsx
index a98ee9b..b582bd7 100644
--- a/src/components/ui/IconButton/IconButton.stories.tsx
+++ b/src/components/atoms/IconButton/IconButton.stories.tsx
@@ -3,7 +3,7 @@ import { X, Plus, Trash2, Menu, ChevronDown, Search, ArrowRight, MoreVertical, C
 import { IconButton } from './IconButton'
 
 const meta: Meta<typeof IconButton> = {
-  title: 'UI/IconButton',
+  title: 'Atoms/IconButton',
   component: IconButton,
   tags: ['autodocs'],
   argTypes: {
diff --git a/src/components/ui/IconButton/IconButton.tsx b/src/components/atoms/IconButton/IconButton.tsx
similarity index 100%
rename from src/components/ui/IconButton/IconButton.tsx
rename to src/components/atoms/IconButton/IconButton.tsx
diff --git a/src/components/ui/IconButton/index.ts b/src/components/atoms/IconButton/index.ts
similarity index 100%
rename from src/components/ui/IconButton/index.ts
rename to src/components/atoms/IconButton/index.ts
diff --git a/src/components/ui/Input/Input.stories.tsx b/src/components/atoms/Input/Input.stories.tsx
similarity index 99%
rename from src/components/ui/Input/Input.stories.tsx
rename to src/components/atoms/Input/Input.stories.tsx
index c7e692d..3c65d0b 100644
--- a/src/components/ui/Input/Input.stories.tsx
+++ b/src/components/atoms/Input/Input.stories.tsx
@@ -3,7 +3,7 @@ import type { Meta, StoryObj } from '@storybook/react-vite'
 import { Input } from './Input'
 
 const meta: Meta<typeof Input> = {
-  title: 'UI/Input',
+  title: 'Atoms/Input',
   component: Input,
   tags: ['autodocs'],
   argTypes: {
diff --git a/src/components/ui/Input/Input.tsx b/src/components/atoms/Input/Input.tsx
similarity index 93%
rename from src/components/ui/Input/Input.tsx
rename to src/components/atoms/Input/Input.tsx
index 286d7a9..d4befd2 100644
--- a/src/components/ui/Input/Input.tsx
+++ b/src/components/atoms/Input/Input.tsx
@@ -83,7 +83,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
             {description && (
               <p
                 id={descriptionId}
-                className={cn('text-small text-grey-01', disabled && 'opacity-50')}
+                className={cn('text-small text-text', disabled && 'opacity-50')}
               >
                 {description}
               </p>
@@ -117,7 +117,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
 
           {leftIcon && (
             <span
-              className={cn('inline-flex shrink-0 items-center justify-center text-grey-01 [&>svg]:size-full', styles.icon)}
+              className={cn('inline-flex shrink-0 items-center justify-center text-primary-dark [&>svg]:size-full', styles.icon)}
             >
               {leftIcon}
             </span>
@@ -134,17 +134,17 @@ export const Input = forwardRef<HTMLInputElement, InputProps>(
             aria-invalid={hasError || undefined}
             aria-describedby={describedBy}
             className={cn(
-              'min-w-0 flex-1 bg-transparent font-normal text-grey-01 outline-none',
-              'placeholder:text-grey-01/50',
+              'min-w-0 flex-1 bg-transparent font-normal text-text outline-none',
+              'placeholder:text-text/50',
               styles.input,
-              disabled && 'text-grey-01/50',
+              disabled && 'text-text/50',
             )}
             {...props}
           />
 
           {rightIcon && (
             <span
-              className={cn('inline-flex shrink-0 items-center justify-center text-grey-01 [&>svg]:size-full', styles.icon)}
+              className={cn('inline-flex shrink-0 items-center justify-center text-primary-dark [&>svg]:size-full', styles.icon)}
             >
               {rightIcon}
             </span>
diff --git a/src/components/ui/Input/index.ts b/src/components/atoms/Input/index.ts
similarity index 100%
rename from src/components/ui/Input/index.ts
rename to src/components/atoms/Input/index.ts
diff --git a/src/components/ui/Radio/Radio.stories.tsx b/src/components/atoms/Radio/Radio.stories.tsx
similarity index 99%
rename from src/components/ui/Radio/Radio.stories.tsx
rename to src/components/atoms/Radio/Radio.stories.tsx
index f247ce4..963c4d8 100644
--- a/src/components/ui/Radio/Radio.stories.tsx
+++ b/src/components/atoms/Radio/Radio.stories.tsx
@@ -3,7 +3,7 @@ import type { Meta, StoryObj } from '@storybook/react-vite'
 import { Radio, RadioGroup } from './Radio'
 
 const meta: Meta<typeof RadioGroup> = {
-  title: 'UI/Radio',
+  title: 'Atoms/Radio',
   component: RadioGroup,
   tags: ['autodocs'],
   parameters: {
diff --git a/src/components/ui/Radio/Radio.tsx b/src/components/atoms/Radio/Radio.tsx
similarity index 100%
rename from src/components/ui/Radio/Radio.tsx
rename to src/components/atoms/Radio/Radio.tsx
diff --git a/src/components/ui/Radio/index.ts b/src/components/atoms/Radio/index.ts
similarity index 100%
rename from src/components/ui/Radio/index.ts
rename to src/components/atoms/Radio/index.ts
diff --git a/src/components/ui/Select/Select.stories.tsx b/src/components/atoms/Select/Select.stories.tsx
similarity index 99%
rename from src/components/ui/Select/Select.stories.tsx
rename to src/components/atoms/Select/Select.stories.tsx
index 07c7df7..f7fe105 100644
--- a/src/components/ui/Select/Select.stories.tsx
+++ b/src/components/atoms/Select/Select.stories.tsx
@@ -21,7 +21,7 @@ const categories = [
 ]
 
 const meta: Meta<typeof Select> = {
-  title: 'UI/Select',
+  title: 'Atoms/Select',
   component: Select,
   tags: ['autodocs'],
   argTypes: {
diff --git a/src/components/ui/Select/Select.tsx b/src/components/atoms/Select/Select.tsx
similarity index 100%
rename from src/components/ui/Select/Select.tsx
rename to src/components/atoms/Select/Select.tsx
diff --git a/src/components/ui/Select/index.ts b/src/components/atoms/Select/index.ts
similarity index 100%
rename from src/components/ui/Select/index.ts
rename to src/components/atoms/Select/index.ts
diff --git a/src/components/ui/Switch/Switch.stories.tsx b/src/components/atoms/Switch/Switch.stories.tsx
similarity index 98%
rename from src/components/ui/Switch/Switch.stories.tsx
rename to src/components/atoms/Switch/Switch.stories.tsx
index 3891886..791d36e 100644
--- a/src/components/ui/Switch/Switch.stories.tsx
+++ b/src/components/atoms/Switch/Switch.stories.tsx
@@ -3,7 +3,7 @@ import type { Meta, StoryObj } from '@storybook/react-vite'
 import { Switch } from './Switch'
 
 const meta: Meta<typeof Switch> = {
-  title: 'UI/Switch',
+  title: 'Atoms/Switch',
   component: Switch,
   tags: ['autodocs'],
   argTypes: {
diff --git a/src/components/ui/Switch/Switch.tsx b/src/components/atoms/Switch/Switch.tsx
similarity index 100%
rename from src/components/ui/Switch/Switch.tsx
rename to src/components/atoms/Switch/Switch.tsx
diff --git a/src/components/ui/Switch/index.ts b/src/components/atoms/Switch/index.ts
similarity index 100%
rename from src/components/ui/Switch/index.ts
rename to src/components/atoms/Switch/index.ts
diff --git a/src/components/ui/Tag/Tag.stories.tsx b/src/components/atoms/Tag/Tag.stories.tsx
similarity index 99%
rename from src/components/ui/Tag/Tag.stories.tsx
rename to src/components/atoms/Tag/Tag.stories.tsx
index ea13248..48ddb9a 100644
--- a/src/components/ui/Tag/Tag.stories.tsx
+++ b/src/components/atoms/Tag/Tag.stories.tsx
@@ -5,7 +5,7 @@ import { Tag } from './Tag'
 import type { TagColor } from './Tag'
 
 const meta: Meta<typeof Tag> = {
-  title: 'UI/Tag',
+  title: 'Atoms/Tag',
   component: Tag,
   tags: ['autodocs'],
   argTypes: {
diff --git a/src/components/ui/Tag/Tag.tsx b/src/components/atoms/Tag/Tag.tsx
similarity index 100%
rename from src/components/ui/Tag/Tag.tsx
rename to src/components/atoms/Tag/Tag.tsx
diff --git a/src/components/ui/Tag/index.ts b/src/components/atoms/Tag/index.ts
similarity index 100%
rename from src/components/ui/Tag/index.ts
rename to src/components/atoms/Tag/index.ts
diff --git a/src/components/ui/Textarea/Textarea.stories.tsx b/src/components/atoms/Textarea/Textarea.stories.tsx
similarity index 99%
rename from src/components/ui/Textarea/Textarea.stories.tsx
rename to src/components/atoms/Textarea/Textarea.stories.tsx
index 6e127dd..01fba19 100644
--- a/src/components/ui/Textarea/Textarea.stories.tsx
+++ b/src/components/atoms/Textarea/Textarea.stories.tsx
@@ -3,7 +3,7 @@ import type { Meta, StoryObj } from '@storybook/react-vite'
 import { Textarea } from './Textarea'
 
 const meta: Meta<typeof Textarea> = {
-  title: 'UI/Textarea',
+  title: 'Atoms/Textarea',
   component: Textarea,
   tags: ['autodocs'],
   argTypes: {
diff --git a/src/components/ui/Textarea/Textarea.tsx b/src/components/atoms/Textarea/Textarea.tsx
similarity index 100%
rename from src/components/ui/Textarea/Textarea.tsx
rename to src/components/atoms/Textarea/Textarea.tsx
diff --git a/src/components/ui/Textarea/index.ts b/src/components/atoms/Textarea/index.ts
similarity index 100%
rename from src/components/ui/Textarea/index.ts
rename to src/components/atoms/Textarea/index.ts
diff --git a/src/components/ui/Tooltip/Tooltip.stories.tsx b/src/components/atoms/Tooltip/Tooltip.stories.tsx
similarity index 96%
rename from src/components/ui/Tooltip/Tooltip.stories.tsx
rename to src/components/atoms/Tooltip/Tooltip.stories.tsx
index bebc375..0b9f5e0 100644
--- a/src/components/ui/Tooltip/Tooltip.stories.tsx
+++ b/src/components/atoms/Tooltip/Tooltip.stories.tsx
@@ -1,11 +1,11 @@
 import type { Meta, StoryObj } from '@storybook/react-vite'
 import { Info, HelpCircle, Trash2, Copy } from 'lucide-react'
 import { Tooltip } from './Tooltip'
-import { Button } from '@/components/ui/Button'
-import { IconButton } from '@/components/ui/IconButton'
+import { Button } from '@/components/atoms/Button'
+import { IconButton } from '@/components/atoms/IconButton'
 
 const meta: Meta<typeof Tooltip> = {
-  title: 'UI/Tooltip',
+  title: 'Atoms/Tooltip',
   component: Tooltip,
   tags: ['autodocs'],
   argTypes: {
diff --git a/src/components/ui/Tooltip/Tooltip.tsx b/src/components/atoms/Tooltip/Tooltip.tsx
similarity index 100%
rename from src/components/ui/Tooltip/Tooltip.tsx
rename to src/components/atoms/Tooltip/Tooltip.tsx
diff --git a/src/components/ui/Tooltip/index.ts b/src/components/atoms/Tooltip/index.ts
similarity index 100%
rename from src/components/ui/Tooltip/index.ts
rename to src/components/atoms/Tooltip/index.ts
diff --git a/src/components/ui/Accordion/Accordion.stories.tsx b/src/components/molecules/Accordion/Accordion.stories.tsx
similarity index 99%
rename from src/components/ui/Accordion/Accordion.stories.tsx
rename to src/components/molecules/Accordion/Accordion.stories.tsx
index a1f87cc..c44fb59 100644
--- a/src/components/ui/Accordion/Accordion.stories.tsx
+++ b/src/components/molecules/Accordion/Accordion.stories.tsx
@@ -3,7 +3,7 @@ import { FileText, Settings, Users, Shield, Bell, HelpCircle } from 'lucide-reac
 import { Accordion, AccordionItem, AccordionTrigger, AccordionContent } from './Accordion'
 
 const meta: Meta<typeof Accordion> = {
-  title: 'UI/Accordion',
+  title: 'Molecules/Accordion',
   component: Accordion,
   tags: ['autodocs'],
   argTypes: {
diff --git a/src/components/ui/Accordion/Accordion.tsx b/src/components/molecules/Accordion/Accordion.tsx
similarity index 100%
rename from src/components/ui/Accordion/Accordion.tsx
rename to src/components/molecules/Accordion/Accordion.tsx
diff --git a/src/components/ui/Accordion/index.ts b/src/components/molecules/Accordion/index.ts
similarity index 100%
rename from src/components/ui/Accordion/index.ts
rename to src/components/molecules/Accordion/index.ts
diff --git a/src/components/ui/Alert/Alert.stories.tsx b/src/components/molecules/Alert/Alert.stories.tsx
similarity index 98%
rename from src/components/ui/Alert/Alert.stories.tsx
rename to src/components/molecules/Alert/Alert.stories.tsx
index 888ab0f..5e0c5f3 100644
--- a/src/components/ui/Alert/Alert.stories.tsx
+++ b/src/components/molecules/Alert/Alert.stories.tsx
@@ -1,10 +1,10 @@
 import { useState } from 'react'
 import type { Meta, StoryObj } from '@storybook/react-vite'
 import { Alert } from './Alert'
-import { Button } from '@/components/ui/Button'
+import { Button } from '@/components/atoms/Button'
 
 const meta: Meta<typeof Alert> = {
-  title: 'UI/Alert',
+  title: 'Molecules/Alert',
   component: Alert,
   tags: ['autodocs'],
   argTypes: {
diff --git a/src/components/ui/Alert/Alert.tsx b/src/components/molecules/Alert/Alert.tsx
similarity index 100%
rename from src/components/ui/Alert/Alert.tsx
rename to src/components/molecules/Alert/Alert.tsx
diff --git a/src/components/ui/Alert/index.ts b/src/components/molecules/Alert/index.ts
similarity index 100%
rename from src/components/ui/Alert/index.ts
rename to src/components/molecules/Alert/index.ts
diff --git a/src/components/ui/Card/Card.stories.tsx b/src/components/molecules/Card/Card.stories.tsx
similarity index 99%
rename from src/components/ui/Card/Card.stories.tsx
rename to src/components/molecules/Card/Card.stories.tsx
index e014492..58dac5c 100644
--- a/src/components/ui/Card/Card.stories.tsx
+++ b/src/components/molecules/Card/Card.stories.tsx
@@ -3,7 +3,7 @@ import { ClipboardList, BookOpen, Info, ExternalLink } from 'lucide-react'
 import { Card, CardHeader, CardTitle, CardDescription, CardContent, CardFooter } from './Card'
 
 const meta: Meta<typeof Card> = {
-  title: 'UI/Card',
+  title: 'Molecules/Card',
   component: Card,
   tags: ['autodocs'],
   argTypes: {
diff --git a/src/components/ui/Card/Card.tsx b/src/components/molecules/Card/Card.tsx
similarity index 100%
rename from src/components/ui/Card/Card.tsx
rename to src/components/molecules/Card/Card.tsx
diff --git a/src/components/ui/Card/index.ts b/src/components/molecules/Card/index.ts
similarity index 100%
rename from src/components/ui/Card/index.ts
rename to src/components/molecules/Card/index.ts
diff --git a/src/components/ui/Dialog/Dialog.stories.tsx b/src/components/molecules/Dialog/Dialog.stories.tsx
similarity index 98%
rename from src/components/ui/Dialog/Dialog.stories.tsx
rename to src/components/molecules/Dialog/Dialog.stories.tsx
index 7016d67..43c7a34 100644
--- a/src/components/ui/Dialog/Dialog.stories.tsx
+++ b/src/components/molecules/Dialog/Dialog.stories.tsx
@@ -2,11 +2,11 @@ import { useState } from 'react'
 import type { Meta, StoryObj } from '@storybook/react-vite'
 import { AlertTriangle } from 'lucide-react'
 import { Dialog, DialogHeader, DialogTitle, DialogDescription, DialogContent, DialogFooter } from './Dialog'
-import { Button } from '@/components/ui/Button'
-import { Input } from '@/components/ui/Input'
+import { Button } from '@/components/atoms/Button'
+import { Input } from '@/components/atoms/Input'
 
 const meta: Meta<typeof Dialog> = {
-  title: 'UI/Dialog',
+  title: 'Molecules/Dialog',
   component: Dialog,
   tags: ['autodocs'],
   argTypes: {
diff --git a/src/components/ui/Dialog/Dialog.tsx b/src/components/molecules/Dialog/Dialog.tsx
similarity index 100%
rename from src/components/ui/Dialog/Dialog.tsx
rename to src/components/molecules/Dialog/Dialog.tsx
diff --git a/src/components/ui/Dialog/index.ts b/src/components/molecules/Dialog/index.ts
similarity index 100%
rename from src/components/ui/Dialog/index.ts
rename to src/components/molecules/Dialog/index.ts
diff --git a/src/components/ui/Popover/Popover.stories.tsx b/src/components/molecules/Popover/Popover.stories.tsx
similarity index 95%
rename from src/components/ui/Popover/Popover.stories.tsx
rename to src/components/molecules/Popover/Popover.stories.tsx
index a5bb79c..a3ae1e7 100644
--- a/src/components/ui/Popover/Popover.stories.tsx
+++ b/src/components/molecules/Popover/Popover.stories.tsx
@@ -1,13 +1,13 @@
 import type { Meta, StoryObj } from '@storybook/react-vite'
 import { Settings, Filter, MoreVertical } from 'lucide-react'
 import { Popover, PopoverTrigger, PopoverContent, PopoverClose } from './Popover'
-import { Button } from '@/components/ui/Button'
-import { IconButton } from '@/components/ui/IconButton'
-import { Input } from '@/components/ui/Input'
-import { Checkbox } from '@/components/ui/Checkbox'
+import { Button } from '@/components/atoms/Button'
+import { IconButton } from '@/components/atoms/IconButton'
+import { Input } from '@/components/atoms/Input'
+import { Checkbox } from '@/components/atoms/Checkbox'
 
 const meta: Meta<typeof Popover> = {
-  title: 'UI/Popover',
+  title: 'Molecules/Popover',
   component: Popover,
   tags: ['autodocs'],
   argTypes: {
diff --git a/src/components/ui/Popover/Popover.tsx b/src/components/molecules/Popover/Popover.tsx
similarity index 100%
rename from src/components/ui/Popover/Popover.tsx
rename to src/components/molecules/Popover/Popover.tsx
diff --git a/src/components/ui/Popover/index.ts b/src/components/molecules/Popover/index.ts
similarity index 100%
rename from src/components/ui/Popover/index.ts
rename to src/components/molecules/Popover/index.ts