diff --git a/docs/development_config.md b/docs/dev_101_config.md
similarity index 100%
rename from docs/development_config.md
rename to docs/dev_101_config.md
diff --git a/docs/development_events.md b/docs/dev_101_events.md
similarity index 100%
rename from docs/development_events.md
rename to docs/dev_101_events.md
diff --git a/docs/development_hass_object.md b/docs/dev_101_hass.md
similarity index 97%
rename from docs/development_hass_object.md
rename to docs/dev_101_hass.md
index 6b308a51..17f7811b 100644
--- a/docs/development_hass_object.md
+++ b/docs/dev_101_hass.md
@@ -12,9 +12,9 @@ The Home Assistant instance contains four objects to help you interact with the
 | ------ | ----------- |
 | `hass` | This is the instance of Home Assistant. Allows starting, stopping and enqueing new jobs. [See available methods.](https://dev-docs.home-assistant.io/en/master/api/core.html#homeassistant.core.HomeAssistant)
 | `hass.config` | This is the core configuration of Home Assistant exposing location, temperature preferences and config directory path. [See available methods.](https://dev-docs.home-assistant.io/en/master/api/core.html#homeassistant.core.Config)
-| `hass.states` | This is the StateMachine. It allows you to set states and track when they are changed. [See available methods.](https://dev-docs.home-assistant.io/en/master/api/core.html#homeassistant.core.StateMachine). |
-| `hass.bus` | This is the EventBus. It allows you to trigger and listen for events. [See available methods.](https://dev-docs.home-assistant.io/en/master/api/core.html#homeassistant.core.EventBus). |
-| `hass.services` | This is the ServiceRegistry. It allows you to register services. [See available methods.](https://dev-docs.home-assistant.io/en/master/api/core.html#homeassistant.core.ServiceRegistry). |
+| `hass.states` | This is the StateMachine. It allows you to set states and track when they are changed. [See available methods.](https://dev-docs.home-assistant.io/en/master/api/core.html#homeassistant.core.StateMachine) |
+| `hass.bus` | This is the EventBus. It allows you to trigger and listen for events. [See available methods.](https://dev-docs.home-assistant.io/en/master/api/core.html#homeassistant.core.EventBus) |
+| `hass.services` | This is the ServiceRegistry. It allows you to register services. [See available methods.](https://dev-docs.home-assistant.io/en/master/api/core.html#homeassistant.core.ServiceRegistry) |
 
 ### Where to find `hass`
 
diff --git a/docs/development_101.md b/docs/dev_101_index.md
similarity index 100%
rename from docs/development_101.md
rename to docs/dev_101_index.md
diff --git a/docs/development_services.md b/docs/dev_101_services.md
similarity index 100%
rename from docs/development_services.md
rename to docs/dev_101_services.md
diff --git a/docs/development_states.md b/docs/dev_101_states.md
similarity index 100%
rename from docs/development_states.md
rename to docs/dev_101_states.md
diff --git a/website/i18n/en.json b/website/i18n/en.json
index 7134195a..1b5604cb 100644
--- a/website/i18n/en.json
+++ b/website/i18n/en.json
@@ -31,12 +31,8 @@
     "development_checklist": "Development Checklist",
     "development_config": "Using Config",
     "development_environment": "Set up Development Environment",
-    "development_events": "Using Events",
     "development_guidelines": "Style guidelines",
-    "development_hass_object": "Hass object",
     "development_index": "Starting with Development",
-    "development_services": "Using Services",
-    "development_states": "Using States",
     "development_submitting": "Submit your work",
     "development_testing": "Testing your code",
     "development_validation": "Validate the input",
@@ -49,6 +45,10 @@
     "frontend_creating_custom_panels": "Creating custom panels",
     "frontend_creating_custom_ui": "Creating custom UI",
     "frontend_index": "Frontend development",
+    "hass_core_events": "Using Events",
+    "hass_core_hass": "Hass object",
+    "hass_core_services": "Using Services",
+    "hass_core_states": "Using States",
     "hassio_addon_communication": "Add-On Communication",
     "hassio_addon_config": "Add-On Configuration",
     "hassio_addon_index": "Developing an add-on",
@@ -73,7 +73,8 @@
     "Frontend": "Frontend",
     "Backend": "Backend",
     "Misc": "Misc",
-    "Development": "Development",
+    "Developing a feature": "Developing a feature",
+    "HASS Core methods": "HASS Core methods",
     "Creating Platforms": "Creating Platforms",
     "Creating Components": "Creating Components",
     "External API": "External API",
diff --git a/website/sidebars.json b/website/sidebars.json
index 47624c4c..e1a3c167 100644
--- a/website/sidebars.json
+++ b/website/sidebars.json
@@ -16,22 +16,24 @@
     ]
   },
   "Extending HASS": {
-    "Development": [
+    "Developing a feature": [
       "development_index",
-      "development_101",
-      "development_catching_up",
-      "development_checklist",
-      "development_config",
       "development_environment",
-      "development_events",
-      "development_guidelines",
-      "development_hass_object",
-      "development_services",
-      "development_states",
       "development_submitting",
+      "development_checklist",
+      "development_guidelines",
       "development_testing",
+      "development_catching_up",
       "development_validation"
     ],
+    "HASS Core methods": [
+      "dev_101_index",
+      "dev_101_hass",
+      "dev_101_events",
+      "dev_101_states",
+      "dev_101_services",
+      "dev_101_config"
+    ],
     "Creating Platforms": [
       "creating_platform_index",
       "creating_platform_code_review",
@@ -42,11 +44,11 @@
       "creating_component_index",
       "creating_component_code_review",
       "creating_component_deps_and_reqs",
-      "creating_component_discovery",
       "creating_component_events",
-      "creating_component_generic_discovery",
+      "creating_component_states",
+      "creating_component_discovery",
       "creating_component_loading",
-      "creating_component_states"
+      "creating_component_generic_discovery"
     ]
   },
   "Misc": {