diff --git a/.gitignore b/.gitignore
index 97fda160..9f6d06ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 site
-
-.idea/
\ No newline at end of file
+__pycache__/
+.idea/
diff --git a/mkdocs.yml b/mkdocs.yml
index 0537f463..62ca35f7 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -57,7 +57,7 @@ plugins:
             - /README.md
             - /doc/*
         - name: multicluster-gateway-controller
-          import_url: 'https://github.com/kuadrant/multicluster-gateway-controller?edit_uri=/blob/main/&branch=main'
+          import_url: 'https://github.com/jasonmadigan/multicluster-gateway-controller?edit_uri=/blob/main/&branch=fixing-broken-links'
           imports:
             - /README.md
             - /docs/*
@@ -133,18 +133,30 @@ nav:
   - 'Multicluster Gateway Controller':
     - 'Overview': multicluster-gateway-controller/README.md
     - 'Getting Started': multicluster-gateway-controller/docs/getting-started.md
-    - 'How-to':
-      - 'Setup and use TLSPpolicy': multicluster-gateway-controller/docs/tls-policy.md
-      - 'Setup and use DNSPolicy': multicluster-gateway-controller/docs/dns-policy.md
-      - multicluster-gateway-controller/docs/how-to/ocm-control-plane-walkthrough.md
-      - multicluster-gateway-controller/docs/how-to/managedZone.md
-      - multicluster-gateway-controller/docs/how-to/dnspolicy_basic.md
-      - multicluster-gateway-controller/docs/how-to/ratelimiting-shared-redis.md
-      - multicluster-gateway-controller/docs/how-to/submariner-poc-hub-gateway-walkthrough.md
-      - multicluster-gateway-controller/docs/how-to/submariner-poc-2-gateways-resiliency-walkthrough.md
-      - multicluster-gateway-controller/docs/how-to/vscode-debugging.md
-    - 'Reference':
-        - 'DNSPolicy (v1alpha1)': multicluster-gateway-controller/docs/dns-policy.md
-        - 'DNSRecord (v1alpha1)': multicluster-gateway-controller/docs/proposals/DNSRecordStructure.md
+    - 'Installation Guides':
+      - 'Control Plane installation with Existing OCM': multicluster-gateway-controller/docs/installation/control-plane-installation.md
+      - 'Service Protection installation with Existing OCM': multicluster-gateway-controller/docs/installation/service-protection-installation.md
+    - 'Concepts and APIs':
+      - 'Gateways':
+        - 'Defining and Distributing Multicluster Gateways with OCM': multicluster-gateway-controller/docs/gateways/define-and-place-a-gateway.md
+        - 'Gateway Deletion': multicluster-gateway-controller/docs/gateways/gateway-deletion.md
+      - 'DNSPolicy':
+        - 'DNSPolicy Quickstart': multicluster-gateway-controller/docs/dnspolicy/dnspolicy-quickstart.md
+        - 'DNSPolicy Reference': multicluster-gateway-controller/docs/dnspolicy/dns-policy.md
+        - 'DNS Health Checks': multicluster-gateway-controller/docs/dnspolicy/dns-health-checks.md
+        - 'DNS Providers': multicluster-gateway-controller/docs/dnspolicy/dns-provider.md
+        - 'ManagedZone Reference': multicluster-gateway-controller/docs/dnspolicy/managed-zone.md
+      - 'TLSPolicy':
+        - 'TLSPpolicy Reference': multicluster-gateway-controller/docs/tlspolicy/tls-policy.md
+    - 'How-to Guides':
+        - 'Multicluster Gateways Walkthrough': multicluster-gateway-controller/docs/how-to/multicluster-gateways-walkthrough.md
+        - 'Metrics Federation': multicluster-gateway-controller/docs/how-to/metrics-federation.md
+        - 'Metrics Walkthrough': multicluster-gateway-controller/docs/how-to/metrics-walkthrough.md
+    - 'Contribution':
+      - 'Debugging with VSCode': multicluster-gateway-controller/docs/contribution/vscode-debugging.md
+    - 'Experimental':
+      - 'Kuadrant and Skupper Gateway Resiliency': multicluster-gateway-controller/docs/experimental/skupper-poc-2-gateways-resiliency-walkthrough.md
+      - 'Kuadrant and Submariner Gateway Resiliency': multicluster-gateway-controller/docs/experimental/submariner-poc-2-gateways-resiliency-walkthrough.md
+    - 'Proposals':
         - 'Proposal: Multiple DNS Provider Support': multicluster-gateway-controller/docs/proposals/multiple-dns-provider-support.md
         - 'Proposal: Aggregation of Status Conditions': multicluster-gateway-controller/docs/proposals/status-aggregation.md