diff --git a/loop_docs-19.sh b/loop_docs-19.sh
index aeeee597..f912e021 100644
--- a/loop_docs-19.sh
+++ b/loop_docs-19.sh
@@ -2,11 +2,11 @@
 
 set -xe
 
-sed -i 's/<empty/<&#8288;empty/' versioned_docs/version-1.19/advanced/config-cheat-sheet.en-us.md
+sed -i 's/<empty/<&#8288;empty/' versioned_docs/version-1.19/administration/config-cheat-sheet.en-us.md
 sed -i 's/^url:.*//' versioned_docs/version-1.19/intro.md
 sed -i 's/^title:.*/displayed_sidebar: mySidebar/' versioned_docs/version-1.19/intro.md
 sed -i 's/^slug:.*/slug: \//' versioned_docs/version-1.19/intro.md
-sed -i 's/.\/guidelines-frontend.md/.\/guidelines-frontend/' versioned_docs/version-1.19/developers/hacking-on-gitea.en-us.md
+sed -i 's/.\/guidelines-frontend.md/.\/guidelines-frontend/' versioned_docs/version-1.19/development/hacking-on-gitea.en-us.md
 
 sed -i 's/"version":.*/"version":"1.19.0"/' static/19-swagger.json
 
@@ -20,7 +20,7 @@ for file in `find ./versioned_docs/version-1.19/ -name "*.md"`; do
     sed -i 's/\*\*Table of Contents\*\*//' $file
 done
 
-sed -i 's/</&#8288;/' versioned_docs/version-1.19/developers/guidelines-backend.en-us.md
+sed -i 's/</&#8288;/' versioned_docs/version-1.19/contributing/guidelines-backend.en-us.md
 
 for file in `find ./versioned_docs/version-1.19/usage/ -name "*.md"`; do
     # note only works on linux, forget about it when attempting to run on macos
diff --git a/loop_docs.sh b/loop_docs.sh
index 5826b7c9..2aaebb0b 100644
--- a/loop_docs.sh
+++ b/loop_docs.sh
@@ -2,14 +2,14 @@
 
 set -xe
 
-sed -i 's/<empty/<&#8288;empty/' docs/advanced/config-cheat-sheet.en-us.md
-sed -i 's/<empty/<&#8288;empty/' docs/developers/guidelines-backend.en-us.md
-sed -i 's/</<&#8288;/' docs/developers/guidelines-backend.en-us.md
-sed -i 's/</&#8288;/' docs/developers/guidelines-backend.en-us.md
+sed -i 's/<empty/<&#8288;empty/' docs/administration/config-cheat-sheet.en-us.md
+sed -i 's/<empty/<&#8288;empty/' docs/contributing/guidelines-backend.en-us.md
+sed -i 's/</<&#8288;/' docs/contributing/guidelines-backend.en-us.md
+sed -i 's/</&#8288;/' docs/contributing/guidelines-backend.en-us.md
 sed -i 's/^url:.*//' docs/intro.md
 sed -i 's/^title:.*/displayed_sidebar: mySidebar/' docs/intro.md
 sed -i 's/^slug:.*/slug: \//' docs/intro.md
-sed -i 's/.\/guidelines-frontend.md/.\/guidelines-frontend/' docs/developers/hacking-on-gitea.en-us.md
+sed -i 's/.\/guidelines-frontend.md/.\/guidelines-frontend/' docs/development/hacking-on-gitea.en-us.md
 
 sed -i 's/"version":.*/"version":"1.20-dev"/' static/latest-swagger.json
 
diff --git a/sidebars.js b/sidebars.js
index 0f775722..76bdb70a 100644
--- a/sidebars.js
+++ b/sidebars.js
@@ -5,16 +5,6 @@ module.exports = {
       label: 'What is Gitea?',
       href: '/next/'
     },
-    {
-      type: 'category',
-      label: 'Help',
-      items: [
-          {
-          type: 'autogenerated',
-          dirName: 'help',
-          }
-      ]
-    },
     {
       type: 'category',
       label: 'Installation',
@@ -27,21 +17,11 @@ module.exports = {
     },
     {
       type: 'category',
-      label: 'Upgrade',
+      label: 'Administration',
       items: [
           {
           type: 'autogenerated',
-          dirName: 'upgrade',
-          }
-      ]
-    },
-    {
-      type: 'category',
-      label: 'Features',
-      items: [
-          {
-          type: 'autogenerated',
-          dirName: 'features',
+          dirName: 'administration',
           }
       ]
     },
@@ -57,17 +37,7 @@ module.exports = {
     },
     {
       type: 'category',
-      label: 'Advanced',
-      items: [
-          {
-          type: 'autogenerated',
-          dirName: 'advanced',
-          }
-      ]
-    },
-    {
-      type: 'category',
-      label: 'Packages',
+      label: 'Usage - Packages',
       items: [
           {
           type: 'autogenerated',
@@ -77,21 +47,31 @@ module.exports = {
     },
     {
       type: 'category',
-      label: 'Translation',
+      label: 'Development',
       items: [
           {
           type: 'autogenerated',
-          dirName: 'translation',
+          dirName: 'development',
           }
       ]
     },
     {
       type: 'category',
-      label: 'Developers',
+      label: 'Contributing',
       items: [
           {
           type: 'autogenerated',
-          dirName: 'developers',
+          dirName: 'contributing',
+          }
+      ]
+    },
+    {
+      type: 'category',
+      label: 'Help',
+      items: [
+          {
+          type: 'autogenerated',
+          dirName: 'help',
           }
       ]
     },
diff --git a/versioned_sidebars/version-1.19-sidebars.json b/versioned_sidebars/version-1.19-sidebars.json
index 8f5298e8..d1c74c24 100644
--- a/versioned_sidebars/version-1.19-sidebars.json
+++ b/versioned_sidebars/version-1.19-sidebars.json
@@ -5,16 +5,6 @@
       "label": "What is Gitea?",
       "href": "/"
     },
-    {
-      "type": "category",
-      "label": "Help",
-      "items": [
-          {
-          "type": "autogenerated",
-          "dirName": "help"
-          }
-      ]
-    },
     {
       "type": "category",
       "label": "Installation",
@@ -27,21 +17,11 @@
     },
     {
       "type": "category",
-      "label": "Upgrade",
+      "label": "Administration",
       "items": [
           {
           "type": "autogenerated",
-          "dirName": "upgrade"
-          }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Features",
-      "items": [
-          {
-          "type": "autogenerated",
-          "dirName": "features"
+          "dirName": "administration"
           }
       ]
     },
@@ -57,17 +37,7 @@
     },
     {
       "type": "category",
-      "label": "Advanced",
-      "items": [
-          {
-          "type": "autogenerated",
-          "dirName": "advanced"
-          }
-      ]
-    },
-    {
-      "type": "category",
-      "label": "Packages",
+      "label": "Usage - Packages",
       "items": [
           {
           "type": "autogenerated",
@@ -77,21 +47,31 @@
     },
     {
       "type": "category",
-      "label": "Translation",
+      "label": "Development",
       "items": [
           {
           "type": "autogenerated",
-          "dirName": "translation"
+          "dirName": "development"
           }
       ]
     },
     {
       "type": "category",
-      "label": "Developers",
+      "label": "Contributing",
       "items": [
           {
           "type": "autogenerated",
-          "dirName": "developers"
+          "dirName": "contributing"
+          }
+      ]
+    },
+    {
+      "type": "category",
+      "label": "Help",
+      "items": [
+          {
+          "type": "autogenerated",
+          "dirName": "help"
           }
       ]
     }