diff --git a/src/features/docs/components/DocsDocument.tsx b/src/components/docs/DocsDocument.tsx
similarity index 94%
rename from src/features/docs/components/DocsDocument.tsx
rename to src/components/docs/DocsDocument.tsx
index 04f407d..379dbb9 100644
--- a/src/features/docs/components/DocsDocument.tsx
+++ b/src/components/docs/DocsDocument.tsx
@@ -1,6 +1,6 @@
 import ReactMarkdown from "react-markdown";
 import remarkGfm from "remark-gfm";
-import { useDocsLanguage } from "@/features/docs/hooks/useDocsLanguage";
+import { useDocsLanguage } from "@/hooks/docs/useDocsLanguage";
 
 interface DocsDocumentProps {
   title: string;
diff --git a/src/features/docs/components/DocsLayout.tsx b/src/components/docs/DocsLayout.tsx
similarity index 91%
rename from src/features/docs/components/DocsLayout.tsx
rename to src/components/docs/DocsLayout.tsx
index 66aa6ca..65fc3a5 100644
--- a/src/features/docs/components/DocsLayout.tsx
+++ b/src/components/docs/DocsLayout.tsx
@@ -1,7 +1,7 @@
 import { Link, Outlet } from "@tanstack/react-router";
 import { Home } from "lucide-react";
-import { DocsLanguageProvider } from "@/features/docs/providers/DocsLanguageProvider";
-import { docGroups } from "@/features/docs/data/docsSections";
+import { docGroups } from "@/data/docs/docsSections";
+import { DocsLanguageProvider } from "@/providers/docs/DocsLanguageProvider";
 
 export function DocsLayout(): React.JSX.Element {
   return (
diff --git a/src/features/editor/components/EditorControls.tsx b/src/components/editor/EditorControls.tsx
similarity index 100%
rename from src/features/editor/components/EditorControls.tsx
rename to src/components/editor/EditorControls.tsx
diff --git a/src/features/editor/scene/EditorMap.tsx b/src/components/editor/scene/EditorMap.tsx
similarity index 100%
rename from src/features/editor/scene/EditorMap.tsx
rename to src/components/editor/scene/EditorMap.tsx
diff --git a/src/features/editor/scene/EditorScene.tsx b/src/components/editor/scene/EditorScene.tsx
similarity index 95%
rename from src/features/editor/scene/EditorScene.tsx
rename to src/components/editor/scene/EditorScene.tsx
index 7497b5e..000b681 100644
--- a/src/features/editor/scene/EditorScene.tsx
+++ b/src/components/editor/scene/EditorScene.tsx
@@ -1,7 +1,7 @@
 import { useEffect } from "react";
 import { OrbitControls } from "@react-three/drei";
-import { FlyController } from "@/features/editor/controls/FlyController";
-import { EditorMap } from "@/features/editor/scene/EditorMap";
+import { EditorMap } from "@/components/editor/scene/EditorMap";
+import { FlyController } from "@/controls/editor/FlyController";
 import type { MapNode, TransformMode, SceneData } from "@/types/editor";
 
 interface EditorSceneProps {
diff --git a/src/features/docs/contexts/DocsLanguageContext.ts b/src/contexts/docs/DocsLanguageContext.ts
similarity index 100%
rename from src/features/docs/contexts/DocsLanguageContext.ts
rename to src/contexts/docs/DocsLanguageContext.ts
diff --git a/src/features/editor/controls/FlyController.tsx b/src/controls/editor/FlyController.tsx
similarity index 100%
rename from src/features/editor/controls/FlyController.tsx
rename to src/controls/editor/FlyController.tsx
diff --git a/src/features/docs/data/docsSections.ts b/src/data/docs/docsSections.ts
similarity index 100%
rename from src/features/docs/data/docsSections.ts
rename to src/data/docs/docsSections.ts
diff --git a/src/features/docs/data/docsTranslations.ts b/src/data/docs/docsTranslations.ts
similarity index 100%
rename from src/features/docs/data/docsTranslations.ts
rename to src/data/docs/docsTranslations.ts
diff --git a/src/features/docs/hooks/useDocsLanguage.ts b/src/hooks/docs/useDocsLanguage.ts
similarity index 74%
rename from src/features/docs/hooks/useDocsLanguage.ts
rename to src/hooks/docs/useDocsLanguage.ts
index 179551b..664b68d 100644
--- a/src/features/docs/hooks/useDocsLanguage.ts
+++ b/src/hooks/docs/useDocsLanguage.ts
@@ -1,5 +1,5 @@
 import { useContext } from "react";
-import { DocsLanguageContext } from "@/features/docs/contexts/DocsLanguageContext";
+import { DocsLanguageContext } from "@/contexts/docs/DocsLanguageContext";
 
 export function useDocsLanguage() {
   const context = useContext(DocsLanguageContext);
diff --git a/src/features/editor/hooks/useEditorHistory.ts b/src/hooks/editor/useEditorHistory.ts
similarity index 100%
rename from src/features/editor/hooks/useEditorHistory.ts
rename to src/hooks/editor/useEditorHistory.ts
diff --git a/src/features/editor/hooks/useEditorSceneData.ts b/src/hooks/editor/useEditorSceneData.ts
similarity index 100%
rename from src/features/editor/hooks/useEditorSceneData.ts
rename to src/hooks/editor/useEditorSceneData.ts
diff --git a/src/pages/docs/architecture/page.tsx b/src/pages/docs/architecture/page.tsx
index 06cf606..f876316 100644
--- a/src/pages/docs/architecture/page.tsx
+++ b/src/pages/docs/architecture/page.tsx
@@ -1,6 +1,6 @@
 import architecture from "../../../../docs/technical/architecture.md?raw";
-import { DocsDocument } from "@/features/docs/components/DocsDocument";
-import { architectureFr } from "@/features/docs/data/docsTranslations";
+import { DocsDocument } from "@/components/docs/DocsDocument";
+import { architectureFr } from "@/data/docs/docsTranslations";
 
 export function DocsArchitecturePage(): React.JSX.Element {
   return (
diff --git a/src/pages/docs/editor/page.tsx b/src/pages/docs/editor/page.tsx
index 16cc957..53c7236 100644
--- a/src/pages/docs/editor/page.tsx
+++ b/src/pages/docs/editor/page.tsx
@@ -1,6 +1,6 @@
 import editor from "../../../../docs/user/editor.md?raw";
-import { DocsDocument } from "@/features/docs/components/DocsDocument";
-import { editorFr } from "@/features/docs/data/docsTranslations";
+import { DocsDocument } from "@/components/docs/DocsDocument";
+import { editorFr } from "@/data/docs/docsTranslations";
 
 export function DocsEditorPage(): React.JSX.Element {
   return (
diff --git a/src/pages/docs/features/page.tsx b/src/pages/docs/features/page.tsx
index 8915043..4b41580 100644
--- a/src/pages/docs/features/page.tsx
+++ b/src/pages/docs/features/page.tsx
@@ -1,6 +1,6 @@
 import features from "../../../../docs/user/features.md?raw";
-import { DocsDocument } from "@/features/docs/components/DocsDocument";
-import { featuresFr } from "@/features/docs/data/docsTranslations";
+import { DocsDocument } from "@/components/docs/DocsDocument";
+import { featuresFr } from "@/data/docs/docsTranslations";
 
 export function DocsFeaturesPage(): React.JSX.Element {
   return (
diff --git a/src/pages/docs/page.tsx b/src/pages/docs/page.tsx
index 19a9d8d..c1f4380 100644
--- a/src/pages/docs/page.tsx
+++ b/src/pages/docs/page.tsx
@@ -1,6 +1,6 @@
 import readme from "../../../README.md?raw";
-import { DocsDocument } from "@/features/docs/components/DocsDocument";
-import { readmeFr } from "@/features/docs/data/docsTranslations";
+import { DocsDocument } from "@/components/docs/DocsDocument";
+import { readmeFr } from "@/data/docs/docsTranslations";
 
 export function DocsReadmePage(): React.JSX.Element {
   return (
diff --git a/src/pages/docs/target-architecture/page.tsx b/src/pages/docs/target-architecture/page.tsx
index cd06775..b99c6d1 100644
--- a/src/pages/docs/target-architecture/page.tsx
+++ b/src/pages/docs/target-architecture/page.tsx
@@ -1,6 +1,6 @@
 import targetArchitecture from "../../../../docs/technical/target-architecture.md?raw";
-import { DocsDocument } from "@/features/docs/components/DocsDocument";
-import { targetArchitectureFr } from "@/features/docs/data/docsTranslations";
+import { DocsDocument } from "@/components/docs/DocsDocument";
+import { targetArchitectureFr } from "@/data/docs/docsTranslations";
 
 export function DocsTargetArchitecturePage(): React.JSX.Element {
   return (
diff --git a/src/pages/docs/technical-editor/page.tsx b/src/pages/docs/technical-editor/page.tsx
index 3deab9f..f03c609 100644
--- a/src/pages/docs/technical-editor/page.tsx
+++ b/src/pages/docs/technical-editor/page.tsx
@@ -1,5 +1,5 @@
 import technicalEditor from "../../../../docs/technical/editor.md?raw";
-import { DocsDocument } from "@/features/docs/components/DocsDocument";
+import { DocsDocument } from "@/components/docs/DocsDocument";
 
 export function DocsTechnicalEditorPage(): React.JSX.Element {
   return (
diff --git a/src/pages/editor/EditorPage.tsx b/src/pages/editor/EditorPage.tsx
index 2e3cfe1..45666f6 100644
--- a/src/pages/editor/EditorPage.tsx
+++ b/src/pages/editor/EditorPage.tsx
@@ -1,9 +1,9 @@
 import { useCallback, useState } from "react";
 import { Canvas } from "@react-three/fiber";
-import { EditorControls } from "@/features/editor/components/EditorControls";
-import { useEditorHistory } from "@/features/editor/hooks/useEditorHistory";
-import { useEditorSceneData } from "@/features/editor/hooks/useEditorSceneData";
-import { EditorScene } from "@/features/editor/scene/EditorScene";
+import { EditorControls } from "@/components/editor/EditorControls";
+import { EditorScene } from "@/components/editor/scene/EditorScene";
+import { useEditorHistory } from "@/hooks/editor/useEditorHistory";
+import { useEditorSceneData } from "@/hooks/editor/useEditorSceneData";
 import type { MapNode, TransformMode } from "@/types/editor";
 
 export function EditorPage(): React.JSX.Element {
diff --git a/src/features/docs/providers/DocsLanguageProvider.tsx b/src/providers/docs/DocsLanguageProvider.tsx
similarity index 91%
rename from src/features/docs/providers/DocsLanguageProvider.tsx
rename to src/providers/docs/DocsLanguageProvider.tsx
index 6f0905f..a1278bc 100644
--- a/src/features/docs/providers/DocsLanguageProvider.tsx
+++ b/src/providers/docs/DocsLanguageProvider.tsx
@@ -2,7 +2,7 @@ import { useState } from "react";
 import {
   DocsLanguageContext,
   type DocsLanguage,
-} from "@/features/docs/contexts/DocsLanguageContext";
+} from "@/contexts/docs/DocsLanguageContext";
 
 interface DocsLanguageProviderProps {
   children: React.ReactNode;
diff --git a/src/router.tsx b/src/router.tsx
index 38449b3..4c01727 100644
--- a/src/router.tsx
+++ b/src/router.tsx
@@ -14,7 +14,7 @@ import {
   DocsReadmeRoute,
   DocsTargetArchitectureRoute,
   DocsTechnicalEditorRoute,
-} from "@/features/docs/routes/DocsRouteComponents";
+} from "@/routes/docs/DocsRouteComponents";
 
 const rootRoute = createRootRoute({
   component: Outlet,
diff --git a/src/features/docs/routes/DocsRouteComponents.tsx b/src/routes/docs/DocsRouteComponents.tsx
similarity index 96%
rename from src/features/docs/routes/DocsRouteComponents.tsx
rename to src/routes/docs/DocsRouteComponents.tsx
index 57fc5ec..01ef28c 100644
--- a/src/features/docs/routes/DocsRouteComponents.tsx
+++ b/src/routes/docs/DocsRouteComponents.tsx
@@ -1,7 +1,7 @@
 import { Suspense, lazy } from "react";
 
 const LazyDocsLayout = lazy(() =>
-  import("@/features/docs/components/DocsLayout").then((module) => ({
+  import("@/components/docs/DocsLayout").then((module) => ({
     default: module.DocsLayout,
   })),
 );