diff --git a/index-pages.mjs b/index-pages.mjs
index 857d6980..cb7dba17 100644
--- a/index-pages.mjs
+++ b/index-pages.mjs
@@ -32,6 +32,7 @@ const ignore = [
   // [nextjs_dynamic_pages]
   // 404 and 500 error pages
   /^([_.[]|404|500).*$/,
+  /^__components\/.*/
 ]
 
 const pageFilter = (file) => {
diff --git a/pages/adding-new-application/background-app-install.md b/pages-archive/adding-new-application/background-app-install.md
similarity index 100%
rename from pages/adding-new-application/background-app-install.md
rename to pages-archive/adding-new-application/background-app-install.md
diff --git a/pages/adding-new-application/getting-started-with-runbooks/index.md b/pages-archive/adding-new-application/getting-started-with-runbooks/index.md
similarity index 100%
rename from pages/adding-new-application/getting-started-with-runbooks/index.md
rename to pages-archive/adding-new-application/getting-started-with-runbooks/index.md
diff --git a/pages/adding-new-application/getting-started-with-runbooks/runbook-xml.md b/pages-archive/adding-new-application/getting-started-with-runbooks/runbook-xml.md
similarity index 100%
rename from pages/adding-new-application/getting-started-with-runbooks/runbook-xml.md
rename to pages-archive/adding-new-application/getting-started-with-runbooks/runbook-xml.md
diff --git a/pages/adding-new-application/getting-started-with-runbooks/runbook-yaml.md b/pages-archive/adding-new-application/getting-started-with-runbooks/runbook-yaml.md
similarity index 100%
rename from pages/adding-new-application/getting-started-with-runbooks/runbook-yaml.md
rename to pages-archive/adding-new-application/getting-started-with-runbooks/runbook-yaml.md
diff --git a/pages/adding-new-application/guide.md b/pages-archive/adding-new-application/guide.md
similarity index 100%
rename from pages/adding-new-application/guide.md
rename to pages-archive/adding-new-application/guide.md
diff --git a/pages/adding-new-application/index.md b/pages-archive/adding-new-application/index.md
similarity index 100%
rename from pages/adding-new-application/index.md
rename to pages-archive/adding-new-application/index.md
diff --git a/pages/adding-new-application/module-library.md b/pages-archive/adding-new-application/module-library.md
similarity index 100%
rename from pages/adding-new-application/module-library.md
rename to pages-archive/adding-new-application/module-library.md
diff --git a/pages/adding-new-application/plural-artifact-structure.md b/pages-archive/adding-new-application/plural-artifact-structure.md
similarity index 100%
rename from pages/adding-new-application/plural-artifact-structure.md
rename to pages-archive/adding-new-application/plural-artifact-structure.md
diff --git a/pages/adding-new-application/plural-custom-resources.md b/pages-archive/adding-new-application/plural-custom-resources.md
similarity index 100%
rename from pages/adding-new-application/plural-custom-resources.md
rename to pages-archive/adding-new-application/plural-custom-resources.md
diff --git a/pages/adding-new-application/publishing.md b/pages-archive/adding-new-application/publishing.md
similarity index 100%
rename from pages/adding-new-application/publishing.md
rename to pages-archive/adding-new-application/publishing.md
diff --git a/pages/adding-new-application/templating.md b/pages-archive/adding-new-application/templating.md
similarity index 100%
rename from pages/adding-new-application/templating.md
rename to pages-archive/adding-new-application/templating.md
diff --git a/pages/applications/READ_ME_FIRST.txt b/pages-archive/applications/READ_ME_FIRST.txt
similarity index 100%
rename from pages/applications/READ_ME_FIRST.txt
rename to pages-archive/applications/READ_ME_FIRST.txt
diff --git a/pages/applications/[repo].tsx b/pages-archive/applications/[repo].tsx
similarity index 98%
rename from pages/applications/[repo].tsx
rename to pages-archive/applications/[repo].tsx
index 046921f3..abc7a4cd 100644
--- a/pages/applications/[repo].tsx
+++ b/pages-archive/applications/[repo].tsx
@@ -24,7 +24,7 @@ import { RecipesDocument } from '@src/generated/graphql'
 import { readMdFileCached } from '@src/markdoc/mdParser'
 import { providerToProviderName } from '@src/utils/text'
 
-import type { MarkdocHeading, MyPageProps } from '../_app'
+import type { MarkdocHeading, MyPageProps } from '../../pages/_app'
 import type {
   RecipeFragment,
   RecipesQuery,
diff --git a/pages/applications/airbyte.mdpart b/pages-archive/applications/airbyte.mdpart
similarity index 100%
rename from pages/applications/airbyte.mdpart
rename to pages-archive/applications/airbyte.mdpart
diff --git a/pages/applications/airflow.mdpart b/pages-archive/applications/airflow.mdpart
similarity index 100%
rename from pages/applications/airflow.mdpart
rename to pages-archive/applications/airflow.mdpart
diff --git a/pages/applications/console.mdpart b/pages-archive/applications/console.mdpart
similarity index 100%
rename from pages/applications/console.mdpart
rename to pages-archive/applications/console.mdpart
diff --git a/pages/applications/dagster.mdpart b/pages-archive/applications/dagster.mdpart
similarity index 100%
rename from pages/applications/dagster.mdpart
rename to pages-archive/applications/dagster.mdpart
diff --git a/pages/applications/index.md b/pages-archive/applications/index.md
similarity index 100%
rename from pages/applications/index.md
rename to pages-archive/applications/index.md
diff --git a/pages/applications/kubecost.mdpart b/pages-archive/applications/kubecost.mdpart
similarity index 100%
rename from pages/applications/kubecost.mdpart
rename to pages-archive/applications/kubecost.mdpart
diff --git a/pages/applications/postgres.mdpart b/pages-archive/applications/postgres.mdpart
similarity index 100%
rename from pages/applications/postgres.mdpart
rename to pages-archive/applications/postgres.mdpart
diff --git a/pages/applications/prefect.mdpart b/pages-archive/applications/prefect.mdpart
similarity index 100%
rename from pages/applications/prefect.mdpart
rename to pages-archive/applications/prefect.mdpart
diff --git a/pages/archive/architecture.md b/pages-archive/archive-old/architecture.md
similarity index 100%
rename from pages/archive/architecture.md
rename to pages-archive/archive-old/architecture.md
diff --git a/pages/archive/basics/AdminConsole.md b/pages-archive/archive-old/basics/AdminConsole.md
similarity index 100%
rename from pages/archive/basics/AdminConsole.md
rename to pages-archive/archive-old/basics/AdminConsole.md
diff --git a/pages/archive/basics/Architecture.md b/pages-archive/archive-old/basics/Architecture.md
similarity index 100%
rename from pages/archive/basics/Architecture.md
rename to pages-archive/archive-old/basics/Architecture.md
diff --git a/pages/archive/basics/GettingStarted.md b/pages-archive/archive-old/basics/GettingStarted.md
similarity index 100%
rename from pages/archive/basics/GettingStarted.md
rename to pages-archive/archive-old/basics/GettingStarted.md
diff --git a/pages/archive/basics/SecretManagement.md b/pages-archive/archive-old/basics/SecretManagement.md
similarity index 100%
rename from pages/archive/basics/SecretManagement.md
rename to pages-archive/archive-old/basics/SecretManagement.md
diff --git a/pages/archive/basics/WorkspaceLayout.md b/pages-archive/archive-old/basics/WorkspaceLayout.md
similarity index 100%
rename from pages/archive/basics/WorkspaceLayout.md
rename to pages-archive/archive-old/basics/WorkspaceLayout.md
diff --git a/pages/archive/cloud-shell.md b/pages-archive/archive-old/cloud-shell.md
similarity index 100%
rename from pages/archive/cloud-shell.md
rename to pages-archive/archive-old/cloud-shell.md
diff --git a/pages/archive/introduction.md b/pages-archive/archive-old/introduction.md
similarity index 100%
rename from pages/archive/introduction.md
rename to pages-archive/archive-old/introduction.md
diff --git a/pages/archive/secret-management.md b/pages-archive/archive-old/secret-management.md
similarity index 100%
rename from pages/archive/secret-management.md
rename to pages-archive/archive-old/secret-management.md
diff --git a/pages/archive/sharing-existing-repos.md b/pages-archive/archive-old/sharing-existing-repos.md
similarity index 100%
rename from pages/archive/sharing-existing-repos.md
rename to pages-archive/archive-old/sharing-existing-repos.md
diff --git a/pages/archive/workspace-structure.md b/pages-archive/archive-old/workspace-structure.md
similarity index 100%
rename from pages/archive/workspace-structure.md
rename to pages-archive/archive-old/workspace-structure.md
diff --git a/pages/debugging/application-issues.md b/pages-archive/debugging/application-issues.md
similarity index 100%
rename from pages/debugging/application-issues.md
rename to pages-archive/debugging/application-issues.md
diff --git a/pages/debugging/health-checks.md b/pages-archive/debugging/health-checks.md
similarity index 100%
rename from pages/debugging/health-checks.md
rename to pages-archive/debugging/health-checks.md
diff --git a/pages/debugging/index.md b/pages-archive/debugging/index.md
similarity index 100%
rename from pages/debugging/index.md
rename to pages-archive/debugging/index.md
diff --git a/pages/debugging/logs.md b/pages-archive/debugging/logs.md
similarity index 100%
rename from pages/debugging/logs.md
rename to pages-archive/debugging/logs.md
diff --git a/pages/debugging/proxies.md b/pages-archive/debugging/proxies.md
similarity index 100%
rename from pages/debugging/proxies.md
rename to pages-archive/debugging/proxies.md
diff --git a/pages/deployments/addons.md b/pages-archive/deployments/addons.md
similarity index 100%
rename from pages/deployments/addons.md
rename to pages-archive/deployments/addons.md
diff --git a/pages/deployments/browser-quickstart.md b/pages-archive/deployments/browser-quickstart.md
similarity index 100%
rename from pages/deployments/browser-quickstart.md
rename to pages-archive/deployments/browser-quickstart.md
diff --git a/pages/deployments/ci-gh-actions.md b/pages-archive/deployments/ci-gh-actions.md
similarity index 100%
rename from pages/deployments/ci-gh-actions.md
rename to pages-archive/deployments/ci-gh-actions.md
diff --git a/pages/deployments/ci-overview.md b/pages-archive/deployments/ci-overview.md
similarity index 100%
rename from pages/deployments/ci-overview.md
rename to pages-archive/deployments/ci-overview.md
diff --git a/pages/deployments/ci.md b/pages-archive/deployments/ci.md
similarity index 100%
rename from pages/deployments/ci.md
rename to pages-archive/deployments/ci.md
diff --git a/pages/deployments/cluster-config.md b/pages-archive/deployments/cluster-config.md
similarity index 100%
rename from pages/deployments/cluster-config.md
rename to pages-archive/deployments/cluster-config.md
diff --git a/pages/deployments/cluster-cost.md b/pages-archive/deployments/cluster-cost.md
similarity index 100%
rename from pages/deployments/cluster-cost.md
rename to pages-archive/deployments/cluster-cost.md
diff --git a/pages/deployments/cluster-create.md b/pages-archive/deployments/cluster-create.md
similarity index 100%
rename from pages/deployments/cluster-create.md
rename to pages-archive/deployments/cluster-create.md
diff --git a/pages/deployments/cluster-destroy.md b/pages-archive/deployments/cluster-destroy.md
similarity index 100%
rename from pages/deployments/cluster-destroy.md
rename to pages-archive/deployments/cluster-destroy.md
diff --git a/pages/deployments/clusters.md b/pages-archive/deployments/clusters.md
similarity index 100%
rename from pages/deployments/clusters.md
rename to pages-archive/deployments/clusters.md
diff --git a/pages/deployments/cost-addons.md b/pages-archive/deployments/cost-addons.md
similarity index 100%
rename from pages/deployments/cost-addons.md
rename to pages-archive/deployments/cost-addons.md
diff --git a/pages/deployments/credentials.md b/pages-archive/deployments/credentials.md
similarity index 100%
rename from pages/deployments/credentials.md
rename to pages-archive/deployments/credentials.md
diff --git a/pages/deployments/debugging.md b/pages-archive/deployments/debugging.md
similarity index 100%
rename from pages/deployments/debugging.md
rename to pages-archive/deployments/debugging.md
diff --git a/pages/deployments/operator/agent-api.md b/pages-archive/deployments/operator/agent-api.md
similarity index 100%
rename from pages/deployments/operator/agent-api.md
rename to pages-archive/deployments/operator/agent-api.md
diff --git a/pages/deployments/operator/pipeline.md b/pages-archive/deployments/operator/pipeline.md
similarity index 100%
rename from pages/deployments/operator/pipeline.md
rename to pages-archive/deployments/operator/pipeline.md
diff --git a/pages/faq/local-development.md b/pages-archive/faq/local-development.md
similarity index 100%
rename from pages/faq/local-development.md
rename to pages-archive/faq/local-development.md
diff --git a/pages/getting-started/admin-console.md b/pages-archive/getting-started/admin-console.md
similarity index 100%
rename from pages/getting-started/admin-console.md
rename to pages-archive/getting-started/admin-console.md
diff --git a/pages/getting-started/concepts.md b/pages-archive/getting-started/concepts.md
similarity index 100%
rename from pages/getting-started/concepts.md
rename to pages-archive/getting-started/concepts.md
diff --git a/pages/operations/applications.md b/pages-archive/operations/applications.md
similarity index 100%
rename from pages/operations/applications.md
rename to pages-archive/operations/applications.md
diff --git a/pages/operations/auth-access-control/api-tokens.md b/pages-archive/operations/auth-access-control/api-tokens.md
similarity index 100%
rename from pages/operations/auth-access-control/api-tokens.md
rename to pages-archive/operations/auth-access-control/api-tokens.md
diff --git a/pages/operations/auth-access-control/identity-and-installations/audit-logging.md b/pages-archive/operations/auth-access-control/identity-and-installations/audit-logging.md
similarity index 100%
rename from pages/operations/auth-access-control/identity-and-installations/audit-logging.md
rename to pages-archive/operations/auth-access-control/identity-and-installations/audit-logging.md
diff --git a/pages/operations/auth-access-control/identity-and-installations/index.md b/pages-archive/operations/auth-access-control/identity-and-installations/index.md
similarity index 100%
rename from pages/operations/auth-access-control/identity-and-installations/index.md
rename to pages-archive/operations/auth-access-control/identity-and-installations/index.md
diff --git a/pages/operations/auth-access-control/identity-and-installations/service-accounts.md b/pages-archive/operations/auth-access-control/identity-and-installations/service-accounts.md
similarity index 100%
rename from pages/operations/auth-access-control/identity-and-installations/service-accounts.md
rename to pages-archive/operations/auth-access-control/identity-and-installations/service-accounts.md
diff --git a/pages/operations/auth-access-control/index.md b/pages-archive/operations/auth-access-control/index.md
similarity index 100%
rename from pages/operations/auth-access-control/index.md
rename to pages-archive/operations/auth-access-control/index.md
diff --git a/pages/operations/cluster-configuration.md b/pages-archive/operations/cluster-configuration.md
similarity index 100%
rename from pages/operations/cluster-configuration.md
rename to pages-archive/operations/cluster-configuration.md
diff --git a/pages/operations/clusters.md b/pages-archive/operations/clusters.md
similarity index 100%
rename from pages/operations/clusters.md
rename to pages-archive/operations/clusters.md
diff --git a/pages/operations/cost-management.md b/pages-archive/operations/cost-management.md
similarity index 100%
rename from pages/operations/cost-management.md
rename to pages-archive/operations/cost-management.md
diff --git a/pages/operations/dns-setup/creating-dns-zone-in-your-cloud-provider-console.md b/pages-archive/operations/dns-setup/creating-dns-zone-in-your-cloud-provider-console.md
similarity index 100%
rename from pages/operations/dns-setup/creating-dns-zone-in-your-cloud-provider-console.md
rename to pages-archive/operations/dns-setup/creating-dns-zone-in-your-cloud-provider-console.md
diff --git a/pages/operations/dns-setup/index.md b/pages-archive/operations/dns-setup/index.md
similarity index 100%
rename from pages/operations/dns-setup/index.md
rename to pages-archive/operations/dns-setup/index.md
diff --git a/pages/operations/managing-applications/add-application-to-cluster.md b/pages-archive/operations/managing-applications/add-application-to-cluster.md
similarity index 100%
rename from pages/operations/managing-applications/add-application-to-cluster.md
rename to pages-archive/operations/managing-applications/add-application-to-cluster.md
diff --git a/pages/operations/managing-applications/add-users-to-application.md b/pages-archive/operations/managing-applications/add-users-to-application.md
similarity index 100%
rename from pages/operations/managing-applications/add-users-to-application.md
rename to pages-archive/operations/managing-applications/add-users-to-application.md
diff --git a/pages/operations/managing-applications/bounce-application.md b/pages-archive/operations/managing-applications/bounce-application.md
similarity index 100%
rename from pages/operations/managing-applications/bounce-application.md
rename to pages-archive/operations/managing-applications/bounce-application.md
diff --git a/pages/operations/managing-applications/connect-application-db.md b/pages-archive/operations/managing-applications/connect-application-db.md
similarity index 100%
rename from pages/operations/managing-applications/connect-application-db.md
rename to pages-archive/operations/managing-applications/connect-application-db.md
diff --git a/pages/operations/managing-applications/credentials-non-oidc.md b/pages-archive/operations/managing-applications/credentials-non-oidc.md
similarity index 100%
rename from pages/operations/managing-applications/credentials-non-oidc.md
rename to pages-archive/operations/managing-applications/credentials-non-oidc.md
diff --git a/pages/operations/managing-applications/customize-application.md b/pages-archive/operations/managing-applications/customize-application.md
similarity index 100%
rename from pages/operations/managing-applications/customize-application.md
rename to pages-archive/operations/managing-applications/customize-application.md
diff --git a/pages/operations/managing-applications/delete-application.md b/pages-archive/operations/managing-applications/delete-application.md
similarity index 100%
rename from pages/operations/managing-applications/delete-application.md
rename to pages-archive/operations/managing-applications/delete-application.md
diff --git a/pages/operations/managing-applications/index.md b/pages-archive/operations/managing-applications/index.md
similarity index 100%
rename from pages/operations/managing-applications/index.md
rename to pages-archive/operations/managing-applications/index.md
diff --git a/pages/operations/managing-applications/update-application.md b/pages-archive/operations/managing-applications/update-application.md
similarity index 100%
rename from pages/operations/managing-applications/update-application.md
rename to pages-archive/operations/managing-applications/update-application.md
diff --git a/pages/operations/network-configuration.md b/pages-archive/operations/network-configuration.md
similarity index 100%
rename from pages/operations/network-configuration.md
rename to pages-archive/operations/network-configuration.md
diff --git a/pages/operations/uninstall.md b/pages-archive/operations/uninstall.md
similarity index 100%
rename from pages/operations/uninstall.md
rename to pages-archive/operations/uninstall.md
diff --git a/pages/reference/api/console-api.md b/pages-archive/reference/api/console-api.md
similarity index 100%
rename from pages/reference/api/console-api.md
rename to pages-archive/reference/api/console-api.md
diff --git a/pages/reference/api/index.md b/pages-archive/reference/api/index.md
similarity index 100%
rename from pages/reference/api/index.md
rename to pages-archive/reference/api/index.md
diff --git a/pages/reference/api/plural-api.md b/pages-archive/reference/api/plural-api.md
similarity index 100%
rename from pages/reference/api/plural-api.md
rename to pages-archive/reference/api/plural-api.md
diff --git a/pages/reference/cli-reference.md b/pages-archive/reference/cli-reference.md
similarity index 100%
rename from pages/reference/cli-reference.md
rename to pages-archive/reference/cli-reference.md
diff --git a/pages/reference/configuring-cloud-provider.md b/pages-archive/reference/configuring-cloud-provider.md
similarity index 100%
rename from pages/reference/configuring-cloud-provider.md
rename to pages-archive/reference/configuring-cloud-provider.md
diff --git a/pages/reference/operator-guides/adding-kubecost-for-cost-analysis.md b/pages-archive/reference/operator-guides/adding-kubecost-for-cost-analysis.md
similarity index 100%
rename from pages/reference/operator-guides/adding-kubecost-for-cost-analysis.md
rename to pages-archive/reference/operator-guides/adding-kubecost-for-cost-analysis.md
diff --git a/pages/reference/operator-guides/index.md b/pages-archive/reference/operator-guides/index.md
similarity index 100%
rename from pages/reference/operator-guides/index.md
rename to pages-archive/reference/operator-guides/index.md
diff --git a/pages/reference/partial-installation.md b/pages-archive/reference/partial-installation.md
similarity index 100%
rename from pages/reference/partial-installation.md
rename to pages-archive/reference/partial-installation.md
diff --git a/pages/reference/troubleshooting.md b/pages-archive/reference/troubleshooting.md
similarity index 100%
rename from pages/reference/troubleshooting.md
rename to pages-archive/reference/troubleshooting.md
diff --git a/pages/introduction.md b/pages/01-introduction.md
similarity index 100%
rename from pages/introduction.md
rename to pages/01-introduction.md
diff --git a/pages/[...slug].tsx b/pages/[...slug].tsx
index 4de48b84..97175142 100644
--- a/pages/[...slug].tsx
+++ b/pages/[...slug].tsx
@@ -46,12 +46,20 @@ export const getStaticPaths: GetStaticPaths = async () => {
     const relativePath = path.relative(pagesDirectory, file)
     const parsedPath = path.parse(relativePath)
 
-    const dirSegments = parsedPath.dir ? parsedPath.dir.split(path.sep) : []
+    // Remove numeric prefixes from directory names and file name
+    const cleanDirName = parsedPath.dir
+      .split(path.sep)
+      .map((segment) => segment.replace(/^\d+-/, ''))
+      .join(path.sep)
+
+    const cleanFileName = parsedPath.name.replace(/^\d+-/, '')
+
+    const dirSegments = cleanDirName ? cleanDirName.split(path.sep) : []
 
     let slug: string[]
 
-    if (parsedPath.name === 'index') slug = dirSegments
-    else slug = [...dirSegments, parsedPath.name]
+    if (cleanFileName === 'index') slug = dirSegments
+    else slug = [...dirSegments, cleanFileName]
 
     return {
       params: {
@@ -76,12 +84,19 @@ export const getStaticProps: GetStaticProps<
 
   const slugPath = params.slug.join('/')
 
-  // looks for folder/name/index.md first, then folder/name.md
-  const filePath =
-    [
-      path.join('pages', slugPath, 'index.md'),
-      path.join('pages', `${slugPath}.md`),
-    ].find(fs.existsSync) || null
+  // Try both with and without numeric prefixes
+  const possiblePaths = [
+    path.join('pages', slugPath, 'index.md'),
+    path.join('pages', `${slugPath}.md`),
+    // Add these new patterns
+    ...fs
+      .readdirSync('pages')
+      .filter((f) => f.match(/^\d+-.*\.md$/))
+      .filter((f) => f.replace(/^\d+-/, '').replace(/\.md$/, '') === slugPath)
+      .map((f) => path.join('pages', f)),
+  ]
+
+  const filePath = possiblePaths.find(fs.existsSync) || null
 
   if (!filePath) {
     return { notFound: true }
diff --git a/pages/test/blockquotes.md b/pages/__components/blockquotes.md
similarity index 100%
rename from pages/test/blockquotes.md
rename to pages/__components/blockquotes.md
diff --git a/pages/test/buttons.md b/pages/__components/buttons.md
similarity index 100%
rename from pages/test/buttons.md
rename to pages/__components/buttons.md
diff --git a/pages/test/callouts.md b/pages/__components/callouts.md
similarity index 100%
rename from pages/test/callouts.md
rename to pages/__components/callouts.md
diff --git a/pages/test/codefence.md b/pages/__components/codefence.md
similarity index 100%
rename from pages/test/codefence.md
rename to pages/__components/codefence.md
diff --git a/pages/test/codetabs.md b/pages/__components/codetabs.md
similarity index 100%
rename from pages/test/codetabs.md
rename to pages/__components/codetabs.md
diff --git a/pages/test/images.md b/pages/__components/images.md
similarity index 100%
rename from pages/test/images.md
rename to pages/__components/images.md
diff --git a/pages/test/index.md b/pages/__components/index.md
similarity index 100%
rename from pages/test/index.md
rename to pages/__components/index.md
diff --git a/pages/test/tabs.md b/pages/__components/tabs.md
similarity index 100%
rename from pages/test/tabs.md
rename to pages/__components/tabs.md
diff --git a/pages/operations/auth-access-control/openid-connect.md b/pages/faq/openid-connect.md
similarity index 100%
rename from pages/operations/auth-access-control/openid-connect.md
rename to pages/faq/openid-connect.md
diff --git a/pages/operations/security/index.md b/pages/faq/security.md
similarity index 100%
rename from pages/operations/security/index.md
rename to pages/faq/security.md
diff --git a/pages/operations/advanced-operations.md b/pages/operations/advanced-operations.md
deleted file mode 100644
index da5abc05..00000000
--- a/pages/operations/advanced-operations.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Advanced Operations
-description: >-
-  Advanced topics for open-source deployment
----
diff --git a/pages/reference/faq.md b/pages/reference/faq.md
deleted file mode 100644
index 19976a9b..00000000
--- a/pages/reference/faq.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-title: FAQ
----
diff --git a/pages/reference/glossary.md b/pages/reference/glossary.md
deleted file mode 100644
index cdce4a55..00000000
--- a/pages/reference/glossary.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
-title: Glossary
----
diff --git a/pages/reference/index.md b/pages/reference/index.md
deleted file mode 100644
index 32a00146..00000000
--- a/pages/reference/index.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-title: Reference
-description: Non-Operational Reference
----
-
-Plural's reference is split up into a few sections. Here are short descriptions for what they are:
-
-- [Workspaces](workspace/index)
-  - Learn about how Plural workspaces are organized and how you can share your repositories with others securely.
-- [Identity and Access Management](identity-and-access-management/index)
-  - Learn about setting up RBAC in Plural and how we manage Auth for access to your applications.
-- [Debugging](debugging/index)
-  - The tools you need to figure out what's going on with your Plural installation.
-- [API](api/introduction/index)
-  - For those that want to integrate Plural into their applications or run commands programmatically.
diff --git a/pages/catalog/contributing.md b/pages/service-catalog/contributing.md
similarity index 100%
rename from pages/catalog/contributing.md
rename to pages/service-catalog/contributing.md
diff --git a/pages/catalog/creation.md b/pages/service-catalog/creation.md
similarity index 100%
rename from pages/catalog/creation.md
rename to pages/service-catalog/creation.md
diff --git a/pages/catalog/overview.md b/pages/service-catalog/overview.md
similarity index 100%
rename from pages/catalog/overview.md
rename to pages/service-catalog/overview.md
diff --git a/pages/test/global-variables.md b/pages/test/global-variables.md
deleted file mode 100644
index 6417d538..00000000
--- a/pages/test/global-variables.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-title: Global Variables
----
-
-{% comment %}
-https://markdoc.dev/docs/variables
-{% /comment %}
-
-# From design system default
-
-{% $globalTestVar %}
-
-# Added locally
-
-{% $docsGlobalTestVar %}
diff --git a/src/NavData.tsx b/src/NavData.tsx
index 9b083e98..5517696f 100644
--- a/src/NavData.tsx
+++ b/src/NavData.tsx
@@ -227,14 +227,8 @@ const rootNavData: NavMenu = deepFreeze([
         title: 'Notifications',
       },
       {
-        href: '/deployments/operations',
-        title: 'Advanced Operations',
-        sections: [
-          {
-            title: 'Managing Deprecations and K8s upgrades',
-            href: '/deployments/deprecations',
-          },
-        ],
+        title: 'Deprecations and upgrades',
+        href: '/deployments/deprecations',
       },
     ],
   },
@@ -263,15 +257,15 @@ const rootNavData: NavMenu = deepFreeze([
     title: 'Service Catalog',
     sections: [
       {
-        href: '/catalog/overview',
+        href: '/service-catalog/overview',
         title: 'Overview',
       },
       {
-        href: '/catalog/creation',
+        href: '/service-catalog/creation',
         title: 'Creating Your Own Catalog',
       },
       {
-        href: '/catalog/contributing',
+        href: '/service-catalog/contributing',
         title: 'Contributing to the Mainline Plural Catalog',
       },
     ],
@@ -280,11 +274,11 @@ const rootNavData: NavMenu = deepFreeze([
     title: 'FAQ',
     sections: [
       {
-        href: '/operations/security',
+        href: '/faq/security',
         title: 'What does Plural have access to?',
       },
       {
-        href: '/operations/auth-access-control/openid-connect',
+        href: '/faq/openid-connect',
         title: 'What is Plural OIDC?',
       },
       {
diff --git a/src/generated/pages.json b/src/generated/pages.json
index 04db81b0..439cf7d2 100644
--- a/src/generated/pages.json
+++ b/src/generated/pages.json
@@ -1,37 +1,4 @@
 [
-  {
-    "path": "/adding-new-application/background-app-install"
-  },
-  {
-    "path": "/adding-new-application/getting-started-with-runbooks"
-  },
-  {
-    "path": "/adding-new-application/getting-started-with-runbooks/runbook-xml"
-  },
-  {
-    "path": "/adding-new-application/getting-started-with-runbooks/runbook-yaml"
-  },
-  {
-    "path": "/adding-new-application/guide"
-  },
-  {
-    "path": "/adding-new-application"
-  },
-  {
-    "path": "/adding-new-application/module-library"
-  },
-  {
-    "path": "/adding-new-application/plural-artifact-structure"
-  },
-  {
-    "path": "/adding-new-application/plural-custom-resources"
-  },
-  {
-    "path": "/adding-new-application/publishing"
-  },
-  {
-    "path": "/adding-new-application/templating"
-  },
   {
     "path": "/ai/architecture"
   },
@@ -44,66 +11,6 @@
   {
     "path": "/ai/setup"
   },
-  {
-    "path": "/applications"
-  },
-  {
-    "path": "/archive/architecture"
-  },
-  {
-    "path": "/archive/basics/AdminConsole"
-  },
-  {
-    "path": "/archive/basics/Architecture"
-  },
-  {
-    "path": "/archive/basics/GettingStarted"
-  },
-  {
-    "path": "/archive/basics/SecretManagement"
-  },
-  {
-    "path": "/archive/basics/WorkspaceLayout"
-  },
-  {
-    "path": "/archive/cloud-shell"
-  },
-  {
-    "path": "/archive/introduction"
-  },
-  {
-    "path": "/archive/secret-management"
-  },
-  {
-    "path": "/archive/sharing-existing-repos"
-  },
-  {
-    "path": "/archive/workspace-structure"
-  },
-  {
-    "path": "/catalog/contributing"
-  },
-  {
-    "path": "/catalog/creation"
-  },
-  {
-    "path": "/catalog/overview"
-  },
-  {
-    "path": "/debugging/application-issues"
-  },
-  {
-    "path": "/debugging/health-checks"
-  },
-  {
-    "path": "/debugging"
-  },
-  {
-    "path": "/debugging/logs"
-  },
-  {
-    "path": "/debugging/proxies"
-  },
   {
     "path": "/deployments/addons"
   },
@@ -266,21 +173,12 @@
   {
     "path": "/faq/certifications"
   },
-  {
-    "path": "/faq/local-development"
-  },
   {
     "path": "/faq/plural-paid-tiers"
   },
-  {
-    "path": "/getting-started/admin-console"
-  },
   {
     "path": "/getting-started/cloud-shell-quickstart"
   },
-  {
-    "path": "/getting-started/concepts"
-  },
   {
     "path": "/getting-started/deployments"
   },
@@ -464,6 +362,15 @@
   {
     "path": "/reference/troubleshooting"
   },
+  {
+    "path": "/service-catalog/contributing"
+  },
+  {
+    "path": "/service-catalog/creation"
+  },
+  {
+    "path": "/service-catalog/overview"
+  },
   {
     "path": "/stacks/auto-cancellation"
   },
@@ -479,9 +386,6 @@
   {
     "path": "/stacks/manual-runs"
   },
-  {
-    "path": "/stacks/overview"
-  },
   {
     "path": "/stacks/pr-workflow"
   },
diff --git a/tsconfig.json b/tsconfig.json
index ee676b97..63a87547 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -24,6 +24,6 @@
       "@pages/*": ["pages/*"]
     }
   },
-  "include": ["next-env.d.ts", "pages/**/*", "src/**/*"],
+  "include": ["next-env.d.ts", "pages/**/*", "src/**/*", "pages-archive/applications"],
   "exclude": ["node_modules"]
 }