diff --git a/website/content/docs/download-tools.mdx b/website/content/docs/integrate/download-tools.mdx
similarity index 100%
rename from website/content/docs/download-tools.mdx
rename to website/content/docs/integrate/download-tools.mdx
diff --git a/website/data/docs-nav-data.json b/website/data/docs-nav-data.json
index 010d36922..acaf67628 100644
--- a/website/data/docs-nav-data.json
+++ b/website/data/docs-nav-data.json
@@ -58,6 +58,133 @@
       }
     ]
   },
+  {
+    "title": "Release Notes",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "release-notes"
+      },
+      {
+        "title": "Consul",
+        "routes": [
+          {
+            "title": "v1.11.x",
+            "path": "release-notes/consul/v1_11_x"
+          },
+          {
+            "title": "v1.10.x",
+            "path": "release-notes/consul/v1_10_x"
+          },
+          {
+            "title": "v1.9.x",
+            "path": "release-notes/consul/v1_9_x"
+          }
+        ]
+      },
+      {
+        "title": "Consul API Gateway",
+        "routes": [
+          {
+            "title": "v0.4.x",
+            "path": "release-notes/consul-api-gateway/v0_4_x"
+          },
+          {
+            "title": "v0.3.x",
+            "path": "release-notes/consul-api-gateway/v0_3_x"
+          },
+          {
+            "title": "v0.2.x",
+            "path": "release-notes/consul-api-gateway/v0_2_x"
+          },
+          {
+            "title": "v0.1.x",
+            "path": "release-notes/consul-api-gateway/v0_1_x"
+          }
+        ]
+      },
+      {
+        "title": "Consul ECS",
+        "routes": [
+          {
+            "title": "v0.5.x",
+            "path": "release-notes/consul-ecs/v0_5_x"
+          },
+          {
+            "title": "v0.4.x",
+            "path": "release-notes/consul-ecs/v0_4_x"
+          },
+          {
+            "title": "v0.3.x",
+            "path": "release-notes/consul-ecs/v0_3_x"
+          },
+          {
+            "title": "v0.2.x",
+            "path": "release-notes/consul-ecs/v0_2_x"
+          }
+        ]
+      },
+      {
+        "title": "Consul Terraform Sync",
+        "routes": [
+          {
+            "title": "v0.6.x",
+            "path": "release-notes/consul-terraform-sync/v0_6_x"
+          },
+          {
+            "title": "v0.5.x",
+            "path": "release-notes/consul-terraform-sync/v0_5_x"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "title": "Upgrade",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "upgrading"
+      },
+      {
+        "title": "Compatibility Promise",
+        "path": "upgrading/compatibility"
+      },
+      {
+        "title": "Specific Version Details",
+        "path": "upgrading/upgrade-specific"
+      },
+      {
+        "title": "Upgrade Instructions",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "upgrading/instructions"
+          },
+          {
+            "title": "General Process",
+            "path": "upgrading/instructions/general-process"
+          },
+          {
+            "title": "Upgrading to Latest 1.2.x",
+            "path": "upgrading/instructions/upgrade-to-1-2-x"
+          },
+          {
+            "title": "Upgrading to Latest 1.6.x",
+            "path": "upgrading/instructions/upgrade-to-1-6-x"
+          },
+          {
+            "title": "Upgrading to Latest 1.8.x",
+            "path": "upgrading/instructions/upgrade-to-1-8-x"
+          },
+          {
+            "title": "Upgrading to Latest 1.10.x",
+            "path": "upgrading/instructions/upgrade-to-1-10-x"
+          }
+        ]
+      }
+    ]
+  },
   {
     "title": "Architecture",
     "routes": [
@@ -542,6 +669,23 @@
       {
         "title": "Proxy Integration",
         "href": "/docs/connect/proxies/integrate"
+      },
+      {
+        "title": "Consul Tools",
+        "path": "download-tools"
+      }
+    ]
+  },
+  {
+    "title": "Troubleshoot",
+    "routes": [
+      {
+        "title": "Common Error Messages",
+        "path": "troubleshoot/common-errors"
+      },
+      {
+        "title": "FAQ",
+        "path": "troubleshoot/faq"
       }
     ]
   },
@@ -1176,150 +1320,6 @@
   {
     "divider": true
   },
-  {
-    "title": "Release Notes",
-    "routes": [
-      {
-        "title": "Overview",
-        "path": "release-notes"
-      },
-      {
-        "title": "Consul",
-        "routes": [
-          {
-            "title": "v1.11.x",
-            "path": "release-notes/consul/v1_11_x"
-          },
-          {
-            "title": "v1.10.x",
-            "path": "release-notes/consul/v1_10_x"
-          },
-          {
-            "title": "v1.9.x",
-            "path": "release-notes/consul/v1_9_x"
-          }
-        ]
-      },
-      {
-        "title": "Consul API Gateway",
-        "routes": [
-          {
-            "title": "v0.4.x",
-            "path": "release-notes/consul-api-gateway/v0_4_x"
-          },
-          {
-            "title": "v0.3.x",
-            "path": "release-notes/consul-api-gateway/v0_3_x"
-          },
-          {
-            "title": "v0.2.x",
-            "path": "release-notes/consul-api-gateway/v0_2_x"
-          },
-          {
-            "title": "v0.1.x",
-            "path": "release-notes/consul-api-gateway/v0_1_x"
-          }
-        ]
-      },
-      {
-        "title": "Consul ECS",
-        "routes": [
-          {
-            "title": "v0.5.x",
-            "path": "release-notes/consul-ecs/v0_5_x"
-          },
-          {
-            "title": "v0.4.x",
-            "path": "release-notes/consul-ecs/v0_4_x"
-          },
-          {
-            "title": "v0.3.x",
-            "path": "release-notes/consul-ecs/v0_3_x"
-          },
-          {
-            "title": "v0.2.x",
-            "path": "release-notes/consul-ecs/v0_2_x"
-          }
-        ]
-      },
-      {
-        "title": "Consul Terraform Sync",
-        "routes": [
-          {
-            "title": "v0.6.x",
-            "path": "release-notes/consul-terraform-sync/v0_6_x"
-          },
-          {
-            "title": "v0.5.x",
-            "path": "release-notes/consul-terraform-sync/v0_5_x"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "title": "Upgrade",
-    "routes": [
-      {
-        "title": "Overview",
-        "path": "upgrading"
-      },
-      {
-        "title": "Compatibility Promise",
-        "path": "upgrading/compatibility"
-      },
-      {
-        "title": "Specific Version Details",
-        "path": "upgrading/upgrade-specific"
-      },
-      {
-        "title": "Upgrade Instructions",
-        "routes": [
-          {
-            "title": "Overview",
-            "path": "upgrading/instructions"
-          },
-          {
-            "title": "General Process",
-            "path": "upgrading/instructions/general-process"
-          },
-          {
-            "title": "Upgrading to Latest 1.2.x",
-            "path": "upgrading/instructions/upgrade-to-1-2-x"
-          },
-          {
-            "title": "Upgrading to Latest 1.6.x",
-            "path": "upgrading/instructions/upgrade-to-1-6-x"
-          },
-          {
-            "title": "Upgrading to Latest 1.8.x",
-            "path": "upgrading/instructions/upgrade-to-1-8-x"
-          },
-          {
-            "title": "Upgrading to Latest 1.10.x",
-            "path": "upgrading/instructions/upgrade-to-1-10-x"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "title": "Troubleshoot",
-    "routes": [
-      {
-        "title": "Common Error Messages",
-        "path": "troubleshoot/common-errors"
-      },
-      {
-        "title": "FAQ",
-        "path": "troubleshoot/faq"
-      }
-    ]
-  },
-  {
-    "title": "Consul Tools",
-    "path": "download-tools"
-  },
   {
     "title": "Internals",
     "hidden": true,