diff --git a/docs/hassio_addon_index.md b/docs/add-ons.md
similarity index 100%
rename from docs/hassio_addon_index.md
rename to docs/add-ons.md
diff --git a/docs/hassio_addon_communication.md b/docs/add-ons/communication.md
similarity index 100%
rename from docs/hassio_addon_communication.md
rename to docs/add-ons/communication.md
diff --git a/docs/hassio_addon_config.md b/docs/add-ons/configuration.md
similarity index 100%
rename from docs/hassio_addon_config.md
rename to docs/add-ons/configuration.md
diff --git a/docs/hassio_addon_presentation.md b/docs/add-ons/presentation.md
similarity index 100%
rename from docs/hassio_addon_presentation.md
rename to docs/add-ons/presentation.md
diff --git a/docs/hassio_addon_publishing.md b/docs/add-ons/publishing.md
similarity index 100%
rename from docs/hassio_addon_publishing.md
rename to docs/add-ons/publishing.md
diff --git a/docs/hassio_addon_repository.md b/docs/add-ons/repository.md
similarity index 100%
rename from docs/hassio_addon_repository.md
rename to docs/add-ons/repository.md
diff --git a/docs/hassio_addon_security.md b/docs/add-ons/security.md
similarity index 100%
rename from docs/hassio_addon_security.md
rename to docs/add-ons/security.md
diff --git a/docs/hassio_addon_testing.md b/docs/add-ons/testing.md
similarity index 100%
rename from docs/hassio_addon_testing.md
rename to docs/add-ons/testing.md
diff --git a/docs/hassio_addon_tutorial.md b/docs/add-ons/tutorial.md
similarity index 100%
rename from docs/hassio_addon_tutorial.md
rename to docs/add-ons/tutorial.md
diff --git a/docs/documentation_index.md b/docs/documenting.md
similarity index 100%
rename from docs/documentation_index.md
rename to docs/documenting.md
diff --git a/docs/documentation_create_page.md b/docs/documenting/create-page.md
similarity index 100%
rename from docs/documentation_create_page.md
rename to docs/documenting/create-page.md
diff --git a/docs/documentation_standards.md b/docs/documenting/standards.md
similarity index 100%
rename from docs/documentation_standards.md
rename to docs/documenting/standards.md
diff --git a/docusaurus.config.js b/docusaurus.config.js
index c481829f..e91f1230 100644
--- a/docusaurus.config.js
+++ b/docusaurus.config.js
@@ -30,6 +30,7 @@ module.exports = {
               to: "docs/development_index",
             },
             { to: "docs/frontend_index", label: "Frontend" },
+            { to: "docs/add-ons", label: "Add-ons" },
             { to: "docs/internationalization", label: "Internationalization" },
           ],
         },
@@ -37,11 +38,11 @@ module.exports = {
           label: "Documenting",
           position: "left",
           items: [
-            { label: "Documentation", to: "docs/documentation_index" },
-            { label: "Standards", to: "docs/documentation_standards" },
+            { label: "Documentation", to: "docs/documenting" },
+            { label: "Standards", to: "docs/documenting/standards" },
             {
               label: "Create a new page",
-              to: "docs/documentation_create_page",
+              to: "docs/documenting/create-page",
             },
           ],
         },
diff --git a/sidebars.js b/sidebars.js
index 7a2ac441..504051d1 100644
--- a/sidebars.js
+++ b/sidebars.js
@@ -6,6 +6,17 @@
  */
 
 module.exports = {
+  Addons: [
+    "add-ons",
+    "add-ons/tutorial",
+    "add-ons/configuration",
+    "add-ons/communication",
+    "add-ons/testing",
+    "add-ons/publishing",
+    "add-ons/presentation",
+    "add-ons/repository",
+    "add-ons/security",
+  ],
   API: [
     "api/rest",
     "api/websocket",
@@ -22,6 +33,11 @@ module.exports = {
       ],
     },
   ],
+  Documenting: [
+    "documenting",
+    "documenting/standards",
+    "documenting/create-page",
+  ],
   Internationalization: [
     "internationalization",
     "internationalization/core",
@@ -127,11 +143,6 @@ module.exports = {
   },
   Misc: {
     Introduction: ["misc"],
-    Documentation: [
-      "documentation_index",
-      "documentation_standards",
-      "documentation_create_page",
-    ],
     Intents: [
       "intent_index",
       "intent_firing",
@@ -151,17 +162,6 @@ module.exports = {
       "asyncio_working_with_async",
     ],
     "Hass.io": ["hassio_debugging", "hassio_hass"],
-    "Hass.io Add-Ons": [
-      "hassio_addon_index",
-      "hassio_addon_tutorial",
-      "hassio_addon_config",
-      "hassio_addon_communication",
-      "hassio_addon_testing",
-      "hassio_addon_publishing",
-      "hassio_addon_presentation",
-      "hassio_addon_repository",
-      "hassio_addon_security",
-    ],
     "Maintainer docs": ["maintenance", "releasing"],
   },
 };
diff --git a/static/_redirects b/static/_redirects
index f1ada06d..b3cd9920 100644
--- a/static/_redirects
+++ b/static/_redirects
@@ -8,8 +8,20 @@
 /docs/app_integration_sensors /docs/api/native-app-integration/sensors
 /docs/app_integration_setup /docs/api/native-app-integration/setup
 /docs/app_integration_webview /docs/api/native-app-integration/webview
+/docs/documentation_create_page /docs/documenting/create-page
+/docs/documentation_index /docs/documenting
+/docs/documentation_standards /docs/documenting/standards
 /docs/external_api_rest /docs/api/rest
 /docs/external_api_websocket /docs/api/websocket
+/docs/hassio_addon_communication /docs/add-ons/communication
+/docs/hassio_addon_config /docs/add-ons/configuration
+/docs/hassio_addon_index /docs/add-ons
+/docs/hassio_addon_presentation /docs/add-ons/presentation
+/docs/hassio_addon_publishing /docs/add-ons/publishing
+/docs/hassio_addon_repository /docs/add-ons/repository
+/docs/hassio_addon_security /docs/add-ons/security
+/docs/hassio_addon_testing /docs/add-ons/testing
+/docs/hassio_addon_tutorial /docs/add-ons/tutorial
 /docs/internationalization_backend_localization /docs/internationalization/core
 /docs/internationalization_custom_component_localization /docs/internationalization/custom_integration
 /docs/internationalization_index /docs/internationalization