diff --git a/docs/support/project-structure.md b/docs/getting-started/project-structure.md
similarity index 100%
rename from docs/support/project-structure.md
rename to docs/getting-started/project-structure.md
diff --git a/docs/glossary.md b/docs/overview/glossary.md
similarity index 96%
rename from docs/glossary.md
rename to docs/overview/glossary.md
index 745cf5f95b..97a2823365 100644
--- a/docs/glossary.md
+++ b/docs/overview/glossary.md
@@ -11,7 +11,7 @@ terminology below for clarity and consistency when discussing Backstage.
 
 ### Authentication Glossary
 
-This [page](./auth/glossary.md) directs to the terms and phrases related to
+This [page](../auth/glossary.md) directs to the terms and phrases related to
 authentication and identity section of Backstage.
 
 ### Backstage User Profiles
diff --git a/docs/support/support.md b/docs/overview/support.md
similarity index 100%
rename from docs/support/support.md
rename to docs/overview/support.md
diff --git a/microsite/sidebars.json b/microsite/sidebars.json
index 660b3ccbdb..ede2a8c861 100644
--- a/microsite/sidebars.json
+++ b/microsite/sidebars.json
@@ -8,6 +8,8 @@
       "overview/background",
       "overview/adopting",
       "overview/stability-index",
+      "overview/support",
+      "overview/glossary",
       "overview/logos"
     ],
     "Getting Started": [
@@ -24,7 +26,8 @@
       },
       "getting-started/keeping-backstage-updated",
       "getting-started/concepts",
-      "getting-started/contributors"
+      "getting-started/contributors",
+      "getting-started/project-structure"
     ],
     "CLI": ["cli/index", "cli/commands"],
     "Core Features": [
@@ -260,8 +263,6 @@
       "architecture-decisions/adrs-adr010",
       "architecture-decisions/adrs-adr011"
     ],
-    "Support": ["support/support", "support/project-structure"],
-    "Glossary": ["glossary"],
     "FAQ": ["FAQ"]
   }
 }
diff --git a/mkdocs.yml b/mkdocs.yml
index 6c4af107ce..9cc5ed836c 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -13,6 +13,8 @@ nav:
       - The Spotify Story: 'overview/background.md'
       - Strategies for adopting: 'overview/adopting.md'
       - Stability Index: 'overview/stability-index.md'
+      - Support and community: 'overview/support.md'
+      - Glossary: 'overview/glossary.md'
       - Logo assets: 'overview/logos.md'
   - Getting Started:
       - Getting Started: 'getting-started/index.md'
@@ -24,6 +26,7 @@ nav:
       - Keeping Backstage Updated: 'getting-started/keeping-backstage-updated.md'
       - Key Concepts: 'getting-started/concepts.md'
       - Contributors: 'getting-started/contributors.md'
+      - Project Structure: 'getting-started/project-structure.md'
   - CLI:
       - Overview: 'cli/index.md'
       - Commands: 'cli/commands.md'
@@ -174,7 +177,6 @@ nav:
       - ADR010 - Luxon Date Library: 'architecture-decisions/adr010-luxon-date-library.md'
       - ADR011 - Plugin Package Structure: 'architecture-decisions/adr011-plugin-package-structure.md'
   - Support:
-      - Support and community: 'support/support.md'
       - Backstage Project Structure: 'support/project-structure.md'
   - Glossary: glossary.md
   - FAQ: FAQ.md