diff --git a/frontends/nextjs/src/components/ui/avatar.ts b/frontends/nextjs/src/components/ui/display/avatar.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/avatar.ts
rename to frontends/nextjs/src/components/ui/display/avatar.ts
diff --git a/frontends/nextjs/src/components/ui/badge.ts b/frontends/nextjs/src/components/ui/display/badge.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/badge.ts
rename to frontends/nextjs/src/components/ui/display/badge.ts
diff --git a/frontends/nextjs/src/components/ui/label.ts b/frontends/nextjs/src/components/ui/display/label.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/label.ts
rename to frontends/nextjs/src/components/ui/display/label.ts
diff --git a/frontends/nextjs/src/components/ui/table.ts b/frontends/nextjs/src/components/ui/display/table.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/table.ts
rename to frontends/nextjs/src/components/ui/display/table.ts
diff --git a/frontends/nextjs/src/components/ui/alert-dialog.ts b/frontends/nextjs/src/components/ui/feedback/alert-dialog.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/alert-dialog.ts
rename to frontends/nextjs/src/components/ui/feedback/alert-dialog.ts
diff --git a/frontends/nextjs/src/components/ui/alert.ts b/frontends/nextjs/src/components/ui/feedback/alert.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/alert.ts
rename to frontends/nextjs/src/components/ui/feedback/alert.ts
diff --git a/frontends/nextjs/src/components/ui/dialog.ts b/frontends/nextjs/src/components/ui/feedback/dialog.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/dialog.ts
rename to frontends/nextjs/src/components/ui/feedback/dialog.ts
diff --git a/frontends/nextjs/src/components/ui/progress.ts b/frontends/nextjs/src/components/ui/feedback/progress.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/progress.ts
rename to frontends/nextjs/src/components/ui/feedback/progress.ts
diff --git a/frontends/nextjs/src/components/ui/skeleton.ts b/frontends/nextjs/src/components/ui/feedback/skeleton.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/skeleton.ts
rename to frontends/nextjs/src/components/ui/feedback/skeleton.ts
diff --git a/frontends/nextjs/src/components/ui/checkbox.ts b/frontends/nextjs/src/components/ui/forms/checkbox.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/checkbox.ts
rename to frontends/nextjs/src/components/ui/forms/checkbox.ts
diff --git a/frontends/nextjs/src/components/ui/input.ts b/frontends/nextjs/src/components/ui/forms/input.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/input.ts
rename to frontends/nextjs/src/components/ui/forms/input.ts
diff --git a/frontends/nextjs/src/components/ui/radio-group.ts b/frontends/nextjs/src/components/ui/forms/radio-group.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/radio-group.ts
rename to frontends/nextjs/src/components/ui/forms/radio-group.ts
diff --git a/frontends/nextjs/src/components/ui/select.ts b/frontends/nextjs/src/components/ui/forms/select.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/select.ts
rename to frontends/nextjs/src/components/ui/forms/select.ts
diff --git a/frontends/nextjs/src/components/ui/slider.ts b/frontends/nextjs/src/components/ui/forms/slider.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/slider.ts
rename to frontends/nextjs/src/components/ui/forms/slider.ts
diff --git a/frontends/nextjs/src/components/ui/switch.ts b/frontends/nextjs/src/components/ui/forms/switch.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/switch.ts
rename to frontends/nextjs/src/components/ui/forms/switch.ts
diff --git a/frontends/nextjs/src/components/ui/textarea.ts b/frontends/nextjs/src/components/ui/forms/textarea.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/textarea.ts
rename to frontends/nextjs/src/components/ui/forms/textarea.ts
diff --git a/frontends/nextjs/src/components/ui/accordion.ts b/frontends/nextjs/src/components/ui/layout/accordion.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/accordion.ts
rename to frontends/nextjs/src/components/ui/layout/accordion.ts
diff --git a/frontends/nextjs/src/components/ui/card.ts b/frontends/nextjs/src/components/ui/layout/card.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/card.ts
rename to frontends/nextjs/src/components/ui/layout/card.ts
diff --git a/frontends/nextjs/src/components/ui/scroll-area.ts b/frontends/nextjs/src/components/ui/layout/scroll-area.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/scroll-area.ts
rename to frontends/nextjs/src/components/ui/layout/scroll-area.ts
diff --git a/frontends/nextjs/src/components/ui/separator.ts b/frontends/nextjs/src/components/ui/layout/separator.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/separator.ts
rename to frontends/nextjs/src/components/ui/layout/separator.ts
diff --git a/frontends/nextjs/src/components/ui/sheet.ts b/frontends/nextjs/src/components/ui/layout/sheet.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/sheet.ts
rename to frontends/nextjs/src/components/ui/layout/sheet.ts
diff --git a/frontends/nextjs/src/components/ui/tabs.ts b/frontends/nextjs/src/components/ui/layout/tabs.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/tabs.ts
rename to frontends/nextjs/src/components/ui/layout/tabs.ts
diff --git a/frontends/nextjs/src/components/ui/button.ts b/frontends/nextjs/src/components/ui/navigation/button.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/button.ts
rename to frontends/nextjs/src/components/ui/navigation/button.ts
diff --git a/frontends/nextjs/src/components/ui/dropdown-menu.ts b/frontends/nextjs/src/components/ui/navigation/dropdown-menu.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/dropdown-menu.ts
rename to frontends/nextjs/src/components/ui/navigation/dropdown-menu.ts