diff --git a/docs/implementation/FOUNDATION_IMPROVEMENTS.md b/docs/implementation/roadmap/FOUNDATION_IMPROVEMENTS.md
similarity index 100%
rename from docs/implementation/FOUNDATION_IMPROVEMENTS.md
rename to docs/implementation/roadmap/FOUNDATION_IMPROVEMENTS.md
diff --git a/docs/implementation/IMPLEMENTATION_SUMMARY.md b/docs/implementation/roadmap/IMPLEMENTATION_SUMMARY.md
similarity index 100%
rename from docs/implementation/IMPLEMENTATION_SUMMARY.md
rename to docs/implementation/roadmap/IMPLEMENTATION_SUMMARY.md
diff --git a/docs/implementation/IMPROVEMENT_ROADMAP_INDEX.md b/docs/implementation/roadmap/IMPROVEMENT_ROADMAP_INDEX.md
similarity index 100%
rename from docs/implementation/IMPROVEMENT_ROADMAP_INDEX.md
rename to docs/implementation/roadmap/IMPROVEMENT_ROADMAP_INDEX.md
diff --git a/docs/implementation/MULTI_TENANT_SYSTEM.md b/docs/implementation/roadmap/MULTI_TENANT_SYSTEM.md
similarity index 100%
rename from docs/implementation/MULTI_TENANT_SYSTEM.md
rename to docs/implementation/roadmap/MULTI_TENANT_SYSTEM.md
diff --git a/docs/implementation/UNIT_TESTS_IMPLEMENTATION.md b/docs/implementation/testing/UNIT_TESTS_IMPLEMENTATION.md
similarity index 100%
rename from docs/implementation/UNIT_TESTS_IMPLEMENTATION.md
rename to docs/implementation/testing/UNIT_TESTS_IMPLEMENTATION.md
diff --git a/docs/implementation/codegen-studio.md b/docs/implementation/testing/codegen-studio.md
similarity index 100%
rename from docs/implementation/codegen-studio.md
rename to docs/implementation/testing/codegen-studio.md
diff --git a/frontends/nextjs/src/components/ui/molecules/tabs/TabsContent.tsx b/frontends/nextjs/src/components/ui/molecules/tabs/components/TabsContent.tsx
similarity index 100%
rename from frontends/nextjs/src/components/ui/molecules/tabs/TabsContent.tsx
rename to frontends/nextjs/src/components/ui/molecules/tabs/components/TabsContent.tsx
diff --git a/frontends/nextjs/src/components/ui/molecules/tabs/TabsList.tsx b/frontends/nextjs/src/components/ui/molecules/tabs/components/TabsList.tsx
similarity index 100%
rename from frontends/nextjs/src/components/ui/molecules/tabs/TabsList.tsx
rename to frontends/nextjs/src/components/ui/molecules/tabs/components/TabsList.tsx
diff --git a/frontends/nextjs/src/components/ui/molecules/tabs/TabsTrigger.tsx b/frontends/nextjs/src/components/ui/molecules/tabs/components/TabsTrigger.tsx
similarity index 100%
rename from frontends/nextjs/src/components/ui/molecules/tabs/TabsTrigger.tsx
rename to frontends/nextjs/src/components/ui/molecules/tabs/components/TabsTrigger.tsx
diff --git a/frontends/nextjs/src/components/ui/molecules/tabs/Tabs.test.tsx b/frontends/nextjs/src/components/ui/molecules/tabs/core/Tabs.test.tsx
similarity index 100%
rename from frontends/nextjs/src/components/ui/molecules/tabs/Tabs.test.tsx
rename to frontends/nextjs/src/components/ui/molecules/tabs/core/Tabs.test.tsx
diff --git a/frontends/nextjs/src/components/ui/molecules/tabs/Tabs.tsx b/frontends/nextjs/src/components/ui/molecules/tabs/core/Tabs.tsx
similarity index 100%
rename from frontends/nextjs/src/components/ui/molecules/tabs/Tabs.tsx
rename to frontends/nextjs/src/components/ui/molecules/tabs/core/Tabs.tsx
diff --git a/frontends/nextjs/src/components/ui/molecules/tabs/tabs-context.ts b/frontends/nextjs/src/components/ui/molecules/tabs/core/tabs-context.ts
similarity index 100%
rename from frontends/nextjs/src/components/ui/molecules/tabs/tabs-context.ts
rename to frontends/nextjs/src/components/ui/molecules/tabs/core/tabs-context.ts