diff --git a/assets/dashboard-landing.json b/assets/dashboard-landing.json
index 86085cc9c2..6c44204073 100644
--- a/assets/dashboard-landing.json
+++ b/assets/dashboard-landing.json
@@ -109,7 +109,7 @@
           "title": "Get started with Cloudflare"
         },
         {
-          "url_path": "/fundamentals/get-started/setup/add-site/",
+          "url_path": "/fundamentals/setup/account-setup/add-site/",
           "title": "Add a site to Cloudflare"
         },
         {
@@ -174,7 +174,7 @@
           "title": "Solving 'Registry Status: Client transfer prohibited'"
         },
         {
-          "url_path": "/fundamentals/get-started/setup/add-site/",
+          "url_path": "/fundamentals/setup/account-setup/add-site/",
           "title": "Add a site to Cloudflare"
         },
         {
@@ -196,7 +196,7 @@
       "dashPath": "/:accountId/members",
       "recommendations": [
         {
-          "url_path": "/fundamentals/account-and-billing/members/manage/",
+          "url_path": "/fundamentals/setup/manage-members/manage/",
           "title": "Manage account members"
         },
         {
diff --git a/config.toml b/config.toml
index 6c934bd886..cef02a92c2 100644
--- a/config.toml
+++ b/config.toml
@@ -6,7 +6,7 @@ DefaultContentLanguage = "en"
 disableHugoGeneratorInject = true
 enableRobotsTXT = false
 summaryLength = 30
-disableAliases = false
+disableAliases = true
 disableKinds = ["taxonomy", "taxonomyTerm"]
 
 enableEmoji = true
diff --git a/content/_redirects b/content/_redirects
index 74beb52a9d..e977d994dc 100644
--- a/content/_redirects
+++ b/content/_redirects
@@ -271,15 +271,15 @@
 /email-routing/known-limitations/ /email-routing/postmaster/ 301
 
 # firewall
-/firewall/api/cf-lists/ /fundamentals/global-configurations/lists/lists-api/ 301
-/firewall/api/cf-lists/endpoints/ /fundamentals/global-configurations/lists/lists-api/endpoints/ 301
-/firewall/api/cf-lists/json-object/ /fundamentals/global-configurations/lists/lists-api/json-object/ 301
+/firewall/api/cf-lists/ /waf/tools/lists/lists-api/ 301
+/firewall/api/cf-lists/endpoints/ /waf/tools/lists/lists-api/endpoints/ 301
+/firewall/api/cf-lists/json-object/ /waf/tools/lists/lists-api/json-object/ 301
 /firewall/cf-dashboard/edit-expressions/ /ruleset-engine/rules-language/expressions/edit-expressions/ 301
 /firewall/cf-dashboard/expression-preview-editor/ /ruleset-engine/rules-language/expressions/edit-expressions/ 301
-/firewall/cf-dashboard/rules-lists/ /fundamentals/global-configurations/lists/ip-lists/ 301
-/firewall/cf-dashboard/rules-lists/manage-items/ /fundamentals/global-configurations/lists/create-dashboard/#add-items-to-a-list 301
-/firewall/cf-dashboard/rules-lists/manage-lists/ /fundamentals/global-configurations/lists/create-dashboard/ 301
-/firewall/cf-dashboard/rules-lists/use-lists-in-expressions/ /fundamentals/global-configurations/lists/use-in-expressions/ 301
+/firewall/cf-dashboard/rules-lists/ /waf/tools/lists/ip-lists/ 301
+/firewall/cf-dashboard/rules-lists/manage-items/ /rules/url-forwarding/bulk-redirects/create-dashboard/#add-items-to-a-list 301
+/firewall/cf-dashboard/rules-lists/manage-lists/ /rules/url-forwarding/bulk-redirects/create-dashboard/ 301
+/firewall/cf-dashboard/rules-lists/use-lists-in-expressions/ /waf/tools/lists/use-in-expressions/ 301
 /firewall/cf-firewall-language/ /ruleset-engine/rules-language/ 301
 /firewall/cf-firewall-language/fields/ /ruleset-engine/rules-language/fields/ 301
 /firewall/cf-firewall-language/functions/ /ruleset-engine/rules-language/functions/ 301
@@ -287,7 +287,7 @@
 /firewall/cf-firewall-language/values/ /ruleset-engine/rules-language/values/ 301
 /firewall/cf-firewall-rules/api-shield/ /api-shield/ 301
 /firewall/cf-firewall-rules/fields-and-expressions/ /ruleset-engine/rules-language/expressions/ 301
-/firewall/cf-firewall-rules/rules-lists/ /fundamentals/global-configurations/lists/ip-lists/ 301
+/firewall/cf-firewall-rules/rules-lists/ /waf/tools/lists/ip-lists/ 301
 /firewall/cf-rulesets/ /ruleset-engine/about/ 301
 /firewall/cf-rulesets/add-rule-phase-rulesets/ /ruleset-engine/basic-operations/add-rule-phase-rulesets/ 301
 /firewall/cf-rulesets/common-use-cases/ /ruleset-engine/managed-rulesets/override-examples/ 301
@@ -325,19 +325,19 @@
 /support/page-rules/required-firewall-rule-changes-to-enable-url-normalization/ /firewall/troubleshooting/required-changes-to-enable-url-normalization/ 301
 
 # fundamentals
-/fundamentals/account-and-billing/account-setup/account-roles/ /fundamentals/account-and-billing/members/roles/ 301
-/fundamentals/account-and-billing/account-setup/manage-account-members/ /fundamentals/account-and-billing/members/ 301
+/fundamentals/account-and-billing/account-setup/account-roles/ /fundamentals/setup/manage-members/roles/ 301
+/fundamentals/account-and-billing/account-setup/manage-account-members/ /fundamentals/setup/manage-members/ 301
 /fundamentals/account-and-billing/account-security/scim-setup/ /fundamentals/account-and-billing/account-security/ 301
-/fundamentals/get-started/cdn/ /fundamentals/get-started/concepts/how-cloudflare-works/ 301
-/fundamentals/get-started/how-cloudflare-works/ /fundamentals/get-started/concepts/how-cloudflare-works/ 301
-/fundamentals/get-started/cloudflare-cookies/ /fundamentals/get-started/reference/cloudflare-cookies/ 301
-/fundamentals/get-started/google-analytics/ /fundamentals/get-started/reference/google-analytics/ 301
-/fundamentals/get-started/http-request-headers/ /fundamentals/get-started/reference/http-request-headers/ 301
-/fundamentals/get-started/network-ports/ /fundamentals/get-started/reference/network-ports/ 301
-/fundamentals/get-started/basic-tasks/improve-seo/ /fundamentals/get-started/task-guides/improve-seo/ 301
-/fundamentals/get-started/basic-tasks/allow-cloudflare-ip-addresses/ /fundamentals/get-started/setup/allow-cloudflare-ip-addresses/ 301
-/fundamentals/get-started/basic-tasks/account-setup/ /fundamentals/account-and-billing/account-setup/ 301
-/fundamentals/get-started/concepts/cdn-cgi-endpoint/ /fundamentals/get-started/reference/cdn-cgi-endpoint/ 301
+/fundamentals/get-started/cdn/ /fundamentals/concepts/how-cloudflare-works/ 301
+/fundamentals/get-started/how-cloudflare-works/ /fundamentals/concepts/how-cloudflare-works/ 301
+/fundamentals/get-started/cloudflare-cookies/ /fundamentals/reference/policies-compliances/cloudflare-cookies/ 301
+/fundamentals/get-started/google-analytics/ /fundamentals/reference/google-analytics/ 301
+/fundamentals/get-started/http-request-headers/ /fundamentals/reference/http-request-headers/ 301
+/fundamentals/get-started/network-ports/ /fundamentals/reference/network-ports/ 301
+/fundamentals/get-started/basic-tasks/improve-seo/ /fundamentals/basic-tasks/improve-seo/ 301
+/fundamentals/get-started/basic-tasks/allow-cloudflare-ip-addresses/ /fundamentals/setup/allow-cloudflare-ip-addresses/ 301
+/fundamentals/get-started/basic-tasks/account-setup/ /fundamentals/setup/account-setup/ 301
+/fundamentals/get-started/concepts/cdn-cgi-endpoint/ /fundamentals/reference/cdn-cgi-endpoint/ 301
 /fundamentals/get-started/task-guides/secure-your-website/ /learning-paths/application-security/ 301
 /fundamentals/get-started/task-guides/optimize-site-speed/ /learning-paths/optimize-site-speed/ 301
 /fundamentals/signed-exchanges/ /speed/optimization/other/signed-exchanges/ 301
@@ -352,20 +352,108 @@
 /fundamentals/speed/optimization/ /speed/optimization/ 301
 /fundamentals/speed/prefetch-urls/ /speed/optimization/content/prefetch-urls/ 301
 /fundamentals/data-products/analytics-integrations/sumo-logic/ /logs/get-started/enable-destinations/sumo-logic/ 301
-/support/account-management-billing/account-management/ /fundamentals/account-and-billing/ 301
-/support/account-management-billing/account-management/adding-multiple-sites-to-cloudflare-via-automation/ /fundamentals/get-started/setup/add-multiple-sites-automation/ 301
-/support/other-languages/简体中文/通过自动化将多个站点添加到-cloudflare/ /fundamentals/get-started/setup/add-multiple-sites-automation/ 301
-/support/other-languages/한국어/자동화를-통해-여러-사이트를-cloudflare에-추가/ /fundamentals/get-started/setup/add-multiple-sites-automation/ 301
-/support/other-languages/deutsch/mehrere-websites-automatisch-in-cloudflare-aufnehmen-/ /fundamentals/get-started/setup/add-multiple-sites-automation/ 301
-/support/other-languages/español-españa/cómo-añadir-varios-sitios-en-cloudflare-mediante-automatización/ /fundamentals/get-started/setup/add-multiple-sites-automation/ 301
-/support/other-languages/français-france/ajout-de-plusieurs-sites-à-cloudflare-via-automation/ /fundamentals/get-started/setup/add-multiple-sites-automation/ 301
-/support/other-languages/日本語/自動化機能を使ってcloudflareに複数のサイトを追加する/ /fundamentals/get-started/setup/add-multiple-sites-automation/ 301
-/support/other-languages/português-do-brasil/como-adicionar-vários-sites-à-cloudflare-via-automação/ /fundamentals/get-started/setup/add-multiple-sites-automation/ 301
-/support/firewall/settings/ /fundamentals/security/ 301
-/support/firewall/settings/understanding-cloudflare-under-attack-mode-advanced-ddos-protection/ /fundamentals/security/under-attack-mode/ 301
-/support/firewall/settings/understanding-the-cloudflare-browser-integrity-check/ /fundamentals/security/browser-integrity-check/ 301
-/support/firewall/settings/understanding-the-cloudflare-security-level/ /fundamentals/security/security-level/ 301
-/support/firewall/settings/using-privacy-pass-with-cloudflare/ /fundamentals/security/privacy-pass/ 301
+/support/account-management-billing/account-management/ /fundamentals/setup/account-setup/301
+/support/account-management-billing/account-management/adding-multiple-sites-to-cloudflare-via-automation/ /fundamentals/setup/add-multiple-sites-automation/ 301
+/support/other-languages/简体中文/通过自动化将多个站点添加到-cloudflare/ /fundamentals/setup/add-multiple-sites-automation/ 301
+/support/other-languages/한국어/자동화를-통해-여러-사이트를-cloudflare에-추가/ /fundamentals/setup/add-multiple-sites-automation/ 301
+/support/other-languages/deutsch/mehrere-websites-automatisch-in-cloudflare-aufnehmen-/ /fundamentals/setup/add-multiple-sites-automation/ 301
+/support/other-languages/español-españa/cómo-añadir-varios-sitios-en-cloudflare-mediante-automatización/ /fundamentals/setup/add-multiple-sites-automation/ 301
+/support/other-languages/français-france/ajout-de-plusieurs-sites-à-cloudflare-via-automation/ /fundamentals/setup/add-multiple-sites-automation/ 301
+/support/other-languages/日本語/自動化機能を使ってcloudflareに複数のサイトを追加する/ /fundamentals/setup/add-multiple-sites-automation/ 301
+/support/other-languages/português-do-brasil/como-adicionar-vários-sites-à-cloudflare-via-automação/ /fundamentals/setup/add-multiple-sites-automation/ 301
+/support/firewall/settings/ /waf/tools/ 301
+/support/firewall/settings/understanding-cloudflare-under-attack-mode-advanced-ddos-protection/ /fundamentals/reference/under-attack-mode/ 301
+/support/firewall/settings/understanding-the-cloudflare-browser-integrity-check/ /waf/tools/browser-integrity-check/ 301
+/support/firewall/settings/understanding-the-cloudflare-security-level/ /waf/tools/security-level/ 301
+/support/firewall/settings/using-privacy-pass-with-cloudflare/ /waf/tools/privacy-pass/ 301
+
+# fundamentals revamp
+/fundamentals/global-configurations/lists /waf/tools/lists/ 301
+/fundamentals/global-configurations/lists/link-bulk-redirect-lists/ /rules/url-forwarding/bulk-redirects/concepts/#bulk-redirect-lists 301
+/fundamentals/global-configurations/lists/ /waf/tools/lists/ 301
+/fundamentals/global-configurations/ /fundamentals/ 301
+/fundamentals/customizations/building-custom-dashboards/index/ /fundamentals/api/building-custom-dashboards/ 301
+/fundamentals/customizations/ /fundamentals/ 301
+/fundamentals/security/cybersafe/ /fundamentals/reference/policies-compliances/cybersafe/ 301
+/fundamentals/security/challenge-passage/ /waf/tools/challenge-passage/ 301
+/fundamentals/glossary/ /fundamentals/reference/glossary/ 301
+/fundamentals/account-and-billing/login/ /fundamentals/basic-tasks/login/ 301
+/fundamentals/account-and-billing/account-security/securing-a-compromised-account/ /fundamentals/account-and-billing/account-security/securing-a-compromised-account/ 301
+/fundamentals/account-and-billing/account-security/zone-holds/ /fundamentals/account-and-billing/account-security/zone-holds/ 301
+/fundamentals/account-and-billing/account-security/review-audit-logs/ /fundamentals/account-and-billing/account-security/review-audit-logs/ 301
+/fundamentals/account-and-billing/account-security/manage-active-sessions/ /fundamentals/account-and-billing/account-security/manage-active-sessions/ 301
+/fundamentals/account-and-billing/account-security/cloudflare-access/ /fundamentals/account-and-billing/account-security/cloudflare-access/ 301
+/fundamentals/account-and-billing/account-maintenance/delete-account/ /fundamentals/account-and-billing/account-billing/delete-account/ 301
+/fundamentals/account-and-billing/account-maintenance/updating-billing-info/ /fundamentals/account-and-billing/account-billing/updating-billing-info/ 301
+/fundamentals/account-and-billing/account-maintenance/understand-invoices/ /fundamentals/account-and-billing/account-billing/understand-invoices/ 301
+/fundamentals/account-and-billing/account-maintenance/cancel-subscription/ /fundamentals/account-and-billing/account-billing/cancel-subscription/ 301
+/fundamentals/account-and-billing/account-maintenance/change-plan/ /fundamentals/account-and-billing/account-billing/change-plan/ 301
+/fundamentals/account-and-billing/account-maintenance/change-super-admin/ /fundamentals/account-and-billing/account-billing/change-super-admin/ 301
+/fundamentals/account-and-billing/account-maintenance/change-password-or-email/ /fundamentals/account-and-billing/account-billing/change-password-or-email/ 301
+/fundamentals/account-and-billing/account-maintenance/ /fundamentals/account-and-billing/account-billing/ 301
+/fundamentals/account-and-billing/members/scope/ /fundamentals/setup/manage-members/scope/ 301
+/fundamentals/account-and-billing/members/manage/ /fundamentals/setup/manage-members/manage/ 301
+/fundamentals/account-and-billing/non-contract-products/ /fundamentals/account-and-billing/preview-services/ 301
+/fundamentals/account-and-billing/account-setup/create-account/ /fundamentals/setup/account-setup/create-account/ 301
+/fundamentals/account-and-billing/account-setup/verify-email-address/ /fundamentals/setup/account-setup/verify-email-address/ 301
+/fundamentals/account-and-billing/account-setup/create-billing-profile/ /fundamentals/setup/account-setup/create-billing-profile/ 301
+/fundamentals/account-and-billing/account-setup/customize-account/language-preference/ /fundamentals/setup/account-setup/customize-account/language-preference/ 301
+/fundamentals/account-and-billing/account-setup/customize-account/appearance/ /fundamentals/setup/account-setup/customize-account/appearance/ 301
+/fundamentals/account-and-billing/account-setup/customize-account/account-name/ /fundamentals/setup/account-setup/customize-account/account-name/ 301
+/fundamentals/account-and-billing/account-setup/customize-account/ /fundamentals/setup/account-setup/customize-account/ 301
+/fundamentals/account-and-billing/account-setup/customize-account/communication-preference/ /fundamentals/setup/account-setup/customize-account/communication-preference/ 301
+/fundamentals/data-products/types-of-analytics/ /analytics/types-of-analytics/ 301
+/fundamentals/data-products/about-analytics/ /analytics/faq/about-analytics/ 301
+/fundamentals/data-products/analytics-integrations/graylog/index/ /analytics/analytics-integrations/graylog/ 301
+/fundamentals/data-products/analytics-integrations/looker/index/ /analytics/analytics-integrations/looker/ 301
+/fundamentals/data-products/analytics-integrations/elastic/index/ /analytics/analytics-integrations/elastic/ 301
+/fundamentals/data-products/analytics-integrations/splunk/index/ /analytics/analytics-integrations/splunk/ 301
+/fundamentals/data-products/analytics-integrations/datadog/index/ /analytics/analytics-integrations/datadog/ 301
+/fundamentals/data-products/analytics-integrations/google-cloud/index/ /analytics/analytics-integrations/google-cloud/ 301
+/fundamentals/data-products/analytics-integrations/new-relic/index/ /analytics/analytics-integrations/new-relic/ 301
+/fundamentals/data-products/analytics-integrations/ /analytics/analytics-integrations/ 301
+/fundamentals/data-products/ /analytics/ 301
+/fundamentals/get-started/get-started-external-link/ /learning-paths/get-started/ 301
+/fundamentals/get-started/task-guides/optimize-speed-external-link/ /learning-paths/optimize-site-speed/ 301
+/fundamentals/get-started/task-guides/prevent-ddos-attacks-external/ /learning-paths/prevent-ddos-attacks/ 301
+/fundamentals/get-started/task-guides/origin-health/free/ /fundamentals/basic-tasks/protect-your-origin-server/ 301
+/fundamentals/get-started/task-guides/origin-health/business/ /fundamentals/basic-tasks/protect-your-origin-server/ 301
+/fundamentals/get-started/task-guides/origin-health/pro/ /fundamentals/basic-tasks/protect-your-origin-server/ 301
+/fundamentals/get-started/task-guides/origin-health/enterprise/ /fundamentals/basic-tasks/protect-your-origin-server/ 301
+/fundamentals/get-started/task-guides/origin-health/ /fundamentals/basic-tasks/protect-your-origin-server/ 301
+/fundamentals/get-started/task-guides/ /fundamentals/basic-tasks/ 301
+/fundamentals/get-started/setup/ /fundamentals/setup/ 301
+/fundamentals/get-started/setup/minimize-downtime/ /fundamentals/basic-tasks/minimize-downtime/ 301
+/fundamentals/get-started/concepts/what-is-cloudflare/ /fundamentals/concepts/what-is-cloudflare/ 301
+/fundamentals/get-started/concepts/cloudflare-challenges/ /firewall/cf-firewall-rules/cloudflare-challenges/ 301
+/fundamentals/get-started/concepts/accounts-and-zones/ /fundamentals/concepts/accounts-and-zones/ 301
+/fundamentals/get-started/concepts/cloudflare-ip-addresses/ /fundamentals/concepts/cloudflare-ip-addresses/ 301
+/fundamentals/get-started/concepts/network-layers/ /fundamentals/concepts/network-layers/ 301
+/fundamentals/get-started/concepts/ /fundamentals/concepts/ 301
+/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/ /fundamentals/setup/find-account-and-zone-ids/ 301
+/fundamentals/get-started/basic-tasks/maintenance-mode/ /fundamentals/basic-tasks/maintenance-mode/ 301
+/fundamentals/get-started/basic-tasks/access-cloudflare-resources/ /fundamentals/ 301
+/fundamentals/get-started/basic-tasks/manage-domains/remove-domain/ /fundamentals/setup/manage-domains/remove-domain/ 301
+/fundamentals/get-started/basic-tasks/manage-domains/pause-cloudflare/ /fundamentals/setup/manage-domains/pause-cloudflare/ 301
+/fundamentals/get-started/basic-tasks/manage-domains/move-domain/ /fundamentals/setup/manage-domains/move-domain/ 301
+/fundamentals/get-started/basic-tasks/manage-domains/ /fundamentals/setup/manage-domains/ 301
+/fundamentals/get-started/basic-tasks/manage-domains/redirect-domain/ /fundamentals/setup/manage-domains/redirect-domain/ 301
+/fundamentals/get-started/basic-tasks/cloudflare-without-changing-nameservers/ /fundamentals/setup/use-cloudflare-without-changing-nameservers/ 301
+/fundamentals/get-started/basic-tasks/interact-with-cloudflare/ /fundamentals/basic-tasks/interact-with-cloudflare/ 301
+/fundamentals/get-started/basic-tasks/manage-subdomains/ /fundamentals/basic-tasks/manage-subdomains/ 301
+/fundamentals/get-started/basic-tasks/report-abuse/provide-specific-urls/ /fundamentals/reference/report-abuse/provide-specific-urls/ 301
+/fundamentals/get-started/basic-tasks/report-abuse/complaint-types/ /fundamentals/reference/report-abuse/complaint-types/ 301
+/fundamentals/get-started/basic-tasks/report-abuse/ /fundamentals/reference/report-abuse/ 301
+/fundamentals/get-started/basic-tasks/access-compliance-docs/ /fundamentals/reference/policies-compliances/compliance-docs/ 301
+/fundamentals/get-started/basic-tasks/under-ddos-attack/ /fundamentals/basic-tasks/under-ddos-attack/ 301
+/fundamentals/get-started/basic-tasks/test-speed/ /fundamentals/basic-tasks/test-speed/ 301
+/fundamentals/get-started/basic-tasks/ /fundamentals/basic-tasks/ 301
+/fundamentals/get-started/reference/cloudflare-site-crawling/ /fundamentals/reference/cloudflare-site-crawling/ 301
+/fundamentals/get-started/reference/content-security-policies/ /fundamentals/reference/policies-compliances/content-security-policies/ 301
+/fundamentals/get-started/reference/cloudflare-ray-id/ /fundamentals/reference/cloudflare-ray-id/ 301
+/fundamentals/get-started/reference/ /fundamentals/reference/ 301
+/fundamentals/get-started/ /fundamentals/setup/ 301
+
 
 # gateway
 /gateway/about/ /cloudflare-one/policies/gateway/ 301
@@ -405,7 +493,7 @@
 /support/troubleshooting/general-troubleshooting/troubleshoot-image-resizing-problems/ /images/image-resizing/troubleshooting/ 301
 
 # learning-paths
-/learning-paths/technology-partner-integrations/ /fundamentals/partners/ 301
+/learning-paths/technology-partner-integrations/ /fundamentals/reference/partners/ 301
 /support/about-cloudflare/attack-preparation-and-response/best-practices-ddos-preventative-measures/ /learning-paths/prevent-ddos-attacks/ 301
 # more redirects in the /dynamic/ section
 
@@ -522,11 +610,11 @@
 /pages/tutorials/build-an-api-with-workers/ /pages/tutorials/build-an-api-with-pages-functions/ 301
 
 # partners
-/partners/ /fundamentals/partners/ 301
-/partners/analytics/ /fundamentals/partners/#analytics-integrations 301
-/partners/logs/ /fundamentals/partners/#cloudflare-logs 301
+/partners/ /fundamentals/reference/partners/ 301
+/partners/analytics/ /fundamentals/reference/partners/#analytics-integrations 301
+/partners/logs/ /fundamentals/reference/partners/#cloudflare-logs 301
 /partners/email-security/ /email-security/partners/ 301
-/partners/network-interconnect/ /fundamentals/partners/#cloudflare-network-interconnect 301
+/partners/network-interconnect/ /fundamentals/reference/partners/#cloudflare-network-interconnect 301
 /partners/tenant/ /tenant/ 301
 
 # page-shield
@@ -766,7 +854,6 @@
 /waf/ddos-l34-mitigation/configure-api/ /ddos-protection/managed-rulesets/network/configure-api/ 301
 /waf/ddos-l7-mitigation/ /ddos-protection/managed-rulesets/http/ 301
 /waf/ddos-l7-mitigation/configure-dashboard/ /ddos-protection/managed-rulesets/http/configure-dashboard/ 301
-/waf/firewall-rules/ /waf/custom-rules/ 301
 /waf/managed-rulesets/cloudflare-managed-ruleset/ /waf/managed-rules/reference/cloudflare-managed-ruleset/ 301
 /waf/managed-rulesets/owasp-core-ruleset/ /waf/managed-rules/reference/owasp-core-ruleset/ 301
 /waf/managed-rulesets/exposed-credentials-check/ /waf/managed-rules/reference/exposed-credentials-check/ 301
@@ -865,6 +952,7 @@
 /workers/reference/apis/response/ /workers/runtime-apis/response/ 301
 /workers/reference/apis/streams/ /workers/runtime-apis/streams/ 301
 /workers/learning/using-streams/ /workers/runtime-apis/streams/ 301
+/workers/runtime-apis/streams/use-streams/ /workers/runtime-apis/streams/ 301
 /workers/reference/apis/web-crypto/ /workers/runtime-apis/web-crypto/ 301
 /workers/reference/cache-api/ /workers/runtime-apis/cache/ 301
 /workers/reference/cloudflare-features/ /workers/runtime-apis/request/ 301
@@ -948,9 +1036,6 @@
 /workers/get-started/storage-options/ /workers/learning/storage-options 301
 /workers/tutorials/deploy-a-static-wordpress-site/ /pages/how-to/deploy-a-wordpress-site/ 301
 /workers/wrangler/get-started/ /workers/wrangler/install-and-update/ 301
-/workers/wrangler/workers-kv/ /kv/ 301
-/workers/runtime-apis/kv/ /kv/api/ 301
-/workers/learning/how-kv-works/ /kv/learning/how-kv-works/ 301
 /workers/platform/storage-objects/ /workers/platform/storage-options/ 301
 /workers/wrangler-legacy/migration/deprecations/ /workers/wrangler/deprecations/ 301
 /workers/wrangler-legacy/migration/eject-webpack/ /workers/wrangler/migration/v1-to-v2/eject-webpack/ 301
@@ -1198,10 +1283,10 @@ workers/runtime-apis/fetch-event/#passthroughonexception /workers/runtime-apis/h
 /cloudflare-one/policies/data-loss-prevention/configuration-guides/* /cloudflare-one/policies/data-loss-prevention/dlp-policies/common-policies/ 301
 /distributed-web/* /web3/:splat 301
 /docs-engine/* https://github.com/cloudflare/cloudflare-docs/blob/production/README.md 301
-/fundamentals/internet/* /fundamentals/the-internet/ 301
+/fundamentals/internet/* /fundamentals/reference/the-internet/ 301
 /internet/* https://www.cloudflare.com/learning/ 301
 /fundamentals/get-started/basic-tasks/account-maintenance/* /fundamentals/account-and-billing/account-maintenance/:splat 301
-/fundamentals/get-started/setup/troubleshooting/* /fundamentals/get-started/setup/add-site/ 301
+/fundamentals/get-started/setup/troubleshooting/* /fundamentals/setup/account-setup/add-site/ 301
 /fundamentals/get-started/basic-tasks/account-security/* /fundamentals/account-and-billing/account-security/:splat 301
 /fundamentals/get-started/origin-health/* /fundamentals/get-started/task-guides/origin-health/:splat 301
 /fundamentals/get-started/setup/account-setup/* /fundamentals/account-and-billing/account-setup/:splat 301
@@ -1272,4 +1357,4 @@ workers/runtime-apis/fetch-event/#passthroughonexception /workers/runtime-apis/h
 
 /ssl/custom-certificates/* /ssl/edge-certificates/custom-certificates/:splat 301
 /logs/analytics-integrations/* /fundamentals/data-products/analytics-integrations/:splat 301
-/fundamentals/notifications/* /notifications/:splat 301
+/fundamentals/notifications/* /notifications/:splat 301
\ No newline at end of file
diff --git a/content/analytics/account-and-zone-analytics/account-analytics.md b/content/analytics/account-and-zone-analytics/account-analytics.md
index 26febc1a55..4c3882ac1e 100644
--- a/content/analytics/account-and-zone-analytics/account-analytics.md
+++ b/content/analytics/account-and-zone-analytics/account-analytics.md
@@ -10,7 +10,7 @@ weight: 2
 Cloudflare account analytics lets you access a wide range of aggregated metrics from all the sites under a specific Cloudflare account.
 
 {{<Aside type="note">}}
-For general information about all of Cloudflare's analytics offerings, refer to [About Cloudflare Analytics](/fundamentals/data-products/about-analytics/).
+For general information about all of Cloudflare's analytics offerings, refer to [About Cloudflare Analytics](/analytics/faq/about-analytics/).
 {{</Aside>}}
 
 ___
diff --git a/content/analytics/account-and-zone-analytics/status-codes.md b/content/analytics/account-and-zone-analytics/status-codes.md
index 68a3cd53cd..42c19978e7 100644
--- a/content/analytics/account-and-zone-analytics/status-codes.md
+++ b/content/analytics/account-and-zone-analytics/status-codes.md
@@ -28,7 +28,7 @@ ___
 ## Edge Network errors
 
 -   `400` - Bad Request intercepted at the Cloudflare Edge (for example, missing or bad HTTP header)
--   `403` - Security functionality (for example, Web Application Firewall, Browser Integrity Check, [Cloudflare challenges](/fundamentals/get-started/concepts/cloudflare-challenges/), and most 1xxx error codes)
+-   `403` - Security functionality (for example, Web Application Firewall, Browser Integrity Check, [Cloudflare challenges](/firewall/cf-firewall-rules/cloudflare-challenges/), and most 1xxx error codes)
 -   `409` - DNS errors typically in the form of 1000 or 1001 error code
 -   `413` - File size upload exceeded the maximum size allowed (configured under the Speed app)
 -   `444` - Used by Nginx to indicate that the server has returned no information to the client, and closed the connection. This error code is internal to Nginx and is **not** returned to the client.
diff --git a/content/analytics/account-and-zone-analytics/threat-types.md b/content/analytics/account-and-zone-analytics/threat-types.md
index a23b54698f..6a64474a66 100644
--- a/content/analytics/account-and-zone-analytics/threat-types.md
+++ b/content/analytics/account-and-zone-analytics/threat-types.md
@@ -12,7 +12,7 @@ Cloudflare classifies the threats that it blocks or challenges. To help you unde
 
 The source of the request was not legitimate or the request itself was malicious. Users would receive a [1010 error page](/support/troubleshooting/cloudflare-errors/troubleshooting-cloudflare-1xxx-errors/#error-1010-the-owner-of-this-website-has-banned-your-access-based-on-your-browsers-signature) in their browser.
 
-Cloudflare's [Browser Integrity Check](/fundamentals/security/browser-integrity-check/) looks for common HTTP headers abused most commonly by spammers and denies them access to your page. It will also challenge visitors that do not have a user agent or a non standard user agent (also commonly used by bots, crawlers, or visitors).
+Cloudflare's [Browser Integrity Check](/waf/tools/browser-integrity-check/) looks for common HTTP headers abused most commonly by spammers and denies them access to your page. It will also challenge visitors that do not have a user agent or a non standard user agent (also commonly used by bots, crawlers, or visitors).
 
 ## Blocked hotlink
 
diff --git a/content/analytics/account-and-zone-analytics/total-threats-stopped.md b/content/analytics/account-and-zone-analytics/total-threats-stopped.md
index 2a69d8ba46..5c38b96f17 100644
--- a/content/analytics/account-and-zone-analytics/total-threats-stopped.md
+++ b/content/analytics/account-and-zone-analytics/total-threats-stopped.md
@@ -9,7 +9,7 @@ title: Total threats stopped
 Total Threats Stopped measures the number of “suspicious” and “bad” requests that were aimed at your site. Requests receive these labels by our IP Reputation Database as they enter Cloudflare’s network:
 
 -   **Legitimate:** request pass directly to your site
--   **Suspicious:** request has been challenged with a [Cloudflare challenge](/fundamentals/get-started/concepts/cloudflare-challenges/)
+-   **Suspicious:** request has been challenged with a [Cloudflare challenge](/firewall/cf-firewall-rules/cloudflare-challenges/)
 -   **Bad:** request has been blocked because our Browser Integrity Check, or because of user configured settings like WAF rules or IP range block.
 
 Cloudflare uses Threat Scores gathered from sources such as Project Honeypot, as well as our own communities' traffic to determine whether a visitor is legitimate or malicious. When a legitimate visitor passes a challenge, that helps offset the Threat Score against the previous negative behavior seen from that IP address. Our system learns who is a threat from this activity.
diff --git a/content/analytics/account-and-zone-analytics/zone-analytics.md b/content/analytics/account-and-zone-analytics/zone-analytics.md
index 886a5d994c..e90d678fb4 100644
--- a/content/analytics/account-and-zone-analytics/zone-analytics.md
+++ b/content/analytics/account-and-zone-analytics/zone-analytics.md
@@ -10,7 +10,7 @@ weight: 1
 The Cloudflare zone analytics is a major component of the overall Cloudflare Analytics product line.  Specifically, this app gives you access to a wide range of metrics, collected at the website or domain level.
 
 {{<Aside type="note">}}
-Read [Cloudflare Analytics](/fundamentals/data-products/about-analytics/)
+Read [Cloudflare Analytics](/analytics/faq/about-analytics/)
 for general information about all of Cloudflare's analytics offerings.
 You can also understand the characteristics of the data that Cloudflare
 captures and processes.
diff --git a/content/analytics/analytics-integrations/_index.md b/content/analytics/analytics-integrations/_index.md
index f07f8c0406..ac2f4c342b 100644
--- a/content/analytics/analytics-integrations/_index.md
+++ b/content/analytics/analytics-integrations/_index.md
@@ -2,8 +2,6 @@
 pcx_content_type: navigation
 title: Analytics integrations
 weight: 7
-aliases:
-- /fundamentals/data-products/analytics-integrations/
 ---
 
 # Analytics integrations
diff --git a/content/analytics/analytics-integrations/datadog/index.md b/content/analytics/analytics-integrations/datadog/index.md
index c9d9361700..f4d7694dff 100644
--- a/content/analytics/analytics-integrations/datadog/index.md
+++ b/content/analytics/analytics-integrations/datadog/index.md
@@ -3,8 +3,6 @@ pcx_content_type: how-to
 title: Datadog
 weight: 98
 layout: single
-aliases:
-- /fundamentals/data-products/analytics-integrations/datadog/
 ---
 
 # Datadog
@@ -37,7 +35,7 @@ To install the Cloudflare App for Datadog:
 
     - **Account name**: (Optional) This can be any value. It has not impact on the site data pulled from Cloudflare.
 
-    - **Email**: This value helps keep your account safe. We recommend creating a dedicated Cloudflare user for analytics with the [_Analytics_ role](/fundamentals/account-and-billing/members/roles/) (read-only). Note that the _Analytics_ role is available to Enterprise customers only.
+    - **Email**: This value helps keep your account safe. We recommend creating a dedicated Cloudflare user for analytics with the [_Analytics_ role](/fundamentals/setup/manage-members/roles/) (read-only). Note that the _Analytics_ role is available to Enterprise customers only.
 
     - **API Key**: Enter your Cloudflare Global API key. For details refer to [API Keys](/fundamentals/api/get-started/keys/).
 
diff --git a/content/analytics/analytics-integrations/elastic/index.md b/content/analytics/analytics-integrations/elastic/index.md
index 6b8aa76460..87d07ba55a 100644
--- a/content/analytics/analytics-integrations/elastic/index.md
+++ b/content/analytics/analytics-integrations/elastic/index.md
@@ -3,8 +3,6 @@ pcx_content_type: how-to
 title: Elastic
 weight: 100
 layout: single
-aliases:
-- /fundamentals/data-products/analytics-integrations/elastic/
 ---
 
 # Elastic
diff --git a/content/analytics/analytics-integrations/google-cloud/index.md b/content/analytics/analytics-integrations/google-cloud/index.md
index 8ca48d0807..d9d2edf976 100644
--- a/content/analytics/analytics-integrations/google-cloud/index.md
+++ b/content/analytics/analytics-integrations/google-cloud/index.md
@@ -3,8 +3,6 @@ pcx_content_type: how-to
 title: Google Cloud
 weight: 101
 layout: single
-aliases:
-- /fundamentals/data-products/analytics-integrations/google-cloud/
 ---
 
 # Google Cloud
diff --git a/content/analytics/analytics-integrations/graylog/index.md b/content/analytics/analytics-integrations/graylog/index.md
index 4cd6d49988..9ea103acdf 100644
--- a/content/analytics/analytics-integrations/graylog/index.md
+++ b/content/analytics/analytics-integrations/graylog/index.md
@@ -3,8 +3,6 @@ pcx_content_type: how-to
 title: Graylog
 weight: 102
 layout: single
-aliases:
-- /fundamentals/data-products/analytics-integrations/graylog/
 ---
 
 # Graylog
diff --git a/content/analytics/analytics-integrations/looker/index.md b/content/analytics/analytics-integrations/looker/index.md
index b3399d9baa..dae1075b62 100644
--- a/content/analytics/analytics-integrations/looker/index.md
+++ b/content/analytics/analytics-integrations/looker/index.md
@@ -3,8 +3,6 @@ pcx_content_type: how-to
 title: Looker
 weight: 102
 layout: single
-aliases:
-- /fundamentals/data-products/analytics-integrations/looker/
 ---
 
 # Looker
@@ -15,7 +13,7 @@ This tutorial explains how to analyze [Cloudflare Logs](https://www.cloudflare.c
 
 If you have not used Cloudflare Logs before, refer to the [Logs documentation](/logs/) for more details. Contact your Cloudflare Customer Account Team to enable logs for your account.
 
-This tutorial uses Cloudflare Logpush to send logs to [Google Cloud Storage Bucket and Cloud Function](/fundamentals/data-products/analytics-integrations/google-cloud/) and then import them into Google Big Query.
+This tutorial uses Cloudflare Logpush to send logs to [Google Cloud Storage Bucket and Cloud Function](/analytics/analytics-integrations/google-cloud/) and then import them into Google Big Query.
 
 ### Prerequisites
 
diff --git a/content/analytics/analytics-integrations/new-relic/index.md b/content/analytics/analytics-integrations/new-relic/index.md
index 2a771237be..c44175a3f1 100644
--- a/content/analytics/analytics-integrations/new-relic/index.md
+++ b/content/analytics/analytics-integrations/new-relic/index.md
@@ -3,8 +3,6 @@ pcx_content_type: how-to
 title: New Relic
 weight: 103
 layout: single
-aliases:
-- /fundamentals/data-products/analytics-integrations/new-relic/
 ---
 
 # New Relic
diff --git a/content/analytics/analytics-integrations/splunk/index.md b/content/analytics/analytics-integrations/splunk/index.md
index de63313f29..748613193f 100644
--- a/content/analytics/analytics-integrations/splunk/index.md
+++ b/content/analytics/analytics-integrations/splunk/index.md
@@ -3,9 +3,6 @@ pcx_content_type: how-to
 title: Splunk
 weight: 104
 layout: single
-aliases:
-- /fundamentals/data-products/analytics-integrations/splunk/
-
 ---
 
 # Splunk
diff --git a/content/analytics/faq/about-analytics.md b/content/analytics/faq/about-analytics.md
index f66a2cdda1..90ea30f726 100644
--- a/content/analytics/faq/about-analytics.md
+++ b/content/analytics/faq/about-analytics.md
@@ -4,8 +4,6 @@ title: About Cloudflare Analytics
 weight: 1
 meta:
     title: A quick overview of Cloudflare Analytics
-aliases:
-- /fundamentals/data-products/about-analytics/
 ---
 
 # About Cloudflare Analytics
@@ -14,7 +12,7 @@ In an effort to make analytics an ubiquitous component of all Cloudflare's produ
 
 You can access root-level analytics that give you an overview of metadata related to your Cloudflare account, analytics related to specific properties and products, and the GraphQL API that gives you more control over how you visualize the analytics and log information available on the Cloudflare dashboard.
 
-Refer to [Types of analytics](/fundamentals/data-products/types-of-analytics/) for more information regarding this subject.
+Refer to [Types of analytics](/analytics/types-of-analytics/) for more information regarding this subject.
 
 ## How Cloudflare captures and processes analytics data
 
@@ -22,7 +20,7 @@ The underlying datasets that Cloudflare Analytics captures and processes share t
 
 * All metrics reflect traffic proxied through the Cloudflare network (also known as orange-clouded), as configured via DNS records in the Cloudflare DNS app. Note that for a [CNAME setup](/dns/zone-setups/partial-setup/), Cloudflare is unable to offer DNS metrics.
 * Cloudflare does not count traffic for unproxied DNS records. However, if your site is not proxied through Cloudflare but Cloudflare is your authoritative DNS server, then we are able to collect DNS metrics.
-* Cloudflare can only proxy information for traffic targeting [specific ports](/fundamentals/get-started/reference/network-ports/).
+* Cloudflare can only proxy information for traffic targeting [specific ports](/fundamentals/reference/network-ports/).
 * In determining the originating country, Cloudflare uses the IP address associated with each request. Learn about [Configuring Cloudflare IP Geolocation](https://support.cloudflare.com/hc/articles/200168236).
 
 ## Apparent data discrepancies
diff --git a/content/analytics/graphql-api/getting-started/querying-basics.md b/content/analytics/graphql-api/getting-started/querying-basics.md
index b4d964b466..975111c8e0 100644
--- a/content/analytics/graphql-api/getting-started/querying-basics.md
+++ b/content/analytics/graphql-api/getting-started/querying-basics.md
@@ -276,7 +276,7 @@ Here are some helpful articles about working with the Cloudflare Analytics API a
 [1]: </analytics/graphql-api/features/discovery/introspection/>
 [2]: </analytics/graphql-api/getting-started/compose-graphql-query/>
 [3]: </analytics/graphql-api/getting-started/execute-graphql-query/>
-[5]: </fundamentals/get-started/basic-tasks/find-account-and-zone-ids/>
+[5]: </fundamentals/setup/find-account-and-zone-ids/>
 [6]: <https://www.howtographql.com/>
 [7]: <https://graphql.org/learn/thinking-in-graphs/>
 [8]: <https://graphql.org/learn/schema/>
diff --git a/content/analytics/network-analytics/reference/network-analytics-v1.md b/content/analytics/network-analytics/reference/network-analytics-v1.md
index e5681cdc7c..2809fa1da6 100644
--- a/content/analytics/network-analytics/reference/network-analytics-v1.md
+++ b/content/analytics/network-analytics/reference/network-analytics-v1.md
@@ -259,7 +259,7 @@ Network Analytics currently has these limitations:
     -   Application layer rules
     -   Gatekeeper and manually applied rules
     -   [flowtrackd](https://blog.cloudflare.com/announcing-flowtrackd/) (Advanced TCP protection) (available in Network Analytics v2)
-    -   WARP traffic and [Orange-clouded traffic](/fundamentals/get-started/concepts/how-cloudflare-works/)
+    -   WARP traffic and [Orange-clouded traffic](/fundamentals/concepts/how-cloudflare-works/)
 
 -   Data from Cloudflare services that proxy traffic, such as CDN, is not available in Network Analytics.
 
diff --git a/content/analytics/types-of-analytics.md b/content/analytics/types-of-analytics.md
index fe576d375d..f740b0dc59 100644
--- a/content/analytics/types-of-analytics.md
+++ b/content/analytics/types-of-analytics.md
@@ -2,8 +2,6 @@
 pcx_content_type: reference
 title: Types of analytics
 weight: 2
-aliases:
-- /fundamentals/data-products/types-of-analytics/
 ---
 
 # Types of analytics
diff --git a/content/argo-smart-routing/get-started.md b/content/argo-smart-routing/get-started.md
index 672387b8e0..9c66d87efd 100644
--- a/content/argo-smart-routing/get-started.md
+++ b/content/argo-smart-routing/get-started.md
@@ -20,7 +20,7 @@ To enable [Argo Smart Routing](https://dash.cloudflare.com/?to=/:account/:zone/t
 3. For **Argo Smart Routing**, switch the toggle to **On**.
 4. Provide your billing information.
 
-    * If you do not have a [billing profile](/fundamentals/account-and-billing/account-setup/create-billing-profile/), enter your billing information.
+    * If you do not have a [billing profile](/fundamentals/setup/account-setup/create-billing-profile/), enter your billing information.
 
     * If you have a billing profile, confirm your billing information.
 
@@ -29,7 +29,7 @@ To enable [Argo Smart Routing](https://dash.cloudflare.com/?to=/:account/:zone/t
 
 To enable or disable Argo Smart Routing with the API, send a [`PATCH`](/api/operations/argo-smart-routing-patch-argo-smart-routing-setting) request with the `value` parameter set to your desired setting (`"on"` or `"off"`).
 
-You will need to already have a [billing profile](/fundamentals/account-and-billing/account-setup/create-billing-profile/) on your account to enable Argo Smart Routing.
+You will need to already have a [billing profile](/fundamentals/setup/account-setup/create-billing-profile/) on your account to enable Argo Smart Routing.
 
 {{</tab>}}
 {{</tabs>}}
diff --git a/content/bots/_partials/_bots-cookie.md b/content/bots/_partials/_bots-cookie.md
index b62b7e2880..6026f5082f 100644
--- a/content/bots/_partials/_bots-cookie.md
+++ b/content/bots/_partials/_bots-cookie.md
@@ -9,4 +9,4 @@ Cloudflare uses the `__cf_bm cookie` to smooth out the Bot Score and reduce fals
 
 The Bot Management cookie measures a single user's request pattern and applies it to the machine learning data to generate a reliable Bot Score for all of that user's requests.
 
-For more details, refer to [Cloudflare Cookies](/fundamentals/get-started/reference/cloudflare-cookies/).
+For more details, refer to [Cloudflare Cookies](/fundamentals/reference/policies-compliances/cloudflare-cookies/).
diff --git a/content/bots/reference/wordpress-loopback-issue.md b/content/bots/reference/wordpress-loopback-issue.md
index 6aff2dcc35..541fd05dd1 100644
--- a/content/bots/reference/wordpress-loopback-issue.md
+++ b/content/bots/reference/wordpress-loopback-issue.md
@@ -12,7 +12,7 @@ weight: 0
 WordPress relies on making loopback requests to monitor and occasionally administer its websites. Customers can opt-in to optimize Super Bot Fight Mode for WordPress. If this feature is enabled, automated loopback requests made by your WordPress site will be authorized even when Super Bot Fight Mode blocks other bots.
 
 {{<Aside type="note">}}
-Loopback requests may also be blocked by [I’m Under Attack mode](/fundamentals/security/under-attack-mode/) or certain [WAF custom rules](/waf/custom-rules/).
+Loopback requests may also be blocked by [I’m Under Attack mode](/fundamentals/reference/under-attack-mode/) or certain [WAF custom rules](/waf/custom-rules/).
 {{</Aside>}}
 
 ## Enable Optimize for WordPress
diff --git a/content/byoip/concepts/dynamic-advertisement/best-practices.md b/content/byoip/concepts/dynamic-advertisement/best-practices.md
index b3d3110bac..9afa7c3894 100644
--- a/content/byoip/concepts/dynamic-advertisement/best-practices.md
+++ b/content/byoip/concepts/dynamic-advertisement/best-practices.md
@@ -11,7 +11,7 @@ meta:
 
 To prevent issues and simplify the advertisement process during an attack scenario, complete the following tasks.
 
-- **Assign appropriate user roles.** Ensure that users assigned to manage the status of IP prefix advertisement have the **Administrator** or **Super Administrator** role in your Cloudflare account. For more information, refer to [Setting up Multi-user accounts on Cloudflare](/fundamentals/account-and-billing/members/).
+- **Assign appropriate user roles.** Ensure that users assigned to manage the status of IP prefix advertisement have the **Administrator** or **Super Administrator** role in your Cloudflare account. For more information, refer to [Setting up Multi-user accounts on Cloudflare](/fundamentals/setup/manage-members/).
 
 - **Get a list of the Prefix IDs you want to manage.** Maintain a list of Cloudflare prefix IDs to simplify dynamic advertisement management and operations. To obtain Prefix IDs, review [obtain prefix IDs](/byoip/how-to/configure-dynamic-advertisement/#obtain-prefix-ids) from the dashboard or use the [list prefixes](/api/operations/ip-address-management-prefixes-list-prefixes) operation in the Cloudflare API. Refer to these Prefix IDs when managing prefix advertisement.
 
diff --git a/content/china-network/get-started.md b/content/china-network/get-started.md
index 197f44d51f..3c915f906e 100644
--- a/content/china-network/get-started.md
+++ b/content/china-network/get-started.md
@@ -32,6 +32,6 @@ Contact your sales team for more information on these steps.
 
 ## Step 3 — Onboard your domains to the Cloudflare China Network
 
-After content vetting is complete, [add your domains to Cloudflare](/fundamentals/get-started/setup/add-site/).
+After content vetting is complete, [add your domains to Cloudflare](/fundamentals/setup/account-setup/add-site/).
 
 It will take a minimum of 24 hours to enable user traffic (that is, until DNS starts answering with JD Cloud's network IP addresses).
\ No newline at end of file
diff --git a/content/cloudflare-for-platforms/_partials/_get-started-prereqs.md b/content/cloudflare-for-platforms/_partials/_get-started-prereqs.md
index 065d52be0f..00b142af3d 100644
--- a/content/cloudflare-for-platforms/_partials/_get-started-prereqs.md
+++ b/content/cloudflare-for-platforms/_partials/_get-started-prereqs.md
@@ -10,7 +10,7 @@ inputParameters: planReqs
 
 Before you start creating custom hostnames:
 
-1. [Add](/fundamentals/get-started/setup/add-site/) your zone to Cloudflare $1
+1. [Add](/fundamentals/setup/account-setup/add-site/) your zone to Cloudflare $1
 2. [Enable](/cloudflare-for-platforms/cloudflare-for-saas/start/enable/) Cloudflare for SaaS for your zone.
 3. (optional) Review the following documentation:
 
diff --git a/content/cloudflare-for-platforms/cloudflare-for-saas/hostname-analytics.md b/content/cloudflare-for-platforms/cloudflare-for-saas/hostname-analytics.md
index c9b8d17428..a5112d7170 100644
--- a/content/cloudflare-for-platforms/cloudflare-for-saas/hostname-analytics.md
+++ b/content/cloudflare-for-platforms/cloudflare-for-saas/hostname-analytics.md
@@ -26,7 +26,7 @@ Use custom hostname analytics to help your organization with billing and infrast
 
 If you see one customer is using more data than another, you might increase their bill. If requests are increasing in a certain geographic region, you might want to increase the origin servers in that region.
 
-To access custom hostname analytics, either [use the dashboard](/fundamentals/data-products/about-analytics/) and filter by the `Host` field or [use the GraphQL API](/analytics/graphql-api/) and filter by the `clientRequestHTTPHost` field. For more details, refer to our tutorial on [Querying HTTP events by hostname with GraphQL](/analytics/graphql-api/tutorials/end-customer-analytics/).
+To access custom hostname analytics, either [use the dashboard](/analytics/faq/about-analytics/) and filter by the `Host` field or [use the GraphQL API](/analytics/graphql-api/) and filter by the `clientRequestHTTPHost` field. For more details, refer to our tutorial on [Querying HTTP events by hostname with GraphQL](/analytics/graphql-api/tutorials/end-customer-analytics/).
 
 ## Share Cloudflare data with your customers
 
diff --git a/content/cloudflare-for-platforms/cloudflare-for-saas/performance/early-hints-for-saas.md b/content/cloudflare-for-platforms/cloudflare-for-saas/performance/early-hints-for-saas.md
index 3499a27fe7..7d5638ad15 100644
--- a/content/cloudflare-for-platforms/cloudflare-for-saas/performance/early-hints-for-saas.md
+++ b/content/cloudflare-for-platforms/cloudflare-for-saas/performance/early-hints-for-saas.md
@@ -18,7 +18,7 @@ Before you can employ Early Hints for SaaS, you need to create a custom hostname
 
 ## Enable Early Hints per custom hostname via the API
 
-1. [Locate your zone ID](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/), available in the Cloudflare dashboard.
+1. [Locate your zone ID](/fundamentals/setup/find-account-and-zone-ids/), available in the Cloudflare dashboard.
 
 2. Locate your Authentication Key by selecting **My Profile** > **API tokens** > **Global API Key**.
 
diff --git a/content/cloudflare-for-platforms/cloudflare-for-saas/saas-customers/product-compatibility.md b/content/cloudflare-for-platforms/cloudflare-for-saas/saas-customers/product-compatibility.md
index 5b07f5e59e..d33ba36bb8 100644
--- a/content/cloudflare-for-platforms/cloudflare-for-saas/saas-customers/product-compatibility.md
+++ b/content/cloudflare-for-platforms/cloudflare-for-saas/saas-customers/product-compatibility.md
@@ -27,7 +27,7 @@ This is not an exhaustive list of Cloudflare products and features.
 | [API Shield](/api-shield/) | Yes | No |
 | [Argo Smart Routing](/argo-smart-routing/) | No | Yes | Customer zones can still use Smart Routing for non-O2O traffic. |
 | [Bot Management](/bots/plans/bm-subscription/) | Yes* | Yes* | Bot Management cannot be enabled on both the customer zone and the SaaS zone |
-| [Browser Integrity Check](/fundamentals/security/browser-integrity-check/) | Yes | Yes |
+| [Browser Integrity Check](/waf/tools/browser-integrity-check/) | Yes | Yes |
 | [Cache](/cache/) | Yes* | Yes | Though caching is possible on a customer zone, it is generally discouraged (especially for HTML).<br/><br/>Your SaaS provider likely performs its own caching outside of Cloudflare and caching on your zone might lead to out-of-sync or stale cache states.<br/><br/>Customer zones can still cache content that are not routed through a SaaS provider's zone.|
 | [China Network](/china-network/) | No | No |
 | [DNS](/dns/) | Yes* | Yes | As a SaaS customer, do not remove the records related to your Cloudflare for SaaS setup.<br/><br/>Otherwise, your traffic will begin routing away from your SaaS provider. |
@@ -41,7 +41,7 @@ This is not an exhaustive list of Cloudflare products and features.
 | [Origin Rules](/rules/origin-rules/) | No | Yes | Origin Rules that match the subdomain used for O2O may block or interfere with the flow of visitors to your website. |
 | [Polish](/images/polish/) | Yes* | Yes | Polish only runs on cached assets. If the customer zone is bypassing cache for SaaS zone destined traffic, then images optimized by Polish will not be loaded from origin. |
 | [Rate Limiting](/waf/rate-limiting-rules/) | Yes* | Yes | Rate Limiting rules that match the subdomain used for O2O may block or interfere with the flow of visitors to your website. |
-| [Security Level](/fundamentals/security/security-level/) | Yes | Yes |
+| [Security Level](/waf/tools/security-level/) | Yes | Yes |
 | [Spectrum](/spectrum/) | No | No |
 | [Transform Rules](/rules/transform/) | Yes* | Yes | Transform Rules that match the subdomain used for O2O may block or interfere with the flow of visitors to your website. |
 | [WAF custom rules](/waf/custom-rules/) | Yes | Yes | WAF custom rules that match the subdomain used for O2O may block or interfere with the flow of visitors to your website. |
diff --git a/content/cloudflare-for-platforms/cloudflare-for-saas/security/certificate-management/issue-and-validate/validate-certificates/delegated-dcv.md b/content/cloudflare-for-platforms/cloudflare-for-saas/security/certificate-management/issue-and-validate/validate-certificates/delegated-dcv.md
index 642ca81031..adebfef8f5 100644
--- a/content/cloudflare-for-platforms/cloudflare-for-saas/security/certificate-management/issue-and-validate/validate-certificates/delegated-dcv.md
+++ b/content/cloudflare-for-platforms/cloudflare-for-saas/security/certificate-management/issue-and-validate/validate-certificates/delegated-dcv.md
@@ -48,4 +48,4 @@ If desired, you could also manually fetch the DCV tokens and share them with you
 
 ## Moved domains
 
- If you [move your SaaS zone to another account](/fundamentals/get-started/basic-tasks/manage-domains/move-domain/), you will need to update the `CNAME` record with a new hostname value.
\ No newline at end of file
+ If you [move your SaaS zone to another account](/fundamentals/setup/manage-domains/move-domain/), you will need to update the `CNAME` record with a new hostname value.
\ No newline at end of file
diff --git a/content/cloudflare-for-platforms/cloudflare-for-saas/security/waf-for-saas/_index.md b/content/cloudflare-for-platforms/cloudflare-for-saas/security/waf-for-saas/_index.md
index 26eedcbd2b..a35ab8c719 100644
--- a/content/cloudflare-for-platforms/cloudflare-for-saas/security/waf-for-saas/_index.md
+++ b/content/cloudflare-for-platforms/cloudflare-for-saas/security/waf-for-saas/_index.md
@@ -30,7 +30,7 @@ curl -X POST "https://api.cloudflare.com/client/v4/zones/{zone:id}/custom_hostna
 
 To apply WAF to your custom hostname, you need to create an association between your customer’s domain and the WAF configuration that you’d like to attach to it. Cloudflare’s product, [custom metadata](/cloudflare-for-platforms/cloudflare-for-saas/domain-support/custom-metadata/) allows you to do this via the API.
 
-1. [Locate your zone ID](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/), available in the Cloudflare dashboard.
+1. [Locate your zone ID](/fundamentals/setup/find-account-and-zone-ids/), available in the Cloudflare dashboard.
 
 2. Locate your Authentication Key by selecting **My Profile** > **API tokens** > **Global API Key**.
 
diff --git a/content/cloudflare-for-platforms/cloudflare-for-saas/start/enable.md b/content/cloudflare-for-platforms/cloudflare-for-saas/start/enable.md
index 199edfcec2..1194614e7b 100644
--- a/content/cloudflare-for-platforms/cloudflare-for-saas/start/enable.md
+++ b/content/cloudflare-for-platforms/cloudflare-for-saas/start/enable.md
@@ -15,7 +15,7 @@ To enable Cloudflare for SaaS for your account:
 3. Go to **SSL/TLS** > **Custom Hostnames**.
 4. Select **Enable**.
 5. The next step depends on the zone's plan:
-    - **Enterprise**: Can preview this product as a [non-contract service](/fundamentals/account-and-billing/non-contract-products/), which provide full access, free of metered usage fees, limits, and certain other restrictions.
+    - **Enterprise**: Can preview this product as a [non-contract service](/fundamentals/account-and-billing/preview-services/), which provide full access, free of metered usage fees, limits, and certain other restrictions.
     - **Non-enterprise**: Will have to enter payment information.
 
 {{<Aside type="note">}}
diff --git a/content/cloudflare-one/_partials/gateway/_recommended-dns-policies.md b/content/cloudflare-one/_partials/gateway/_recommended-dns-policies.md
index 8d95d2db38..5757b53392 100644
--- a/content/cloudflare-one/_partials/gateway/_recommended-dns-policies.md
+++ b/content/cloudflare-one/_partials/gateway/_recommended-dns-policies.md
@@ -73,7 +73,7 @@ Block specific IP addresses that are known to be malicious or pose a threat to y
 
 ## CIPA Filter
 
-The CIPA Filter is a collection of subcategories that encompass a wide range of topics that could be harmful or inappropriate for minors. It is used as a part of [Project Cybersafe Schools](/fundamentals/security/cybersafe/) to block access to unwanted or harmful online content.
+The CIPA Filter is a collection of subcategories that encompass a wide range of topics that could be harmful or inappropriate for minors. It is used as a part of [Project Cybersafe Schools](/fundamentals/reference/policies-compliances/cybersafe/) to block access to unwanted or harmful online content.
 
 
 | Selector           | Operator | Value         | Action |
diff --git a/content/cloudflare-one/applications/configure-apps/dash-sso-apps.md b/content/cloudflare-one/applications/configure-apps/dash-sso-apps.md
index 39c8d2846f..628793e6be 100644
--- a/content/cloudflare-one/applications/configure-apps/dash-sso-apps.md
+++ b/content/cloudflare-one/applications/configure-apps/dash-sso-apps.md
@@ -14,7 +14,7 @@ By adding a Dashboard SSO application to your Cloudflare Zero Trust account, you
 
 ## Prerequisites
 
-All users in your email domain must exist as a member in your Cloudflare account and IdP.  To add users to your Cloudflare account, refer to [Manage Cloudflare account access](/fundamentals/account-and-billing/members/).
+All users in your email domain must exist as a member in your Cloudflare account and IdP.  To add users to your Cloudflare account, refer to [Manage Cloudflare account access](/fundamentals/setup/manage-members/).
 
 {{<Aside>}}
 
diff --git a/content/cloudflare-one/applications/configure-apps/self-hosted-apps.md b/content/cloudflare-one/applications/configure-apps/self-hosted-apps.md
index a391a7d844..db7be690ab 100644
--- a/content/cloudflare-one/applications/configure-apps/self-hosted-apps.md
+++ b/content/cloudflare-one/applications/configure-apps/self-hosted-apps.md
@@ -12,7 +12,7 @@ Cloudflare Access allows you to securely publish internal tools and applications
 
 ## Prerequisites
 
-- [Add your domain](/fundamentals/get-started/setup/add-site/) to Cloudflare.
+- [Add your domain](/fundamentals/setup/account-setup/add-site/) to Cloudflare.
 - [Change your domain nameservers](/dns/zone-setups/full-setup/) to Cloudflare, or configure a [partial (`CNAME`) setup](/dns/zone-setups/partial-setup/).
 
 ## 1. Add your application to Access
diff --git a/content/cloudflare-one/cloudflare-teams-roles-permissions.md b/content/cloudflare-one/cloudflare-teams-roles-permissions.md
index 8bf8485bbb..0be8114e69 100644
--- a/content/cloudflare-one/cloudflare-teams-roles-permissions.md
+++ b/content/cloudflare-one/cloudflare-teams-roles-permissions.md
@@ -8,7 +8,7 @@ weight: 21
 
 When creating a Cloudflare Zero Trust account, you will be given the Super Administrator role. As a Super Administrator, you can invite members to join your Zero Trust account and assign them different roles. There is no limit to the number of members which can be added to a given account. Any members with the proper permissions will be able to make configuration changes while actively logged into Zero Trust (unless [read-only mode](/cloudflare-one/api-terraform/#set-dashboard-to-read-only) is enabled).
 
-To check the list of members in your account, or to manage roles and permissions, refer to our [Account setup](/fundamentals/account-and-billing/members/) documentation.
+To check the list of members in your account, or to manage roles and permissions, refer to our [Account setup](/fundamentals/setup/manage-members/) documentation.
 
 ## Zero Trust roles
 
diff --git a/content/cloudflare-one/connections/connect-devices/warp/configure-warp/warp-modes/device-information-only.md b/content/cloudflare-one/connections/connect-devices/warp/configure-warp/warp-modes/device-information-only.md
index 8c5e7273aa..9b6f7d7218 100644
--- a/content/cloudflare-one/connections/connect-devices/warp/configure-warp/warp-modes/device-information-only.md
+++ b/content/cloudflare-one/connections/connect-devices/warp/configure-warp/warp-modes/device-information-only.md
@@ -10,7 +10,7 @@ Device Information Only mode allows you to enforce device posture rules when a u
 
 To set up Device Information Only mode:
 
-1. Enable client certificate provisioning for [your zone](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/):
+1. Enable client certificate provisioning for [your zone](/fundamentals/setup/find-account-and-zone-ids/):
 
    ```sh
    curl -X PATCH 'https://api.cloudflare.com/client/v4/zones/<ZONE ID>/devices/policy/certificates' \
diff --git a/content/cloudflare-one/connections/connect-networks/deployment-guides/ansible.md b/content/cloudflare-one/connections/connect-networks/deployment-guides/ansible.md
index 3189460563..6744df8873 100644
--- a/content/cloudflare-one/connections/connect-networks/deployment-guides/ansible.md
+++ b/content/cloudflare-one/connections/connect-networks/deployment-guides/ansible.md
@@ -16,7 +16,7 @@ To complete the steps in this guide, you will need:
 
 - [A Google Cloud Project](https://cloud.google.com/resource-manager/docs/creating-managing-projects#creating_a_project) and [GCP CLI installed and authenticated](https://cloud.google.com/sdk/docs/install).
 - [Basic knowledge of Terraform](/cloudflare-one/connections/connect-networks/deployment-guides/terraform/) and[Terraform installed](https://developer.hashicorp.com/terraform/tutorials/certification-associate-tutorials/install-cli).
-- [A zone on Cloudflare](/fundamentals/get-started/setup/add-site/).
+- [A zone on Cloudflare](/fundamentals/setup/account-setup/add-site/).
 - [A Cloudflare API token](/fundamentals/api/get-started/create-token/) with `Cloudflare Tunnel` and `DNS` permissions.
 
 ## 1. Install Ansible
diff --git a/content/cloudflare-one/connections/connect-networks/deployment-guides/terraform.md b/content/cloudflare-one/connections/connect-networks/deployment-guides/terraform.md
index 267aa7a696..3d9f6ab4c4 100644
--- a/content/cloudflare-one/connections/connect-networks/deployment-guides/terraform.md
+++ b/content/cloudflare-one/connections/connect-networks/deployment-guides/terraform.md
@@ -22,7 +22,7 @@ In this guide, you will use Terraform to deploy:
 To complete the following procedure, you will need:
 
 - [A Google Cloud Project](https://cloud.google.com/resource-manager/docs/creating-managing-projects#creating_a_project)
-- [A zone on Cloudflare](/fundamentals/get-started/setup/add-site/)
+- [A zone on Cloudflare](/fundamentals/setup/account-setup/add-site/)
 
 ## 1. Install Terraform
 
diff --git a/content/cloudflare-one/connections/connect-networks/install-and-setup/tunnel-guide/local/_index.md b/content/cloudflare-one/connections/connect-networks/install-and-setup/tunnel-guide/local/_index.md
index ac48cd2f01..8ae6ed8836 100644
--- a/content/cloudflare-one/connections/connect-networks/install-and-setup/tunnel-guide/local/_index.md
+++ b/content/cloudflare-one/connections/connect-networks/install-and-setup/tunnel-guide/local/_index.md
@@ -13,7 +13,7 @@ Follow this step-by-step guide to get your first tunnel up and running using the
 
 Before you start, make sure you:
 
-- [Add a website to Cloudflare](/fundamentals/get-started/setup/add-site/).
+- [Add a website to Cloudflare](/fundamentals/setup/account-setup/add-site/).
 - [Change your domain nameservers to Cloudflare](/dns/zone-setups/full-setup/setup/).
 
 ## 1. Download and install `cloudflared`
diff --git a/content/cloudflare-one/connections/connect-networks/install-and-setup/tunnel-guide/remote/_index.md b/content/cloudflare-one/connections/connect-networks/install-and-setup/tunnel-guide/remote/_index.md
index 2d84459e41..c0aefaef9f 100644
--- a/content/cloudflare-one/connections/connect-networks/install-and-setup/tunnel-guide/remote/_index.md
+++ b/content/cloudflare-one/connections/connect-networks/install-and-setup/tunnel-guide/remote/_index.md
@@ -13,7 +13,7 @@ Follow this step-by-step guide to get your first tunnel up and running using Zer
 
 Before you start, make sure you:
 
-- [Add a website to Cloudflare](/fundamentals/get-started/setup/add-site/).
+- [Add a website to Cloudflare](/fundamentals/setup/account-setup/add-site/).
 - [Change your domain nameservers to Cloudflare](/dns/zone-setups/full-setup/setup/).
 
 ## 1. Create a tunnel
diff --git a/content/cloudflare-one/identity/authorization-cookie/cors.md b/content/cloudflare-one/identity/authorization-cookie/cors.md
index c02d8dc5e6..a3a83deb2a 100644
--- a/content/cloudflare-one/identity/authorization-cookie/cors.md
+++ b/content/cloudflare-one/identity/authorization-cookie/cors.md
@@ -139,7 +139,7 @@ Follow [these instructions](/cloudflare-one/identity/service-tokens/) to generat
    $ cd redirect-worker
    ```
 
-3. Open `wrangler.toml` in a text editor and insert your [account ID](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/).
+3. Open `wrangler.toml` in a text editor and insert your [account ID](/fundamentals/setup/find-account-and-zone-ids/).
 
    ```txt
    ---
diff --git a/content/cloudflare-one/insights/logs/gateway-logs/manage-pii.md b/content/cloudflare-one/insights/logs/gateway-logs/manage-pii.md
index dd71cac39e..5e0909a938 100644
--- a/content/cloudflare-one/insights/logs/gateway-logs/manage-pii.md
+++ b/content/cloudflare-one/insights/logs/gateway-logs/manage-pii.md
@@ -34,4 +34,4 @@ This feature is only available on Enterprise plans.
 
 PII is by default redacted from Gateway Activity logs for all permission roles except the Super Admin and users with the [Cloudflare Zero Trust PII role](/cloudflare-one/cloudflare-teams-roles-permissions/#cloudflare-zero-trust-pii) assigned to them. Only the Super Admin can assign roles and determine who has permission to view PII. Redacting PII does not affect the way PII is captured in logs — the data is simply hidden and no information is lost.
 
-To add or remove the Cloudflare Zero Trust PII role for a user, refer to our [Account setup](/fundamentals/account-and-billing/members/) documentation.
+To add or remove the Cloudflare Zero Trust PII role for a user, refer to our [Account setup](/fundamentals/setup/manage-members/) documentation.
diff --git a/content/cloudflare-one/policies/access/external-evaluation.md b/content/cloudflare-one/policies/access/external-evaluation.md
index 3713dae58e..e1613378e9 100644
--- a/content/cloudflare-one/policies/access/external-evaluation.md
+++ b/content/cloudflare-one/policies/access/external-evaluation.md
@@ -47,7 +47,7 @@ You can set up External Evaluation rules using any API service, but to get start
 
 4. Open `wrangler.toml` in a text editor and insert the following:
 
-   - `<ACCOUNT_ID>`: your Cloudflare [account ID](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/).
+   - `<ACCOUNT_ID>`: your Cloudflare [account ID](/fundamentals/setup/find-account-and-zone-ids/).
    - `<KV_NAMESPACE_ID>`: the `id` of your KV namespace.
    - `<TEAM_NAME>`: your Cloudflare Zero Trust [team name](/cloudflare-one/glossary/#team-name).
 
diff --git a/content/cloudflare-one/tutorials/azuread-risky-users.md b/content/cloudflare-one/tutorials/azuread-risky-users.md
index 9bcc63a58d..2357d620e4 100644
--- a/content/cloudflare-one/tutorials/azuread-risky-users.md
+++ b/content/cloudflare-one/tutorials/azuread-risky-users.md
@@ -86,7 +86,7 @@ To get started quickly, deploy our example Cloudflare Workers script by followin
 
 4. Modify `wrangler.toml` to include the following values:
 
-   - `<ACCOUNT_ID>`: your Cloudflare [account ID](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/).
+   - `<ACCOUNT_ID>`: your Cloudflare [account ID](/fundamentals/setup/find-account-and-zone-ids/).
    - `<TENANT_ID>`: your Azure AD **Directory (tenant) ID**, obtained when [setting up Azure AD as an identity provider](#1-set-up-azure-ad-as-an-identity-provider).
    - `<CLIENT_ID>`: your Azure AD **Application (client) ID**, obtained when [setting up Azure AD as an identity provider](#1-set-up-azure-ad-as-an-identity-provider).
 
diff --git a/content/cloudflare-one/tutorials/kubectl.md b/content/cloudflare-one/tutorials/kubectl.md
index da4126b6e3..0505ba12f2 100644
--- a/content/cloudflare-one/tutorials/kubectl.md
+++ b/content/cloudflare-one/tutorials/kubectl.md
@@ -17,7 +17,7 @@ You can connect to machines over `kubectl` using Cloudflare's Zero Trust platfor
 
 **Before you start**
 
-- [Add a website to Cloudflare](/fundamentals/get-started/setup/add-site/)
+- [Add a website to Cloudflare](/fundamentals/setup/account-setup/add-site/)
 
 **Time to complete:**
 
diff --git a/content/cloudflare-one/tutorials/vnc-client-in-browser.md b/content/cloudflare-one/tutorials/vnc-client-in-browser.md
index 5ecfda4d2f..62d052eedf 100644
--- a/content/cloudflare-one/tutorials/vnc-client-in-browser.md
+++ b/content/cloudflare-one/tutorials/vnc-client-in-browser.md
@@ -31,7 +31,7 @@ There are a number of VNC versions, deployments, and instances. This tutorial fo
 
 ## Before you start
 
-1. [Add a website to Cloudflare.](/fundamentals/get-started/setup/add-site/)
+1. [Add a website to Cloudflare.](/fundamentals/setup/account-setup/add-site/)
 2. [Enable Cloudflare Zero Trust on your account.](/cloudflare-one/setup/)
 3. [Connect your identity provider to Cloudflare Zero Trust.](/cloudflare-one/identity/idp-integration/)
 
diff --git a/content/data-localization/metadata-boundary/get-started.md b/content/data-localization/metadata-boundary/get-started.md
index 2e0ae80ddf..67547e91de 100644
--- a/content/data-localization/metadata-boundary/get-started.md
+++ b/content/data-localization/metadata-boundary/get-started.md
@@ -8,7 +8,7 @@ weight: 1
 
 You can configure the Metadata Boundary to select the region where your logs and analytics are stored via API or dashboard.
 
-Currently, this can only be applied at the account-level. If you only want the Metadata Boundary to be applied on a portion of zones beneath the same account, you will have to [move the rest of zones to a new account](/fundamentals/get-started/basic-tasks/manage-domains/move-domain/).
+Currently, this can only be applied at the account-level. If you only want the Metadata Boundary to be applied on a portion of zones beneath the same account, you will have to [move the rest of zones to a new account](/fundamentals/setup/manage-domains/move-domain/).
 
 ## Configure Customer Metadata Boundary in the dashboard
 
diff --git a/content/ddos-protection/best-practices/respond-to-ddos-attacks.md b/content/ddos-protection/best-practices/respond-to-ddos-attacks.md
index 01feb23a9f..1c400f0466 100644
--- a/content/ddos-protection/best-practices/respond-to-ddos-attacks.md
+++ b/content/ddos-protection/best-practices/respond-to-ddos-attacks.md
@@ -14,7 +14,7 @@ All customers should perform the following steps to better secure their applicat
 
 1. Make sure all [DDoS managed rulesets](/ddos-protection/managed-rulesets/) are set to default settings (_High_ sensitivity level and mitigation actions) for optimal DDoS activation.
 2. Deploy [WAF custom rules](/waf/custom-rules/) and [rate limiting rules](/waf/rate-limiting-rules/) to enforce a combined positive and negative security model. Reduce the traffic allowed to your website based on your known usage.
-3. Make sure your origin is not exposed to the public Internet, meaning that access is only possible from [Cloudflare IP addresses](/fundamentals/get-started/setup/allow-cloudflare-ip-addresses/). As an extra security precaution, we recommend contacting your hosting provider and requesting new origin server IPs if they have been targeted directly in the past.
+3. Make sure your origin is not exposed to the public Internet, meaning that access is only possible from [Cloudflare IP addresses](/fundamentals/setup/allow-cloudflare-ip-addresses/). As an extra security precaution, we recommend contacting your hosting provider and requesting new origin server IPs if they have been targeted directly in the past.
 4. If you have [Managed IP Lists](/waf/tools/lists/ip-lists/#managed-ip-lists) or [Bot Management](/bots/plans/bm-subscription/), consider using these in WAF custom rules.
 5. Enable [caching](/cache/) as much as possible to reduce the strain on your origin servers, and when using [Workers](/workers/), avoid overwhelming your origin server with more subrequests than necessary.
 
diff --git a/content/ddos-protection/managed-rulesets/http/configure-api.md b/content/ddos-protection/managed-rulesets/http/configure-api.md
index 6852d8d6dd..98764e0d75 100644
--- a/content/ddos-protection/managed-rulesets/http/configure-api.md
+++ b/content/ddos-protection/managed-rulesets/http/configure-api.md
@@ -18,7 +18,7 @@ Use overrides to configure the HTTP DDoS Attack Protection managed ruleset. Over
 
 Overrides can have a ruleset, tag, or rule scope. Tag and rule configurations have greater priority than ruleset configurations.
 
-You can create overrides at the zone level and at the account level. Account-level overrides allow you to apply the same override to several zones in your account with a single rule. For example, you can use an account-level override to lower the sensitivity of a specific managed ruleset rule or exclude an [IP List](/fundamentals/global-configurations/lists/ip-lists/) for multiple zones. However, if a given zone has overrides for the HTTP DDoS Attack Protection managed ruleset, the account-level overrides will not be applied for that zone.
+You can create overrides at the zone level and at the account level. Account-level overrides allow you to apply the same override to several zones in your account with a single rule. For example, you can use an account-level override to lower the sensitivity of a specific managed ruleset rule or exclude an [IP List](/waf/tools/lists/ip-lists/) for multiple zones. However, if a given zone has overrides for the HTTP DDoS Attack Protection managed ruleset, the account-level overrides will not be applied for that zone.
 
 {{<Aside type="warning" header="Important">}}
 * The HTTP DDoS Attack Protection managed ruleset is always enabled — you cannot disable its rules using an override with `"enabled": false`.
@@ -142,7 +142,7 @@ For more information on defining overrides for managed rulesets using the Rulese
 
 ### Account-level configuration example
 
-The following `PUT` example creates a new phase ruleset (or updates the existing one) for the `ddos_l7` phase at the account level. The example defines a single rule override for requests coming from IP addresses in the `allowlisted_ips` [IP List](/fundamentals/global-configurations/lists/ip-lists/), with the following configuration:
+The following `PUT` example creates a new phase ruleset (or updates the existing one) for the `ddos_l7` phase at the account level. The example defines a single rule override for requests coming from IP addresses in the `allowlisted_ips` [IP List](/waf/tools/lists/ip-lists/), with the following configuration:
 
 * The rule with ID `<MANAGED_RULESET_RULE_ID>`, belonging to the HTTP DDoS Attack Protection managed ruleset (with ID `<MANAGED_RULESET_ID>`),  will have an `eoff` (_Essentially Off_) sensitivity level and it will perform a `log` action.
 
diff --git a/content/dmarc-management/enable.md b/content/dmarc-management/enable.md
index fb3654b158..637ea65ec3 100644
--- a/content/dmarc-management/enable.md
+++ b/content/dmarc-management/enable.md
@@ -6,7 +6,7 @@ pcx_content_type: how-to
 
 {{<heading-pill style="beta">}}Enable DMARC Management{{</heading-pill>}}
 
-You need to enable DMARC Management to allow Cloudflare to process DMARC reports on your behalf. Before enabling DMARC Management, note that it does not support subdomains. You can only use it with your primary domain on [each zone](/fundamentals/get-started/concepts/accounts-and-zones/) of your Cloudflare account.
+You need to enable DMARC Management to allow Cloudflare to process DMARC reports on your behalf. Before enabling DMARC Management, note that it does not support subdomains. You can only use it with your primary domain on [each zone](/fundamentals/concepts/accounts-and-zones/) of your Cloudflare account.
 
 {{<Aside type="warning" header="A warning on DMARC Management and SPF records">}}
 DMARC Management does not support actions on SPF records when your zone has a CNAME record that points to a different domain. Changing the SPF record would make DMARC rules invalid, as Cloudflare cannot change other DNS records to reflect your updates.
diff --git a/content/dns/_partials/_minimize-downtime-tip.md b/content/dns/_partials/_minimize-downtime-tip.md
index ade84619b8..55f763386f 100644
--- a/content/dns/_partials/_minimize-downtime-tip.md
+++ b/content/dns/_partials/_minimize-downtime-tip.md
@@ -7,6 +7,6 @@ _build:
 
 {{<Aside type="warning">}}
 
-If your domain is particularly sensitive to downtime, review our suggestions to [minimize downtime](/fundamentals/get-started/setup/minimize-downtime/).
+If your domain is particularly sensitive to downtime, review our suggestions to [minimize downtime](/fundamentals/basic-tasks/minimize-downtime/).
 
 {{</Aside>}}
\ No newline at end of file
diff --git a/content/dns/_partials/_onboard-warning.md b/content/dns/_partials/_onboard-warning.md
index ee2c850948..08e5c98039 100644
--- a/content/dns/_partials/_onboard-warning.md
+++ b/content/dns/_partials/_onboard-warning.md
@@ -5,4 +5,4 @@ _build:
   list: never
 ---
 
-When you [add a domain](/fundamentals/get-started/setup/add-site/) to Cloudflare, Cloudflare protection will be in a [pending state](/dns/zone-setups/reference/domain-status/) until we can verify ownership. This could take up to 24 hours to complete.
\ No newline at end of file
+When you [add a domain](/fundamentals/setup/account-setup/add-site/) to Cloudflare, Cloudflare protection will be in a [pending state](/dns/zone-setups/reference/domain-status/) until we can verify ownership. This could take up to 24 hours to complete.
\ No newline at end of file
diff --git a/content/dns/_partials/_proxied-records-definition.md b/content/dns/_partials/_proxied-records-definition.md
index ab67b91ff2..41bd33d3f4 100644
--- a/content/dns/_partials/_proxied-records-definition.md
+++ b/content/dns/_partials/_proxied-records-definition.md
@@ -14,4 +14,4 @@ A[Visitor] <-- Connection --> B[Cloudflare global network] <-- Connection --> C[
 ```
 <br/>
 
-This behavior allows Cloudflare to [optimize, cache, and protect](/fundamentals/get-started/concepts/how-cloudflare-works/) all requests to your application, as well as protect your origin server from [DDoS attacks](https://www.cloudflare.com/learning/ddos/what-is-a-ddos-attack/).
\ No newline at end of file
+This behavior allows Cloudflare to [optimize, cache, and protect](/fundamentals/concepts/how-cloudflare-works/) all requests to your application, as well as protect your origin server from [DDoS attacks](https://www.cloudflare.com/learning/ddos/what-is-a-ddos-attack/).
\ No newline at end of file
diff --git a/content/dns/_partials/_recover-deleted-domain.md b/content/dns/_partials/_recover-deleted-domain.md
index 4e767b2aa9..f712e2b2a5 100644
--- a/content/dns/_partials/_recover-deleted-domain.md
+++ b/content/dns/_partials/_recover-deleted-domain.md
@@ -5,7 +5,7 @@ _build:
   list: never
 ---
 
-To recover a deleted domain, [re-add it in Cloudflare](/fundamentals/get-started/setup/add-site/) just like you would for a new domain.
+To recover a deleted domain, [re-add it in Cloudflare](/fundamentals/setup/account-setup/add-site/) just like you would for a new domain.
 
 {{<Aside type="warning">}}
 Cloudflare support is unable to restore DNS or settings for deleted domains.
diff --git a/content/dns/dnssec/dnssec-active-migration.md b/content/dns/dnssec/dnssec-active-migration.md
index 9da81e5af0..e2d6270e49 100644
--- a/content/dns/dnssec/dnssec-active-migration.md
+++ b/content/dns/dnssec/dnssec-active-migration.md
@@ -23,7 +23,7 @@ The provider you are migrating from must allow you to add DNSKEY records on the
 
 ## 1. Set up Cloudflare
 
-1. [Add your zone to Cloudflare](/fundamentals/get-started/setup/add-site/).
+1. [Add your zone to Cloudflare](/fundamentals/setup/account-setup/add-site/).
 
     To add your zone using the API, refer to the [Create Zone endpoint](/api/operations/zones-post).
 
diff --git a/content/dns/manage-dns-records/how-to/round-robin-dns.md b/content/dns/manage-dns-records/how-to/round-robin-dns.md
index 12fba3d4f7..82e960e555 100644
--- a/content/dns/manage-dns-records/how-to/round-robin-dns.md
+++ b/content/dns/manage-dns-records/how-to/round-robin-dns.md
@@ -14,7 +14,7 @@ Use this setup for simple, [round-robin load balancing](https://www.cloudflare.c
 
 The following example illustrates how you would distribute traffic intended for `www.example.com`. Though the example uses `A` records, you could also use `AAAA` records.
 
-After [creating an account](/fundamentals/account-and-billing/account-setup/create-account/) and [updating your nameservers](/dns/zone-setups/full-setup/setup/) for `example.com`, you might [create multiple DNS records](/dns/manage-dns-records/how-to/create-dns-records/) for your `www` subdomain:
+After [creating an account](/fundamentals/setup/account-setup/create-account/) and [updating your nameservers](/dns/zone-setups/full-setup/setup/) for `example.com`, you might [create multiple DNS records](/dns/manage-dns-records/how-to/create-dns-records/) for your `www` subdomain:
 
 | Type | Name  | IPv4 address |
 | ---- | ----- | ------------ |
diff --git a/content/dns/manage-dns-records/reference/proxied-dns-records.md b/content/dns/manage-dns-records/reference/proxied-dns-records.md
index 534108c1fa..342903e31f 100644
--- a/content/dns/manage-dns-records/reference/proxied-dns-records.md
+++ b/content/dns/manage-dns-records/reference/proxied-dns-records.md
@@ -18,7 +18,7 @@ The **Proxy status** of a DNS record affects how Cloudflare treats incoming traf
 
 {{<render file="_mix-proxied-and-unproxied.md">}}
 
-Because requests to proxied hostnames go through Cloudflare before reaching your origin server, all requests will appear to be coming from Cloudflare's IP addresses (and could potentially be blocked or rate limited). If you use proxied records, you may need to adjust your server configuration to [allow Cloudflare IPs](/fundamentals/get-started/setup/allow-cloudflare-ip-addresses/).
+Because requests to proxied hostnames go through Cloudflare before reaching your origin server, all requests will appear to be coming from Cloudflare's IP addresses (and could potentially be blocked or rate limited). If you use proxied records, you may need to adjust your server configuration to [allow Cloudflare IPs](/fundamentals/setup/allow-cloudflare-ip-addresses/).
 
 Cloudflare Anycast IPs used to proxy traffic on your domain are assigned automatically. These IPs might change at any time for operational reasons.
 If you need to allowlist Cloudflare IPs on your infrastructure or hosting provider, include the full list of [Cloudflare Anycast IPs](https://www.cloudflare.com/ips/).
@@ -37,7 +37,7 @@ If you encounter a `CNAME` record that you cannot proxy — usually associated w
 
 By default, Cloudflare only proxies HTTP and HTTPS traffic.
 
-If you need to connect to your origin using a non-HTTP protocol (SSH, FTP, SMTP) or the traffic targets an [unsupported port](/fundamentals/get-started/reference/network-ports/) at the origin, either leave your records [unproxied (DNS-only)](#dns-only-records) or use [Cloudflare Spectrum](/spectrum/).
+If you need to connect to your origin using a non-HTTP protocol (SSH, FTP, SMTP) or the traffic targets an [unsupported port](/fundamentals/reference/network-ports/) at the origin, either leave your records [unproxied (DNS-only)](#dns-only-records) or use [Cloudflare Spectrum](/spectrum/).
 
 #### Pending domains
 
@@ -62,4 +62,4 @@ When an `A`, `AAAA`, or `CNAME` record is **DNS-only** — also known as being g
 
 {{<render file="_mix-proxied-and-unproxied.md">}}
 
-In addition to potentially exposing your origin IP addresses to bad actors and [DDoS attacks](https://www.cloudflare.com/learning/ddos/what-is-a-ddos-attack/), leaving your records as **DNS-only** means that Cloudflare cannot [optimize, cache, and protect](/fundamentals/get-started/concepts/how-cloudflare-works/) requests to your application.
+In addition to potentially exposing your origin IP addresses to bad actors and [DDoS attacks](https://www.cloudflare.com/learning/ddos/what-is-a-ddos-attack/), leaving your records as **DNS-only** means that Cloudflare cannot [optimize, cache, and protect](/fundamentals/concepts/how-cloudflare-works/) requests to your application.
diff --git a/content/dns/troubleshooting/faq.md b/content/dns/troubleshooting/faq.md
index 0fb9bbd183..5c1b15fd17 100644
--- a/content/dns/troubleshooting/faq.md
+++ b/content/dns/troubleshooting/faq.md
@@ -178,9 +178,9 @@ ___
 This can happen when you had a wildcard \* record configured at your previous authoritative DNS. You can remove these records in bulk [using the API](/api/operations/dns-records-for-a-zone-delete-dns-record).
 
 You can also:
-1. [Remove your domain](/fundamentals/get-started/basic-tasks/manage-domains/remove-domain/) from Cloudflare.
+1. [Remove your domain](/fundamentals/setup/manage-domains/remove-domain/) from Cloudflare.
 2. Delete the wildcard record from your authoritative DNS.
-3. [Re-add](/fundamentals/get-started/setup/add-site/) the domain.
+3. [Re-add](/fundamentals/setup/account-setup/add-site/) the domain.
 
 ___
 
diff --git a/content/dns/zone-setups/full-setup/setup.md b/content/dns/zone-setups/full-setup/setup.md
index 504a8a45f9..b20130c276 100644
--- a/content/dns/zone-setups/full-setup/setup.md
+++ b/content/dns/zone-setups/full-setup/setup.md
@@ -26,7 +26,7 @@ All domains purchased through Cloudflare Registrar automatically use Cloudflare
 
 {{</Aside>}}
 
-- Have previously created a [Cloudflare account](/fundamentals/account-and-billing/account-setup/create-account/).
+- Have previously created a [Cloudflare account](/fundamentals/setup/account-setup/create-account/).
 - Disabled [DNSSEC](/dns/concepts/#dnssec) at your registrar (where you bought your domain name).
   
 {{<render file="_dnssec-providers.md">}}
@@ -37,7 +37,7 @@ All domains purchased through Cloudflare Registrar automatically use Cloudflare
 
 {{<tutorial-step title="Add site to Cloudflare">}}
 
-In the Cloudflare dashboard, [add your domain](/fundamentals/get-started/setup/add-site/).
+In the Cloudflare dashboard, [add your domain](/fundamentals/setup/account-setup/add-site/).
 
 {{</tutorial-step>}}
 
diff --git a/content/dns/zone-setups/partial-setup/setup.md b/content/dns/zone-setups/partial-setup/setup.md
index 5594f20221..db1418d602 100644
--- a/content/dns/zone-setups/partial-setup/setup.md
+++ b/content/dns/zone-setups/partial-setup/setup.md
@@ -21,7 +21,7 @@ A partial setup is only available to customers on a Business or Enterprise plan.
 {{<tutorial>}}
 {{<tutorial-step title="Add your domain to Cloudflare">}}
 
-1.  Create a Cloudflare account and [add your domain](/fundamentals/get-started/setup/add-site/).
+1.  Create a Cloudflare account and [add your domain](/fundamentals/setup/account-setup/add-site/).
 
 2.  For your **Plan**, choose **Business** or **Enterprise**.
 
diff --git a/content/dns/zone-setups/reference/domain-status.md b/content/dns/zone-setups/reference/domain-status.md
index d2c54171f4..fa1f0a4645 100644
--- a/content/dns/zone-setups/reference/domain-status.md
+++ b/content/dns/zone-setups/reference/domain-status.md
@@ -5,7 +5,7 @@ title: Domain statuses
 
 # Domain statuses
 
-Once you [add a domain](/fundamentals/get-started/setup/add-site/) to Cloudflare on a full or partial setup, it moves through several statuses:
+Once you [add a domain](/fundamentals/setup/account-setup/add-site/) to Cloudflare on a full or partial setup, it moves through several statuses:
 
 - **Setup**: You initiated but did not finish the signup process.
 
@@ -19,13 +19,13 @@ Once you [add a domain](/fundamentals/get-started/setup/add-site/) to Cloudflare
   - **Limitations**:
 
     - Pending zones cannot be used to [proxy traffic to Cloudflare](/dns/manage-dns-records/reference/proxied-dns-records/#pending-domains).
-    - If your domain is on the Free plan, it will be deleted automatically if not activated within 28 days. Any pending zone with a paid plan (Pro, Business, Enterprise) will remain pending until the plan is removed or the domain is activated or [removed from Cloudflare](/fundamentals/get-started/basic-tasks/manage-domains/remove-domain/).
+    - If your domain is on the Free plan, it will be deleted automatically if not activated within 28 days. Any pending zone with a paid plan (Pro, Business, Enterprise) will remain pending until the plan is removed or the domain is activated or [removed from Cloudflare](/fundamentals/setup/manage-domains/remove-domain/).
 
 - **Active**: Cloudflare has authenticated your [nameserver changes](/dns/zone-setups/full-setup/setup/#update-your-nameservers) or [verification TXT record](/dns/zone-setups/partial-setup/setup/#verify-ownership-for-your-domain) and you can proxy domain traffic through Cloudflare.
 
 - **Moved**: Your domain has failed multiple DNS checks, indicating that your authoritative DNS no longer points to Cloudflare nameservers. The domain will be deleted automatically after 7 days, unless there is an active plan subscription.
 
-- **Deleted**: This domain has been archived. You can re-add the domain to Cloudflare by following the [regular onboarding flow](/fundamentals/get-started/setup/add-site/).
+- **Deleted**: This domain has been archived. You can re-add the domain to Cloudflare by following the [regular onboarding flow](/fundamentals/setup/account-setup/add-site/).
 
 If your domain's status changes, you will receive an email at the address associated with your account.
 
@@ -33,6 +33,6 @@ If your domain's status changes, you will receive an email at the address associ
 
 If domains remain in the **Pending Nameserver Update** or **Moved** status for too long, Cloudflare automatically [removes them](/dns/zone-setups/troubleshooting/domain-deleted/) from your account and the Cloudflare network.
 
-You can also [manually remove a domain](/fundamentals/get-started/basic-tasks/manage-domains/remove-domain/) from Cloudflare.
+You can also [manually remove a domain](/fundamentals/setup/manage-domains/remove-domain/) from Cloudflare.
 
-If you need to re-add a domain to your account, follow the [regular onboarding flow](/fundamentals/get-started/setup/add-site/).
+If you need to re-add a domain to your account, follow the [regular onboarding flow](/fundamentals/setup/account-setup/add-site/).
diff --git a/content/dns/zone-setups/subdomain-setup/move-to-new-account.md b/content/dns/zone-setups/subdomain-setup/move-to-new-account.md
index 55326edfb9..d218a34d74 100644
--- a/content/dns/zone-setups/subdomain-setup/move-to-new-account.md
+++ b/content/dns/zone-setups/subdomain-setup/move-to-new-account.md
@@ -12,6 +12,6 @@ When using a [subdomain setup](/dns/zone-setups/subdomain-setup/), you can have
 
 If you have already [created a standalone subdomain zone](/dns/zone-setups/subdomain-setup/setup/) within the same account, you still can move it to a separate account.
 
-1. [Add the subdomain](/fundamentals/get-started/setup/add-site/) to a new Cloudflare account.
+1. [Add the subdomain](/fundamentals/setup/account-setup/add-site/) to a new Cloudflare account.
 2. Import all DNS records. Cloudflare recommends [exporting](/dns/manage-dns-records/how-to/import-and-export/#export-records) records from the parent domain, deleting all unnecessary records, and then [importing](/dns/manage-dns-records/how-to/import-and-export/#import-records) the records into your new zone.
 3. Update the `NS` records in the parent zone to refer to the newly assigned nameservers of the child zone.
\ No newline at end of file
diff --git a/content/dns/zone-setups/subdomain-setup/setup.md b/content/dns/zone-setups/subdomain-setup/setup.md
index dd47d493a0..ab2625e334 100644
--- a/content/dns/zone-setups/subdomain-setup/setup.md
+++ b/content/dns/zone-setups/subdomain-setup/setup.md
@@ -46,7 +46,7 @@ If the parent domain is using a [full setup](/dns/zone-setups/full-setup/)[^1],
 
 If you have not yet created a DNS record covering your child domain in the parent domain:
 
-1. [Add the child domain](/fundamentals/get-started/setup/add-site/) to the parent domain's Cloudflare account or another account.
+1. [Add the child domain](/fundamentals/setup/account-setup/add-site/) to the parent domain's Cloudflare account or another account.
 2. [Get the nameserver names](/dns/zone-setups/full-setup/setup/#get-nameserver-names) for the child domain. These will not be the same nameservers as the parent domain.
 3. Within the **DNS** > **Records** of the parent zone, [add](/dns/manage-dns-records/how-to/create-dns-records/) two `NS` records in the parent zone for the subdomain you want to delegate.
 
@@ -65,7 +65,7 @@ If you have not yet created a DNS record covering your child domain in the paren
 
 If you have already created a DNS record covering your child domain in the parent domain:
 
-1. [Add the child domain](/fundamentals/get-started/setup/add-site/) to the parent domain's Cloudflare account or another account.
+1. [Add the child domain](/fundamentals/setup/account-setup/add-site/) to the parent domain's Cloudflare account or another account.
 2. In your child domain, [re-create all DNS records](/dns/manage-dns-records/how-to/create-dns-records/) that relate to your child domain. This includes all DNS records deeper than the delegated subdomain, meaning that if you are delegating `www.example.com`, you should also move over records for `api.www.example.com`.
 
     {{<Aside type="note">}}Cloudflare recommends [exporting](/dns/manage-dns-records/how-to/import-and-export/#export-records) records from the parent domain, deleting all unnecessary records, and then [importing](/dns/manage-dns-records/how-to/import-and-export/#import-records) the records into your new zone.
@@ -99,7 +99,7 @@ If the parent domain is using a [partial setup](/dns/zone-setups/partial-setup/)
 
 If you have not yet created a DNS record covering your child domain in the parent domain:
 
-1. [Add the child domain](/fundamentals/get-started/setup/add-site/) in the same or a new account.
+1. [Add the child domain](/fundamentals/setup/account-setup/add-site/) in the same or a new account.
 2. Convert the child zone to [a partial setup](/dns/zone-setups/partial-setup/setup/#add-your-domain-to-cloudflare).
 3. Create the various [DNS records](/dns/manage-dns-records/how-to/create-dns-records/) needed for your child domain.
 4. [Add the TXT verification record](/dns/zone-setups/partial-setup/setup/#verify-ownership-for-your-domain) at your authoritative DNS provider.
@@ -110,7 +110,7 @@ If you have not yet created a DNS record covering your child domain in the paren
 
 If you have already created a DNS record covering your child domain in the parent domain:
 
-1. [Add the child domain](/fundamentals/get-started/setup/add-site/) in the same or a new account.
+1. [Add the child domain](/fundamentals/setup/account-setup/add-site/) in the same or a new account.
 2. Convert the child zone to [a partial setup](/dns/zone-setups/partial-setup/setup/#add-your-domain-to-cloudflare).
 3. In your child domain, [re-create all DNS records](/dns/manage-dns-records/how-to/create-dns-records/) that relate to your child domain. This includes all DNS records deeper than the delegated subdomain, meaning that if you are delegating `www.example.com`, you should also move over records for `api.www.example.com`.
 
diff --git a/content/dns/zone-setups/troubleshooting/cannot-add-domain.md b/content/dns/zone-setups/troubleshooting/cannot-add-domain.md
index c7937500dd..fc74c87c5f 100644
--- a/content/dns/zone-setups/troubleshooting/cannot-add-domain.md
+++ b/content/dns/zone-setups/troubleshooting/cannot-add-domain.md
@@ -8,7 +8,7 @@ meta:
 
 # Cannot add domain
 
-If you encounter issues [adding a domain](/fundamentals/get-started/setup/add-site/) to Cloudflare, follow these troubleshooting steps.
+If you encounter issues [adding a domain](/fundamentals/setup/account-setup/add-site/) to Cloudflare, follow these troubleshooting steps.
 
 ## Step 1 - Disable DNSSEC
 
diff --git a/content/dns/zone-setups/zone-transfers/cloudflare-as-primary/setup.md b/content/dns/zone-setups/zone-transfers/cloudflare-as-primary/setup.md
index 0cc2f60caa..29de16472a 100644
--- a/content/dns/zone-setups/zone-transfers/cloudflare-as-primary/setup.md
+++ b/content/dns/zone-setups/zone-transfers/cloudflare-as-primary/setup.md
@@ -36,7 +36,7 @@ Make sure your account team has enabled your zone for outgoing zone transfers.
 
 Also, review your [existing DNS records](/dns/manage-dns-records/how-to/create-dns-records/) to make sure all of them have a **Proxy status** of **Unproxied**.
 
-If using the API, you may also want to [locate your Zone and Account IDs](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/).
+If using the API, you may also want to [locate your Zone and Account IDs](/fundamentals/setup/find-account-and-zone-ids/).
 
 ---
 
diff --git a/content/dns/zone-setups/zone-transfers/cloudflare-as-secondary/setup.md b/content/dns/zone-setups/zone-transfers/cloudflare-as-secondary/setup.md
index 29275de038..26b685ee34 100644
--- a/content/dns/zone-setups/zone-transfers/cloudflare-as-secondary/setup.md
+++ b/content/dns/zone-setups/zone-transfers/cloudflare-as-secondary/setup.md
@@ -38,8 +38,8 @@ You will also need the following information from your Primary DNS provider:
 Make sure your account team has enabled your zone for Secondary DNS.
 
 Get the following values from your Cloudflare account:
-- [Account ID](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/)
-- [Zone ID](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/)
+- [Account ID](/fundamentals/setup/find-account-and-zone-ids/)
+- [Zone ID](/fundamentals/setup/find-account-and-zone-ids/)
 - [Nameserver names](/dns/zone-setups/full-setup/setup/#get-nameserver-names), which should have **secondary** in the name.
 
 ---
diff --git a/content/firewall/api/_index.md b/content/firewall/api/_index.md
index 7ee6b9cb96..d477779459 100644
--- a/content/firewall/api/_index.md
+++ b/content/firewall/api/_index.md
@@ -17,4 +17,4 @@ These APIs are the following:
 
 * [**Firewall Rules API**](/firewall/api/cf-firewall-rules/): Manage firewall rules and their actions, based on criteria separately defined through filters.
 * [**Filters API**](/firewall/api/cf-filters/): Manage the filters that enable rule matching.
-* [**Lists API**](/fundamentals/global-configurations/lists/lists-api/): Manage named lists of items (such as IP addresses) that you can use in the rules of different Cloudflare products.
+* [**Lists API**](/waf/tools/lists/lists-api/): Manage named lists of items (such as IP addresses) that you can use in the rules of different Cloudflare products.
diff --git a/content/firewall/api/cf-filters/_index.md b/content/firewall/api/cf-filters/_index.md
index 2326541ac6..fd6e3fcab2 100644
--- a/content/firewall/api/cf-filters/_index.md
+++ b/content/firewall/api/cf-filters/_index.md
@@ -19,7 +19,7 @@ For example, a filter matching:
 
 Associate a filter with a firewall rule to define the scope of that rule.
 
-Use IP Lists within a filter to refer collectively to a group of IP addresses. Refer to the [Lists API](/fundamentals/global-configurations/lists/lists-api/) for more information.
+Use IP Lists within a filter to refer collectively to a group of IP addresses. Refer to the [Lists API](/waf/tools/lists/lists-api/) for more information.
 
 Before getting started with the Cloudflare Filters API, familiarize yourself with rule [expressions](/ruleset-engine/rules-language/expressions/). For a complete reference, refer to [Rules language](/ruleset-engine/rules-language/).
 
diff --git a/content/firewall/cf-dashboard/rule-preview.md b/content/firewall/cf-dashboard/rule-preview.md
index 2b40cf7baf..29f33353e3 100644
--- a/content/firewall/cf-dashboard/rule-preview.md
+++ b/content/firewall/cf-dashboard/rule-preview.md
@@ -41,7 +41,7 @@ In this screenshot, a rule that matches all User-Agents that contain the string
 
 **Rule Preview does not take into account other firewall rules** that you have already configured. In effect, Rule Preview tests a single firewall rule in isolation. Security events or any other rules with a higher priority that may have blocked or challenged a request are ignored.
 
-**You cannot test firewall rules that reference [IP Lists](/fundamentals/global-configurations/lists/ip-lists/)**.
+**You cannot test firewall rules that reference [IP Lists](/waf/tools/lists/ip-lists/)**.
 
 **Cloudflare does not store the entirety of requests, so only a limited number of fields are available to Rule Preview**. The table below lists the fields that Rule Preview supports (green cells), broken down by operator. Fields and operators that are not supported are not included in this table.
 
diff --git a/content/firewall/cf-firewall-rules/_index.md b/content/firewall/cf-firewall-rules/_index.md
index 4410740bab..d8b07f5cbf 100644
--- a/content/firewall/cf-firewall-rules/_index.md
+++ b/content/firewall/cf-firewall-rules/_index.md
@@ -13,6 +13,6 @@ Cloudflare Firewall Rules is a flexible and intuitive framework for filtering HT
 
 {{<render file="_deprecation-notice.md">}}
 
-In a firewall rule you define an [expression](/ruleset-engine/rules-language/expressions/) that tells Cloudflare what to look for in a request, and specify the appropriate [action](/firewall/cf-firewall-rules/actions/) to take when those conditions are met. Expressions can reference [IP Lists](/fundamentals/global-configurations/lists/ip-lists/) - groups of IP addresses that you can reference collectively by name.
+In a firewall rule you define an [expression](/ruleset-engine/rules-language/expressions/) that tells Cloudflare what to look for in a request, and specify the appropriate [action](/firewall/cf-firewall-rules/actions/) to take when those conditions are met. Expressions can reference [IP Lists](/waf/tools/lists/ip-lists/) - groups of IP addresses that you can reference collectively by name.
 
 To write firewall rule expressions, use the [Rules language](/ruleset-engine/rules-language/), a powerful expression language inspired in the Wireshark Display Filter language.
diff --git a/content/firewall/cf-firewall-rules/actions.md b/content/firewall/cf-firewall-rules/actions.md
index 9dc634fadc..ec113e33e0 100644
--- a/content/firewall/cf-firewall-rules/actions.md
+++ b/content/firewall/cf-firewall-rules/actions.md
@@ -72,9 +72,9 @@ For reference information on rule actions available for Cloudflare products powe
               <p>Matching requests exempt from evaluation by a user-defined list containing one or more of the following Cloudflare security features:</p>
               <ul>
                 <li><a href="/waf/tools/user-agent-blocking/">User Agent Blocking</a></li>
-                <li><a href="/fundamentals/security/browser-integrity-check/">Browser Integrity Check</a></li>
+                <li><a href="/waf/tools/browser-integrity-check/">Browser Integrity Check</a></li>
                 <li><a href="/support/more-dashboard-apps/cloudflare-scrape-shield/understanding-cloudflare-hotlink-protection/">Hotlink Protection</a></li>
-                <li><a href="/fundamentals/security/security-level/">Security Level (IP Reputation)</a></li>
+                <li><a href="/waf/tools/security-level/">Security Level (IP Reputation)</a></li>
                 <li><a href="/waf/reference/legacy/old-rate-limiting/">Rate Limiting</a> (previous version, deprecated)</li>
                 <li><a href="/waf/tools/zone-lockdown/">Zone Lockdown</a></li>
                 <li><a href="/waf/reference/legacy/old-waf-managed-rules/">WAF managed rules</a> (previous version, deprecated)</li>
diff --git a/content/firewall/cf-firewall-rules/cloudflare-challenges.md b/content/firewall/cf-firewall-rules/cloudflare-challenges.md
index efafb71e17..cd79ab55c6 100644
--- a/content/firewall/cf-firewall-rules/cloudflare-challenges.md
+++ b/content/firewall/cf-firewall-rules/cloudflare-challenges.md
@@ -2,8 +2,6 @@
 pcx_content_type: concept
 title: Challenges
 weight: 4
-aliases:
-- /fundamentals/get-started/concepts/cloudflare-challenges/
 ---
 
 # Cloudflare challenges
diff --git a/content/firewall/troubleshooting/required-changes-to-enable-url-normalization.md b/content/firewall/troubleshooting/required-changes-to-enable-url-normalization.md
index 99488dc4f7..a123d8d113 100644
--- a/content/firewall/troubleshooting/required-changes-to-enable-url-normalization.md
+++ b/content/firewall/troubleshooting/required-changes-to-enable-url-normalization.md
@@ -55,7 +55,7 @@ Before enabling URL normalization, you should review the affected firewall rules
 
 Once you have updated the affected firewall rules, enable URL normalization in **Rules** > **Settings**.
 
-A Cloudflare user must have the [Firewall role](/fundamentals/account-and-billing/members/roles/) or one of the Administrator roles to access URL normalization settings in the dashboard.
+A Cloudflare user must have the [Firewall role](/fundamentals/setup/manage-members/roles/) or one of the Administrator roles to access URL normalization settings in the dashboard.
 
 ___
 
diff --git a/content/fundamentals/_index.md b/content/fundamentals/_index.md
index 769e4b1fd3..7c927cb8b2 100644
--- a/content/fundamentals/_index.md
+++ b/content/fundamentals/_index.md
@@ -2,10 +2,6 @@
 title: Overview
 pcx_content_type: overview
 weight: 1
-aliases:
-- /fundamentals/
-- /fundamentals/get-started/
-- /fundamentals/get-started/basic-tasks/access-cloudflare-resources/
 ---
 
 # Cloudflare Fundamentals
diff --git a/content/fundamentals/_partials/_account-member-manage-limitation.md b/content/fundamentals/_partials/_account-member-manage-limitation.md
index a400787f3e..485a8f6f15 100644
--- a/content/fundamentals/_partials/_account-member-manage-limitation.md
+++ b/content/fundamentals/_partials/_account-member-manage-limitation.md
@@ -5,4 +5,4 @@ _build:
   list: never
 ---
 
-To manage account members, you must have a role of **Super Administrator** and have a [verified email address](/fundamentals/account-and-billing/account-setup/verify-email-address/).
\ No newline at end of file
+To manage account members, you must have a role of **Super Administrator** and have a [verified email address](/fundamentals/setup/account-setup/verify-email-address/).
\ No newline at end of file
diff --git a/content/fundamentals/_partials/_non-contract-enablement.md b/content/fundamentals/_partials/_non-contract-enablement.md
index caed6222d2..9441591786 100644
--- a/content/fundamentals/_partials/_non-contract-enablement.md
+++ b/content/fundamentals/_partials/_non-contract-enablement.md
@@ -7,6 +7,6 @@ _build:
 
 {{<Aside type="note">}}
 
-Enterprise customers can preview this product as a [non-contract service](/fundamentals/account-and-billing/non-contract-products/), which provide full access, free of metered usage fees, limits, and certain other restrictions.
+Enterprise customers can preview this product as a [non-contract service](/fundamentals/account-and-billing/preview-services/), which provide full access, free of metered usage fees, limits, and certain other restrictions.
 
 {{</Aside>}}
diff --git a/content/fundamentals/_partials/_origin-health-overview.md b/content/fundamentals/_partials/_origin-health-overview.md
index 62bc3edb80..a46dce80b0 100644
--- a/content/fundamentals/_partials/_origin-health-overview.md
+++ b/content/fundamentals/_partials/_origin-health-overview.md
@@ -12,8 +12,8 @@ Receiving too many requests can be bad for your origin. These requests might inc
 Select a plan to see how Cloudflare can help you protect your origin:
 
 {{<button-group>}}
-  {{<button type="primary" href="/fundamentals/get-started/task-guides/origin-health/free/">}}Free{{</button>}}
-  {{<button type="primary" href="/fundamentals/get-started/task-guides/origin-health/pro/">}}Pro{{</button>}}
-  {{<button type="primary" href="/fundamentals/get-started/task-guides/origin-health/business/">}}Business{{</button>}}
-  {{<button type="primary" href="/fundamentals/get-started/task-guides/origin-health/enterprise/">}}Enterprise{{</button>}}
+  {{<button type="primary" href="/fundamentals/basic-tasks/protect-your-origin-server/">}}Free{{</button>}}
+  {{<button type="primary" href="/fundamentals/basic-tasks/protect-your-origin-server/">}}Pro{{</button>}}
+  {{<button type="primary" href="/fundamentals/basic-tasks/protect-your-origin-server/">}}Business{{</button>}}
+  {{<button type="primary" href="/fundamentals/basic-tasks/protect-your-origin-server/">}}Enterprise{{</button>}}
 {{</button-group>}}
diff --git a/content/fundamentals/_partials/_origin-secure-dns.md b/content/fundamentals/_partials/_origin-secure-dns.md
index 0de8206d0f..cd8013cef3 100644
--- a/content/fundamentals/_partials/_origin-secure-dns.md
+++ b/content/fundamentals/_partials/_origin-secure-dns.md
@@ -9,7 +9,7 @@ When you secure origin connections, it prevents attackers from discovering and o
 
 - **DNS**: 
 
-    1. **Proxy records** (when possible): Set up [proxied (orange-clouded) DNS records](/dns/manage-dns-records/reference/proxied-dns-records/) to hide your origin IP addresses and provide DDoS protection. As part of this, you should [allow Cloudflare IP addresses](/fundamentals/get-started/setup/allow-cloudflare-ip-addresses/) at your origin to prevent requests from being blocked.
+    1. **Proxy records** (when possible): Set up [proxied (orange-clouded) DNS records](/dns/manage-dns-records/reference/proxied-dns-records/) to hide your origin IP addresses and provide DDoS protection. As part of this, you should [allow Cloudflare IP addresses](/fundamentals/setup/allow-cloudflare-ip-addresses/) at your origin to prevent requests from being blocked.
     2. **Review DNS-only records**: Audit existing **DNS-only** records (`SPF`, `TXT`, and more) to make sure they do not contain origin IP information.
     3. **Evaluate mail infrastructure**: If possible, do not host a mail service on the same server as the web resource you want to protect, since emails sent to non-existent addresses get bounced back to the attacker and reveal the mail server IP.
     4. **Rotate origin IPs**: Once [onboarded](/dns/zone-setups/full-setup/setup/#verify-changes), rotate your origin IPs, as DNS records are in the public domain. Historical records are kept and would contain IP addresses prior to joining Cloudflare.
\ No newline at end of file
diff --git a/content/fundamentals/_partials/_user-permissions-table.md b/content/fundamentals/_partials/_user-permissions-table.md
index f65594d6ee..8183901e9e 100644
--- a/content/fundamentals/_partials/_user-permissions-table.md
+++ b/content/fundamentals/_partials/_user-permissions-table.md
@@ -10,7 +10,7 @@ inputParameters: editWord
 | --- | --- |
 | API Tokens Read | Grants read access to user's [API tokens](/fundamentals/api/reference/permissions/). | 
 | API Tokens $1 | Grants write access to user's [API tokens](/fundamentals/api/reference/permissions/). |
-| Memberships Read | Grants read access to a user's [account memberships](/fundamentals/account-and-billing/members/manage/). |
-| Memberships $1  | Grants write access to a user's [account memberships](/fundamentals/account-and-billing/members/manage/). |
+| Memberships Read | Grants read access to a user's [account memberships](/fundamentals/setup/manage-members/manage/). |
+| Memberships $1  | Grants write access to a user's [account memberships](/fundamentals/setup/manage-members/manage/). |
 | User Details Read | Grants read access to user details. |
 | User Details $1 | Grants write access to user details. |
\ No newline at end of file
diff --git a/content/fundamentals/account-and-billing/account-billing/_index.md b/content/fundamentals/account-and-billing/account-billing/_index.md
index 44e4d2ed51..f55c48137d 100644
--- a/content/fundamentals/account-and-billing/account-billing/_index.md
+++ b/content/fundamentals/account-and-billing/account-billing/_index.md
@@ -2,8 +2,6 @@
 title: Subscriptions and billing
 pcx_content_type: navigation
 weight: 2
-aliases:
-- /fundamentals/account-and-billing/account-maintenance/
 ---
 
 # Account maintenance
diff --git a/content/fundamentals/account-and-billing/account-billing/cancel-subscription.md b/content/fundamentals/account-and-billing/account-billing/cancel-subscription.md
index 2d438c2643..d0ff0fdf9e 100644
--- a/content/fundamentals/account-and-billing/account-billing/cancel-subscription.md
+++ b/content/fundamentals/account-and-billing/account-billing/cancel-subscription.md
@@ -2,8 +2,6 @@
 pcx_content_type: how-to
 title: Cancel Cloudflare subscriptions
 weight: 2
-aliases:
-- /fundamentals/account-and-billing/account-maintenance/cancel-subscription/
 ---
 
 # Cancel Cloudflare subscriptions
diff --git a/content/fundamentals/account-and-billing/account-billing/change-password-or-email.md b/content/fundamentals/account-and-billing/account-billing/change-password-or-email.md
index 72389d4e5e..0a55652e30 100644
--- a/content/fundamentals/account-and-billing/account-billing/change-password-or-email.md
+++ b/content/fundamentals/account-and-billing/account-billing/change-password-or-email.md
@@ -4,8 +4,6 @@ title: Change password or email
 weight: 1
 meta:
     description: Learn how to change your Cloudflare password or email.
-aliases:
-- /fundamentals/account-and-billing/account-maintenance/change-password-or-email/
 ---
 
 # Change password or email
diff --git a/content/fundamentals/account-and-billing/account-billing/change-plan.md b/content/fundamentals/account-and-billing/account-billing/change-plan.md
index b2818836c0..11b28959ba 100644
--- a/content/fundamentals/account-and-billing/account-billing/change-plan.md
+++ b/content/fundamentals/account-and-billing/account-billing/change-plan.md
@@ -2,8 +2,6 @@
 pcx_content_type: how-to
 title: Change domain plan
 weight: 2
-aliases:
-- /fundamentals/account-and-billing/account-maintenance/change-plan/
 ---
 
 # Change domain plan
@@ -18,7 +16,7 @@ If you decide to downgrade or remove a domain, Cloudflare does not issue refunds
 
 Upgrades are processed immediately, but downgrades are not processed until the end of the billing period. When downgrading, you are allowed to continue using the higher plans' products until the new billing period begins.
 
-If you downgrade your plan, your plan may have access to [fewer Page Rules](/support/page-rules/understanding-and-configuring-cloudflare-page-rules-page-rules-tutorial/). If you continue to use more page rules than is allowed by your plan limit, you may be charged for additional rules. Remove excess rules and [cancel additional subscriptions](/fundamentals/account-and-billing/account-maintenance/cancel-subscription/) if you do not want to be charged.
+If you downgrade your plan, your plan may have access to [fewer Page Rules](/support/page-rules/understanding-and-configuring-cloudflare-page-rules-page-rules-tutorial/). If you continue to use more page rules than is allowed by your plan limit, you may be charged for additional rules. Remove excess rules and [cancel additional subscriptions](/fundamentals/account-and-billing/account-billing/cancel-subscription/) if you do not want to be charged.
 
 The Enterprise App Sec Advanced and Enterprise App Sec Core plans cannot be downgraded without [contacting Cloudflare](/support/troubleshooting/general-troubleshooting/contacting-cloudflare-support/).
 
diff --git a/content/fundamentals/account-and-billing/account-billing/change-super-admin.md b/content/fundamentals/account-and-billing/account-billing/change-super-admin.md
index 491af0da0c..6a6bcf3200 100644
--- a/content/fundamentals/account-and-billing/account-billing/change-super-admin.md
+++ b/content/fundamentals/account-and-billing/account-billing/change-super-admin.md
@@ -2,14 +2,12 @@
 pcx_content_type: how-to
 title: Change Super Administrator
 weight: 4
-aliases:
-- /fundamentals/account-and-billing/account-maintenance/change-super-admin/
 ---
 
 # Change Super Administrator
 
 If you or someone in your organization leaves or loses access to email, you can add another Super Administrator.
 
-First, [add a member](/fundamentals/account-and-billing/members/manage/) to your account and assign the **Super Administrator** role.
+First, [add a member](/fundamentals/setup/manage-members/manage/) to your account and assign the **Super Administrator** role.
 
 Then, if needed, remove the previous Super Administrator.
diff --git a/content/fundamentals/account-and-billing/account-billing/delete-account.md b/content/fundamentals/account-and-billing/account-billing/delete-account.md
index e2cf9597d3..5647da593a 100644
--- a/content/fundamentals/account-and-billing/account-billing/delete-account.md
+++ b/content/fundamentals/account-and-billing/account-billing/delete-account.md
@@ -2,8 +2,6 @@
 pcx_content_type: how-to
 title: Delete your Cloudflare account
 weight: 2
-aliases:
-- /fundamentals/account-and-billing/account-maintenance/delete-account/
 ---
 
 # Delete your Cloudflare account
@@ -22,9 +20,9 @@ If your account does not use SSO, you can delete your account on your own.
 
 Before Cloudflare can cancel your account and delete your personal information, you will need to follow the process below for each domain associated with your Cloudflare account:
 
-* [Cancel your subscriptions or add-on services](/fundamentals/account-and-billing/account-maintenance/cancel-subscription/)
+* [Cancel your subscriptions or add-on services](/fundamentals/account-and-billing/account-billing/cancel-subscription/)
 
-* [Remove your domain from Cloudflare](/fundamentals/get-started/basic-tasks/manage-domains/remove-domain/)
+* [Remove your domain from Cloudflare](/fundamentals/setup/manage-domains/remove-domain/)
 
 * [Remove Cloudflare nameservers at your domain registrar](/dns/zone-setups/full-setup/setup/)
 
diff --git a/content/fundamentals/account-and-billing/account-billing/understand-invoices.md b/content/fundamentals/account-and-billing/account-billing/understand-invoices.md
index 15e566522a..c3aafe04c0 100644
--- a/content/fundamentals/account-and-billing/account-billing/understand-invoices.md
+++ b/content/fundamentals/account-and-billing/account-billing/understand-invoices.md
@@ -2,8 +2,6 @@
 pcx_content_type: how-to
 title: Understand Cloudflare invoices
 weight: 3
-aliases:
-- /fundamentals/account-and-billing/account-maintenance/understand-invoices/
 ---
 
 # Understand Cloudflare invoices
@@ -85,7 +83,7 @@ Billing periods are 30 days. Payments for all recurring monthly costs are proces
 
 ### Cloudflare invoice without company name
 
-To add your business or company name, VAT ID, or Tax ID/EIN on an invoice, add the company name when [updating billing information](/fundamentals/account-and-billing/account-maintenance/updating-billing-info/).
+To add your business or company name, VAT ID, or Tax ID/EIN on an invoice, add the company name when [updating billing information](/fundamentals/account-and-billing/account-billing/updating-billing-info/).
 
 ### Inconsistent invoice and payment amounts
 
diff --git a/content/fundamentals/account-and-billing/account-billing/updating-billing-info.md b/content/fundamentals/account-and-billing/account-billing/updating-billing-info.md
index b30aa9872e..d6043d27a5 100644
--- a/content/fundamentals/account-and-billing/account-billing/updating-billing-info.md
+++ b/content/fundamentals/account-and-billing/account-billing/updating-billing-info.md
@@ -2,8 +2,6 @@
 pcx_content_type: how-to
 title: Update billing information
 weight: 2
-aliases:
-- /fundamentals/account-and-billing/account-maintenance//updating-billing-info/
 ---
 
 # Update billing information
diff --git a/content/fundamentals/account-and-billing/account-security/2fa.md b/content/fundamentals/account-and-billing/account-security/2fa.md
index b297774433..f070468ec3 100644
--- a/content/fundamentals/account-and-billing/account-security/2fa.md
+++ b/content/fundamentals/account-and-billing/account-security/2fa.md
@@ -2,8 +2,6 @@
 pcx_content_type: navigation
 title: Set up 2FA
 external_link: /support/account-management-billing/account-privacy-and-security/securing-user-access-with-two-factor-authentication-2fa/
-aliases:
-- /fundamentals/account-and-billing/account-security/2fa/
 weight: 1
 _build:
   publishResources: false
diff --git a/content/fundamentals/account-and-billing/account-security/_index.md b/content/fundamentals/account-and-billing/account-security/_index.md
index 4e4bd0ecd1..846d35b246 100644
--- a/content/fundamentals/account-and-billing/account-security/_index.md
+++ b/content/fundamentals/account-and-billing/account-security/_index.md
@@ -2,8 +2,6 @@
 pcx_content_type: navigation
 title: Account security
 weight: 1
-aliases:
-- /fundamentals/account-and-billing/account-security/
 ---
 
 # Account security
diff --git a/content/fundamentals/account-and-billing/account-security/cloudflare-access.md b/content/fundamentals/account-and-billing/account-security/cloudflare-access.md
index 175b45102a..2a33fae3e1 100644
--- a/content/fundamentals/account-and-billing/account-security/cloudflare-access.md
+++ b/content/fundamentals/account-and-billing/account-security/cloudflare-access.md
@@ -4,8 +4,6 @@ title: Allow Cloudflare access
 weight: 4
 meta:
     title: Provide edit access to Cloudflare Support
-aliases:
-- /fundamentals/account-and-billing/account-security/cloudflare-access/
 ---
 
 # Provide edit access to Cloudflare Support
diff --git a/content/fundamentals/account-and-billing/account-security/manage-active-sessions.md b/content/fundamentals/account-and-billing/account-security/manage-active-sessions.md
index b725b4283e..bc4e441467 100644
--- a/content/fundamentals/account-and-billing/account-security/manage-active-sessions.md
+++ b/content/fundamentals/account-and-billing/account-security/manage-active-sessions.md
@@ -2,8 +2,6 @@
 title: Manage active sessions
 pcx_content_type: how-to
 weight: 4
-aliases:
-- /fundamentals/account-and-billing/account-security/manage-active-sessions/
 ---
 
 # Manage active sessions
diff --git a/content/fundamentals/account-and-billing/account-security/review-audit-logs.md b/content/fundamentals/account-and-billing/account-security/review-audit-logs.md
index 1f417dfbb7..5295fca183 100644
--- a/content/fundamentals/account-and-billing/account-security/review-audit-logs.md
+++ b/content/fundamentals/account-and-billing/account-security/review-audit-logs.md
@@ -2,8 +2,6 @@
 title: Review audit logs
 pcx_content_type: how-to
 weight: 3
-aliases:
-- /fundamentals/account-and-billing/account-security/review-audit-logs/
 ---
 
 # Review audit logs
diff --git a/content/fundamentals/account-and-billing/account-security/securing-a-compromised-account.md b/content/fundamentals/account-and-billing/account-security/securing-a-compromised-account.md
index a47b013f9e..b91759856f 100644
--- a/content/fundamentals/account-and-billing/account-security/securing-a-compromised-account.md
+++ b/content/fundamentals/account-and-billing/account-security/securing-a-compromised-account.md
@@ -2,8 +2,6 @@
 title: Secure compromised account
 pcx_content_type: tutorial
 weight: 5
-aliases:
-- /fundamentals/account-and-billing/account-security/securing-a-compromised-account/
 ---
 
 # Secure compromised account
diff --git a/content/fundamentals/account-and-billing/account-security/zone-holds.md b/content/fundamentals/account-and-billing/account-security/zone-holds.md
index 669d73db43..23612cb4e6 100644
--- a/content/fundamentals/account-and-billing/account-security/zone-holds.md
+++ b/content/fundamentals/account-and-billing/account-security/zone-holds.md
@@ -2,8 +2,6 @@
 title: Zone holds
 pcx_content_type: how-to
 weight: 6
-aliases:
-- /fundamentals/account-and-billing/account-security/zone-holds/
 ---
 
 # Zone holds
@@ -18,7 +16,7 @@ For example, you might already have an active Cloudflare zone for `example.com`.
 
 ## Enable zone holds
 
-When you enable a zone hold, no one else can [add your zone](/fundamentals/get-started/setup/add-site/) to their Cloudflare account. If they attempt to, they will receive the following message:
+When you enable a zone hold, no one else can [add your zone](/fundamentals/setup/account-setup/add-site/) to their Cloudflare account. If they attempt to, they will receive the following message:
 
 _The zone name provided is subject to a hold which disallows the creation of this zone. Please contact the domain owner to have this hold removed._
 
diff --git a/content/fundamentals/account-and-billing/billing-policy.md b/content/fundamentals/account-and-billing/billing-policy.md
index d4d7a273c8..510bb0a5bf 100644
--- a/content/fundamentals/account-and-billing/billing-policy.md
+++ b/content/fundamentals/account-and-billing/billing-policy.md
@@ -2,8 +2,6 @@
 pcx_content_type: navigation
 title: Billing Policy
 external_link: /support/account-management-billing/billing-cloudflare-plans/cloudflare-billing-policy/
-aliases:
-- /fundamentals/account-and-billing/billing-policy/
 _build:
   publishResources: false
   render: never
diff --git a/content/fundamentals/account-and-billing/preview-services.md b/content/fundamentals/account-and-billing/preview-services.md
index 110077a76d..d46f1c4717 100644
--- a/content/fundamentals/account-and-billing/preview-services.md
+++ b/content/fundamentals/account-and-billing/preview-services.md
@@ -3,8 +3,6 @@ pcx_content_type: reference
 title: Preview services
 weight: 4
 layout: list
-aliases:
-- /fundamentals/account-and-billing/non-contract-products/
 ---
 
 # Preview services
diff --git a/content/fundamentals/api/building-custom-dashboards/index.md b/content/fundamentals/api/building-custom-dashboards/index.md
index 077e8afc4c..a365187b3e 100644
--- a/content/fundamentals/api/building-custom-dashboards/index.md
+++ b/content/fundamentals/api/building-custom-dashboards/index.md
@@ -2,8 +2,6 @@
 pcx_content_type: how-to
 title: Building custom views
 weight: 11
-aliases:
-- /fundamentals/customizations/building-custom-dashboards/
 ---
 
 # Building custom views
diff --git a/content/fundamentals/api/get-started/create-token.md b/content/fundamentals/api/get-started/create-token.md
index 77dc70647c..271c276848 100644
--- a/content/fundamentals/api/get-started/create-token.md
+++ b/content/fundamentals/api/get-started/create-token.md
@@ -10,7 +10,7 @@ meta:
 
 {{<Aside type="note" header="Prerequisite">}}
  
-Before you begin, [find your zone and account IDs](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/).
+Before you begin, [find your zone and account IDs](/fundamentals/setup/find-account-and-zone-ids/).
  
 {{</Aside>}}
 
diff --git a/content/fundamentals/api/get-started/keys.md b/content/fundamentals/api/get-started/keys.md
index e222b1163b..b5c165db7f 100644
--- a/content/fundamentals/api/get-started/keys.md
+++ b/content/fundamentals/api/get-started/keys.md
@@ -10,7 +10,7 @@ Global API key is the previous authorization scheme for interacting with the Clo
 
 {{<Aside type="note">}}
 
-Global API key is only available after the [account email address is verified](/fundamentals/account-and-billing/account-setup/verify-email-address/).
+Global API key is only available after the [account email address is verified](/fundamentals/setup/account-setup/verify-email-address/).
 
 {{</Aside>}}
 
diff --git a/content/fundamentals/basic-tasks/_index.md b/content/fundamentals/basic-tasks/_index.md
index 7cff633a1a..6a5e3e625a 100644
--- a/content/fundamentals/basic-tasks/_index.md
+++ b/content/fundamentals/basic-tasks/_index.md
@@ -2,8 +2,6 @@
 pcx_content_type: navigation
 title: Basic tasks
 weight: 5
-aliases:
-- /fundamentals/get-started/basic-tasks/
 ---
 
 # Basic tasks
diff --git a/content/fundamentals/basic-tasks/improve-seo.md b/content/fundamentals/basic-tasks/improve-seo.md
index 88eb20d768..fcef185c26 100644
--- a/content/fundamentals/basic-tasks/improve-seo.md
+++ b/content/fundamentals/basic-tasks/improve-seo.md
@@ -1,8 +1,6 @@
 ---
 pcx_content_type: reference
 title: Improve SEO
-aliases:
-- /fundamentals/get-started/task-guides/improve-seo/
 ---
 
 # Improve SEO
diff --git a/content/fundamentals/basic-tasks/interact-with-cloudflare.md b/content/fundamentals/basic-tasks/interact-with-cloudflare.md
index 82339de9e1..3f500492e4 100644
--- a/content/fundamentals/basic-tasks/interact-with-cloudflare.md
+++ b/content/fundamentals/basic-tasks/interact-with-cloudflare.md
@@ -1,13 +1,11 @@
 ---
 pcx_content_type: concept
 title: Interacting with Cloudflare
-aliases:
-- /fundamentals/get-started/basic-tasks/interact-with-cloudflare/
 ---
 
 # How to interact with Cloudflare
 
-Once you [set up an account](/fundamentals/account-and-billing/account-setup/), you have several ways to interact with Cloudflare.
+Once you [set up an account](/fundamentals/setup/account-setup/), you have several ways to interact with Cloudflare.
 
 ## Without code
 
diff --git a/content/fundamentals/basic-tasks/login.md b/content/fundamentals/basic-tasks/login.md
index aac1d3988c..55314a3136 100644
--- a/content/fundamentals/basic-tasks/login.md
+++ b/content/fundamentals/basic-tasks/login.md
@@ -2,8 +2,6 @@
 pcx_content_type: how-to
 title: Log into Cloudflare
 weight: 3
-aliases:
-- /fundamentals/account-and-billing/login/
 ---
 
 # Log into Cloudflare
@@ -20,7 +18,7 @@ Cloudflare offers the following sign-in options:
 - **Single sign on (SS0)**: Enter your email address (available if your admin has [enabled SSO](/cloudflare-one/applications/configure-apps/dash-sso-apps/)).
 - **Sign in with Apple**: 
     - *Same Cloudflare account email as Apple ID*: You can either sign in with your email and password or sign in with Apple.
-    - *Different Cloudflare account email as Apple ID*: Will create a new Cloudflare account if you sign in with Apple. If you want to log into an existing account, [change your email address](/fundamentals/account-and-billing/account-maintenance/change-password-or-email/) to match the one used for your Apple ID.
+    - *Different Cloudflare account email as Apple ID*: Will create a new Cloudflare account if you sign in with Apple. If you want to log into an existing account, [change your email address](/fundamentals/account-and-billing/account-billing/change-password-or-email/) to match the one used for your Apple ID.
 
 {{<Aside type="note">}}
 
diff --git a/content/fundamentals/basic-tasks/maintenance-mode.md b/content/fundamentals/basic-tasks/maintenance-mode.md
index 4acb6c166a..14be39f33f 100644
--- a/content/fundamentals/basic-tasks/maintenance-mode.md
+++ b/content/fundamentals/basic-tasks/maintenance-mode.md
@@ -1,8 +1,6 @@
 ---
 title: Maintenance mode
 pcx_content_type: how-to
-aliases:
-- /fundamentals/get-started/basic-tasks/maintenance-mode/
 ---
 
 # Maintenance mode
diff --git a/content/fundamentals/basic-tasks/manage-subdomains.md b/content/fundamentals/basic-tasks/manage-subdomains.md
index 3571202dca..4d0d8b149b 100644
--- a/content/fundamentals/basic-tasks/manage-subdomains.md
+++ b/content/fundamentals/basic-tasks/manage-subdomains.md
@@ -1,13 +1,11 @@
 ---
 pcx_content_type: reference
 title: Manage subdomains
-aliases:
-- /fundamentals/get-started/basic-tasks/manage-subdomains/
 ---
 
 # Manage subdomains
 
-Once you have [added your domain to Cloudflare](/fundamentals/get-started/setup/add-site/) and [updated your nameservers](/dns/zone-setups/full-setup/), you also might want to set up a subdomain.
+Once you have [added your domain to Cloudflare](/fundamentals/setup/account-setup/add-site/) and [updated your nameservers](/dns/zone-setups/full-setup/), you also might want to set up a subdomain.
 
 Most subdomains serve a specific purpose within the overall context of your website. For example, `blog.example.com` might be your blog, `support.example.com` could be your customer help portal, and `store.example.com` would be your e-commerce site.
 
diff --git a/content/fundamentals/basic-tasks/minimize-downtime.md b/content/fundamentals/basic-tasks/minimize-downtime.md
index c3c0c950a1..67d81b2cee 100644
--- a/content/fundamentals/basic-tasks/minimize-downtime.md
+++ b/content/fundamentals/basic-tasks/minimize-downtime.md
@@ -1,13 +1,11 @@
 ---
 title: Minimize downtime
 pcx_content_type: tutorial
-aliases:
-- /fundamentals/get-started/setup/minimize-downtime/
 ---
 
 # Minimize downtime
 
-When you [add your domain](/fundamentals/get-started/setup/add-site/) to Cloudflare, it may experience a brief period of downtime due to certificate issuance, misconfigured Cloudflare settings, or limitations at your origin server.
+When you [add your domain](/fundamentals/setup/account-setup/add-site/) to Cloudflare, it may experience a brief period of downtime due to certificate issuance, misconfigured Cloudflare settings, or limitations at your origin server.
 
 {{<tutorial>}}
 {{<tutorial-step title="Update and review DNS records">}}
@@ -53,7 +51,7 @@ For more details about timing and certificate recommendations, refer to [Certifi
 
 You may want to test your configuration using your local machine or proxying traffic from a development domain or subdomain.
 
-If you experience issues, you should make sure that you have [allowed Cloudflare IP addresses](/fundamentals/get-started/setup/allow-cloudflare-ip-addresses/) at your origin server.
+If you experience issues, you should make sure that you have [allowed Cloudflare IP addresses](/fundamentals/setup/allow-cloudflare-ip-addresses/) at your origin server.
 
 {{</tutorial-step>}}
 
diff --git a/content/fundamentals/basic-tasks/optimize-speed-external-link.md b/content/fundamentals/basic-tasks/optimize-speed-external-link.md
index cb8481d5cd..95f47d6f6e 100644
--- a/content/fundamentals/basic-tasks/optimize-speed-external-link.md
+++ b/content/fundamentals/basic-tasks/optimize-speed-external-link.md
@@ -2,8 +2,6 @@
 pcx_content_type: navigation
 title: Optimize site speed
 external_link: /learning-paths/optimize-site-speed/
-aliases:
-- /fundamentals/get-started/task-guides/optimize-speed-external-link/
 _build:
   publishResources: false
   render: never
diff --git a/content/fundamentals/basic-tasks/prevent-ddos-attacks-external.md b/content/fundamentals/basic-tasks/prevent-ddos-attacks-external.md
index 9541eecf1b..97a51145f9 100644
--- a/content/fundamentals/basic-tasks/prevent-ddos-attacks-external.md
+++ b/content/fundamentals/basic-tasks/prevent-ddos-attacks-external.md
@@ -2,8 +2,6 @@
 pcx_content_type: navigation
 title: Prevent DDoS attacks
 external_link: /learning-paths/prevent-ddos-attacks/
-aliases:
-- /fundamentals/get-started/task-guides/prevent-ddos-attacks-external/
 _build:
   publishResources: false
   render: never
diff --git a/content/fundamentals/basic-tasks/protect-your-origin-server.md b/content/fundamentals/basic-tasks/protect-your-origin-server.md
index 86d0b60362..f17e4dfa77 100644
--- a/content/fundamentals/basic-tasks/protect-your-origin-server.md
+++ b/content/fundamentals/basic-tasks/protect-your-origin-server.md
@@ -3,12 +3,6 @@ pcx_content_type: how-to
 title: Protect your origin server
 meta:
   title: Protect your origin server
-aliases:
-- /fundamentals/get-started/task-guides/origin-health/
-- /fundamentals/get-started/task-guides/origin-health/free/
-- /fundamentals/get-started/task-guides/origin-health/pro/
-- /fundamentals/get-started/task-guides/origin-health/business/
-- /fundamentals/get-started/task-guides/origin-health/enterprise/
 ---
 
 # Protect your origin server
diff --git a/content/fundamentals/basic-tasks/secure-your-website.md b/content/fundamentals/basic-tasks/secure-your-website.md
index 8e7e67504a..a01875e48f 100644
--- a/content/fundamentals/basic-tasks/secure-your-website.md
+++ b/content/fundamentals/basic-tasks/secure-your-website.md
@@ -2,8 +2,6 @@
 pcx_content_type: navigation
 title: Secure your website
 external_link: /learning-paths/application-security/
-aliases:
-- /fundamentals/get-started/task-guides/secure-your-website/
 _build:
   publishResources: false
   render: never
diff --git a/content/fundamentals/basic-tasks/test-speed.md b/content/fundamentals/basic-tasks/test-speed.md
index d07e517f5b..4365f096c1 100644
--- a/content/fundamentals/basic-tasks/test-speed.md
+++ b/content/fundamentals/basic-tasks/test-speed.md
@@ -1,8 +1,6 @@
 ---
 pcx_content_type: how-to
 title: Test speed
-aliases:
-- /fundamentals/get-started/basic-tasks/test-speed/
 ---
 
 # Test speed
@@ -15,9 +13,9 @@ Cloudflare offers several tools to test the speed of your website, as well as th
 
 ### Using Cloudflare
 
-Once your domain is [active on Cloudflare](/fundamentals/get-started/setup/add-site/), you can run speed tests within the [Cloudflare dashboard](https://dash.cloudflare.com/?to=/:account/:zone/speed).
+Once your domain is [active on Cloudflare](/fundamentals/setup/account-setup/add-site/), you can run speed tests within the [Cloudflare dashboard](https://dash.cloudflare.com/?to=/:account/:zone/speed).
 
-This speed test will provide information about critical loading times, performance with and without [Cloudflare's proxy](/fundamentals/get-started/concepts/how-cloudflare-works/), and recommended optimizations.
+This speed test will provide information about critical loading times, performance with and without [Cloudflare's proxy](/fundamentals/concepts/how-cloudflare-works/), and recommended optimizations.
 
 If you experience any issues, make sure you are not blocking specific [user agents](/fundamentals/reference/cloudflare-site-crawling/#other-situations).
 
@@ -32,7 +30,7 @@ If your domain is not yet active on Cloudflare or you want to measure the before
 
 If you use these third-party tools, you should do the following to test website speed:
 
-1. [Pause Cloudflare](/fundamentals/get-started/basic-tasks/manage-domains/pause-cloudflare/) to remove performance and caching benefits.
+1. [Pause Cloudflare](/fundamentals/setup/manage-domains/pause-cloudflare/) to remove performance and caching benefits.
 2. Run a speed test.
 3. Unpause Cloudflare.
 4. Run a speed test[^1].
diff --git a/content/fundamentals/basic-tasks/under-ddos-attack.md b/content/fundamentals/basic-tasks/under-ddos-attack.md
index 26724b78b2..e0a11be95c 100644
--- a/content/fundamentals/basic-tasks/under-ddos-attack.md
+++ b/content/fundamentals/basic-tasks/under-ddos-attack.md
@@ -3,8 +3,6 @@ pcx_content_type: how-to
 title: Under a DDoS attack?
 meta:
     description: Learn a few ways to tell if your application is under a DDoS attack.
-aliases:
-- /fundamentals/get-started/basic-tasks/under-ddos-attack/
 ---
 
 # How to tell if you are under DDoS attack
diff --git a/content/fundamentals/concepts/_index.md b/content/fundamentals/concepts/_index.md
index bf9ec39675..9671978816 100644
--- a/content/fundamentals/concepts/_index.md
+++ b/content/fundamentals/concepts/_index.md
@@ -2,8 +2,6 @@
 pcx_content_type: navigation
 title: Concepts
 weight: 2
-aliases:
-- /fundamentals/get-started/concepts/
 ---
 
 # Key concepts
diff --git a/content/fundamentals/concepts/accounts-and-zones.md b/content/fundamentals/concepts/accounts-and-zones.md
index 7252590899..b2b5a7406c 100644
--- a/content/fundamentals/concepts/accounts-and-zones.md
+++ b/content/fundamentals/concepts/accounts-and-zones.md
@@ -2,8 +2,6 @@
 pcx_content_type: concept
 title: Accounts, zones, and profiles
 weight: 4
-aliases:
-- /fundamentals/get-started/concepts/accounts-and-zones/
 ---
 
 # Accounts, zones, and profiles
@@ -36,7 +34,7 @@ end
 
 ## User profiles
 
-Each user has a profile that contains several settings, such as [Communication preferences](/fundamentals/account-and-billing/account-setup/customize-account/communication-preference/) and [Language preferences](/fundamentals/account-and-billing/account-setup/customize-account/language-preference/).
+Each user has a profile that contains several settings, such as [Communication preferences](/fundamentals/setup/account-setup/customize-account/communication-preference/) and [Language preferences](/fundamentals/setup/account-setup/customize-account/language-preference/).
 
 ### Navigation
 
@@ -54,7 +52,7 @@ There are also several account-level products - such as [Workers](/workers/), [P
 
 After you [log in](https://dash.cloudflare.com) and select an account - but before you select a zone - the sidebar will list account-level products.
 
-Accounts also have their own settings, including [account billing profiles](/fundamentals/account-and-billing/account-setup/create-billing-profile/), [account members](/fundamentals/account-and-billing/members/), [lists](/fundamentals/global-configurations/lists/), and more.
+Accounts also have their own settings, including [account billing profiles](/fundamentals/setup/account-setup/create-billing-profile/), [account members](/fundamentals/setup/manage-members/), [lists](/waf/tools/lists/), and more.
 
 ### Navigation
 
diff --git a/content/fundamentals/concepts/cloudflare-ip-addresses.md b/content/fundamentals/concepts/cloudflare-ip-addresses.md
index 4f5f8299fd..dcb0ae7fe1 100644
--- a/content/fundamentals/concepts/cloudflare-ip-addresses.md
+++ b/content/fundamentals/concepts/cloudflare-ip-addresses.md
@@ -2,8 +2,6 @@
 pcx_content_type: concept
 title: Cloudflare IP addresses
 weight: 3
-aliases:
-- /fundamentals/get-started/concepts/cloudflare-ip-addresses/
 ---
 
 # Cloudflare IP addresses
@@ -14,9 +12,9 @@ Together, these IP addresses form the backbone of our [Anycast network](https://
 
 ## Allow Cloudflare IP addresses
 
-Because of [how Cloudflare works](/fundamentals/get-started/concepts/how-cloudflare-works/), all traffic to your origin server will appear to be coming from Cloudflare IP addresses.
+Because of [how Cloudflare works](/fundamentals/concepts/how-cloudflare-works/), all traffic to your origin server will appear to be coming from Cloudflare IP addresses.
 
-To avoid rate limiting or blocking these requests, you will want to [allow Cloudflare IPs](/fundamentals/get-started/setup/allow-cloudflare-ip-addresses/) at your origin server.
+To avoid rate limiting or blocking these requests, you will want to [allow Cloudflare IPs](/fundamentals/setup/allow-cloudflare-ip-addresses/) at your origin server.
 
 ## Customize Cloudflare IP addresses
 
diff --git a/content/fundamentals/concepts/how-cloudflare-works.md b/content/fundamentals/concepts/how-cloudflare-works.md
index 17fb6dfd75..9902c4ec3d 100644
--- a/content/fundamentals/concepts/how-cloudflare-works.md
+++ b/content/fundamentals/concepts/how-cloudflare-works.md
@@ -2,13 +2,11 @@
 pcx_content_type: concept
 title: How Cloudflare works
 weight: 2
-aliases:
-- /fundamentals/get-started/concepts/how-cloudflare-works/
 ---
 
 # How Cloudflare works
 
-Fundamentally, Cloudflare is a [large network of servers](/fundamentals/get-started/concepts/what-is-cloudflare/) that can improve the security, performance, and reliability of anything connected to the Internet.
+Fundamentally, Cloudflare is a [large network of servers](/fundamentals/concepts/what-is-cloudflare/) that can improve the security, performance, and reliability of anything connected to the Internet.
 
 Cloudflare does this by serving as a [reverse proxy](https://www.cloudflare.com/learning/cdn/glossary/reverse-proxy/) for your web traffic. All requests to and from your origin flow through Cloudflare and — as these requests pass through our network — we can apply various rules and optimizations to improve security, performance, and reliability.
 
diff --git a/content/fundamentals/concepts/network-layers.md b/content/fundamentals/concepts/network-layers.md
index 3e1e822167..538a150911 100644
--- a/content/fundamentals/concepts/network-layers.md
+++ b/content/fundamentals/concepts/network-layers.md
@@ -2,8 +2,6 @@
 pcx_content_type: concept
 title: Network Layers
 weight: 4
-aliases:
-- /fundamentals/get-started/concepts/network-layers/
 ---
 
 # Network layers
diff --git a/content/fundamentals/concepts/reference-architecture.md b/content/fundamentals/concepts/reference-architecture.md
index 2adf601653..8c2ae230e7 100644
--- a/content/fundamentals/concepts/reference-architecture.md
+++ b/content/fundamentals/concepts/reference-architecture.md
@@ -3,8 +3,6 @@ pcx_content_type: navigation
 title: Reference architectures
 external_link: /reference-architecture/
 weight: 11
-aliases:
-- /fundamentals/get-started/concepts/reference-architecture/
 _build:
   publishResources: false
   render: never
diff --git a/content/fundamentals/concepts/what-is-cloudflare.md b/content/fundamentals/concepts/what-is-cloudflare.md
index 757c9a15dc..7357ef55ee 100644
--- a/content/fundamentals/concepts/what-is-cloudflare.md
+++ b/content/fundamentals/concepts/what-is-cloudflare.md
@@ -2,8 +2,6 @@
 pcx_content_type: concept
 title: What is Cloudflare?
 weight: 1
-aliases:
-- /fundamentals/get-started/concepts/what-is-cloudflare/
 ---
 
 # What is Cloudflare?
@@ -12,7 +10,7 @@ Cloudflare is a global network of [servers](https://www.cloudflare.com/learning/
 
 ![Cloudflare sits in between requests and your origin server.](/images/fundamentals/get-started/website-with-cloudflare.svg)
 
-This [position](/fundamentals/get-started/concepts/how-cloudflare-works/) allows us to do several things — speeding up content delivery and user experience ([CDN](https://www.cloudflare.com/learning/cdn/what-is-a-cdn/)), protecting your website from malicious activity ([DDoS](https://www.cloudflare.com/learning/ddos/what-is-a-ddos-attack/), [Web Application Firewall](https://www.cloudflare.com/learning/ddos/glossary/web-application-firewall-waf/)), routing traffic ([Load balancing](/load-balancing/), [Waiting Room](/waiting-room/)), and more.
+This [position](/fundamentals/concepts/how-cloudflare-works/) allows us to do several things — speeding up content delivery and user experience ([CDN](https://www.cloudflare.com/learning/cdn/what-is-a-cdn/)), protecting your website from malicious activity ([DDoS](https://www.cloudflare.com/learning/ddos/what-is-a-ddos-attack/), [Web Application Firewall](https://www.cloudflare.com/learning/ddos/glossary/web-application-firewall-waf/)), routing traffic ([Load balancing](/load-balancing/), [Waiting Room](/waiting-room/)), and more.
 
 {{<Aside type="note">}}
 
diff --git a/content/fundamentals/reference/_index.md b/content/fundamentals/reference/_index.md
index 7176af27af..f124d359b4 100644
--- a/content/fundamentals/reference/_index.md
+++ b/content/fundamentals/reference/_index.md
@@ -4,8 +4,6 @@ title: Reference
 weight: 8
 meta:
    title: Reference - Get started
-aliases:
-- /fundamentals/get-started/reference/
 ---
 
 # Reference
diff --git a/content/fundamentals/reference/cdn-cgi-endpoint.md b/content/fundamentals/reference/cdn-cgi-endpoint.md
index 2876ec5871..3887ca57d9 100644
--- a/content/fundamentals/reference/cdn-cgi-endpoint.md
+++ b/content/fundamentals/reference/cdn-cgi-endpoint.md
@@ -1,13 +1,11 @@
 ---
 pcx_content_type: concept
 title: /cdn-cgi/ endpoint
-aliases:
-- /fundamentals/get-started/reference/cdn-cgi-endpoint/
 ---
 
 # /cdn-cgi/ endpoint
 
-When you [add a domain to Cloudflare](/fundamentals/get-started/setup/add-site/), Cloudflare adds a `/cdn-cgi/` endpoint (`www.example.com/cdn-cgi/`) to that domain.
+When you [add a domain to Cloudflare](/fundamentals/setup/account-setup/add-site/), Cloudflare adds a `/cdn-cgi/` endpoint (`www.example.com/cdn-cgi/`) to that domain.
 
 This endpoint is managed and served by Cloudflare. It cannot be modified or customized. The endpoint is not used by every Cloudflare product, but you may find some products use the endpoint in its URL.
 
diff --git a/content/fundamentals/reference/cloudflare-ray-id.md b/content/fundamentals/reference/cloudflare-ray-id.md
index db30566849..fa395342f6 100644
--- a/content/fundamentals/reference/cloudflare-ray-id.md
+++ b/content/fundamentals/reference/cloudflare-ray-id.md
@@ -1,8 +1,6 @@
 ---
 pcx_content_type: reference
 title: Cloudflare Ray ID
-aliases:
-- /fundamentals/get-started/reference/cloudflare-ray-id/
 ---
 
 # Cloudflare Ray ID
diff --git a/content/fundamentals/reference/cloudflare-site-crawling.md b/content/fundamentals/reference/cloudflare-site-crawling.md
index 0ffc4b1621..3335ec20cd 100644
--- a/content/fundamentals/reference/cloudflare-site-crawling.md
+++ b/content/fundamentals/reference/cloudflare-site-crawling.md
@@ -1,8 +1,6 @@
 ---
 pcx_content_type: reference
 title: Cloudflare crawlers
-aliases:
-- /fundamentals/get-started/reference/cloudflare-site-crawling/
 ---
 
 # Cloudflare crawlers
diff --git a/content/fundamentals/reference/glossary.md b/content/fundamentals/reference/glossary.md
index 10be8ae586..71c574bc0b 100644
--- a/content/fundamentals/reference/glossary.md
+++ b/content/fundamentals/reference/glossary.md
@@ -1,8 +1,6 @@
 ---
 title: Glossary
 pcx_content_type: glossary
-aliases:
-- /fundamentals/glossary/
 ---
 
 # Glossary
@@ -297,7 +295,7 @@ SSL public and private keys are essentially long strings of characters used for
 
 ## roles
 
-Authorize which Cloudflare products and features a member is allowed to access in a Cloudflare account. Learn more about [roles](/fundamentals/account-and-billing/members/roles/).
+Authorize which Cloudflare products and features a member is allowed to access in a Cloudflare account. Learn more about [roles](/fundamentals/setup/manage-members/roles/).
 
 ## root certificate
 
diff --git a/content/fundamentals/reference/google-analytics.md b/content/fundamentals/reference/google-analytics.md
index 14d9afe0b3..7b27d2d5ad 100644
--- a/content/fundamentals/reference/google-analytics.md
+++ b/content/fundamentals/reference/google-analytics.md
@@ -3,8 +3,6 @@ title: Cloudflare and Google Analytics
 pcx_content_type: reference
 meta:
   title: Using Google Analytics with Cloudflare
-aliases:
-- /fundamentals/get-started/reference/google-analytics/
 ---
 
 # Using Google Analytics with Cloudflare
diff --git a/content/fundamentals/reference/http-request-headers.md b/content/fundamentals/reference/http-request-headers.md
index f3048c50be..8900f1f718 100644
--- a/content/fundamentals/reference/http-request-headers.md
+++ b/content/fundamentals/reference/http-request-headers.md
@@ -1,8 +1,6 @@
 ---
 pcx_content_type: reference
 title: Cloudflare HTTP request headers
-aliases:
-- /fundamentals/get-started/reference/http-request-headers/
 ---
 
 # HTTP request headers
@@ -86,7 +84,7 @@ For incoming requests, the value of this header will be set to the protocol the
 
 ## CF-RAY
 
-The `CF-ray` header (otherwise known as a [Ray ID](/fundamentals/get-started/reference/cloudflare-ray-id/)) is a hashed value that encodes information about the data center and the visitor’s request. For example: `CF-RAY: 230b030023ae2822-SJC`.
+The `CF-ray` header (otherwise known as a [Ray ID](/fundamentals/reference/cloudflare-ray-id/)) is a hashed value that encodes information about the data center and the visitor’s request. For example: `CF-RAY: 230b030023ae2822-SJC`.
 
 Add the [`CF-Ray` header to your origin web server logs](https://support.cloudflare.com/hc/articles/203118044#h_f7a7396f-ec41-4c52-abf5-a110cadaca7c) to match requests proxied to Cloudflare to requests in your server logs.
 
diff --git a/content/fundamentals/reference/network-ports.md b/content/fundamentals/reference/network-ports.md
index 9f97badcce..8fb543bfbf 100644
--- a/content/fundamentals/reference/network-ports.md
+++ b/content/fundamentals/reference/network-ports.md
@@ -1,8 +1,6 @@
 ---
 pcx_content_type: reference
 title: Network ports
-aliases:
-- /fundamentals/get-started/reference/network-ports/
 ---
 
 # Network ports
diff --git a/content/fundamentals/reference/partners.md b/content/fundamentals/reference/partners.md
index 2c06ef7ee0..145136ee4a 100644
--- a/content/fundamentals/reference/partners.md
+++ b/content/fundamentals/reference/partners.md
@@ -3,8 +3,6 @@ pcx_content_type: reference
 title: Partners
 meta:
     title: Technology partner integrations
-aliases:
-- /fundamentals/partners/
 ---
 
 # Technology partner integrations
diff --git a/content/fundamentals/reference/policies-compliances/cloudflare-cookies.md b/content/fundamentals/reference/policies-compliances/cloudflare-cookies.md
index 8e70197100..502abe4a6e 100644
--- a/content/fundamentals/reference/policies-compliances/cloudflare-cookies.md
+++ b/content/fundamentals/reference/policies-compliances/cloudflare-cookies.md
@@ -1,8 +1,6 @@
 ---
 pcx_content_type: reference
 title: Cloudflare Cookies
-aliases:
-- /fundamentals/get-started/reference/cloudflare-cookies/
 ---
 
 # Cloudflare Cookies
diff --git a/content/fundamentals/reference/policies-compliances/compliance-docs.md b/content/fundamentals/reference/policies-compliances/compliance-docs.md
index fd85d5c2cd..5e461b57ff 100644
--- a/content/fundamentals/reference/policies-compliances/compliance-docs.md
+++ b/content/fundamentals/reference/policies-compliances/compliance-docs.md
@@ -1,8 +1,6 @@
 ---
 pcx_content_type: how-to
 title: Compliance documentation
-aliases:
-- /fundamentals/get-started/basic-tasks/access-compliance-docs/
 ---
 
 # Compliance documentation
diff --git a/content/fundamentals/reference/policies-compliances/content-security-policies.md b/content/fundamentals/reference/policies-compliances/content-security-policies.md
index 2ffbe3f9f9..af57fb8e61 100644
--- a/content/fundamentals/reference/policies-compliances/content-security-policies.md
+++ b/content/fundamentals/reference/policies-compliances/content-security-policies.md
@@ -3,8 +3,6 @@ pcx_content_type: reference
 title: Content Security Policies (CSPs)
 meta:
   title: Content Security Policies (CSPs) and Cloudflare
-aliases:
-- /fundamentals/get-started/reference/content-security-policies/
 ---
 
 # Content Security Policies (CSPs) and Cloudflare
@@ -26,7 +24,7 @@ Cloudflare does not:
 
 * Modify CSP headers from the origin web server.
 * Require changes to acceptable sources for first or third-party content.
-* Modify URLs (besides adding the [`/cdn-cgi/` endpoint](/fundamentals/get-started/reference/cdn-cgi-endpoint/)).
+* Modify URLs (besides adding the [`/cdn-cgi/` endpoint](/fundamentals/reference/cdn-cgi-endpoint/)).
 * Interfere with locations specified in your CSP.
 
 ### Product requirements
diff --git a/content/fundamentals/reference/policies-compliances/cybersafe.md b/content/fundamentals/reference/policies-compliances/cybersafe.md
index e3620487b6..b14a271c7b 100644
--- a/content/fundamentals/reference/policies-compliances/cybersafe.md
+++ b/content/fundamentals/reference/policies-compliances/cybersafe.md
@@ -1,8 +1,6 @@
 ---
 pcx_content_type: reference
 title: Project Cybersafe Schools
-aliases:
-- /fundamentals/security/cybersafe/
 ---
 
 # Project Cybersafe Schools
diff --git a/content/fundamentals/reference/policies-compliances/incident-management-policy.md b/content/fundamentals/reference/policies-compliances/incident-management-policy.md
index a3fe56cb05..9d315469f9 100644
--- a/content/fundamentals/reference/policies-compliances/incident-management-policy.md
+++ b/content/fundamentals/reference/policies-compliances/incident-management-policy.md
@@ -2,8 +2,6 @@
 pcx_content_type: navigation
 title: Incident Management Policy
 external_link: /support/about-cloudflare/enterprise-documentation/customer-incident-management-policy/
-aliases:
-- /fundamentals/get-started/reference/incident-management-policy/
 _build:
   publishResources: false
   render: never
diff --git a/content/fundamentals/reference/policies-compliances/licenses.md b/content/fundamentals/reference/policies-compliances/licenses.md
index e033445298..74f8cbbf89 100644
--- a/content/fundamentals/reference/policies-compliances/licenses.md
+++ b/content/fundamentals/reference/policies-compliances/licenses.md
@@ -2,8 +2,6 @@
 title: Licenses
 pcx_content_type: reference
 hidden: true
-aliases:
-- /fundamentals/api/licenses/
 ---
 
 # Licenses
diff --git a/content/fundamentals/reference/report-abuse/_index.md b/content/fundamentals/reference/report-abuse/_index.md
index e16826b75c..a542f8138b 100644
--- a/content/fundamentals/reference/report-abuse/_index.md
+++ b/content/fundamentals/reference/report-abuse/_index.md
@@ -5,8 +5,6 @@ weight: 2
 meta:
     title: Report abuse to Cloudflare
     description: Learn how to report DMCA issues, phishing, trademark infringement, malware sites, child exploitation material, and more to Cloudflare’s Trust and Safety team.
-aliases:
-- /fundamentals/get-started/basic-tasks/report-abuse/
 ---
 
 # Report abuse
@@ -18,6 +16,6 @@ When it comes to reports of abuse on websites that use our services, our ability
 ## Resources
 
 - [Read abuse policy](https://www.cloudflare.com/trust-hub/abuse-approach/)
-- [Review complaint types](/fundamentals/get-started/basic-tasks/report-abuse/complaint-types/)
-- [Providing specific URLs](/fundamentals/get-started/basic-tasks/report-abuse/provide-specific-urls/)
+- [Review complaint types](/fundamentals/reference/report-abuse/complaint-types/)
+- [Providing specific URLs](/fundamentals/reference/report-abuse/provide-specific-urls/)
 - [Submit abuse report](https://www.cloudflare.com/abuse/form)
\ No newline at end of file
diff --git a/content/fundamentals/reference/report-abuse/complaint-types.md b/content/fundamentals/reference/report-abuse/complaint-types.md
index 3d63065db6..1c3f4cacb3 100644
--- a/content/fundamentals/reference/report-abuse/complaint-types.md
+++ b/content/fundamentals/reference/report-abuse/complaint-types.md
@@ -4,8 +4,6 @@ title: Complaint types
 weight: 2
 meta:
     title: Complaint types - Report abuse
-aliases:
-- /fundamentals/get-started/basic-tasks/report-abuse/complaint-types/    
 ---
 
 # Complaint types
@@ -20,7 +18,7 @@ Valid [Digital Millennium Copyright Act (DMCA)](https://www.copyright.gov/dmca/)
 
 - A physical or electronic signature (typing your full name is valid) of the copyright owner or a person authorized to act on their behalf.
 - Identification of the infringed copyright (for example, a link to your original work or clear description of the materials allegedly infringed upon).
-- Identification of the infringing material and information reasonably sufficient to allow Cloudflare to locate the material on the infringing website (for example, a [link to the site](/fundamentals/get-started/basic-tasks/report-abuse/provide-specific-urls/) where the infringed copyrighted material appears).
+- Identification of the infringing material and information reasonably sufficient to allow Cloudflare to locate the material on the infringing website (for example, a [link to the site](/fundamentals/reference/report-abuse/provide-specific-urls/) where the infringed copyrighted material appears).
 - Your contact information, including your address, telephone number, and email address.
 - A statement that you believe, in good faith, that the use of the material in the manner asserted is not authorized by the copyright owner, its agent, or the law.
 - A statement that the information in the notification is accurate, and, under penalty of perjury, that you are authorized to act on behalf of the copyright owner.
diff --git a/content/fundamentals/reference/report-abuse/provide-specific-urls.md b/content/fundamentals/reference/report-abuse/provide-specific-urls.md
index 5b9ad5de6e..b47dcd2229 100644
--- a/content/fundamentals/reference/report-abuse/provide-specific-urls.md
+++ b/content/fundamentals/reference/report-abuse/provide-specific-urls.md
@@ -5,8 +5,6 @@ weight: 3
 meta:
     title: Providing specific URLs - Report abuse
     description: Learn how to provide specific asset URLs when submitting an abuse report.
-aliases:
-- /fundamentals/get-started/basic-tasks/report-abuse/provide-specific-urls/
 ---
 
 # Providing specific URLs
diff --git a/content/fundamentals/reference/report-abuse/review-policies.md b/content/fundamentals/reference/report-abuse/review-policies.md
index 8fecaa17ba..cfb0885862 100644
--- a/content/fundamentals/reference/report-abuse/review-policies.md
+++ b/content/fundamentals/reference/report-abuse/review-policies.md
@@ -3,8 +3,6 @@ pcx_content_type: navigation
 title: Review abuse policies
 external_link: https://www.cloudflare.com/trust-hub/abuse-approach/
 weight: 1
-aliases:
-- /fundamentals/get-started/basic-tasks/report-abuse/review-policies/
 _build:
   publishResources: false
   render: never
diff --git a/content/fundamentals/reference/report-abuse/submit-report.md b/content/fundamentals/reference/report-abuse/submit-report.md
index 09bd80da2e..9816b39b7c 100644
--- a/content/fundamentals/reference/report-abuse/submit-report.md
+++ b/content/fundamentals/reference/report-abuse/submit-report.md
@@ -3,8 +3,6 @@ pcx_content_type: navigation
 title: Submit report
 external_link: https://abuse.cloudflare.com/
 weight: 4
-aliases:
-- /fundamentals/get-started/basic-tasks/report-abuse/submit-report/
 _build:
   publishResources: false
   render: never
diff --git a/content/fundamentals/reference/the-internet.md b/content/fundamentals/reference/the-internet.md
index f153540e8e..5c4f78dff0 100644
--- a/content/fundamentals/reference/the-internet.md
+++ b/content/fundamentals/reference/the-internet.md
@@ -1,8 +1,6 @@
 ---
 pcx_content_type: navigation
 title: The Internet
-aliases:
-- /fundamentals/the-internet/
 ---
 
 # The Internet
diff --git a/content/fundamentals/reference/under-attack-mode.md b/content/fundamentals/reference/under-attack-mode.md
index 76b8e24a2b..dd7d498a22 100644
--- a/content/fundamentals/reference/under-attack-mode.md
+++ b/content/fundamentals/reference/under-attack-mode.md
@@ -2,8 +2,6 @@
 pcx_content_type: reference
 source: https://support.cloudflare.com/hc/en-us/articles/200170076-Understanding-Cloudflare-Under-Attack-mode-advanced-DDOS-protection-
 title: Under Attack mode
-aliases:
-- /fundamentals/security/under-attack-mode/
 ---
 
 # Under Attack mode
@@ -43,7 +41,7 @@ To preview what **I'm Under Attack** mode looks like for your visitors:
 4. Go to **Custom Pages**.
 5. For **Managed Challenge / I'm Under Attack Mode™**, select **Custom Pages** > **View default**.
 
-The "Checking your browser before accessing..." challenge determines whether to block or allow a visitor within five seconds. After passing the challenge, the visitor does not observe another challenge until the duration configured in [**Challenge Passage**](/fundamentals/security/challenge-passage/).
+The "Checking your browser before accessing..." challenge determines whether to block or allow a visitor within five seconds. After passing the challenge, the visitor does not observe another challenge until the duration configured in [**Challenge Passage**](/waf/tools/challenge-passage/).
 
 ---
 
diff --git a/content/fundamentals/setup/_index.md b/content/fundamentals/setup/_index.md
index 55a94b1b99..e8cfec64e6 100644
--- a/content/fundamentals/setup/_index.md
+++ b/content/fundamentals/setup/_index.md
@@ -4,18 +4,16 @@ title: Setup
 weight: 2
 meta:
   title: Set up Cloudflare
-aliases:
-- /fundamentals/get-started/setup/
 ---
 
 # Set up Cloudflare
 
-To get the [security, performance, and reliability benefits](/fundamentals/get-started/concepts/how-cloudflare-works/) of Cloudflare, you need to set up Cloudflare on your domain:
+To get the [security, performance, and reliability benefits](/fundamentals/concepts/how-cloudflare-works/) of Cloudflare, you need to set up Cloudflare on your domain:
 
-1. [Create your account](/fundamentals/account-and-billing/account-setup/): Create a new account with Cloudflare and adjust account settings as needed.
-2. [Minimize downtime](/fundamentals/get-started/setup/minimize-downtime/)(*for some*): If your domain is particularly sensitive to downtime, review our suggestions to avoid it.
-2. [Add a site](/fundamentals/get-started/setup/add-site/): Add and activate a new domain to use Cloudflare.
-3. [Allow Cloudflare IP addresses](/fundamentals/get-started/setup/allow-cloudflare-ip-addresses/) (*for some*): If you control your [origin server](https://www.cloudflare.com/learning/cdn/glossary/origin-server/) and plan on using [Cloudflare's proxy](/dns/manage-dns-records/reference/proxied-dns-records/), you should review your server configuration to make sure you are not accidentally blocking Cloudflare IP addresses.
+1. [Create your account](/fundamentals/setup/account-setup/): Create a new account with Cloudflare and adjust account settings as needed.
+2. [Minimize downtime](/fundamentals/basic-tasks/minimize-downtime/)(*for some*): If your domain is particularly sensitive to downtime, review our suggestions to avoid it.
+2. [Add a site](/fundamentals/setup/account-setup/add-site/): Add and activate a new domain to use Cloudflare.
+3. [Allow Cloudflare IP addresses](/fundamentals/setup/allow-cloudflare-ip-addresses/) (*for some*): If you control your [origin server](https://www.cloudflare.com/learning/cdn/glossary/origin-server/) and plan on using [Cloudflare's proxy](/dns/manage-dns-records/reference/proxied-dns-records/), you should review your server configuration to make sure you are not accidentally blocking Cloudflare IP addresses.
 4. [Optimize site setup](/fundamentals/basic-tasks/): Once your site is activated on Cloudflare, you can improve site speed and SEO, build out layers of application security, and more.
 
 {{<render file="_pointer-to-workers-zt-docs.md">}}
\ No newline at end of file
diff --git a/content/fundamentals/setup/account-setup/_index.md b/content/fundamentals/setup/account-setup/_index.md
index a61d9bd89d..7b2a98599b 100644
--- a/content/fundamentals/setup/account-setup/_index.md
+++ b/content/fundamentals/setup/account-setup/_index.md
@@ -2,8 +2,6 @@
 pcx_content_type: navigation
 title: Account setup
 weight: 1
-aliases:
-- /fundamentals/account-and-billing/account-setup/
 ---
 
 # Set up a new account
diff --git a/content/fundamentals/setup/account-setup/add-site.md b/content/fundamentals/setup/account-setup/add-site.md
index 82ab9a1dcf..6e276f2cce 100644
--- a/content/fundamentals/setup/account-setup/add-site.md
+++ b/content/fundamentals/setup/account-setup/add-site.md
@@ -2,8 +2,6 @@
 title: Add a site
 pcx_content_type: tutorial
 weight: 4
-aliases:
-- /fundamentals/get-started/setup/add-site/
 ---
 
 # Add site to Cloudflare
diff --git a/content/fundamentals/setup/account-setup/create-account.md b/content/fundamentals/setup/account-setup/create-account.md
index 07c454e5b0..07bba71957 100644
--- a/content/fundamentals/setup/account-setup/create-account.md
+++ b/content/fundamentals/setup/account-setup/create-account.md
@@ -4,8 +4,6 @@ title: Create account
 weight: 1
 meta:
     description: Learn how to create a new Cloudflare account.
-aliases:
-- /fundamentals/account-and-billing/account-setup/create-account/
 ---
 
 # Create a Cloudflare account
@@ -16,7 +14,7 @@ To create a Cloudflare account:
 2. Enter your **Email** and **Password**. 
 3. Click **Create Account**.
 
-Once you create your account, Cloudflare will automatically send an email to your address to [verify that email address](/fundamentals/account-and-billing/account-setup/verify-email-address/).
+Once you create your account, Cloudflare will automatically send an email to your address to [verify that email address](/fundamentals/setup/account-setup/verify-email-address/).
 
 ## Best practices
 
diff --git a/content/fundamentals/setup/account-setup/create-billing-profile.md b/content/fundamentals/setup/account-setup/create-billing-profile.md
index 4bc3ca2e68..921dacf1a3 100644
--- a/content/fundamentals/setup/account-setup/create-billing-profile.md
+++ b/content/fundamentals/setup/account-setup/create-billing-profile.md
@@ -2,14 +2,12 @@
 pcx_content_type: tutorial
 title: Create billing profile
 weight: 3
-aliases:
-- /fundamentals/account-and-billing/account-setup/create-billing-profile/
 updated: 2022-08-24
 ---
 
 # Create billing profile
 
-After you [create a new account](/fundamentals/account-and-billing/account-setup/create-account/), you might want to create your billing profile.
+After you [create a new account](/fundamentals/setup/account-setup/create-account/), you might want to create your billing profile.
 
 {{<tutorial>}}
 {{<tutorial-step title="Add primary payment method">}}
diff --git a/content/fundamentals/setup/account-setup/customize-account/_index.md b/content/fundamentals/setup/account-setup/customize-account/_index.md
index 9e2e2aa34b..dee787b883 100644
--- a/content/fundamentals/setup/account-setup/customize-account/_index.md
+++ b/content/fundamentals/setup/account-setup/customize-account/_index.md
@@ -4,12 +4,10 @@ pcx_content_type: navigation
 weight: 4
 meta: 
     title: Customize account and profile
-aliases:
-- /fundamentals/account-and-billing/account-setup/customize-account/
 ---
 
 # Customize account and profile
 
-After you [create your Cloudflare account](/fundamentals/account-and-billing/account-setup/create-account/), you might want to update the following settings in your account and profile.
+After you [create your Cloudflare account](/fundamentals/setup/account-setup/create-account/), you might want to update the following settings in your account and profile.
 
 {{<directory-listing>}}
\ No newline at end of file
diff --git a/content/fundamentals/setup/account-setup/customize-account/account-name.md b/content/fundamentals/setup/account-setup/customize-account/account-name.md
index 41a5f35cd7..c730a2f54b 100644
--- a/content/fundamentals/setup/account-setup/customize-account/account-name.md
+++ b/content/fundamentals/setup/account-setup/customize-account/account-name.md
@@ -1,8 +1,6 @@
 ---
 title: Account name
 pcx_content_type: how-to
-aliases:
-- /fundamentals/account-and-billing/account-setup/customize-account/account-name/
 ---
 
 # Account name
diff --git a/content/fundamentals/setup/account-setup/customize-account/appearance.md b/content/fundamentals/setup/account-setup/customize-account/appearance.md
index 913cf1662a..10e2b5f59c 100644
--- a/content/fundamentals/setup/account-setup/customize-account/appearance.md
+++ b/content/fundamentals/setup/account-setup/customize-account/appearance.md
@@ -1,8 +1,6 @@
 ---
 title: Appearance
 pcx_content_type: how-to
-aliases:
-- /fundamentals/account-and-billing/account-setup/customize-account/appearance/
 ---
 
 # Appearance
diff --git a/content/fundamentals/setup/account-setup/customize-account/communication-preference.md b/content/fundamentals/setup/account-setup/customize-account/communication-preference.md
index 104623af79..095694818c 100644
--- a/content/fundamentals/setup/account-setup/customize-account/communication-preference.md
+++ b/content/fundamentals/setup/account-setup/customize-account/communication-preference.md
@@ -1,15 +1,13 @@
 ---
 title: Communication preferences
 pcx_content_type: how-to
-aliases:
-- /fundamentals/account-and-billing/account-setup/customize-account/communication-preference/
 ---
 
 # Communication preferences
 
 When you create an account, Cloudflare automatically chooses your **Communication Preferences**, or when Cloudflare might occasionally send you emails.
 
-To update the communication preferences for your profile (which requires a [verified email address](/fundamentals/account-and-billing/account-setup/verify-email-address/)):
+To update the communication preferences for your profile (which requires a [verified email address](/fundamentals/setup/account-setup/verify-email-address/)):
 
 1. Log into the [Cloudflare dashboard](https://dash.cloudflare.com).
 2. Go to **My Profile**
diff --git a/content/fundamentals/setup/account-setup/customize-account/language-preference.md b/content/fundamentals/setup/account-setup/customize-account/language-preference.md
index f023592ec4..3fdf9b8463 100644
--- a/content/fundamentals/setup/account-setup/customize-account/language-preference.md
+++ b/content/fundamentals/setup/account-setup/customize-account/language-preference.md
@@ -1,8 +1,6 @@
 ---
 title: Language preference
 pcx_content_type: how-to
-aliases:
-- /fundamentals/account-and-billing/account-setup/customize-account/language-preference/
 ---
 
 # Language preference
diff --git a/content/fundamentals/setup/account-setup/login-account-issues.md b/content/fundamentals/setup/account-setup/login-account-issues.md
index 79d9eaed9d..d92086c1d8 100644
--- a/content/fundamentals/setup/account-setup/login-account-issues.md
+++ b/content/fundamentals/setup/account-setup/login-account-issues.md
@@ -2,8 +2,6 @@
 pcx_content_type: navigation
 title: Login and account issues
 external_link: /support/account-management-billing/common-account-questions/login-and-account-issues/
-aliases:
-- /fundamentals/account-and-billing/login-account-issues/
 weight: 5
 _build:
   publishResources: false
diff --git a/content/fundamentals/setup/account-setup/verify-email-address.md b/content/fundamentals/setup/account-setup/verify-email-address.md
index 0b656b2ef0..6f491cdc2c 100644
--- a/content/fundamentals/setup/account-setup/verify-email-address.md
+++ b/content/fundamentals/setup/account-setup/verify-email-address.md
@@ -2,8 +2,6 @@
 title: Verify email address
 pcx_content_type: how-to
 weight: 2
-aliases:
-- /fundamentals/account-and-billing/account-setup/verify-email-address/
 ---
 
 # Verify email address
@@ -12,7 +10,7 @@ For security reasons, Cloudflare attempts to verify the email address associated
 
 ## When creating your account
 
-When you first [create an account](/fundamentals/account-and-billing/account-setup/create-account/), Cloudflare automatically sends a message to the email address you provided for your account.
+When you first [create an account](/fundamentals/setup/account-setup/create-account/), Cloudflare automatically sends a message to the email address you provided for your account.
 
 To verify your email:
 
diff --git a/content/fundamentals/setup/add-multiple-sites-automation.md b/content/fundamentals/setup/add-multiple-sites-automation.md
index 2647caea74..a7e8919b4b 100644
--- a/content/fundamentals/setup/add-multiple-sites-automation.md
+++ b/content/fundamentals/setup/add-multiple-sites-automation.md
@@ -2,8 +2,6 @@
 pcx_content_type: tutorial
 source: https://support.cloudflare.com/hc/articles/360000841472
 title: Add Multiple Sites via automation
-aliases:
-- /fundamentals/get-started/setup/add-multiple-sites-automation/
 ---
 
 # Add multiple sites via automation
@@ -25,7 +23,7 @@ ___
 
 To add multiple sites to Cloudflare via automation, you need:
 
-- An existing [Cloudflare account](/fundamentals/account-and-billing/account-setup/create-account/).
+- An existing [Cloudflare account](/fundamentals/setup/account-setup/create-account/).
 - Command line with `curl`
 - A Cloudflare [API token](/fundamentals/api/get-started/create-token/) with one of the following permissions:
   - Zone-level `Administrator`
diff --git a/content/fundamentals/setup/allow-cloudflare-ip-addresses.md b/content/fundamentals/setup/allow-cloudflare-ip-addresses.md
index 633c1147dc..b7c8b0782c 100644
--- a/content/fundamentals/setup/allow-cloudflare-ip-addresses.md
+++ b/content/fundamentals/setup/allow-cloudflare-ip-addresses.md
@@ -2,13 +2,11 @@
 pcx_content_type: tutorial
 title: Allow Cloudflare IP addresses
 weight: 5
-aliases:
-- /fundamentals/get-started/setup/allow-cloudflare-ip-addresses/
 ---
 
 # Allow Cloudflare IP addresses
 
-Because of [how Cloudflare works](/fundamentals/get-started/concepts/how-cloudflare-works/), all traffic to [proxied DNS records](/dns/manage-dns-records/reference/proxied-dns-records/) passes through Cloudflare before reaching your origin server. This means that your origin server will stop receiving traffic from individual visitor IP addresses and instead receive traffic from [Cloudflare IP addresses](https://www.cloudflare.com/ips), which are shared by all proxied hostnames.
+Because of [how Cloudflare works](/fundamentals/concepts/how-cloudflare-works/), all traffic to [proxied DNS records](/dns/manage-dns-records/reference/proxied-dns-records/) passes through Cloudflare before reaching your origin server. This means that your origin server will stop receiving traffic from individual visitor IP addresses and instead receive traffic from [Cloudflare IP addresses](https://www.cloudflare.com/ips), which are shared by all proxied hostnames.
 
 This setup can cause issues if your origin server blocks or rate limits connections from Cloudflare IP addresses. Because all visitor traffic will appear to come from Cloudflare IP addresses, blocking these IPs — even accidentally — will prevent visitor traffic from reaching your application.
 
@@ -59,7 +57,7 @@ For more specific guidance, contact your hosting provider or website administrat
 
 #### Further protection
 
-For further recommendations on securing your origin server, refer to our guide on [protecting your origin server](/fundamentals/get-started/task-guides/origin-health/).
+For further recommendations on securing your origin server, refer to our guide on [protecting your origin server](/fundamentals/basic-tasks/protect-your-origin-server/).
 
 #### Visitor IP information
 
diff --git a/content/fundamentals/setup/find-account-and-zone-ids.md b/content/fundamentals/setup/find-account-and-zone-ids.md
index 4b4a999300..60f5aa7014 100644
--- a/content/fundamentals/setup/find-account-and-zone-ids.md
+++ b/content/fundamentals/setup/find-account-and-zone-ids.md
@@ -2,13 +2,11 @@
 pcx_content_type: how-to
 title: Find zone and account IDs
 weight: 6
-aliases:
-- /fundamentals/get-started/basic-tasks/find-account-and-zone-ids/
 ---
 
 # Find zone and account IDs
 
-Once you [set up a new account](/fundamentals/account-and-billing/account-setup/) and [add your domain](/fundamentals/get-started/setup/add-site/) to Cloudflare, you may need access to your zone and account IDs for API operations.
+Once you [set up a new account](/fundamentals/setup/account-setup/) and [add your domain](/fundamentals/setup/account-setup/add-site/) to Cloudflare, you may need access to your zone and account IDs for API operations.
 
 To find your zone and account IDs:
 
diff --git a/content/fundamentals/setup/manage-domains/_index.md b/content/fundamentals/setup/manage-domains/_index.md
index cea25b8b1b..52d29bd463 100644
--- a/content/fundamentals/setup/manage-domains/_index.md
+++ b/content/fundamentals/setup/manage-domains/_index.md
@@ -2,8 +2,6 @@
 pcx_content_type: navigation
 title: Manage domains
 weight: 3
-aliases:
-- /fundamentals/get-started/basic-tasks/manage-domains/
 ---
 
 # Manage domains
@@ -26,7 +24,7 @@ Cloudflare does not offer web hosting for most websites, though you can deploy a
 
 ## Add a domain to Cloudflare
 
-For help adding a domain to Cloudflare, refer to our [setup guide](/fundamentals/get-started/setup/add-site/).
+For help adding a domain to Cloudflare, refer to our [setup guide](/fundamentals/setup/account-setup/add-site/).
 
 Once you finish adding your domain, you likely will want to also [update your domain's nameservers](/dns/zone-setups/full-setup/) to get Cloudflare's performance and security benefits.
 
@@ -36,4 +34,4 @@ Cloudflare offers free, unshared, publicy trusted [Universal SSL certificates](/
 
 ## Manage subdomains
 
-For more details about subdomains (`www.example.com` or `blog.example.com`), refer to [Manage subdomains](/fundamentals/get-started/basic-tasks/manage-subdomains/).
+For more details about subdomains (`www.example.com` or `blog.example.com`), refer to [Manage subdomains](/fundamentals/basic-tasks/manage-subdomains/).
diff --git a/content/fundamentals/setup/manage-domains/move-domain.md b/content/fundamentals/setup/manage-domains/move-domain.md
index 02c5e30c48..0ec4ad36ad 100644
--- a/content/fundamentals/setup/manage-domains/move-domain.md
+++ b/content/fundamentals/setup/manage-domains/move-domain.md
@@ -2,8 +2,6 @@
 pcx_content_type: reference
 title: Move a domain between Cloudflare accounts
 weight: 2
-aliases:
-- /fundamentals/get-started/basic-tasks/manage-domains/move-domain/
 ---
 
 # Move a domain between Cloudflare accounts
@@ -35,7 +33,7 @@ To transfer a domain from one Cloudflare account to another, you will need:
 
 {{<Aside type="warning">}}
 
-Before transferring an active Cloudflare domain to another Cloudflare account, you must remove any [DNSSEC configurations](/dns/dnssec/) and [add-ons or subscriptions](/fundamentals/account-and-billing/account-maintenance/cancel-subscription/).
+Before transferring an active Cloudflare domain to another Cloudflare account, you must remove any [DNSSEC configurations](/dns/dnssec/) and [add-ons or subscriptions](/fundamentals/account-and-billing/account-billing/cancel-subscription/).
 
 We also recommend [exporting](/dns/manage-dns-records/how-to/import-and-export/#export-records) the DNS records of your zone while it is in the previous account. Then, you can [import](/dns/manage-dns-records/how-to/import-and-export/#import-records) the correct DNS records into the new account.
 If you miss this step, Cloudflare will import your proxied dns records might experience a [1000 error](/support/troubleshooting/cloudflare-errors/troubleshooting-cloudflare-1xxx-errors/). 
@@ -48,9 +46,9 @@ If you lose access to the email address associated with your Cloudflare account
 
 The domain transfer process depends on your DNS settings. If Cloudflare is your authoritative DNS provider (that is, your domain nameservers point to Cloudflare), you must:
 
-1. [Create a new Cloudflare account](/fundamentals/account-and-billing/account-setup/create-account/) or log in to an existing Cloudflare account.
+1. [Create a new Cloudflare account](/fundamentals/setup/account-setup/create-account/) or log in to an existing Cloudflare account.
 
-2. [Add the domain](/fundamentals/get-started/setup/add-site/) to the account (as if you were adding it for the first time).
+2. [Add the domain](/fundamentals/setup/account-setup/add-site/) to the account (as if you were adding it for the first time).
 
 3. Log in to your domain registrar account and [update the nameservers](/dns/zone-setups/full-setup/setup/) to the provided Cloudflare nameservers.
 
diff --git a/content/fundamentals/setup/manage-domains/pause-cloudflare.md b/content/fundamentals/setup/manage-domains/pause-cloudflare.md
index e70c785e29..f7258bd49b 100644
--- a/content/fundamentals/setup/manage-domains/pause-cloudflare.md
+++ b/content/fundamentals/setup/manage-domains/pause-cloudflare.md
@@ -2,8 +2,6 @@
 pcx_content_type: reference
 title: Pause Cloudflare
 weight: 5
-aliases:
-- /fundamentals/get-started/basic-tasks/manage-domains/pause-cloudflare/
 ---
 
 # Pause Cloudflare
diff --git a/content/fundamentals/setup/manage-domains/redirect-domain.md b/content/fundamentals/setup/manage-domains/redirect-domain.md
index e95e2ecf0c..dc8391015c 100644
--- a/content/fundamentals/setup/manage-domains/redirect-domain.md
+++ b/content/fundamentals/setup/manage-domains/redirect-domain.md
@@ -2,8 +2,6 @@
 pcx_content_type: reference
 title: Redirect one domain to another
 weight: 4
-aliases:
-- /fundamentals/get-started/basic-tasks/manage-domains/redirect-domain/
 ---
 
 # Redirect one domain to another
diff --git a/content/fundamentals/setup/manage-domains/remove-domain.md b/content/fundamentals/setup/manage-domains/remove-domain.md
index d3f3b48009..9fc546d0e3 100644
--- a/content/fundamentals/setup/manage-domains/remove-domain.md
+++ b/content/fundamentals/setup/manage-domains/remove-domain.md
@@ -4,8 +4,6 @@ title: Remove a domain
 weight: 3
 meta:
     title: Remove a domain from Cloudflare
-aliases:
-- /fundamentals/get-started/basic-tasks/manage-domains/remove-domain/
 ---
 
 # Remove a domain
@@ -16,7 +14,7 @@ However, Cloudflare will still retain your configuration history for 18 months,
 
 ## Before removing your domain
 
-If you experience website issues, we recommend [temporarily pausing Cloudflare](/fundamentals/get-started/basic-tasks/manage-domains/pause-cloudflare/) to evaluate your website's performance.
+If you experience website issues, we recommend [temporarily pausing Cloudflare](/fundamentals/setup/manage-domains/pause-cloudflare/) to evaluate your website's performance.
 
 If you need to re-add the domain in a different account, make sure the current settings have been saved. For example, you may [Import and export DNS records](/dns/manage-dns-records/how-to/import-and-export/).
 
@@ -30,7 +28,7 @@ If you need to re-add the domain in a different account, make sure the current s
 
 ### Actions within Cloudflare
 
-* [Cancel active add-on subscriptions](/fundamentals/account-and-billing/account-maintenance/cancel-subscription/).
+* [Cancel active add-on subscriptions](/fundamentals/account-and-billing/account-billing/cancel-subscription/).
 
 * [Delete all the Logpush jobs for that domain](/logs/tutorials/examples/example-logpush-curl/#step-4---delete-a-job)
 
diff --git a/content/fundamentals/setup/manage-members/_index.md b/content/fundamentals/setup/manage-members/_index.md
index 7809d5cbbf..1becd298b2 100644
--- a/content/fundamentals/setup/manage-members/_index.md
+++ b/content/fundamentals/setup/manage-members/_index.md
@@ -4,8 +4,6 @@ title: Manage members
 weight: 2
 meta:
     title: Account members
-aliases:
-- /fundamentals/account-and-billing/members/
 ---
 
 # Account members
diff --git a/content/fundamentals/setup/manage-members/manage.md b/content/fundamentals/setup/manage-members/manage.md
index f64abbe0af..b3950ff7bc 100644
--- a/content/fundamentals/setup/manage-members/manage.md
+++ b/content/fundamentals/setup/manage-members/manage.md
@@ -4,8 +4,6 @@ title: Manage
 weight: 2
 meta:
     title: Manage account members
-aliases:
-- /fundamentals/account-and-billing/members/manage/
 ---
 
 # Manage account members
@@ -51,8 +49,8 @@ To add a member to your account:
 4. Fill out the following information:
 
     - **Invite members**: Enter one or more email addresses (if multiple, separate addresses with commas).
-    - **Scope**: Use a variety of fields to adjust the [scope](/fundamentals/account-and-billing/members/roles/) of your roles.
-    - **Roles**: Choose one or more [roles](/fundamentals/account-and-billing/members/roles/) to assign your members.
+    - **Scope**: Use a variety of fields to adjust the [scope](/fundamentals/setup/manage-members/roles/) of your roles.
+    - **Roles**: Choose one or more [roles](/fundamentals/setup/manage-members/roles/) to assign your members.
 
 5. Select **Continue to summary**.
 6. Review the information, then select **Invite**.
diff --git a/content/fundamentals/setup/manage-members/roles.md b/content/fundamentals/setup/manage-members/roles.md
index 4523fdaf5e..5790e5a7ef 100644
--- a/content/fundamentals/setup/manage-members/roles.md
+++ b/content/fundamentals/setup/manage-members/roles.md
@@ -4,17 +4,15 @@ title: Roles
 weight: 3
 meta:
     title: Account roles
-aliases:
-- /fundamentals/account-and-billing/members/roles/
 ---
 
 # Roles
 
-Whenever you [add a new member](/fundamentals/account-and-billing/members/manage/) to your account, you can assign specific roles to these users.
+Whenever you [add a new member](/fundamentals/setup/manage-members/manage/) to your account, you can assign specific roles to these users.
 
 ## Account-scoped Roles
 
-If you are adding members whose [role scope](/fundamentals/account-and-billing/members/scope/) includes **All domains** and has no other limitations, you can assign **Account Scoped Roles** that apply to every domain across your account.
+If you are adding members whose [role scope](/fundamentals/setup/manage-members/scope/) includes **All domains** and has no other limitations, you can assign **Account Scoped Roles** that apply to every domain across your account.
 
 | Role | Description |
 | --- | --- |
@@ -26,7 +24,7 @@ If you are adding members whose [role scope](/fundamentals/account-and-billing/m
 | API Gateway Read | Grants read access to [API Gateway (including API Shield)](/api-shield/) for all domains in an account. |
 | Audit Logs Viewer | Can view [Audit Logs](/fundamentals/account-and-billing/account-security/review-audit-logs/). |
 | Bot Management (Account-wide) | Can edit [Bot Management](/bots/plans/bm-subscription/) (including [Super Bot Fight Mode](/bots/get-started/pro/)) configurations for all domains in account. |
-| Billing | Can edit the account’s [billing profile](/fundamentals/account-and-billing/account-setup/create-billing-profile/) and subscriptions |
+| Billing | Can edit the account’s [billing profile](/fundamentals/setup/account-setup/create-billing-profile/) and subscriptions |
 | Cloudflare Access | Can edit [Cloudflare Access](/cloudflare-one/policies/access/) policies. |
 | Cache Purge | Can purge the edge cache. |
 | Cloudflare DEX | Can edit [Cloudflare DEX](/cloudflare-one/insights/dex/). |
@@ -41,7 +39,7 @@ If you are adding members whose [role scope](/fundamentals/account-and-billing/m
 | Cloudflare Zero Trust Read Only | Can access [Cloudflare for Zero Trust](/cloudflare-one/) read only mode. |
 | Cloudflare Zero Trust Reporting | Can access [Cloudflare for Zero Trust](/cloudflare-one/) reporting data. |
 | DNS | Can edit [DNS records](/dns/manage-dns-records/). |
-| Firewall | Can edit [WAF](/waf/), [IP Firewall](/fundamentals/global-configurations/lists/ip-lists/), and [Zone Lockdown](/waf/tools/zone-lockdown/) settings. |
+| Firewall | Can edit [WAF](/waf/), [IP Firewall](/waf/tools/lists/ip-lists/), and [Zone Lockdown](/waf/tools/zone-lockdown/) settings. |
 | Load Balancer | Can edit [Load Balancers](/load-balancing/), Pools, Origins, and Health Checks. |
 | Log Share | Can edit [Log Share](/logs/) configuration. |
 | Log Share Reader | Can read Enterprise [Log Share](/logs/). |
@@ -69,7 +67,7 @@ If you are adding members whose [role scope](/fundamentals/account-and-billing/m
 
 ## Domain-scoped Roles
 
-If you are adding members whose [role scope](/fundamentals/account-and-billing/members/scope/) has some limitations (specific domains allowed or excluded, limited to a domain group), you can assign **Domain Scoped Roles** that apply to all relevant domains.
+If you are adding members whose [role scope](/fundamentals/setup/manage-members/scope/) has some limitations (specific domains allowed or excluded, limited to a domain group), you can assign **Domain Scoped Roles** that apply to all relevant domains.
 
 | Role | Description |
 | --- | --- |
diff --git a/content/fundamentals/setup/manage-members/scope.md b/content/fundamentals/setup/manage-members/scope.md
index 1901b6d947..e36de6e778 100644
--- a/content/fundamentals/setup/manage-members/scope.md
+++ b/content/fundamentals/setup/manage-members/scope.md
@@ -2,8 +2,6 @@
 pcx_content_type: reference
 title: Role scopes
 weight: 4
-aliases:
-- /fundamentals/account-and-billing/members/scope/
 ---
 
 # Role scopes
@@ -14,7 +12,7 @@ When you assign domain specific roles to account members, you can scope these ro
 
 ## Choose role scopes
 
-You choose the scope of a role when you [add a member](/fundamentals/account-and-billing/members/manage/) to your account.
+You choose the scope of a role when you [add a member](/fundamentals/setup/manage-members/manage/) to your account.
 
 ### All domains
 
@@ -60,7 +58,7 @@ If you want a member with access to a group of specific domains, you can also cr
 
 To create a domain group: 
 
-1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/login) and select your account (you must be logged in as a **Super Administrator** and have a [verified email address](/fundamentals/account-and-billing/account-setup/verify-email-address/)).
+1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/login) and select your account (you must be logged in as a **Super Administrator** and have a [verified email address](/fundamentals/setup/account-setup/verify-email-address/)).
 2. Go to **Manage Account** > **Configurations** > **Lists**.
 3. For **Domain Group Manager**, select **Create**.
 4. Create your domain group:
diff --git a/content/fundamentals/setup/use-cloudflare-without-changing-nameservers.md b/content/fundamentals/setup/use-cloudflare-without-changing-nameservers.md
index 3fcf013d31..c12ca53452 100644
--- a/content/fundamentals/setup/use-cloudflare-without-changing-nameservers.md
+++ b/content/fundamentals/setup/use-cloudflare-without-changing-nameservers.md
@@ -1,8 +1,6 @@
 ---
 pcx_content_type: how-to
 title: Use Cloudflare without changing nameservers
-aliases:
-- /fundamentals/get-started/basic-tasks/cloudflare-without-changing-nameservers/
 ---
 
 # Use Cloudflare without changing nameservers
diff --git a/content/images/cloudflare-images/api-request.md b/content/images/cloudflare-images/api-request.md
index 7ea4842d1e..d957501bf0 100644
--- a/content/images/cloudflare-images/api-request.md
+++ b/content/images/cloudflare-images/api-request.md
@@ -14,7 +14,7 @@ To make your first request to the Images API, you must obtain these pieces of in
 
 1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com/login), and select your
 account and website.
-2. In **Overview**, scroll down to find your [Account ID](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/).
+2. In **Overview**, scroll down to find your [Account ID](/fundamentals/setup/find-account-and-zone-ids/).
 
 </div>
 </details>
diff --git a/content/kv/get-started.md b/content/kv/get-started.md
index 12092c912a..ed67f5f2e4 100644
--- a/content/kv/get-started.md
+++ b/content/kv/get-started.md
@@ -13,7 +13,7 @@ This guide will instruct you through:
 
 ## Prerequisites
 
-1. A [Cloudflare account](/fundamentals/account-and-billing/account-setup/), if you do not have one already. 
+1. A [Cloudflare account](/fundamentals/setup/account-setup/), if you do not have one already. 
 2. [Wrangler](/workers/wrangler/install-and-update/) installed.
 
 ## 1. Enable Workers KV in the dashboard
diff --git a/content/learning-paths/_partials/_limit-external-connections-network.md b/content/learning-paths/_partials/_limit-external-connections-network.md
index 24a88f1e90..e9cbce5997 100644
--- a/content/learning-paths/_partials/_limit-external-connections-network.md
+++ b/content/learning-paths/_partials/_limit-external-connections-network.md
@@ -10,7 +10,7 @@ _build:
 
 <div>
 
-Explicitly block all traffic that does not come from [Cloudflare IP addresses](/fundamentals/get-started/setup/allow-cloudflare-ip-addresses/) (or the IP addresses of your trusted partners, vendors, or applications).
+Explicitly block all traffic that does not come from [Cloudflare IP addresses](/fundamentals/setup/allow-cloudflare-ip-addresses/) (or the IP addresses of your trusted partners, vendors, or applications).
 
 - **Security**: Moderately secure.
 - **Availability**: All customers.
diff --git a/content/learning-paths/cybersafe/account-creation/create-cloudflare-account.md b/content/learning-paths/cybersafe/account-creation/create-cloudflare-account.md
index b5d125240e..0e4655f942 100644
--- a/content/learning-paths/cybersafe/account-creation/create-cloudflare-account.md
+++ b/content/learning-paths/cybersafe/account-creation/create-cloudflare-account.md
@@ -11,7 +11,7 @@ To create a new Cloudflare account:
 
 2. To secure your account, enable [two-factor authentication](/support/account-management-billing/account-privacy-and-security/securing-user-access-with-two-factor-authentication-2fa/).
 
-3. After your account is accepted into the Cybersafe Schools program, you can to reach out to your Cloudflare contact and ask them to set up your account as a multi-user organization. This will allow you to define [role based access](/fundamentals/account-and-billing/members/roles/) controls. For this project, account members will need:
+3. After your account is accepted into the Cybersafe Schools program, you can to reach out to your Cloudflare contact and ask them to set up your account as a multi-user organization. This will allow you to define [role based access](/fundamentals/setup/manage-members/roles/) controls. For this project, account members will need:
     - [**Gateway** permissions](/cloudflare-one/cloudflare-teams-roles-permissions/) to read or edit DNS policies.
     - [**PII** permissions](/cloudflare-one/cloudflare-teams-roles-permissions/#cloudflare-zero-trust-pii) to view user information in DNS logs.
     - [**Configuration** permissions](/email-security/account-setup/permissions/) for Area 1 Email Security.
diff --git a/content/learning-paths/get-started-free/onboarding/add-and-activate.md b/content/learning-paths/get-started-free/onboarding/add-and-activate.md
index abea989d6b..5a8ab5ecc4 100644
--- a/content/learning-paths/get-started-free/onboarding/add-and-activate.md
+++ b/content/learning-paths/get-started-free/onboarding/add-and-activate.md
@@ -7,7 +7,7 @@ layout: learning-unit
 
 For most customers, adding and activating your domain on Cloudflare is straightforward.
 
-The first step is always the same, to [create a Cloudflare account](/fundamentals/account-and-billing/account-setup/create-account/).
+The first step is always the same, to [create a Cloudflare account](/fundamentals/setup/account-setup/create-account/).
 
 Your next steps depend on whether you have a domain name, such as `example.com`.
 
@@ -47,12 +47,12 @@ If you already have a domain, the easiest way to get set up with Cloudflare is t
 
 If you cannot transfer your domain or want to keep your current registrar, your setup has a few more steps:
 
-1. [Add your site](/fundamentals/get-started/setup/add-site/).
-2. (*Optional*) If your domain is sensitive to downtime, you may have a [few additional steps](/fundamentals/get-started/setup/minimize-downtime/).
+1. [Add your site](/fundamentals/setup/account-setup/add-site/).
+2. (*Optional*) If your domain is sensitive to downtime, you may have a [few additional steps](/fundamentals/basic-tasks/minimize-downtime/).
 3. At your registrar (where you bought your domain name), disable DNSSEC.
     <br/>
     {{<render file="_dnssec-providers.md" productFolder="dns">}}
-4. (*For some*) At your origin server, [allow Cloudflare IP addresses](/fundamentals/get-started/setup/allow-cloudflare-ip-addresses/).
+4. (*For some*) At your origin server, [allow Cloudflare IP addresses](/fundamentals/setup/allow-cloudflare-ip-addresses/).
 5. Change your [domain nameservers](/dns/zone-setups/full-setup/setup/).
 6. Wait for your domain to become [Active](/dns/zone-setups/reference/domain-status/) on Cloudflare.
 
diff --git a/content/learning-paths/get-started-free/onboarding/check-dns.md b/content/learning-paths/get-started-free/onboarding/check-dns.md
index 40680800a7..919c1e23ee 100644
--- a/content/learning-paths/get-started-free/onboarding/check-dns.md
+++ b/content/learning-paths/get-started-free/onboarding/check-dns.md
@@ -36,7 +36,7 @@ For more details on these errors and how to fix them, refer to the following res
 - [Cloudflare 1xxx errors](/support/troubleshooting/cloudflare-errors/troubleshooting-cloudflare-1xxx-errors/)
 - [Add a record on the zone apex](/dns/manage-dns-records/how-to/create-zone-apex/)
 - [Add a subdomain](/dns/manage-dns-records/how-to/create-subdomain/)
-- [Allow Cloudflare IP addresses](/fundamentals/get-started/setup/allow-cloudflare-ip-addresses/)
+- [Allow Cloudflare IP addresses](/fundamentals/setup/allow-cloudflare-ip-addresses/)
 
 ## Does your domain's email still work?
 
diff --git a/content/learning-paths/get-started-free/onboarding/proxy-dns-records.md b/content/learning-paths/get-started-free/onboarding/proxy-dns-records.md
index 690a5c3070..2814764e36 100644
--- a/content/learning-paths/get-started-free/onboarding/proxy-dns-records.md
+++ b/content/learning-paths/get-started-free/onboarding/proxy-dns-records.md
@@ -40,7 +40,7 @@ DNS records are instructions that live in authoritative DNS servers and provide
 {{<render file="_proxied-records-definition.md" productFolder="dns">}}
 
 - [Reverse proxy (definition)](https://www.cloudflare.com/learning/cdn/glossary/reverse-proxy/)
-- [How Cloudflare works](/fundamentals/get-started/concepts/how-cloudflare-works/)
+- [How Cloudflare works](/fundamentals/concepts/how-cloudflare-works/)
 - [DNS record proxy status](/dns/manage-dns-records/reference/proxied-dns-records/)
 
 </div>
@@ -50,7 +50,7 @@ DNS records are instructions that live in authoritative DNS servers and provide
 
 Before proxying your records, review [our guide](/dns/manage-dns-records/reference/proxied-dns-records/) that explains what proxying does and what limitations it has.
 
-You may also need to [allow Cloudflare IP addresses](/fundamentals/get-started/setup/allow-cloudflare-ip-addresses/) at your origin to prevent requests from being blocked.
+You may also need to [allow Cloudflare IP addresses](/fundamentals/setup/allow-cloudflare-ip-addresses/) at your origin to prevent requests from being blocked.
 
 ## How to do it
 
diff --git a/content/learning-paths/prevent-ddos-attacks/advanced/customize-security.md b/content/learning-paths/prevent-ddos-attacks/advanced/customize-security.md
index 9122e96abb..e267460311 100644
--- a/content/learning-paths/prevent-ddos-attacks/advanced/customize-security.md
+++ b/content/learning-paths/prevent-ddos-attacks/advanced/customize-security.md
@@ -14,5 +14,5 @@ To reduce incoming malicious requests, you could:
 - Build [rate limiting rules](/waf/rate-limiting-rules/) to protect against specific patterns of requests.
 - Enable [bot protection](/bots/get-started/) or set up [Bot Management for Enterprise](/learning-paths/bot-management/) to protect against automated abuse.
 - Explore [network-layer DDoS attack protection](/ddos-protection/managed-rulesets/network/).
-- Configure your zone's [Security Level](/fundamentals/security/security-level/) globally or selectively (depending on your needs).
+- Configure your zone's [Security Level](/waf/tools/security-level/) globally or selectively (depending on your needs).
 - Review the rest of Cloudflare's [security options](/learning-paths/application-security/).
\ No newline at end of file
diff --git a/content/learning-paths/prevent-ddos-attacks/baseline/proxy-dns-records.md b/content/learning-paths/prevent-ddos-attacks/baseline/proxy-dns-records.md
index 920264ccc9..a55271eb30 100644
--- a/content/learning-paths/prevent-ddos-attacks/baseline/proxy-dns-records.md
+++ b/content/learning-paths/prevent-ddos-attacks/baseline/proxy-dns-records.md
@@ -29,7 +29,7 @@ This obscurity makes it harder for someone to connect directly to your origin, w
 
 ## How to do it
 
-Before proxying your records, you should likely [allow Cloudflare IP addresses](/fundamentals/get-started/setup/allow-cloudflare-ip-addresses/) at your origin to prevent requests from being blocked.
+Before proxying your records, you should likely [allow Cloudflare IP addresses](/fundamentals/setup/allow-cloudflare-ip-addresses/) at your origin to prevent requests from being blocked.
 
 Then, [update your Cloudflare DNS records](/dns/manage-dns-records/how-to/create-dns-records/#edit-dns-records) so their **Proxy status** is **Proxied**.
 
diff --git a/content/load-balancing/how-to/enable-load-balancing.md b/content/load-balancing/how-to/enable-load-balancing.md
index f8aadc2782..df859b1c0d 100644
--- a/content/load-balancing/how-to/enable-load-balancing.md
+++ b/content/load-balancing/how-to/enable-load-balancing.md
@@ -9,7 +9,7 @@ meta:
 
 # Enable Load Balancing
 
-Load balancing is an add-on for your account, meaning your account needs a [billing profile](/fundamentals/account-and-billing/account-setup/create-billing-profile/).
+Load balancing is an add-on for your account, meaning your account needs a [billing profile](/fundamentals/setup/account-setup/create-billing-profile/).
 
 {{<Aside type="note">}}
 Load Balancing is not available with [China Network](/china-network/).{{</Aside>}}
diff --git a/content/logs/get-started/api-configuration.md b/content/logs/get-started/api-configuration.md
index 2f36c474a9..6c8402100b 100644
--- a/content/logs/get-started/api-configuration.md
+++ b/content/logs/get-started/api-configuration.md
@@ -10,7 +10,7 @@ weight: 42
 
 The table below summarizes the job operations available for both Logpush and Edge Log Delivery jobs. Make sure that Account-scoped datasets use `/accounts/<account_identifier>` and Zone-scoped use `/zone/<zone_identifier>`. For more information, refer to the [Log fields](/logs/reference/log-fields/) page.
 
-The `<zone_identifier>` argument is the zone id (hexadecimal string). The `<account_identifier>` argument is the organization id (hexadecimal string). These arguments can be found using [API's zones endpoint](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/).
+The `<zone_identifier>` argument is the zone id (hexadecimal string). The `<account_identifier>` argument is the organization id (hexadecimal string). These arguments can be found using [API's zones endpoint](/fundamentals/setup/find-account-and-zone-ids/).
 The `<job_identifier>` argument is the numeric job id. The `<dataset>` argument indicates the log category (such as `http_requests`, `spectrum_events`, `firewall_events`, `nel_reports`, or `dns_logs`).
 
 {{<table-wrap>}}
diff --git a/content/logs/get-started/enable-destinations/datadog/index.md b/content/logs/get-started/enable-destinations/datadog/index.md
index 9527933b3e..508731f8ea 100644
--- a/content/logs/get-started/enable-destinations/datadog/index.md
+++ b/content/logs/get-started/enable-destinations/datadog/index.md
@@ -163,5 +163,5 @@ The Datadog destination is exclusive to new jobs and might not be backward compa
 {{</Aside>}}
 
 {{<Aside type="note" header="Note">}}
-To analyze and visualize Cloudflare metrics using the Cloudflare Integration tile for Datadog, follow the steps in the [Datadog Analytics integration page](/fundamentals/data-products/analytics-integrations/datadog/).
+To analyze and visualize Cloudflare metrics using the Cloudflare Integration tile for Datadog, follow the steps in the [Datadog Analytics integration page](/analytics/analytics-integrations/datadog/).
 {{</Aside>}}
diff --git a/content/logs/get-started/enable-destinations/google-cloud-storage/index.md b/content/logs/get-started/enable-destinations/google-cloud-storage/index.md
index 26bc4610a7..2499ba377c 100644
--- a/content/logs/get-started/enable-destinations/google-cloud-storage/index.md
+++ b/content/logs/get-started/enable-destinations/google-cloud-storage/index.md
@@ -49,5 +49,5 @@ To enable Logpush to GCS:
 2. In **Storage** > **Browser** > **Bucket** > **Permissions**, add the member `logpush@cloudflare-data.iam.gserviceaccount.com` with `Storage Object Admin` permission.
 
 {{<Aside type="note" header="Note">}}
-To analyze your Cloudflare Logs data using the Google Cloud Platform (GCP), follow the steps in the [Google Cloud Analytics integration page](/fundamentals/data-products/analytics-integrations/google-cloud/).
+To analyze your Cloudflare Logs data using the Google Cloud Platform (GCP), follow the steps in the [Google Cloud Analytics integration page](/analytics/analytics-integrations/google-cloud/).
 {{</Aside>}}
diff --git a/content/logs/get-started/enable-destinations/new-relic/index.md b/content/logs/get-started/enable-destinations/new-relic/index.md
index c5d10261f0..eacd962f65 100644
--- a/content/logs/get-started/enable-destinations/new-relic/index.md
+++ b/content/logs/get-started/enable-destinations/new-relic/index.md
@@ -145,5 +145,5 @@ Response:
 ```
 
  {{<Aside type="note" header="Note">}}
-To analyze and visualize Cloudflare metrics using the Cloudflare Network Logs quickstart, follow the steps in the [New Relic Analytics integration page](/fundamentals/data-products/analytics-integrations/new-relic/).
+To analyze and visualize Cloudflare metrics using the Cloudflare Network Logs quickstart, follow the steps in the [New Relic Analytics integration page](/analytics/analytics-integrations/new-relic/).
 {{</Aside>}}
\ No newline at end of file
diff --git a/content/logs/get-started/enable-destinations/splunk/index.md b/content/logs/get-started/enable-destinations/splunk/index.md
index c8b25a70ff..ec8b3c5b2b 100644
--- a/content/logs/get-started/enable-destinations/splunk/index.md
+++ b/content/logs/get-started/enable-destinations/splunk/index.md
@@ -60,7 +60,7 @@ To create a job, make a `POST` request to the Logpush jobs endpoint with the fol
   - **\<SPLUNK_ENDPOINT_URL>**: The Splunk raw HTTP Event Collector URL with port. For example: `splunk.cf-analytics.com:8088/services/collector/raw`.
     - Cloudflare expects the HEC network port to be configured to `:443` or `:8088`.
     - Cloudflare expects the Splunk endpoint to be `/services/collector/raw` while configuring and setting up the Logpush job.
-    - Ensure you have enabled HEC in Splunk. Refer to [Splunk Analytics Integrations](/fundamentals/data-products/analytics-integrations/splunk/) for information on how to set up HEC in Splunk.
+    - Ensure you have enabled HEC in Splunk. Refer to [Splunk Analytics Integrations](/analytics/analytics-integrations/splunk/) for information on how to set up HEC in Splunk.
     - You may notice an API request failed with a 504 error, when adding an incorrect URL. Splunk Cloud endpoint URL usually contains `http-inputs-` or similar text before the hostname. Refer to [Send data to HTTP Event Collector on Splunk Cloud Platform](https://docs.splunk.com/Documentation/Splunk/latest/Data/UsetheHTTPEventCollector#Send_data_to_HTTP_Event_Collector) for more details.
   - **\<SPLUNK_CHANNEL_ID>**: A unique channel ID. This is a random GUID that you can generate by:
     - Using an online tool like the [GUID generator](https://www.guidgenerator.com/).
@@ -182,6 +182,6 @@ If you have the Cloudflare Web Application Firewall (WAF) turned on, you may get
 The WAF should now ignore requests made to Splunk HEC by Cloudflare.
 
 {{<Aside type="note" header="Note">}}
-To analyze and visualize Cloudflare Logs using the Cloudflare App for Splunk, follow the steps in the [Splunk Analytics integration page](/fundamentals/data-products/analytics-integrations/splunk/).
+To analyze and visualize Cloudflare Logs using the Cloudflare App for Splunk, follow the steps in the [Splunk Analytics integration page](/analytics/analytics-integrations/splunk/).
 {{</Aside>}}
 
diff --git a/content/logs/get-started/permissions.md b/content/logs/get-started/permissions.md
index b3f1aa0eee..871c9ac46c 100644
--- a/content/logs/get-started/permissions.md
+++ b/content/logs/get-started/permissions.md
@@ -35,4 +35,4 @@ To check the list of members in your account, or to manage roles and permissions
 3.  Enter a member’s email address to add them to your account, and select **Invite**.
 4.  Alternatively, scroll down to the **Members** card to find a list of members with their status and role.
 
-For more information, refer to [Managing roles within your Cloudflare account](/fundamentals/account-and-billing/members/).
+For more information, refer to [Managing roles within your Cloudflare account](/fundamentals/setup/manage-members/).
diff --git a/content/logs/reference/glossary.md b/content/logs/reference/glossary.md
index 113bbf7706..5030dbbfc6 100644
--- a/content/logs/reference/glossary.md
+++ b/content/logs/reference/glossary.md
@@ -93,7 +93,7 @@ Total threats stopped indicates the number of suspicious and bad requests aimed
 
 #### Bad browser score
 
-The bad browser score indicates that the source of the request was not legitimate or that the request itself was malicious. This value results from the [Cloudflare Browser Integrity Check (BIC)](/fundamentals/security/browser-integrity-check/) feature. Users would see a Cloudflare error `1010` page in their browser. Cloudflare’s Browser Integrity Check looks for common HTTP headers used most often by spammers, and blocks access to your page. It also challenges visitors that do not have a user agent or use a non-standard user agent (commonly used by bots, crawlers, or visitors).
+The bad browser score indicates that the source of the request was not legitimate or that the request itself was malicious. This value results from the [Cloudflare Browser Integrity Check (BIC)](/waf/tools/browser-integrity-check/) feature. Users would see a Cloudflare error `1010` page in their browser. Cloudflare’s Browser Integrity Check looks for common HTTP headers used most often by spammers, and blocks access to your page. It also challenges visitors that do not have a user agent or use a non-standard user agent (commonly used by bots, crawlers, or visitors).
 
 #### Blocked hotlink score
 
diff --git a/content/logs/tutorials/_index.md b/content/logs/tutorials/_index.md
index d2cdb531ba..56622669c0 100644
--- a/content/logs/tutorials/_index.md
+++ b/content/logs/tutorials/_index.md
@@ -6,7 +6,7 @@ weight: 81
 
 # Tutorials
 
-Learn to manage and analyze your Cloudflare Logs with the following resources. For information about Cloudflare's analytics integrations, refer to [Analytics Integrations](/fundamentals/data-products/analytics-integrations/).
+Learn to manage and analyze your Cloudflare Logs with the following resources. For information about Cloudflare's analytics integrations, refer to [Analytics Integrations](/analytics/analytics-integrations/).
 
 ## Logpull and Logpush
 
diff --git a/content/magic-firewall/best-practices/extended-ruleset.md b/content/magic-firewall/best-practices/extended-ruleset.md
index 52968481e0..a263dc8bbe 100644
--- a/content/magic-firewall/best-practices/extended-ruleset.md
+++ b/content/magic-firewall/best-practices/extended-ruleset.md
@@ -72,7 +72,7 @@ Rule 10 in the example ruleset below is acting as a catch-all to block all traff
 
 Follow the best practices for internal routers or firewall interface IP addresses on your MT prefixes below.
 
-1.  Create [an IP List](/fundamentals/global-configurations/lists/ip-lists/), **Internal routers** for example, list your IP addresses.
+1.  Create [an IP List](/waf/tools/lists/ip-lists/), **Internal routers** for example, list your IP addresses.
 2.  Block ICMP if it is not needed.
 3.  Permit GRE/ESP as needed if the devices have GRE/IPsec tunnels via the Internet.
 
@@ -102,7 +102,7 @@ Where possible, permit the required destination IP addresses and ports for web s
 
 The following is an example of suggested rules, but you should only make changes based on your specific requirements. For example, if you are not proxied by Cloudflare Layer 7 protection and you expect traffic sourced from the web towards your web servers:
 
-1.  Create [an IP List](/fundamentals/global-configurations/lists/ip-lists/), **web servers** for example, to list IP addresses for your web servers.
+1.  Create [an IP List](/waf/tools/lists/ip-lists/), **web servers** for example, to list IP addresses for your web servers.
 2.  Permit traffic for the web server traffic inbound from the Internet.
 3.  Permit traffic for the infrastructure or client traffic flows from the Internet, for example DNS and NTP.
 4.  Block all other traffic destined for the web server IP addresses.
diff --git a/content/magic-firewall/how-to/use-rules-list.md b/content/magic-firewall/how-to/use-rules-list.md
index 3caf25d20d..1cfbad1dbc 100644
--- a/content/magic-firewall/how-to/use-rules-list.md
+++ b/content/magic-firewall/how-to/use-rules-list.md
@@ -8,7 +8,7 @@ meta:
 
 # Define an IP List
 
-[IP Lists](/fundamentals/global-configurations/lists/ip-lists/) defined at the account level can be used to match against `ip.src` and `ip.dst` fields. Currently only IPv4 addresses in these lists are used as IPv6 is currently not supported in Magic Firewall.
+[IP Lists](/waf/tools/lists/ip-lists/) defined at the account level can be used to match against `ip.src` and `ip.dst` fields. Currently only IPv4 addresses in these lists are used as IPv6 is currently not supported in Magic Firewall.
 
 To use this feature first [create a new IP list](/api/operations/lists-create-a-list).
 
diff --git a/content/magic-firewall/reference/examples.md b/content/magic-firewall/reference/examples.md
index 3ca37d4639..639e34998f 100644
--- a/content/magic-firewall/reference/examples.md
+++ b/content/magic-firewall/reference/examples.md
@@ -72,7 +72,7 @@ curl https://api.cloudflare.com/client/v4/accounts/{account_id}/rulesets \
 
 ## Use an IP List
 
-Magic Firewall supports [using lists in expressions](/fundamentals/global-configurations/lists/use-in-expressions/) for the `ip.src` and `ip.dst` fields. The supported lists are:
+Magic Firewall supports [using lists in expressions](/waf/tools/lists/use-in-expressions/) for the `ip.src` and `ip.dst` fields. The supported lists are:
 
 - `$cf.anonymizer` - Anonymizer proxies
 - `$cf.botnetcc` - Botnet command and control channel
diff --git a/content/magic-transit/_partials/_tunnel-endpoints.md b/content/magic-transit/_partials/_tunnel-endpoints.md
index ccb2f876ae..16d9e8c141 100644
--- a/content/magic-transit/_partials/_tunnel-endpoints.md
+++ b/content/magic-transit/_partials/_tunnel-endpoints.md
@@ -28,13 +28,13 @@ This value is not required for IPsec tunnels, unless your router is using an IKE
 
 ### GRE tunnels
 
-You can set up GRE tunnels through the Cloudflare dashboard or via the API. However, if you want to use the API, be sure to have your [account ID](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/) and [API key](/fundamentals/api/get-started/keys/#view-your-global-api-key) ready before you begin.
+You can set up GRE tunnels through the Cloudflare dashboard or via the API. However, if you want to use the API, be sure to have your [account ID](/fundamentals/setup/find-account-and-zone-ids/) and [API key](/fundamentals/api/get-started/keys/#view-your-global-api-key) ready before you begin.
 
 ### IPsec tunnels
 
 You can [use IPsec]($4) as an on-ramp to connect with your entire virtual network. With an IPsec tunnel, you can route traffic from your network to Cloudflare's global network and define static routes to direct traffic down the correct tunnel.
 
-You can set up IPsec tunnels through the Cloudflare dashboard or via the API. However, if you want to use the API, be sure to have your [account ID](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/) and [API key](/fundamentals/api/get-started/keys/#view-your-global-api-key) ready before you begin.
+You can set up IPsec tunnels through the Cloudflare dashboard or via the API. However, if you want to use the API, be sure to have your [account ID](/fundamentals/setup/find-account-and-zone-ids/) and [API key](/fundamentals/api/get-started/keys/#view-your-global-api-key) ready before you begin.
 
 {{<Aside type="note" header="Note">}}$2 only supports Internet Key Exchange version 2 (IKEv2).{{</Aside>}}
 
diff --git a/content/page-shield/reference/page-shield-api.md b/content/page-shield/reference/page-shield-api.md
index 6b4fb630ac..4df107c74f 100644
--- a/content/page-shield/reference/page-shield-api.md
+++ b/content/page-shield/reference/page-shield-api.md
@@ -22,7 +22,7 @@ You can obtain the complete endpoint by appending the [Page Shield API](/api/ope
 https://api.cloudflare.com/client/v4
 ```
 
-The `{zone_id}` argument is the zone ID (a hexadecimal string). You can find this value in the Cloudflare dashboard or using the Cloudflare API's [`/zones` endpoint](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/).
+The `{zone_id}` argument is the zone ID (a hexadecimal string). You can find this value in the Cloudflare dashboard or using the Cloudflare API's [`/zones` endpoint](/fundamentals/setup/find-account-and-zone-ids/).
 
 The `{script_id}` argument is the script ID (a hexadecimal string). This value is included in the response of the [List Page Shield scripts](/api/operations/page-shield-list-page-shield-scripts) operation for every detected script.
 
diff --git a/content/pages/how-to/add-custom-http-headers.md b/content/pages/how-to/add-custom-http-headers.md
index 9de1dabdd2..7322cb67a0 100644
--- a/content/pages/how-to/add-custom-http-headers.md
+++ b/content/pages/how-to/add-custom-http-headers.md
@@ -86,7 +86,7 @@ route = "FILL-IN-YOUR-WEBSITE.com/*"
 zone_id = "FILL-IN-YOUR-ZONE-ID"
 ```
 
-If you do not know how to find your Account ID and Zone ID, refer to [our guide](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/).
+If you do not know how to find your Account ID and Zone ID, refer to [our guide](/fundamentals/setup/find-account-and-zone-ids/).
 
 Once you have configured your `wrangler.toml`, run `npx wrangler deploy` in your terminal to deploy your Worker:
 
diff --git a/content/pages/platform/api.md b/content/pages/platform/api.md
index b77123b51d..da9536c803 100644
--- a/content/pages/platform/api.md
+++ b/content/pages/platform/api.md
@@ -27,7 +27,7 @@ $ curl 'https://api.cloudflare.com/client/v4/accounts/{account_id}/pages/project
   -H 'Authorization: Bearer {API_token}'
 ```
 
-Try it with one of your projects by replacing `{account_id}`, `{project_name}`, and `{API_token}`. Refer to [Find your account ID](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/) for more information.
+Try it with one of your projects by replacing `{account_id}`, `{project_name}`, and `{API_token}`. Refer to [Find your account ID](/fundamentals/setup/find-account-and-zone-ids/) for more information.
 
 ## Examples
 
diff --git a/content/pages/platform/known-issues.md b/content/pages/platform/known-issues.md
index 47878f08c4..8ff970a931 100644
--- a/content/pages/platform/known-issues.md
+++ b/content/pages/platform/known-issues.md
@@ -113,4 +113,4 @@ $ CF_API_TOKEN=<YOUR_CF_API_TOKEN> CF_ACCOUNT_ID=<ACCOUNT_ID> CF_PAGES_PROJECT_N
 
 To find your Cloudflare API token, log in to the [Cloudflare dashboard](https://dash.cloudflare.com), select the user icon on the upper righthand side of your screen > go to **My Profile** > **API Tokens**.
 
-To find your Account ID, refer to [Find your zone and account ID](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/).
+To find your Account ID, refer to [Find your zone and account ID](/fundamentals/setup/find-account-and-zone-ids/).
diff --git a/content/pages/platform/preview-deployments.md b/content/pages/platform/preview-deployments.md
index 4a67567220..34afac2701 100644
--- a/content/pages/platform/preview-deployments.md
+++ b/content/pages/platform/preview-deployments.md
@@ -33,7 +33,7 @@ Any custom domains, as well as your `user-example.pages.dev` site, will not be a
 
 You can use [Cloudflare Access](/cloudflare-one/policies/access/) to manage access to your deployment previews. By default, these deployment URLs are public. Enabling the access policy will restrict viewing project deployments to your Cloudflare account.
 
-Once enabled, you can [set up a multi-user account](/fundamentals/account-and-billing/members/) to allow other members of your team to view preview deployments.
+Once enabled, you can [set up a multi-user account](/fundamentals/setup/manage-members/) to allow other members of your team to view preview deployments.
 
 By default, preview deployments are enabled and available publicly. In your project's settings, you can require visitors to authenticate to view preview deployment. This allows you to lock down access to these preview deployments to your teammates, organization, or anyone else you specify via [Access policies](/cloudflare-one/policies/).
 
diff --git a/content/pub-sub/guide.md b/content/pub-sub/guide.md
index ce2fee8a15..b69aa357ea 100644
--- a/content/pub-sub/guide.md
+++ b/content/pub-sub/guide.md
@@ -25,7 +25,7 @@ Before you begin, you should be familiar with using the command line and running
 
 ## Prerequisite: Create a Cloudflare account
 
-In order to use Pub/Sub, you need a [Cloudflare account](/fundamentals/account-and-billing/account-setup/). If you already have an account, you can skip this step.
+In order to use Pub/Sub, you need a [Cloudflare account](/fundamentals/setup/account-setup/). If you already have an account, you can skip this step.
 
 ## 1. Enable Pub/Sub
 
diff --git a/content/queues/get-started.md b/content/queues/get-started.md
index 5f4273c944..df78ced527 100644
--- a/content/queues/get-started.md
+++ b/content/queues/get-started.md
@@ -14,7 +14,7 @@ Cloudflare Queues is a flexible messaging queue that allows you to queue message
 
 To use Queues, you will need:
 
-1. A [Cloudflare account](/fundamentals/account-and-billing/account-setup/), if you do not have one already.
+1. A [Cloudflare account](/fundamentals/setup/account-setup/), if you do not have one already.
 
 2. C3 ([`create-cloudflare-cli`](https://www.npmjs.com/package/create-cloudflare)) to help you setup and deploy Workers to Cloudflare as fast as possible. C3 will also install [Wrangler](/workers/wrangler/install-and-update/), a command-line tool for building Cloudflare Workers and accessing Queues. To install `create-cloudflare`, ensure you have [`npm`](https://docs.npmjs.com/getting-started) and [`Node.js`](https://nodejs.org/en/) installed.
 3. A Node version manager like [Volta](https://volta.sh/) or [nvm](https://github.com/nvm-sh/nvm) to avoid permission issues and change Node.js versions. Wrangler requires a Node version of `16.13.0` or later. You will install these tools as part of creating a new project in [step 2](/queues/get-started/#2-create-a-worker-project).
diff --git a/content/r2/api/s3/api.md b/content/r2/api/s3/api.md
index 478c485589..d5b3b7c341 100644
--- a/content/r2/api/s3/api.md
+++ b/content/r2/api/s3/api.md
@@ -7,7 +7,7 @@ weight: 1
 # S3 API compatibility
 
 R2 implements the S3 API to allow users and their applications to migrate with ease. When comparing to AWS S3, Cloudflare has removed some API operations' features and added others. The S3 API operations are listed below with their current implementation status. Feature implementation is currently in progress. Refer back to this page for updates.
-The API is available via the `https://<ACCOUNT_ID>.r2.cloudflarestorage.com` endpoint. Find your [account ID in the Cloudflare dashboard](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/).
+The API is available via the `https://<ACCOUNT_ID>.r2.cloudflarestorage.com` endpoint. Find your [account ID in the Cloudflare dashboard](/fundamentals/setup/find-account-and-zone-ids/).
 
 ## How to read this page
 
diff --git a/content/r2/api/s3/tokens.md b/content/r2/api/s3/tokens.md
index 41885a4940..e0758fedfd 100644
--- a/content/r2/api/s3/tokens.md
+++ b/content/r2/api/s3/tokens.md
@@ -30,7 +30,7 @@ You will not be able to access your **Secret Access Key** again after this step.
 
 The S3 endpoint is available via the `https://<ACCOUNT_ID>.r2.cloudflarestorage.com` endpoint. 
 
-Find your [account ID in the Cloudflare dashboard](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/).
+Find your [account ID in the Cloudflare dashboard](/fundamentals/setup/find-account-and-zone-ids/).
 
 ## Permissions
 
diff --git a/content/radar/investigate/application-layer-attacks.md b/content/radar/investigate/application-layer-attacks.md
index 2a06723e29..6122ac2994 100644
--- a/content/radar/investigate/application-layer-attacks.md
+++ b/content/radar/investigate/application-layer-attacks.md
@@ -9,7 +9,7 @@ weight: 3
 While in [HTTP requests](/radar/investigate/http-requests) you can examine all kinds of web requests, in application layer attacks you have access only to mitigated HTTP requests. These requests can be mitigated by one of several Cloudflare products, like [WAF](/waf/), [Cloudflare DDoS Protection](/ddos-protection/), [Cloudflare bot solutions](/bots/) and others.
 
 {{<Aside type="note" header="Mitigated traffic">}}
-Mitigated traffic is any HTTP request from an end-user that has a terminating action applied by the Cloudflare platform. These include actions like `BLOCK` or [challenges](/fundamentals/get-started/concepts/cloudflare-challenges/).
+Mitigated traffic is any HTTP request from an end-user that has a terminating action applied by the Cloudflare platform. These include actions like `BLOCK` or [challenges](/firewall/cf-firewall-rules/cloudflare-challenges/).
 {{</Aside>}}
 
 Since we are examining attacks, we can inspect both sides of an attack — both the source location and the target location of the attack. For the source of the attack Cloudflare uses the location the attack is coming from associated with the IP (note that the human orchestrator of the attack may be in a different location than the computer the attack is originating from). For the target location of the attacks, Cloudflare uses the billing location associated with the zone under attack.
diff --git a/content/railgun/_index.md b/content/railgun/_index.md
index ebe47e9dfd..b2e7f04e8d 100644
--- a/content/railgun/_index.md
+++ b/content/railgun/_index.md
@@ -20,5 +20,5 @@ Since Railgun’s launch, Cloudflare has released several products in different
 | Use case | Railgun solution | Improved Cloudflare solution |
 | --- | --- | --- | 
 | Performance | Railgun can transmit the difference between dynamic page requests, but not necessarily over the fastest Internet path. | <ul><li>[Argo Smart Routing](/argo-smart-routing/) routes requests over the most efficient path, avoiding any network congestion.</li></ul> |
-| Connectivity and IP Management | Railgun listeners can front multiple origin servers simultaneously, reducing the need for more IP management.</br></br>Redundant Railgun listeners can be deployed for increased fault tolerance. | <ul><li>[Cloudflare Tunnel](/cloudflare-one/connections/connect-networks/) securely connects your origin servers to Cloudflare without a publicly routable IP address.</li><li>[Cloudflare Load Balancing](/load-balancing/) distributes traffic across your servers, which reduces server strain and latency.</li><li>[Cloudflare Aegis](/fundamentals/get-started/task-guides/origin-health/enterprise/) are dedicated IPs between Cloudflare and your origin. This allows you to lock down your services and applications at an IP level and build a protected environment that is application aware, protocol aware, and even IP-aware.</li><li>[Cloudflare Network Interconnect (CNI)](/network-interconnect/) allows you to connect your network infrastructure directly with Cloudflare – rather than using the public Internet.</li></ul> |
+| Connectivity and IP Management | Railgun listeners can front multiple origin servers simultaneously, reducing the need for more IP management.</br></br>Redundant Railgun listeners can be deployed for increased fault tolerance. | <ul><li>[Cloudflare Tunnel](/cloudflare-one/connections/connect-networks/) securely connects your origin servers to Cloudflare without a publicly routable IP address.</li><li>[Cloudflare Load Balancing](/load-balancing/) distributes traffic across your servers, which reduces server strain and latency.</li><li>[Cloudflare Aegis](/fundamentals/basic-tasks/protect-your-origin-server/) are dedicated IPs between Cloudflare and your origin. This allows you to lock down your services and applications at an IP level and build a protected environment that is application aware, protocol aware, and even IP-aware.</li><li>[Cloudflare Network Interconnect (CNI)](/network-interconnect/) allows you to connect your network infrastructure directly with Cloudflare – rather than using the public Internet.</li></ul> |
 | Reduce egress fees to Cloudflare | In some cases, Railgun compression can reduce egress. | <ul><li>[Cloudflare R2](/r2/) allows users to store large amounts of unstructured data.</li><li>[Cloudflare Tiered Cache](/cache/how-to/tiered-cache/) uses the size of Cloudflare's network to reduce requests to customer origins by dramatically increasing cache hit ratios.</li><li>[Bandwidth Alliance](https://blog.cloudflare.com/empowering-customers-with-the-bandwidth-alliance/) a collective group of cloud and storage providers who have agreed to waive or steeply discount egress costs for mutual customers.</li></ul> |
\ No newline at end of file
diff --git a/content/railgun/user-guide/troubleshooting/potential-problems.md b/content/railgun/user-guide/troubleshooting/potential-problems.md
index c81a726a3a..e740d5a797 100644
--- a/content/railgun/user-guide/troubleshooting/potential-problems.md
+++ b/content/railgun/user-guide/troubleshooting/potential-problems.md
@@ -10,7 +10,7 @@ meta:
 
 {{<render file="_railgun-deprecation-notice.md">}}
 
-If you notice consistent `523`, `524`, or other error responses, check the [System Status Map](https://www.cloudflarestatus.com/) and [contact support](#support) if needed. Railgun will fall back to direct HTTP requests if Cloudflare's endpoints cannot contact your Railgun daemon, but consistent error responses may indicate a system or origin server problem. When contacting support, please provide a screenshot of `http://www.yourdomain.com/cdn-cgi/trace` if possible, or a [traceroute](https://support.cloudflare.com/hc/articles/200169336) to your domain so Cloudflare knows which data center your requests are reaching. You can then [pause](/fundamentals/get-started/basic-tasks/manage-domains/pause-cloudflare/) Cloudflare via the website to disable the service and resume normal website traffic.
+If you notice consistent `523`, `524`, or other error responses, check the [System Status Map](https://www.cloudflarestatus.com/) and [contact support](#support) if needed. Railgun will fall back to direct HTTP requests if Cloudflare's endpoints cannot contact your Railgun daemon, but consistent error responses may indicate a system or origin server problem. When contacting support, please provide a screenshot of `http://www.yourdomain.com/cdn-cgi/trace` if possible, or a [traceroute](https://support.cloudflare.com/hc/articles/200169336) to your domain so Cloudflare knows which data center your requests are reaching. You can then [pause](/fundamentals/setup/manage-domains/pause-cloudflare/) Cloudflare via the website to disable the service and resume normal website traffic.
 
 Railgun does not perform DNS queries when it receives a request for maximum efficiency and to prevent tampering. This means that the daemon is unaware of NAT routing or firewalls. NAT does not allow for addressing a public interface from within the associated LAN, and Railgun requests will timeout and produce `502` errors. This can be corrected by setting up a static IP mapping. You can set that either through the hosts file for your system (usually at the path `/etc/hosts`) or through the `railgun-nat.conf` file in the same directory as the `railgun.conf` file. Contact support if you require assistance with the NAT configuration file.
 
diff --git a/content/registrar/_partials/_before-you-begin.md b/content/registrar/_partials/_before-you-begin.md
index a8b9c89351..94586bf736 100644
--- a/content/registrar/_partials/_before-you-begin.md
+++ b/content/registrar/_partials/_before-you-begin.md
@@ -7,8 +7,8 @@ _build:
 
 ## Before transferring a domain to Cloudflare
 
-* Create [a Cloudflare account](/fundamentals/account-and-billing/account-setup/create-account/).
-* [Add the domain](/fundamentals/get-started/setup/add-site/) you are transferring to your Cloudflare account.
+* Create [a Cloudflare account](/fundamentals/setup/account-setup/create-account/).
+* [Add the domain](/fundamentals/setup/account-setup/add-site/) you are transferring to your Cloudflare account.
 * [Review your DNS records](/dns/zone-setups/full-setup/setup/#review-dns-records) in the Cloudflare dashboard.
 * [Change your DNS nameservers](/dns/zone-setups/full-setup/) to Cloudflare.
 * If initiating multiple transfers, notify your financial institution to prevent them from flagging these charges as fraudulent.
diff --git a/content/registrar/_partials/_email-verification.md b/content/registrar/_partials/_email-verification.md
index 6e2584cd24..1f207636ad 100644
--- a/content/registrar/_partials/_email-verification.md
+++ b/content/registrar/_partials/_email-verification.md
@@ -7,6 +7,6 @@ _build:
 
 {{<Aside type="note">}}
 
-If you have an [unverified account email address](/fundamentals/account-and-billing/account-setup/verify-email-address/), you will not be able to transfer or register domains. Verify your account email address before proceeding.
+If you have an [unverified account email address](/fundamentals/setup/account-setup/verify-email-address/), you will not be able to transfer or register domains. Verify your account email address before proceeding.
 
 {{</Aside>}}
diff --git a/content/registrar/get-started/register-domain.md b/content/registrar/get-started/register-domain.md
index b4764db773..a86055a6e6 100644
--- a/content/registrar/get-started/register-domain.md
+++ b/content/registrar/get-started/register-domain.md
@@ -10,7 +10,7 @@ weight: 1
 
 * Cloudflare Registrar is only available for customers that use Cloudflare as their authoritative DNS provider (also known as a [full setup](/dns/zone-setups/)).
 * Cloudflare Registrar does not currently support internationalized domain names (IDNs), also known as Unicode.
-* You must have a [verified account email address](/fundamentals/account-and-billing/account-setup/verify-email-address/), to transfer or register domains.
+* You must have a [verified account email address](/fundamentals/setup/account-setup/verify-email-address/), to transfer or register domains.
 
 ---
 
diff --git a/content/registrar/get-started/transfer-domain-to-cloudflare.md b/content/registrar/get-started/transfer-domain-to-cloudflare.md
index 4709540b77..be9a8785ca 100644
--- a/content/registrar/get-started/transfer-domain-to-cloudflare.md
+++ b/content/registrar/get-started/transfer-domain-to-cloudflare.md
@@ -75,12 +75,12 @@ You will not be billed at this step. Cloudflare will only bill your card when yo
 
 Sites can be unavailable for a few reasons, including:
 
-- You did not [add your domain](/fundamentals/get-started/setup/add-site/) to your Cloudflare.
+- You did not [add your domain](/fundamentals/setup/account-setup/add-site/) to your Cloudflare.
 - The site was registered in the last 60 days.
 - Cloudflare does not yet support the TLD.
 - The domain is designated as a premium domain by the registry.
 - The domain has a status that does not allow for a transfer.
-- You failed to follow the steps highlighted above in [creating an account with your domain](/fundamentals/account-and-billing/account-setup/create-account/) and [changing your DNS nameservers to Cloudflare](/dns/zone-setups/full-setup/).
+- You failed to follow the steps highlighted above in [creating an account with your domain](/fundamentals/setup/account-setup/create-account/) and [changing your DNS nameservers to Cloudflare](/dns/zone-setups/full-setup/).
 
 {{</Aside>}}
 
diff --git a/content/registrar/top-level-domains/uk-domains.md b/content/registrar/top-level-domains/uk-domains.md
index d6ee25b01f..1ff8d9943b 100644
--- a/content/registrar/top-level-domains/uk-domains.md
+++ b/content/registrar/top-level-domains/uk-domains.md
@@ -13,7 +13,7 @@ meta:
 Cloudflare currently supports the transfer of `.uk`, `co.uk`, `org.uk`, and `me.uk` domains. To transfer a `.uk` domain to Cloudflare from another registrar follow these steps:
 
 1. Log in go the [Cloudflare dashboard](https://dash.cloudflare.com/) and select your account.
-2. Select **Domain Registration** > **Transfer Domains**. Cloudflare will show you a list of domains that are eligible for transfer (see below for restrictions). If you do not see your domain, [add the domain you want to transfer](/fundamentals/get-started/setup/add-site/) to your Cloudflare account before you try to transfer your `.uk` domain.
+2. Select **Domain Registration** > **Transfer Domains**. Cloudflare will show you a list of domains that are eligible for transfer (see below for restrictions). If you do not see your domain, [add the domain you want to transfer](/fundamentals/setup/account-setup/add-site/) to your Cloudflare account before you try to transfer your `.uk` domain.
 3. Select the domains you wish to transfer.
 4. Proceed to checkout. Note that there is no fee to transfer a `.uk` domain and an additional year is NOT added during the transfer process.
 5. After checkout, request your current registrar to update the [IPS tag](https://en.wikipedia.org/wiki/Internet_Provider_Security) to `CLOUDFLARE`. If the transfer is not completed within 24 hours, ask your registrar again to update the IPS tag. The transfer will be automatically canceled if not completed within 30 days.
diff --git a/content/rules/configuration-rules/settings.md b/content/rules/configuration-rules/settings.md
index 3f73be3297..9680ab10f3 100644
--- a/content/rules/configuration-rules/settings.md
+++ b/content/rules/configuration-rules/settings.md
@@ -64,7 +64,7 @@ header: API configuration example
 
 ## Browser Integrity Check
 
-Enable or disable [Browser Integrity Check](/fundamentals/security/browser-integrity-check/) [^3] for matching requests.
+Enable or disable [Browser Integrity Check](/waf/tools/browser-integrity-check/) [^3] for matching requests.
 
 <details>
 <summary>API information</summary>
@@ -310,7 +310,7 @@ header: API configuration example
 
 ## Security Level
 
-Select the [Security Level](/fundamentals/security/security-level/) [^13] for matching requests.
+Select the [Security Level](/waf/tools/security-level/) [^13] for matching requests.
 
 <details>
 <summary>API information</summary>
diff --git a/content/rules/transform/_index.md b/content/rules/transform/_index.md
index d72234998b..87acd105b2 100644
--- a/content/rules/transform/_index.md
+++ b/content/rules/transform/_index.md
@@ -40,7 +40,7 @@ This table outlines the Transform Rules features available with each customer pl
 
 {{<feature-table id="rules.transform_rules">}}
 
-A Cloudflare user must have the [Firewall role](/fundamentals/account-and-billing/members/roles/) or one of the Administrator roles to access Transform Rules.
+A Cloudflare user must have the [Firewall role](/fundamentals/setup/manage-members/roles/) or one of the Administrator roles to access Transform Rules.
 
 ## Get started
 
diff --git a/content/rules/transform/response-header-modification/_index.md b/content/rules/transform/response-header-modification/_index.md
index 153ffe8e5f..3e04857859 100644
--- a/content/rules/transform/response-header-modification/_index.md
+++ b/content/rules/transform/response-header-modification/_index.md
@@ -28,7 +28,7 @@ To modify HTTP headers in the **request**, refer to [HTTP request header modific
 
 * You cannot modify the value of certain headers such as `server`, `eh-cache-tag`, or `eh-cdn-cache-control`.
 
-* Currently you cannot reference [IP Lists](/fundamentals/global-configurations/lists/ip-lists/) in expressions of HTTP response header modification rules.
+* Currently you cannot reference [IP Lists](/waf/tools/lists/ip-lists/) in expressions of HTTP response header modification rules.
 
 * The HTTP response header removal operation will remove all response headers with the provided name.
 
diff --git a/content/rules/url-forwarding/bulk-redirects/create-api.md b/content/rules/url-forwarding/bulk-redirects/create-api.md
index 7e16fedbcb..6015c139a8 100644
--- a/content/rules/url-forwarding/bulk-redirects/create-api.md
+++ b/content/rules/url-forwarding/bulk-redirects/create-api.md
@@ -61,7 +61,7 @@ highlight: 3
 
 Take note of the list ID — you will need it in the next step.
 
-For more information on list operations, refer to the [Lists API](/fundamentals/global-configurations/lists/lists-api/) documentation.
+For more information on list operations, refer to the [Lists API](/waf/tools/lists/lists-api/) documentation.
 
 ## 2. Add items to the list
 
diff --git a/content/ruleset-engine/managed-rulesets/deploy-managed-ruleset.md b/content/ruleset-engine/managed-rulesets/deploy-managed-ruleset.md
index 11f0e25756..b6c51ec5d5 100644
--- a/content/ruleset-engine/managed-rulesets/deploy-managed-ruleset.md
+++ b/content/ruleset-engine/managed-rulesets/deploy-managed-ruleset.md
@@ -14,7 +14,7 @@ To deploy a managed ruleset to a phase, use the [Rulesets API](/ruleset-engine/r
 
 Use the following workflow to deploy a managed ruleset to a phase at the account level.
 
-1. Get your [account ID](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/).
+1. Get your [account ID](/fundamentals/setup/find-account-and-zone-ids/).
 2. Invoke the [List account rulesets](/api/operations/listAccountRulesets) operation to obtain the available rulesets. Find the ruleset ID of the managed ruleset you wish to deploy.
 3. Identify the [phase](/ruleset-engine/about/phases/) where you want to deploy the managed ruleset. Ensure that the managed ruleset belongs to the same phase where you want to deploy it. To learn more about the available phases supported by each Cloudflare product, refer to the specific documentation for that product, or the [Phases list](/ruleset-engine/reference/phases-list/).
 4. Add a rule to the account-level phase entry point ruleset that executes the managed ruleset. Use parentheses to enclose any custom conditions in the rule expression and end your expression with `and cf.zone.plan eq "ENT"` so that it only applies to zones on an Enterprise plan.
@@ -89,7 +89,7 @@ header: Response
 
 Use the following workflow to deploy a managed ruleset to a phase at the zone level.
 
-1.  Get your [zone ID](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/).
+1.  Get your [zone ID](/fundamentals/setup/find-account-and-zone-ids/).
 2.  Invoke the [List account rulesets](/api/operations/listAccountRulesets) operation to obtain the available rulesets. Managed rulesets exist at the account level, but you can deploy them to a zone. Find the ruleset ID of the managed ruleset you wish to deploy.
 3.  Identify the [phase](/ruleset-engine/about/phases/) where you want to deploy the managed ruleset. Ensure that the managed ruleset belongs to the same phase where you want to deploy it. To learn more about the available phases supported by each Cloudflare product, refer to the specific documentation for that product, or the [Phases list](/ruleset-engine/reference/phases-list/).
 4.  Add a rule to the zone-level phase entry point ruleset that executes the managed ruleset.
diff --git a/content/ruleset-engine/rules-language/values.md b/content/ruleset-engine/rules-language/values.md
index 4fbb8da39d..90f6e68748 100644
--- a/content/ruleset-engine/rules-language/values.md
+++ b/content/ruleset-engine/rules-language/values.md
@@ -97,13 +97,13 @@ Lists allow you to create a group of items and refer to them collectively, by na
 
 To refer to a list in a rule expression, use `$<list_name>` and specify the `in` [operator](/ruleset-engine/rules-language/operators/). Only one value in the list has to match the left-hand side of the expression (before the `in` operator) for the simple expression to evaluate to `true`. If there is no match, the expression will evaluate to `false`.
 
-The following example expression filters requests from IP addresses that are in an [IP List](/fundamentals/global-configurations/lists/ip-lists/) named `office_network`:
+The following example expression filters requests from IP addresses that are in an [IP List](/waf/tools/lists/ip-lists/) named `office_network`:
 
 ```sql
 (ip.src in $office_network)
 ```
 
-List names can only include lowercase letters, numbers, and the underscore (`_`) character. For guidance on creating and managing lists, refer to [Lists](/fundamentals/global-configurations/lists/).
+List names can only include lowercase letters, numbers, and the underscore (`_`) character. For guidance on creating and managing lists, refer to [Lists](/waf/tools/lists/).
 
 ### Inline lists
 
diff --git a/content/security-center/app-security-reports/index.md b/content/security-center/app-security-reports/index.md
index 99f77f2d21..c769ef2396 100644
--- a/content/security-center/app-security-reports/index.md
+++ b/content/security-center/app-security-reports/index.md
@@ -32,7 +32,7 @@ To download a monthly application security report:
 
 ## Required roles
 
-A Cloudflare user must have one of the following [roles](/fundamentals/account-and-billing/members/roles/) to download application security reports:
+A Cloudflare user must have one of the following [roles](/fundamentals/setup/manage-members/roles/) to download application security reports:
 
 * Super Administrator
 * Administrator
diff --git a/content/ssl/_partials/_universal-ssl-definition.md b/content/ssl/_partials/_universal-ssl-definition.md
index 5c563ab53e..1dbec15c06 100644
--- a/content/ssl/_partials/_universal-ssl-definition.md
+++ b/content/ssl/_partials/_universal-ssl-definition.md
@@ -5,4 +5,4 @@ _build:
   list: never
 ---
 
-By default, Cloudflare issues — and renews — free, unshared, publicly trusted SSL certificates to all domains [added to](/fundamentals/get-started/setup/add-site/) and [activated on](/dns/zone-setups/reference/domain-status/) Cloudflare.
+By default, Cloudflare issues — and renews — free, unshared, publicly trusted SSL certificates to all domains [added to](/fundamentals/setup/account-setup/add-site/) and [activated on](/dns/zone-setups/reference/domain-status/) Cloudflare.
diff --git a/content/ssl/edge-certificates/additional-options/total-tls/error-messages.md b/content/ssl/edge-certificates/additional-options/total-tls/error-messages.md
index dc0cab590d..baa47aa0bc 100644
--- a/content/ssl/edge-certificates/additional-options/total-tls/error-messages.md
+++ b/content/ssl/edge-certificates/additional-options/total-tls/error-messages.md
@@ -12,7 +12,7 @@ To help avoid [`ERR_SSL_VERSION_OR_CIPHER_MISMATCH`](/ssl/troubleshooting/versio
 
 ## Pending domains
 
-If you recently [added your domain](/fundamentals/get-started/setup/add-site/) to Cloudflare - meaning that your zone is in a [pending state](/dns/zone-setups/reference/domain-status/) - you can often ignore this warning.
+If you recently [added your domain](/fundamentals/setup/account-setup/add-site/) to Cloudflare - meaning that your zone is in a [pending state](/dns/zone-setups/reference/domain-status/) - you can often ignore this warning.
 
 Once most domains becomes **Active**, Cloudflare will automatically issue a Universal SSL certificate, which will provide SSL/TLS coverage and remove the warning message.
 
diff --git a/content/ssl/edge-certificates/changing-dcv-method/methods/delegated-dcv.md b/content/ssl/edge-certificates/changing-dcv-method/methods/delegated-dcv.md
index 8e9bc765e3..9ad1e8bd71 100644
--- a/content/ssl/edge-certificates/changing-dcv-method/methods/delegated-dcv.md
+++ b/content/ssl/edge-certificates/changing-dcv-method/methods/delegated-dcv.md
@@ -61,4 +61,4 @@ _acme-challenge.sub.example.com CNAME sub.example.com.<COPIED_HOSTNAME>.
 
 ## Moved domains
 
- If you [move your zone to another account](/fundamentals/get-started/basic-tasks/manage-domains/move-domain/), you will need to update the `CNAME` record at your authoritative DNS provider with a new hostname value.
+ If you [move your zone to another account](/fundamentals/setup/manage-domains/move-domain/), you will need to update the `CNAME` record at your authoritative DNS provider with a new hostname value.
diff --git a/content/ssl/edge-certificates/custom-certificates/renewing.md b/content/ssl/edge-certificates/custom-certificates/renewing.md
index 64bb7ae0f8..d7ce2d112c 100644
--- a/content/ssl/edge-certificates/custom-certificates/renewing.md
+++ b/content/ssl/edge-certificates/custom-certificates/renewing.md
@@ -12,7 +12,7 @@ meta:
 
 Since Cloudflare cannot renew uploaded certificates, you should ensure that you replace or [update](/ssl/edge-certificates/custom-certificates/uploading/#update-an-existing-custom-certificate) an expiring custom certificate before it expires, otherwise your visitors may not be able to connect.
 
-Cloudflare automatically sends email notifications 30 and 14 days before your custom certificate expires. The email is sent to users who have the SSL/TLS, Administrator, or Super Administrator [roles](/fundamentals/account-and-billing/members/roles/).
+Cloudflare automatically sends email notifications 30 and 14 days before your custom certificate expires. The email is sent to users who have the SSL/TLS, Administrator, or Super Administrator [roles](/fundamentals/setup/manage-members/roles/).
 
 {{<Aside type="note">}}
 When renewing a custom certificate, you can reuse a [previously generated CSR](/ssl/edge-certificates/additional-options/certificate-signing-requests/).
diff --git a/content/ssl/get-started/index.md b/content/ssl/get-started/index.md
index 8037ca323e..e2c35b5983 100644
--- a/content/ssl/get-started/index.md
+++ b/content/ssl/get-started/index.md
@@ -15,7 +15,7 @@ Follow the steps below to enable SSL/TLS protection for your application.
 
 {{<tutorial-prereqs>}}
 
-- [Create an account and register an application](/fundamentals/get-started/setup/)
+- [Create an account and register an application](/fundamentals/setup/)
 
 {{</tutorial-prereqs>}}
 
diff --git a/content/ssl/origin-configuration/authenticated-origin-pull/explanation.md b/content/ssl/origin-configuration/authenticated-origin-pull/explanation.md
index ebfbf03cf4..6a760ae31d 100644
--- a/content/ssl/origin-configuration/authenticated-origin-pull/explanation.md
+++ b/content/ssl/origin-configuration/authenticated-origin-pull/explanation.md
@@ -54,7 +54,7 @@ This is true even if you have [**Full**](/ssl/origin-configuration/ssl-modes/ful
 ```
 <br/>
 
-This lack of authentication means that - even if your origin is [protected behind Cloudflare](/fundamentals/get-started/concepts/how-cloudflare-works/) - attackers with your origin's IP address will still receive a response from your origin for HTTPS requests.
+This lack of authentication means that - even if your origin is [protected behind Cloudflare](/fundamentals/concepts/how-cloudflare-works/) - attackers with your origin's IP address will still receive a response from your origin for HTTPS requests.
 
 With Authenticated Origin Pulls, Cloudflare performs standard TLS handshakes between a client device and Cloudflare, but a client-authenticated TLS handshake between Cloudflare and your origin.
 
diff --git a/content/ssl/troubleshooting/general-ssl-errors.md b/content/ssl/troubleshooting/general-ssl-errors.md
index c4165a25f7..40f77afa25 100644
--- a/content/ssl/troubleshooting/general-ssl-errors.md
+++ b/content/ssl/troubleshooting/general-ssl-errors.md
@@ -61,7 +61,7 @@ Our SSL vendors verify each SSL certificate request before Cloudflare can issue
 
 If your Cloudflare SSL certificate is not issued within 24 hours of Cloudflare domain activation:
 
--   If your origin web server has a valid SSL certificate, [temporarily pause Cloudflare](/fundamentals/get-started/basic-tasks/manage-domains/pause-cloudflare/), and
+-   If your origin web server has a valid SSL certificate, [temporarily pause Cloudflare](/fundamentals/setup/manage-domains/pause-cloudflare/), and
 -   [Contact Support](/support/troubleshooting/general-troubleshooting/contacting-cloudflare-support/) and provide a screenshot of the errors.
 
 Temporarily pausing Cloudflare will allow the HTTPS traffic to be served properly from your origin web server while the support team investigates the issue.
diff --git a/content/ssl/troubleshooting/too-many-redirects.md b/content/ssl/troubleshooting/too-many-redirects.md
index 57f4bed1ef..3cbd56b3ee 100644
--- a/content/ssl/troubleshooting/too-many-redirects.md
+++ b/content/ssl/troubleshooting/too-many-redirects.md
@@ -8,7 +8,7 @@ meta:
 
 # ERR_TOO_MANY_REDIRECTS
 
-After you [add a new domain](/fundamentals/get-started/setup/add-site/) to Cloudflare, your visitors' browsers might display `ERR_TOO_MANY_REDIRECTS` or `The page isn’t redirecting properly` errors. 
+After you [add a new domain](/fundamentals/setup/account-setup/add-site/) to Cloudflare, your visitors' browsers might display `ERR_TOO_MANY_REDIRECTS` or `The page isn’t redirecting properly` errors. 
 
 This error occurs when visitors get stuck in a redirect loop.
 
diff --git a/content/ssl/troubleshooting/version-cipher-mismatch.md b/content/ssl/troubleshooting/version-cipher-mismatch.md
index d980a4b4da..647e4bdacd 100644
--- a/content/ssl/troubleshooting/version-cipher-mismatch.md
+++ b/content/ssl/troubleshooting/version-cipher-mismatch.md
@@ -9,7 +9,7 @@ meta:
 
 # ERR_SSL_VERSION_OR_CIPHER_MISMATCH
 
-After you [add a new domain](/fundamentals/get-started/setup/add-site/) to Cloudflare, your visitors' browsers might display `ERR_SSL_VERSION_OR_CIPHER_MISMATCH` (Chrome) or `SSL_ERROR_NO_CYPHER_OVERLAP` (Firefox) errors.
+After you [add a new domain](/fundamentals/setup/account-setup/add-site/) to Cloudflare, your visitors' browsers might display `ERR_SSL_VERSION_OR_CIPHER_MISMATCH` (Chrome) or `SSL_ERROR_NO_CYPHER_OVERLAP` (Firefox) errors.
 
 This error occurs when your domain or subdomain is not covered by an SSL/TLS certificate, which is usually caused by:
 
@@ -52,7 +52,7 @@ If the **Status** is anything other than **Active**, you can either wait a bit l
 
 ### Solutions
 
-If you need to immediately resolve this error, [temporarily pause Cloudflare](/fundamentals/get-started/basic-tasks/manage-domains/pause-cloudflare/).
+If you need to immediately resolve this error, [temporarily pause Cloudflare](/fundamentals/setup/manage-domains/pause-cloudflare/).
 
 Since Universal certificates can take up to 24 hours to be issued, wait and [monitor the certificate's status](/ssl/reference/certificate-statuses/#ssltls). Once your certificate becomes **Active**, unpause Cloudflare using whichever method you used previously.
 
diff --git a/content/stream/get-started.md b/content/stream/get-started.md
index b6f4afbdd6..36f48f6860 100644
--- a/content/stream/get-started.md
+++ b/content/stream/get-started.md
@@ -8,7 +8,7 @@ weight: 2
 
 {{<Aside type="note" header="Before you get started:">}}
 
-You must first [create a Cloudflare account](/fundamentals/account-and-billing/account-setup/create-account/) and [create an API token](/fundamentals/api/get-started/create-token/) to begin using Stream.
+You must first [create a Cloudflare account](/fundamentals/setup/account-setup/create-account/) and [create an API token](/fundamentals/api/get-started/create-token/) to begin using Stream.
 
 {{</Aside>}}
 
diff --git a/content/style-guide/documentation-content-strategy/content-types/3rd-party-integration-guide.md b/content/style-guide/documentation-content-strategy/content-types/3rd-party-integration-guide.md
index 39e223d8d4..f4d0e5e3f1 100644
--- a/content/style-guide/documentation-content-strategy/content-types/3rd-party-integration-guide.md
+++ b/content/style-guide/documentation-content-strategy/content-types/3rd-party-integration-guide.md
@@ -161,4 +161,4 @@ We publish with the expectation of maintenance. If you want to publish something
 
 + [Workers](/workers/tutorials/)
 + [Zero Trust](/cloudflare-one/identity/idp-integration/)
-+ [Analytics](/fundamentals/data-products/analytics-integrations/)
++ [Analytics](/analytics/analytics-integrations/)
diff --git a/content/support/About Cloudflare/Getting Started/Troubleshooting FAQ for new Cloudflare customers.md b/content/support/About Cloudflare/Getting Started/Troubleshooting FAQ for new Cloudflare customers.md
index 6cf042dd0f..a72160ff6c 100644
--- a/content/support/About Cloudflare/Getting Started/Troubleshooting FAQ for new Cloudflare customers.md	
+++ b/content/support/About Cloudflare/Getting Started/Troubleshooting FAQ for new Cloudflare customers.md	
@@ -21,7 +21,7 @@ Below are the most common customer questions and issues experienced when getting
 There are two common scenarios where Cloudflare is falsely perceived to attack your site:
 
 - Unless you [restore the original visitor IP addresses](/support/troubleshooting/restoring-visitor-ips/restoring-original-visitor-ips/), Cloudflare IP addresses appear in your server logs for all proxied requests.
-- The attacker is spoofing Cloudflare's IPs. Cloudflare only [sends traffic to your origin web server over a few specific ports](/fundamentals/get-started/reference/network-ports/) unless you use [Cloudflare Spectrum](/spectrum/).
+- The attacker is spoofing Cloudflare's IPs. Cloudflare only [sends traffic to your origin web server over a few specific ports](/fundamentals/reference/network-ports/) unless you use [Cloudflare Spectrum](/spectrum/).
 
 Ideally, because Cloudflare is a reverse proxy, your hosting provider observes attack traffic connecting from [Cloudflare IP addresses](https://www.cloudflare.com/ips/). In contrast, if you notice connections from IP addresses that do not belong to Cloudflare, the attack is direct to your origin web server. Cloudflare cannot stop attacks directly to your origin IP address because the traffic bypasses Cloudflare’s network.
 
diff --git a/content/support/Account Management & Billing/Account Privacy and Security/Securing user access with two-factor authentication (2FA).md b/content/support/Account Management & Billing/Account Privacy and Security/Securing user access with two-factor authentication (2FA).md
index dcb84b8de4..82a0750ef0 100644
--- a/content/support/Account Management & Billing/Account Privacy and Security/Securing user access with two-factor authentication (2FA).md	
+++ b/content/support/Account Management & Billing/Account Privacy and Security/Securing user access with two-factor authentication (2FA).md	
@@ -32,7 +32,7 @@ ___
 
 We recommend that all Cloudflare user account holders enable 2FA to keep their accounts secure. 
 
-2FA can only be enabled successfully on an account with a [verified email address](/fundamentals/account-and-billing/account-setup/verify-email-address/). If you do not verify your email address first, you may lock yourself out of your account.
+2FA can only be enabled successfully on an account with a [verified email address](/fundamentals/setup/account-setup/verify-email-address/). If you do not verify your email address first, you may lock yourself out of your account.
 
 {{<Aside type="warning">}}
 Super Administrators can turn on **2FA Enforcement** to require all
@@ -235,4 +235,4 @@ ___
 
 -   [Google Authentication documentation](https://support.google.com/accounts/answer/1066447?hl=en&ref_topic=2954345&co=GENIE.Platform%3DiOS&oco=0)
 -   [YubiKey documentation](https://www.yubico.com/works-with-yubikey/catalog/cloudflare/)
--   [Setting up multi-user accounts on Cloudflare](/fundamentals/account-and-billing/members/)
+-   [Setting up multi-user accounts on Cloudflare](/fundamentals/setup/manage-members/)
diff --git a/content/support/Account Management & Billing/Account Privacy and Security/Understanding SameSite cookie interaction with Cloudflare.md b/content/support/Account Management & Billing/Account Privacy and Security/Understanding SameSite cookie interaction with Cloudflare.md
index bb8c0f347c..d551f4026e 100644
--- a/content/support/Account Management & Billing/Account Privacy and Security/Understanding SameSite cookie interaction with Cloudflare.md	
+++ b/content/support/Account Management & Billing/Account Privacy and Security/Understanding SameSite cookie interaction with Cloudflare.md	
@@ -35,7 +35,7 @@ ___
 
 ## Known issues with SameSite and cf_clearance cookies
 
-When a visitor solves a [challenge](/fundamentals/get-started/concepts/cloudflare-challenges/) presented due to a [WAF custom rule](/waf/custom-rules/) or an [IP Access rule](/waf/tools/ip-access-rules/), a `cf_clearance` cookie is set in the client browser. The `cf_clearance` cookie has a default lifetime of 30 minutes, which you can configure via [Challenge Passage](/fundamentals/security/challenge-passage/).
+When a visitor solves a [challenge](/firewall/cf-firewall-rules/cloudflare-challenges/) presented due to a [WAF custom rule](/waf/custom-rules/) or an [IP Access rule](/waf/tools/ip-access-rules/), a `cf_clearance` cookie is set in the client browser. The `cf_clearance` cookie has a default lifetime of 30 minutes, which you can configure via [Challenge Passage](/waf/tools/challenge-passage/).
 
 Cloudflare uses `SameSite=None` in the `cf_clearance` cookie so that visitor requests from different hostnames are not met with subsequent challenges or errors. When `SameSite=None` is used, it must be set in conjunction with the `Secure` flag.
 
@@ -49,6 +49,6 @@ ___
 ## Related resources
 
 -   [Learn more about the SameSite cookie](https://web.dev/samesite-cookies-explained/) 
--   [Cloudflare Cookies](/fundamentals/get-started/reference/cloudflare-cookies/)
+-   [Cloudflare Cookies](/fundamentals/reference/policies-compliances/cloudflare-cookies/)
 -   [Cloudflare SSL FAQ](/support/ssl-tls/faq-and-reference/ssl-faq/)
 -   [Automatic HTTPS Rewrites](/ssl/edge-certificates/additional-options/automatic-https-rewrites/)
diff --git a/content/support/Account Management & Billing/Common account questions/Login and account issues.md b/content/support/Account Management & Billing/Common account questions/Login and account issues.md
index 0c5241af67..738d67cbf2 100644
--- a/content/support/Account Management & Billing/Common account questions/Login and account issues.md	
+++ b/content/support/Account Management & Billing/Common account questions/Login and account issues.md	
@@ -115,13 +115,13 @@ ___
 
 ## Cannot verify your email?
 
-For more help with email verification, refer to [Verify email address](/fundamentals/account-and-billing/account-setup/verify-email-address/).
+For more help with email verification, refer to [Verify email address](/fundamentals/setup/account-setup/verify-email-address/).
 
 ___
 
 ## Change your Cloudflare email address or password
 
-For more help, refer to [Change password or email address](/fundamentals/account-and-billing/account-maintenance/change-password-or-email/).
+For more help, refer to [Change password or email address](/fundamentals/account-and-billing/account-billing/change-password-or-email/).
 
 ___
 
diff --git a/content/support/Network/Configuring IP geolocation.md b/content/support/Network/Configuring IP geolocation.md
index d72d70cdba..fdc011334a 100644
--- a/content/support/Network/Configuring IP geolocation.md	
+++ b/content/support/Network/Configuring IP geolocation.md	
@@ -111,7 +111,7 @@ ___
 
 ## Related resources
 
--   [HTTP request headers](/fundamentals/get-started/reference/http-request-headers/)
+-   [HTTP request headers](/fundamentals/reference/http-request-headers/)
 -   [Managed Transforms](/rules/transform/managed-transforms/)
 -   [Apache Log Files Format](https://httpd.apache.org/docs/2.4/logs.html)
 -   [Configuring NGINX Logging](https://docs.nginx.com/nginx/admin-guide/monitoring/logging/)
diff --git a/content/support/Other Languages/Deutsch/Cloudflare Page Rules verstehen und konfigurieren (Tutorial für Page Rules) .md b/content/support/Other Languages/Deutsch/Cloudflare Page Rules verstehen und konfigurieren (Tutorial für Page Rules) .md
index 076a321727..7588b894df 100644
--- a/content/support/Other Languages/Deutsch/Cloudflare Page Rules verstehen und konfigurieren (Tutorial für Page Rules) .md	
+++ b/content/support/Other Languages/Deutsch/Cloudflare Page Rules verstehen und konfigurieren (Tutorial für Page Rules) .md	
@@ -785,7 +785,7 @@ Beachten Sie, dass `example.com/some-path/cloudflare.com` _ohne_ einen abschlie
 
 Wenn Sie einen Port im Page-Rule-Feld **Wenn die URL übereinstimmt** angeben, muss es sich um einen der folgenden Ports handeln:
 
--   Einer der HTTP/HTTPS-Ports, die [mit dem Proxy von Cloudflare kompatibel](/fundamentals/get-started/reference/network-ports/#network-ports-compatible-with-cloudflares-proxy) sind.
+-   Einer der HTTP/HTTPS-Ports, die [mit dem Proxy von Cloudflare kompatibel](/fundamentals/reference/network-ports/#network-ports-compatible-with-cloudflares-proxy) sind.
 -   Ein benutzerdefinierter Port einer [Cloudflare Spectrum](/spectrum/) HTTPS-Anwendung.
 
 ### Page Rules mit Workers verwenden
diff --git a/content/support/Other Languages/Deutsch/Cloudflare-1XXX.md b/content/support/Other Languages/Deutsch/Cloudflare-1XXX.md
index b220ab8aa2..bafd189568 100644
--- a/content/support/Other Languages/Deutsch/Cloudflare-1XXX.md	
+++ b/content/support/Other Languages/Deutsch/Cloudflare-1XXX.md	
@@ -231,7 +231,7 @@ ___
 
 ### Häufige Ursache
 
-Der vom Client oder Browser durch [Server Name Indication](/fundamentals/glossary#server-name-indication-sni) (SNI) gesendete Hostname stimmt nicht mit dem Host-Header der Anfrage überein.
+Der vom Client oder Browser durch [Server Name Indication](/fundamentals/reference/glossary/#server-name-indication-sni) (SNI) gesendete Hostname stimmt nicht mit dem Host-Header der Anfrage überein.
 
 ### Lösung
 
diff --git a/content/support/Other Languages/Deutsch/Cloudflare.md b/content/support/Other Languages/Deutsch/Cloudflare.md
index b2f20b90f5..4f67c4e989 100644
--- a/content/support/Other Languages/Deutsch/Cloudflare.md	
+++ b/content/support/Other Languages/Deutsch/Cloudflare.md	
@@ -21,14 +21,14 @@ verwenden (dokumentiert in Cloudflares Support KB), sind
 Cache-Ressourcen und bekannte Suchmaschinen-Crawler von Ihren
 Durchsatzbegrenzungsregeln ausgenommen. Daher haben sie keinen Einfluss
 auf das
-[SEO-Ranking](/fundamentals/get-started/task-guides/improve-seo/)
+[SEO-Ranking](/fundamentals/basic-tasks/improve-seo/)
 Ihrer Website. Wenn Sie jedoch die [neue Version der
 Durchsatzbegrenzungsregeln](/waf/rate-limiting-rules/)
 verwenden (dokumentiert in der Entwicklerdokumentation), sollten Sie
 darauf achten, dass Ihre Durchsatzbegrenzungsregeln keine bekannten
 guten Bots betreffen. Dies könnte sonst das SEO-Ranking Ihrer Website
 beeinträchtigen. Weitere Informationen finden Sie unter [SEO
-verbessern](/fundamentals/get-started/task-guides/improve-seo/).
+verbessern](/fundamentals/basic-tasks/improve-seo/).
 {{</Aside>}}
 
 {{<Aside type="note">}}
diff --git a/content/support/Other Languages/Español (España)/Cómo entender y configurar las reglas de página de Cloudflare (Tutorial sobre las reglas de página).md b/content/support/Other Languages/Español (España)/Cómo entender y configurar las reglas de página de Cloudflare (Tutorial sobre las reglas de página).md
index d36244858a..16852217ed 100644
--- a/content/support/Other Languages/Español (España)/Cómo entender y configurar las reglas de página de Cloudflare (Tutorial sobre las reglas de página).md	
+++ b/content/support/Other Languages/Español (España)/Cómo entender y configurar las reglas de página de Cloudflare (Tutorial sobre las reglas de página).md	
@@ -269,7 +269,7 @@ Ten en cuenta que `ejemplo.com/alguna-ruta/cloudflare.com` se guardará _sin_ un
 
 Si especificas un puerto en el campo **si la URL coincide** de una regla de página, debe ser uno de los siguientes:
 
--   Uno de los puertos HTTP/HTTPS [compatible con el proxy de Cloudflare](/fundamentals/get-started/reference/network-ports/#network-ports-compatible-with-cloudflares-proxy).
+-   Uno de los puertos HTTP/HTTPS [compatible con el proxy de Cloudflare](/fundamentals/reference/network-ports/#network-ports-compatible-with-cloudflares-proxy).
 -   Un puerto personalizado de una aplicación HTTPS de [Cloudflare Spectrum](/spectrum/).
 
 ### Uso de Page Rules con Workers
diff --git a/content/support/Other Languages/Español (España)/Cómo solucionar errores 1XXX de Clouflare.md b/content/support/Other Languages/Español (España)/Cómo solucionar errores 1XXX de Clouflare.md
index a307974fbd..d369555cc5 100644
--- a/content/support/Other Languages/Español (España)/Cómo solucionar errores 1XXX de Clouflare.md	
+++ b/content/support/Other Languages/Español (España)/Cómo solucionar errores 1XXX de Clouflare.md	
@@ -230,7 +230,7 @@ ___
 
 ### Causas habituales
 
-El nombre del servidor que envía el cliente o el navegador a través de la [indicación de nombre de servidor](/fundamentals/glossary#server-name-indication-sni) (SNI) no es compatible con el encabezado del servidor de la solicitud.
+El nombre del servidor que envía el cliente o el navegador a través de la [indicación de nombre de servidor](/fundamentals/reference/glossary/#server-name-indication-sni) (SNI) no es compatible con el encabezado del servidor de la solicitud.
 
 ### Solución
 
diff --git a/content/support/Other Languages/Français (France)/Comprendre et configurer Cloudflare Page Rules (tutoriel Page Rules).md b/content/support/Other Languages/Français (France)/Comprendre et configurer Cloudflare Page Rules (tutoriel Page Rules).md
index 0045f9290a..d2858a1c35 100644
--- a/content/support/Other Languages/Français (France)/Comprendre et configurer Cloudflare Page Rules (tutoriel Page Rules).md	
+++ b/content/support/Other Languages/Français (France)/Comprendre et configurer Cloudflare Page Rules (tutoriel Page Rules).md	
@@ -256,7 +256,7 @@ Remarque : `exemple.com/some-path/cloudflare.com` sera enregistré _sans_ barre
 
 Si vous spécifiez un port dans le champ **If the URL matches** (Si l'URL correspond) d'une Page Rule, celui-ci doit être l'un des suivants :
 
--   Un des ports HTTP/HTTPS [compatible avec le proxy de Cloudflare](/fundamentals/get-started/reference/network-ports/#network-ports-compatible-with-cloudflares-proxy).
+-   Un des ports HTTP/HTTPS [compatible avec le proxy de Cloudflare](/fundamentals/reference/network-ports/#network-ports-compatible-with-cloudflares-proxy).
 -   Un port personnalisé d'une application [Cloudflare Spectrum](/spectrum/) HTTPS.
 
 ### Utilisation de Page Rules avec Workers
diff --git a/content/support/Other Languages/Français (France)/Résolution des erreurs Cloudflare 1XXX.md b/content/support/Other Languages/Français (France)/Résolution des erreurs Cloudflare 1XXX.md
index 18f20d1a6e..80006562d1 100644
--- a/content/support/Other Languages/Français (France)/Résolution des erreurs Cloudflare 1XXX.md	
+++ b/content/support/Other Languages/Français (France)/Résolution des erreurs Cloudflare 1XXX.md	
@@ -225,7 +225,7 @@ ___
 
 ### Cause courante
 
-Le nom d'hôte envoyé par le client ou le navigateur via [Server Name Indication](/fundamentals/glossary#server-name-indication-sni) (SNI) ne correspond pas à l'en-tête de l’hôte de la requête.
+Le nom d'hôte envoyé par le client ou le navigateur via [Server Name Indication](/fundamentals/reference/glossary/#server-name-indication-sni) (SNI) ne correspond pas à l'en-tête de l’hôte de la requête.
 
 ### Résolution
 
diff --git a/content/support/Other Languages/Português do Brasil/Entendendo e configurando o Page Rules da Cloudflare (tutorial do Page Rules).md b/content/support/Other Languages/Português do Brasil/Entendendo e configurando o Page Rules da Cloudflare (tutorial do Page Rules).md
index fd3ae6ef54..617be6c71e 100644
--- a/content/support/Other Languages/Português do Brasil/Entendendo e configurando o Page Rules da Cloudflare (tutorial do Page Rules).md	
+++ b/content/support/Other Languages/Português do Brasil/Entendendo e configurando o Page Rules da Cloudflare (tutorial do Page Rules).md	
@@ -764,7 +764,7 @@ Observe que `example.com/some-path/cloudflare.com` será salvo _sem_ a barra no
 
 No campo **Se o URL corresponder** de uma regra de página, somente as portas a seguir podem ser especificadas:
 
--   Uma das portas HTTP/HTTPS [compatíveis com o proxy da Cloudflare](/fundamentals/get-started/reference/network-ports/#network-ports-compatible-with-cloudflares-proxy).
+-   Uma das portas HTTP/HTTPS [compatíveis com o proxy da Cloudflare](/fundamentals/reference/network-ports/#network-ports-compatible-with-cloudflares-proxy).
 -   Uma porta personalizada de um aplicativo HTTPS do [Cloudflare Spectrum](/spectrum/).
 
 ### Como usar Page Rules com o Workers
diff --git a/content/support/Other Languages/Português do Brasil/Solução de problemas de erros 1XXX da Cloudflare.md b/content/support/Other Languages/Português do Brasil/Solução de problemas de erros 1XXX da Cloudflare.md
index e6667406d4..fbde092021 100644
--- a/content/support/Other Languages/Português do Brasil/Solução de problemas de erros 1XXX da Cloudflare.md	
+++ b/content/support/Other Languages/Português do Brasil/Solução de problemas de erros 1XXX da Cloudflare.md	
@@ -225,7 +225,7 @@ ___
 
 ### Causa comum
 
-O hostname enviado pelo cliente ou pelo navegador por meio da [Indicação de Nome do Servidor](/fundamentals/glossary#server-name-indication-sni) (SNI) não corresponde ao cabeçalho do host da solicitação.
+O hostname enviado pelo cliente ou pelo navegador por meio da [Indicação de Nome do Servidor](/fundamentals/reference/glossary/#server-name-indication-sni) (SNI) não corresponde ao cabeçalho do host da solicitação.
 
 ### Solução
 
diff --git a/content/support/Other Languages/日本語/Cloudflare 1XXX エラーのトラブルシューティング.md b/content/support/Other Languages/日本語/Cloudflare 1XXX エラーのトラブルシューティング.md
index b0afafd287..933f462cc1 100644
--- a/content/support/Other Languages/日本語/Cloudflare 1XXX エラーのトラブルシューティング.md	
+++ b/content/support/Other Languages/日本語/Cloudflare 1XXX エラーのトラブルシューティング.md	
@@ -225,7 +225,7 @@ ___
 
 ### 考えられる原因
 
-[Server Name Indication](/fundamentals/glossary#server-name-indication-sni)（SNI）を介して、クライアントまたはブラウザが送信したホスト名が、リクエストホストヘッダーと一致しない。
+[Server Name Indication](/fundamentals/reference/glossary/#server-name-indication-sni)（SNI）を介して、クライアントまたはブラウザが送信したホスト名が、リクエストホストヘッダーと一致しない。
 
 ### 解決方法
 
diff --git a/content/support/Other Languages/日本語/CloudflareのPage Rulesを理解した上で設定する（Page Rulesチュートリアル）.md b/content/support/Other Languages/日本語/CloudflareのPage Rulesを理解した上で設定する（Page Rulesチュートリアル）.md
index a81cfa3bf5..173e3ed7e9 100644
--- a/content/support/Other Languages/日本語/CloudflareのPage Rulesを理解した上で設定する（Page Rulesチュートリアル）.md	
+++ b/content/support/Other Languages/日本語/CloudflareのPage Rulesを理解した上で設定する（Page Rulesチュートリアル）.md	
@@ -735,7 +735,7 @@ Page Ruleを保存する際、Cloudflareは**URLが一致する場合**フィー
 
 Page Ruleの**URLが一致する場合**フィールドでポートを特定する場合、ポートは次のどれかである必要があります。
 
--   [Cloudflareのプロキシと互換性がある](/fundamentals/get-started/reference/network-ports/#network-ports-compatible-with-cloudflares-proxy)HTTP/HTTPSポートの1つ。
+-   [Cloudflareのプロキシと互換性がある](/fundamentals/reference/network-ports/#network-ports-compatible-with-cloudflares-proxy)HTTP/HTTPSポートの1つ。
 -   [Cloudflare Spectrum](/spectrum/) HTTPSアプリケーションのカスタムポート。
 
 ### WorkersでPage Rulesを使う
diff --git a/content/support/Other Languages/简体中文/Cloudflare 1XXX 错误故障排除.md b/content/support/Other Languages/简体中文/Cloudflare 1XXX 错误故障排除.md
index 68eae2220b..f1a2583f23 100644
--- a/content/support/Other Languages/简体中文/Cloudflare 1XXX 错误故障排除.md	
+++ b/content/support/Other Languages/简体中文/Cloudflare 1XXX 错误故障排除.md	
@@ -225,7 +225,7 @@ ___
 
 ### 常见原因
 
-客户端或浏览器通过[服务器名称指示](/fundamentals/glossary#server-name-indication-sni)（SNI）发送的主机名与请求主机标头不匹配。
+客户端或浏览器通过[服务器名称指示](/fundamentals/reference/glossary/#server-name-indication-sni)（SNI）发送的主机名与请求主机标头不匹配。
 
 ### 解决方案
 
diff --git a/content/support/Other Languages/简体中文/了解和配置 Cloudflare Page Rules（页面规则教程）.md b/content/support/Other Languages/简体中文/了解和配置 Cloudflare Page Rules（页面规则教程）.md
index 4d630d2fde..4ef7ee1a71 100644
--- a/content/support/Other Languages/简体中文/了解和配置 Cloudflare Page Rules（页面规则教程）.md	
+++ b/content/support/Other Languages/简体中文/了解和配置 Cloudflare Page Rules（页面规则教程）.md	
@@ -735,7 +735,7 @@ ___
 
 如果您在 Page Rule 的**如果 URL 匹配**字段中指定一个端口，则它必须是下列端口之一：
 
--   [与 Cloudflare 的代理兼容的](/fundamentals/get-started/reference/network-ports/#network-ports-compatible-with-cloudflares-proxy) HTTP/HTTPS 端口之一。
+-   [与 Cloudflare 的代理兼容的](/fundamentals/reference/network-ports/#network-ports-compatible-with-cloudflares-proxy) HTTP/HTTPS 端口之一。
 -   [Cloudflare Spectrum](/spectrum/) HTTPS 应用程序的自定义端口。
 
 ### 将页面规则用于 Workers
diff --git a/content/support/Other Languages/한국어/Cloudflare Page Rules의 이해 및 구성(Page Rules 튜토리얼).md b/content/support/Other Languages/한국어/Cloudflare Page Rules의 이해 및 구성(Page Rules 튜토리얼).md
index 9a34ff2d58..74f3928322 100644
--- a/content/support/Other Languages/한국어/Cloudflare Page Rules의 이해 및 구성(Page Rules 튜토리얼).md	
+++ b/content/support/Other Languages/한국어/Cloudflare Page Rules의 이해 및 구성(Page Rules 튜토리얼).md	
@@ -762,7 +762,7 @@ Page Rule을 저장할 때, Cloudflare는 **URL이 일치하는 경우** 필드
 
 **If the URL matches** 필드 또는 Page Rule에서 포트를 지정하면 해당 포트는 다음 중 한 가지여야 합니다.
 
--   [Cloudflare 프록시와 호환되는](/fundamentals/get-started/reference/network-ports/#network-ports-compatible-with-cloudflares-proxy) HTTP/HTTPS 포트 중 하나.
+-   [Cloudflare 프록시와 호환되는](/fundamentals/reference/network-ports/#network-ports-compatible-with-cloudflares-proxy) HTTP/HTTPS 포트 중 하나.
 -   [Cloudflare Spectrum](/spectrum/) HTTPS 응용 프로그램의 사용자 지정 포트.
 
 ### Workers와 함께 Page Rules 사용하기
diff --git a/content/support/Other Languages/한국어/Troubleshooting Cloudflare 1XXX errors.md b/content/support/Other Languages/한국어/Troubleshooting Cloudflare 1XXX errors.md
index 8e710a2bd1..ab95ab336f 100644
--- a/content/support/Other Languages/한국어/Troubleshooting Cloudflare 1XXX errors.md	
+++ b/content/support/Other Languages/한국어/Troubleshooting Cloudflare 1XXX errors.md	
@@ -225,7 +225,7 @@ ___
 
 ### 일반적인 원인
 
-클라이언트 또는 브라우저에서  [서버 이름 표시](/fundamentals/glossary#server-name-indication-sni) (SNI)를 통해 전송된 호스트 이름이 요청 호스트 헤더와 일치하지 않습니다.
+클라이언트 또는 브라우저에서  [서버 이름 표시](/fundamentals/reference/glossary/#server-name-indication-sni) (SNI)를 통해 전송된 호스트 이름이 요청 호스트 헤더와 일치하지 않습니다.
 
 ### 문제 해결
 
diff --git a/content/support/Page Rules/Understanding and configuring Cloudflare Page Rules (Page Rules Tutorial).md b/content/support/Page Rules/Understanding and configuring Cloudflare Page Rules (Page Rules Tutorial).md
index 61f77695d2..d5b473ca26 100644
--- a/content/support/Page Rules/Understanding and configuring Cloudflare Page Rules (Page Rules Tutorial).md	
+++ b/content/support/Page Rules/Understanding and configuring Cloudflare Page Rules (Page Rules Tutorial).md	
@@ -185,7 +185,7 @@ Below is the full list of settings available, presented in the order that they a
 | [Auto Minify](/speed/optimization/content/auto-minify/) | Indicate which file extensions to minify automatically.{{<render file="_configuration-rule-promotion.md" productFolder="rules">}} | All |
 | [Automatic HTTPS Rewrites](/ssl/edge-certificates/additional-options/automatic-https-rewrites/) | Turn on or off **Automatic HTTPS Rewrites**.{{<render file="_configuration-rule-promotion.md" productFolder="rules">}} | All |
 | [Browser Cache TTL](/cache/how-to/edge-browser-cache-ttl/) | Control how long resources cached by client browsers remain valid. The Cloudflare UI and API both prohibit setting **Browser Cache TTL** to _0_ for non-Enterprise domains. | All |
-| [Browser Integrity Check](/fundamentals/security/browser-integrity-check/) | Inspect the visitor's browser for headers commonly associated with spammers and certain bots.{{<render file="_configuration-rule-promotion.md" productFolder="rules">}} | All |
+| [Browser Integrity Check](/waf/tools/browser-integrity-check/) | Inspect the visitor's browser for headers commonly associated with spammers and certain bots.{{<render file="_configuration-rule-promotion.md" productFolder="rules">}} | All |
 | Bypass Cache on Cookie | Bypass Cache and fetch resources from the origin server if a regular expression matches against a cookie name present in the request.<br/>If you add both this setting and the _Cache On Cookie_ setting to the same page rule, _Cache On Cookie_ takes precedence over _Bypass Cache on Cookie_.<br/><br/>Refer to the [Additional details](#additional-details) to learn about limited regular expression support. | Business and Enterprise |
 | [Cache By Device Type](/cache/how-to/edge-browser-cache-ttl/create-page-rules/#cache-by-device-type-enterprise-only) | Separate cached content based on the visitor’s device type.  | Enterprise |
 | [Cache Deception Armor](/cache/cache-security/cache-deception-armor/) | Protect from web cache deception attacks while still allowing static assets to be cached. This setting verifies that the URL's extension matches the returned _Content-Type_. | All |
@@ -213,7 +213,7 @@ Below is the full list of settings available, presented in the order that they a
 | [Respect Strong ETags](/cache/reference/etag-headers/) | Turn on or off byte-for-byte equivalency checks between the Cloudflare cache and the origin server. | Enterprise |
 | Response Buffering | Turn on or off whether Cloudflare should wait for an entire file from the origin server before forwarding it to the site visitor. By default, Cloudflare sends packets to the client as they arrive from the origin server. |  Enterprise |
 | [Rocket Loader](/speed/optimization/content/rocket-loader/) | Turn on or off **Rocket Loader** in the Cloudflare **Speed** app.{{<render file="_configuration-rule-promotion.md" productFolder="rules">}} | All |
-| [Security Level](/fundamentals/security/security-level/) | Control options for the **Security Level** feature from the **Security** app. {{<render file="_configuration-rule-promotion.md" productFolder="rules">}} | All |
+| [Security Level](/waf/tools/security-level/) | Control options for the **Security Level** feature from the **Security** app. {{<render file="_configuration-rule-promotion.md" productFolder="rules">}} | All |
 | [Server Side Excludes](/support/more-dashboard-apps/cloudflare-scrape-shield/what-does-server-side-excludes-sse-do/)| Turn on or off the **Server Side Excludes** feature of the Cloudflare **Scrape Shield** app.{{<render file="_configuration-rule-promotion.md" productFolder="rules">}} |  All |
 | [SSL](/ssl/origin-configuration/ssl-modes/) | Control options for the **SSL** feature of the **Edge Certificates** tab in the Cloudflare **SSL/TLS** app.{{<render file="_configuration-rule-promotion.md" productFolder="rules">}} | All |
 | True Client IP Header | Turn on or off the **True-Client-IP Header** feature of the Cloudflare **Network** app. [Learn more](/support/network/understanding-the-true-client-ip-header/). | Enterprise |
diff --git a/content/support/SSL TLS/FAQ and Reference/SSL FAQ.md b/content/support/SSL TLS/FAQ and Reference/SSL FAQ.md
index e5b71f8f89..179ac22d55 100644
--- a/content/support/SSL TLS/FAQ and Reference/SSL FAQ.md	
+++ b/content/support/SSL TLS/FAQ and Reference/SSL FAQ.md	
@@ -141,7 +141,7 @@ ___
 
 To learn more about SSL, go to the [Cloudflare Learning Center](https://www.cloudflare.com/learning/ssl/what-is-ssl/).
 
-For SSL terms and definitions, go to the [Cloudflare Glossary](/fundamentals/glossary).
+For SSL terms and definitions, go to the [Cloudflare Glossary](/fundamentals/reference/glossary/).
 
 ___
 
diff --git a/content/support/Troubleshooting/Cloudflare Errors/Troubleshooting Cloudflare 5XX errors.md b/content/support/Troubleshooting/Cloudflare Errors/Troubleshooting Cloudflare 5XX errors.md
index a5fd2998ff..29da0f7106 100644
--- a/content/support/Troubleshooting/Cloudflare Errors/Troubleshooting Cloudflare 5XX errors.md	
+++ b/content/support/Troubleshooting/Cloudflare Errors/Troubleshooting Cloudflare 5XX errors.md	
@@ -130,7 +130,7 @@ Error 520 occurs when the origin server returns an empty, unknown, or unexpected
 {{<Aside type="note">}}
 A quick workaround while further investigating 520 errors is to either
 make the record [DNS-only](/dns/manage-dns-records/reference/proxied-dns-records)
-in the Cloudflare **DNS** app or [temporarily pause Cloudflare](/fundamentals/get-started/basic-tasks/manage-domains/pause-cloudflare/).
+in the Cloudflare **DNS** app or [temporarily pause Cloudflare](/fundamentals/setup/manage-domains/pause-cloudflare/).
 {{</Aside>}}
 
 [Contact your hosting provider or site administrator](#required-error-details-for-hosting-provider) and request a review of your origin web server error logs for crashes and to check for these common causes:
@@ -154,7 +154,7 @@ If 520 errors continue after contacting your hosting provider or site administra
 -   Output from `http://<YOUR_DOMAIN>/cdn-cgi/trace`
 -   Two [HAR files](/support/troubleshooting/general-troubleshooting/gathering-information-for-troubleshooting-sites/#generate-a-har-file):
     -   one with Cloudflare enabled on your website, and
-    -   the other with [Cloudflare temporarily disabled](/fundamentals/get-started/basic-tasks/manage-domains/pause-cloudflare/).
+    -   the other with [Cloudflare temporarily disabled](/fundamentals/setup/manage-domains/pause-cloudflare/).
 
 ___
 
@@ -279,7 +279,7 @@ Contact your hosting provider to exclude the following common causes at your or
 
 -   No valid SSL certificate installed
 -   Port 443 (or other custom secure port) is not open
--   No [SNI](https://developers.cloudflare.com/fundamentals/glossary#server-name-indication-sni) support
+-   No [SNI](https://developers.cloudflare.com/fundamentals/reference/glossary/#server-name-indication-sni) support
 -   The [cipher suites](/ssl/origin-configuration/cipher-suites/) presented by Cloudflare to the origin do not match the cipher suites supported by the origin web server
 
 {{<Aside type="tip">}}
@@ -321,7 +321,7 @@ Request your server administrator or hosting provider to review the origin web s
 -   Certificate is signed by a [Certificate Authority](https://support.cloudflare.com/hc/articles/360026016272) (not self-signed)
 -   The requested or target domain name and hostname are in the certificate's **Common Name** or **Subject Alternative Name**
 -   Your origin web server accepts connections over port SSL port 443
--   [Temporarily pause Cloudflare](/fundamentals/get-started/basic-tasks/manage-domains/pause-cloudflare/) and visit [https://www.sslshopper.com/ssl-checker.html#hostname=www.example.com](https://www.sslshopper.com/ssl-checker.html#hostname=www.example.com) (replace `www.example.com` with your hostname and domain) to verify no issues exists with the origin SSL certificate:
+-   [Temporarily pause Cloudflare](/fundamentals/setup/manage-domains/pause-cloudflare/) and visit [https://www.sslshopper.com/ssl-checker.html#hostname=www.example.com](https://www.sslshopper.com/ssl-checker.html#hostname=www.example.com) (replace `www.example.com` with your hostname and domain) to verify no issues exists with the origin SSL certificate:
 
 ![Screen showing an SSL certificate with no errors.](/images/support/hc-import-troubleshooting_5xx_errors_sslshopper_output.png)
 
diff --git a/content/support/Troubleshooting/General Troubleshooting/Gathering information for troubleshooting sites.md b/content/support/Troubleshooting/General Troubleshooting/Gathering information for troubleshooting sites.md
index 06b71ca038..502faf944d 100644
--- a/content/support/Troubleshooting/General Troubleshooting/Gathering information for troubleshooting sites.md	
+++ b/content/support/Troubleshooting/General Troubleshooting/Gathering information for troubleshooting sites.md	
@@ -265,7 +265,7 @@ ___
 
 ## Temporarily pause Cloudflare
 
-For more details, refer to [Pause Cloudflare](/fundamentals/get-started/basic-tasks/manage-domains/pause-cloudflare/).
+For more details, refer to [Pause Cloudflare](/fundamentals/setup/manage-domains/pause-cloudflare/).
 
 ___
 
diff --git a/content/support/Troubleshooting/HTTP Status Codes/2xx Success.md b/content/support/Troubleshooting/HTTP Status Codes/2xx Success.md
index 79664248fa..614614c471 100644
--- a/content/support/Troubleshooting/HTTP Status Codes/2xx Success.md	
+++ b/content/support/Troubleshooting/HTTP Status Codes/2xx Success.md	
@@ -46,7 +46,7 @@ A **203** response means that the request was successful but the response did no
 
 Servers use this response to tell a client that this resource has been cached at a proxy.
 
-Cloudflare does not cache 203 responses. For details about Cloudflare handles 203 responses, refer to [HTTP request headers](/fundamentals/get-started/reference/http-request-headers/).
+Cloudflare does not cache 203 responses. For details about Cloudflare handles 203 responses, refer to [HTTP request headers](/fundamentals/reference/http-request-headers/).
 
 ___
 
diff --git a/content/support/Troubleshooting/HTTP Status Codes/4xx Client Error.md b/content/support/Troubleshooting/HTTP Status Codes/4xx Client Error.md
index 2f67968171..463cba05bf 100644
--- a/content/support/Troubleshooting/HTTP Status Codes/4xx Client Error.md	
+++ b/content/support/Troubleshooting/HTTP Status Codes/4xx Client Error.md	
@@ -42,9 +42,9 @@ Cloudflare will serve 403 responses if the request violated either a default WAF
 If you're seeing a 403 response that contains Cloudflare branding in the response body, this is the HTTP response code returned along with many of our security features:
 
 -   [WAF Custom or Managed Rules](/waf/) with the challenge or block action
--   [Security Level](/fundamentals/security/security-level/), that is set to Medium by default
+-   [Security Level](/waf/tools/security-level/), that is set to Medium by default
 -   Most [1xxx Cloudflare error codes](/support/troubleshooting/cloudflare-errors/troubleshooting-cloudflare-1xxx-errors/)
--   The [Browser Integrity Check](/fundamentals/security/browser-integrity-check/)
+-   The [Browser Integrity Check](/waf/tools/browser-integrity-check/)
 
 ### **404 Not Found (**[**RFC7231**](https://tools.ietf.org/html/rfc7231)**)**
 
diff --git a/content/support/Troubleshooting/Restoring Visitor IPs/Restoring original visitor IPs.md b/content/support/Troubleshooting/Restoring Visitor IPs/Restoring original visitor IPs.md
index 2480d8ab64..38ea1e7d69 100644
--- a/content/support/Troubleshooting/Restoring Visitor IPs/Restoring original visitor IPs.md	
+++ b/content/support/Troubleshooting/Restoring Visitor IPs/Restoring original visitor IPs.md	
@@ -401,5 +401,5 @@ ___
 
 ## Related Resources
 
--   [HTTP request headers](/fundamentals/get-started/reference/http-request-headers/)
+-   [HTTP request headers](/fundamentals/reference/http-request-headers/)
 -   [Transform Rules](/rules/transform/)
diff --git a/content/tenant/_partials/_tenant-admin-definition.md b/content/tenant/_partials/_tenant-admin-definition.md
index 1602c325d0..c0e8ceed8d 100644
--- a/content/tenant/_partials/_tenant-admin-definition.md
+++ b/content/tenant/_partials/_tenant-admin-definition.md
@@ -7,8 +7,8 @@ _build:
 
 Once you sign a partner agreement with Cloudflare, we create a special Tenant account and then add your user to that account as a **Tenant admin**. Cloudflare can add multiple users as Tenant admins upon request.
 
-Tenant admins then become the default [**Super administrator(s)**](/fundamentals/account-and-billing/members/roles/) for all accounts and zones contained within the Tenant.
+Tenant admins then become the default [**Super administrator(s)**](/fundamentals/setup/manage-members/roles/) for all accounts and zones contained within the Tenant.
 
 This means that each Tenant admin's user API key can be used to provision accounts based on the catalog specified in your partner agreement.
 
-If needed, you can also [create additional **Super administrators**](/fundamentals/account-and-billing/members/manage/).
\ No newline at end of file
+If needed, you can also [create additional **Super administrators**](/fundamentals/setup/manage-members/manage/).
\ No newline at end of file
diff --git a/content/tenant/_partials/_user-definition.md b/content/tenant/_partials/_user-definition.md
index e26654f31a..d72e61cced 100644
--- a/content/tenant/_partials/_user-definition.md
+++ b/content/tenant/_partials/_user-definition.md
@@ -5,4 +5,4 @@ _build:
   list: never
 ---
 
-A member of a Cloudflare account with their own user profile and [an associated role](/fundamentals/account-and-billing/members/roles/) that specifies their privileges within that account.
\ No newline at end of file
+A member of a Cloudflare account with their own user profile and [an associated role](/fundamentals/setup/manage-members/roles/) that specifies their privileges within that account.
\ No newline at end of file
diff --git a/content/tenant/get-started/index.md b/content/tenant/get-started/index.md
index dce8d573c4..542ea53d27 100644
--- a/content/tenant/get-started/index.md
+++ b/content/tenant/get-started/index.md
@@ -12,7 +12,7 @@ Having access to Cloudflare’s provisioning capabilities allows you to more eas
 
 ### Channel and Alliance partner account setup
 
-Before using the Tenant API, you need to [create an account](/fundamentals/account-and-billing/account-setup/create-account/), [verify your email address](/fundamentals/account-and-billing/account-setup/verify-email-address/), and [add your billing information](/fundamentals/account-and-billing/account-setup/create-billing-profile/).
+Before using the Tenant API, you need to [create an account](/fundamentals/setup/account-setup/create-account/), [verify your email address](/fundamentals/setup/account-setup/verify-email-address/), and [add your billing information](/fundamentals/setup/account-setup/create-billing-profile/).
 
 After you sign your partner agreement with Cloudflare, Cloudflare will add [certain entitlements](/tenant/structure/) to your account that allow you to provision and manage custom accounts. If you have signed your partner agreement and your account has not yet been enabled, contact `partners@cloudflare.com`.
 
diff --git a/content/terraform/advanced-topics/best-practices.md b/content/terraform/advanced-topics/best-practices.md
index 66b6a85f9d..864aa746f8 100644
--- a/content/terraform/advanced-topics/best-practices.md
+++ b/content/terraform/advanced-topics/best-practices.md
@@ -15,7 +15,7 @@ After any operation on the configuration, Terraform attempts to reconcile the di
 
 ## Directory structure
 
-Cloudflare recommends using a directory structure that relies on a combination of accounts, zones, and products for isolating changes. This setup lets you have fine-grained owners and scoped Terraform operations to a specific product in a zone. It also more closely aligns owners with Cloudflare's [default roles](/fundamentals/account-and-billing/members/roles/), as well as additional tools like AWS or GCP storage by permissioning separate state files.
+Cloudflare recommends using a directory structure that relies on a combination of accounts, zones, and products for isolating changes. This setup lets you have fine-grained owners and scoped Terraform operations to a specific product in a zone. It also more closely aligns owners with Cloudflare's [default roles](/fundamentals/setup/manage-members/roles/), as well as additional tools like AWS or GCP storage by permissioning separate state files.
 
 For products that encompass many responsibilities such as Rulesets, you can extend this even further by partitioning at the phase level (WAF, redirects, origin rules).
 
diff --git a/content/terraform/tutorial/initialize-terraform.md b/content/terraform/tutorial/initialize-terraform.md
index d48e749627..88327fddcc 100644
--- a/content/terraform/tutorial/initialize-terraform.md
+++ b/content/terraform/tutorial/initialize-terraform.md
@@ -14,7 +14,7 @@ Before you begin, ensure you have [installed Terraform](/terraform/installing/).
 
 ## 1. Define your first Terraform config file
 
-Create an initial Terraform config file, filling in your own values for the [API token](/fundamentals/api/get-started/create-token/), [zone ID](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/), [account ID](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/), and [domain](/fundamentals/get-started/setup/add-site/).
+Create an initial Terraform config file, filling in your own values for the [API token](/fundamentals/api/get-started/create-token/), [zone ID](/fundamentals/setup/find-account-and-zone-ids/), [account ID](/fundamentals/setup/find-account-and-zone-ids/), and [domain](/fundamentals/setup/account-setup/add-site/).
 
 Terraform will process any files with a `.tf` extension. As the configuration becomes more complex, you will want to split the config into separate files and modules. For now, proceed with a single file.
 
diff --git a/content/waf/_partials/_api-generic-create-rule-procedure.md b/content/waf/_partials/_api-generic-create-rule-procedure.md
index 5612bb616d..c88b3a6d26 100644
--- a/content/waf/_partials/_api-generic-create-rule-procedure.md
+++ b/content/waf/_partials/_api-generic-create-rule-procedure.md
@@ -8,7 +8,7 @@ inputParameters: ruleName;;extraObject;;phase
 
 To create a $1 for a zone, add a rule $2 to the `$3` phase entry point ruleset.
 
-1. Invoke the [List zone rulesets](/api/operations/listZoneRulesets) method to obtain the list of rulesets in your zone. You will need the [zone ID](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/) for this operation.
+1. Invoke the [List zone rulesets](/api/operations/listZoneRulesets) method to obtain the list of rulesets in your zone. You will need the [zone ID](/fundamentals/setup/find-account-and-zone-ids/) for this operation.
 
 2. Search for an entry point ruleset for the `$3` phase in the response. Such a ruleset would have the following properties: `"kind": "zone"` and `"phase": "$3"`. If you find the ruleset, take note of its ID for the next step.
 
diff --git a/content/waf/custom-rules/skip/api-examples.md b/content/waf/custom-rules/skip/api-examples.md
index c5a0318856..80be54b5c0 100644
--- a/content/waf/custom-rules/skip/api-examples.md
+++ b/content/waf/custom-rules/skip/api-examples.md
@@ -16,7 +16,7 @@ The `skip` action supports different [skip options](/waf/custom-rules/skip/optio
 
 This page contains examples of different skip rule scenarios for custom rules. Take the following into account:
 
-* The `{zone_id}` value is the [ID of the zone](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/) where you want to add the rule.
+* The `{zone_id}` value is the [ID of the zone](/fundamentals/setup/find-account-and-zone-ids/) where you want to add the rule.
 
 * The `{ruleset_id}` value is the ID of the [entry point ruleset](/ruleset-engine/about/phases/#phase-entry-point-ruleset) of the `http_request_firewall_custom` phase. For details on obtaining this ruleset ID, refer to [List and view rulesets](/ruleset-engine/rulesets-api/view/). The API examples in this page add a skip rule to an existing ruleset using the [Create a zone ruleset rule](/api/operations/createZoneRulesetRule) operation.
 
diff --git a/content/waf/custom-rules/skip/options.md b/content/waf/custom-rules/skip/options.md
index c9228174a4..d1ea9b37aa 100644
--- a/content/waf/custom-rules/skip/options.md
+++ b/content/waf/custom-rules/skip/options.md
@@ -44,9 +44,9 @@ The available skip options in custom rules are the following:
     | ------------------------------------------------------------------------------------ | --------------- |
     | [Zone Lockdown](/waf/tools/zone-lockdown/)                                           | `zoneLockdown`  |
     | [User Agent Blocking](/waf/tools/user-agent-blocking/)                               | `uaBlock`       |
-    | [Browser Integrity Check](/fundamentals/security/browser-integrity-check/)      | `bic`           |
+    | [Browser Integrity Check](/waf/tools/browser-integrity-check/)      | `bic`           |
     | [Hotlink Protection](/support/more-dashboard-apps/cloudflare-scrape-shield/understanding-cloudflare-hotlink-protection/)           | `hot`           |
-    | [Security Level](/fundamentals/security/security-level/)               | `securityLevel` |
+    | [Security Level](/waf/tools/security-level/)               | `securityLevel` |
     | [Rate Limiting (previous version)](/waf/reference/legacy/old-rate-limiting/)         | `rateLimit`     |
     | [WAF managed rules (previous version)](/waf/reference/legacy/old-waf-managed-rules/) | `waf`           |
 
diff --git a/content/waf/custom-rules/use-cases/block-ip-reputation.md b/content/waf/custom-rules/use-cases/block-ip-reputation.md
index 6d14f80b45..d8693ea820 100644
--- a/content/waf/custom-rules/use-cases/block-ip-reputation.md
+++ b/content/waf/custom-rules/use-cases/block-ip-reputation.md
@@ -7,7 +7,7 @@ title: Block requests by Threat Score
 
 Cloudflare’s Threat Score ranks requests based on IP reputation. The [`cf.threat_score`](/ruleset-engine/rules-language/fields/#field-cf-threat_score) field can contain a score from 0 to 100. These scores are collected from [Project Honeypot](https://www.projecthoneypot.org/).
 
-This example blocks requests based on country code ([ISO 3166-1 Alpha 2](https://www.iso.org/obp/ui/#search/code/) format), from IP addresses that score greater than 0. This is equivalent to setting the Security Level in **Security** > **Settings** to _High_. For more information, refer to [Security Level](/fundamentals/security/security-level/).
+This example blocks requests based on country code ([ISO 3166-1 Alpha 2](https://www.iso.org/obp/ui/#search/code/) format), from IP addresses that score greater than 0. This is equivalent to setting the Security Level in **Security** > **Settings** to _High_. For more information, refer to [Security Level](/waf/tools/security-level/).
 
 <table>
   <thead>
diff --git a/content/waf/custom-rules/use-cases/require-specific-http-ports.md b/content/waf/custom-rules/use-cases/require-specific-http-ports.md
index a31e182a4a..131e427127 100644
--- a/content/waf/custom-rules/use-cases/require-specific-http-ports.md
+++ b/content/waf/custom-rules/use-cases/require-specific-http-ports.md
@@ -5,7 +5,7 @@ title: Require specific HTTP ports
 
 # Require specific HTTP ports
 
-By default, Cloudflare allows requests on a [number of different HTTP ports](/fundamentals/get-started/reference/network-ports/).
+By default, Cloudflare allows requests on a [number of different HTTP ports](/fundamentals/reference/network-ports/).
 
 You can target requests based on their HTTP port with the [`cf.edge.server_port`](/ruleset-engine/rules-language/fields/#field-cf-edge-server_port) field. Use the `in` [comparison operator](/ruleset-engine/rules-language/operators/#comparison-operators) to target a set of ports.
 
diff --git a/content/waf/managed-rules/payload-logging/_index.md b/content/waf/managed-rules/payload-logging/_index.md
index 51b0241ada..ca44cc570e 100644
--- a/content/waf/managed-rules/payload-logging/_index.md
+++ b/content/waf/managed-rules/payload-logging/_index.md
@@ -39,4 +39,4 @@ Cloudflare cannot decrypt encrypted payloads, since this operation requires your
 
 ## User role requirements
 
-Only users with the [Super Administrator role](/fundamentals/account-and-billing/members/roles/) can enable payload logging or edit the payload logging configuration.
+Only users with the [Super Administrator role](/fundamentals/setup/manage-members/roles/) can enable payload logging or edit the payload logging configuration.
diff --git a/content/waf/managed-rules/payload-logging/configure.md b/content/waf/managed-rules/payload-logging/configure.md
index be6fc0b742..dae02fe915 100644
--- a/content/waf/managed-rules/payload-logging/configure.md
+++ b/content/waf/managed-rules/payload-logging/configure.md
@@ -11,7 +11,7 @@ meta:
 Configure payload logging for a ruleset in the ruleset configuration page.
 
 {{<Aside type="note">}}
-Only users with the [Super Administrator role](/fundamentals/account-and-billing/members/roles/) can configure payload logging and decrypt payloads in the Cloudflare dashboard. Other users can decrypt payloads if they have access to the logs and to the private key.
+Only users with the [Super Administrator role](/fundamentals/setup/manage-members/roles/) can configure payload logging and decrypt payloads in the Cloudflare dashboard. Other users can decrypt payloads if they have access to the logs and to the private key.
 {{</Aside>}}
 
 Do the following:
diff --git a/content/waf/rate-limiting-rules/_index.md b/content/waf/rate-limiting-rules/_index.md
index fb86548811..b2e996a802 100644
--- a/content/waf/rate-limiting-rules/_index.md
+++ b/content/waf/rate-limiting-rules/_index.md
@@ -36,7 +36,7 @@ Refer to [How Cloudflare determines the request rate](/waf/rate-limiting-rules/r
 
 * Rate limiting rules are not designed to allow a precise number of requests to reach the origin server. In some situations, there may be a delay (up to a few seconds) between detecting a request and updating internal counters. Due to this delay, excess requests could still reach the origin server before Cloudflare enforces a mitigation action (such as blocking or challenging) in our global network.
 
-* Applying rate limiting rules to verified bots might affect Search Engine Optimization (SEO). For more information, refer to [Improve SEO](/fundamentals/get-started/task-guides/improve-seo/).
+* Applying rate limiting rules to verified bots might affect Search Engine Optimization (SEO). For more information, refer to [Improve SEO](/fundamentals/basic-tasks/improve-seo/).
 
 ---
 
diff --git a/content/waf/rate-limiting-rules/best-practices.md b/content/waf/rate-limiting-rules/best-practices.md
index 40a6ff7eaa..f2ec0fa38e 100644
--- a/content/waf/rate-limiting-rules/best-practices.md
+++ b/content/waf/rate-limiting-rules/best-practices.md
@@ -38,7 +38,7 @@ Action                   | Managed Challenge
 
 Another use case when controlling access to resources is to exclude or include IP addresses or Autonomous System Numbers (ASNs) from a rate limiting rule.
 
-The following example rule allows up to 10 requests per minute from the same IP address doing a `GET` request for `/status`, as long as the visitor's IP address is not included in the `partner_ips` [IP List](/fundamentals/global-configurations/lists/ip-lists/).
+The following example rule allows up to 10 requests per minute from the same IP address doing a `GET` request for `/status`, as long as the visitor's IP address is not included in the `partner_ips` [IP List](/waf/tools/lists/ip-lists/).
 
 {{<table-wrap>}}
 Setting                  | Value
diff --git a/content/waf/rate-limiting-rules/parameters.md b/content/waf/rate-limiting-rules/parameters.md
index 70421ac5fc..505acc4cd5 100644
--- a/content/waf/rate-limiting-rules/parameters.md
+++ b/content/waf/rate-limiting-rules/parameters.md
@@ -56,7 +56,7 @@ The available rate limiting rule parameters are the following:
   - For more information on the `lookup_json_string`, `lookup_json_integer`, and `substring` functions, refer to [Functions](/ruleset-engine/rules-language/functions/) in the Ruleset Engine documentation.
   - You should not use the `cf.colo.id` characteristic (data center ID) as a field in rule expressions. Additionally, `cf.colo.id` values may change without warning. For more information about this rate limiting characteristic, refer to [How Cloudflare determines the request rate](/waf/rate-limiting-rules/request-rate/).
   - Cloudflare will consider entire `/64` prefixes as the same IPv6 source address for the purpose of tracking the request rate.
-  - Use _IP with NAT support_ to handle situations such as requests under NAT sharing the same IP address. Cloudflare uses a variety of privacy-preserving techniques to identify unique visitors, which may include use of session cookies. Refer to [Cloudflare Cookies](/fundamentals/get-started/reference/cloudflare-cookies/) for details.
+  - Use _IP with NAT support_ to handle situations such as requests under NAT sharing the same IP address. Cloudflare uses a variety of privacy-preserving techniques to identify unique visitors, which may include use of session cookies. Refer to [Cloudflare Cookies](/fundamentals/reference/policies-compliances/cloudflare-cookies/) for details.
 
 - **Use custom counting expression** > **Increment counter when** {{<type>}}String{{</type>}}
 
@@ -141,9 +141,9 @@ Only Enterprise customers with a paid add-on can throttle requests using the _Bl
 
 ## Configuration restrictions
 
-* If the rule expression includes [IP Lists](/fundamentals/global-configurations/lists/ip-lists/), you must enable the **Also apply rate limiting to cached assets** parameter.
+* If the rule expression includes [IP Lists](/waf/tools/lists/ip-lists/), you must enable the **Also apply rate limiting to cached assets** parameter.
 
-* The rule counting expression, defined in the **Increment counter when** parameter, cannot include both [HTTP response fields](/ruleset-engine/rules-language/fields/#http-response-fields) and [IP Lists](/fundamentals/global-configurations/lists/ip-lists/). If you use IP Lists, you must enable the **Also apply rate limiting to cached assets** parameter.
+* The rule counting expression, defined in the **Increment counter when** parameter, cannot include both [HTTP response fields](/ruleset-engine/rules-language/fields/#http-response-fields) and [IP Lists](/waf/tools/lists/ip-lists/). If you use IP Lists, you must enable the **Also apply rate limiting to cached assets** parameter.
 
 ## Recommendations
 
diff --git a/content/waf/reference/legacy/old-rate-limiting/_index.md b/content/waf/reference/legacy/old-rate-limiting/_index.md
index 34e0e135e7..c26a8fdcd3 100644
--- a/content/waf/reference/legacy/old-rate-limiting/_index.md
+++ b/content/waf/reference/legacy/old-rate-limiting/_index.md
@@ -30,7 +30,7 @@ Are you trying to enable Rate Limiting? [Enable Rate Limiting](https://dash.clou
 
 ### Rate limiting and SEO
 
-Cached resources and known Search Engine crawlers are exempted from your rate limiting rules (previous version only). Therefore, they do not affect your website's [SEO ranking](/fundamentals/get-started/task-guides/improve-seo/).
+Cached resources and known Search Engine crawlers are exempted from your rate limiting rules (previous version only). Therefore, they do not affect your website's [SEO ranking](/fundamentals/basic-tasks/improve-seo/).
 
 ___
 
@@ -132,7 +132,7 @@ Rate limit actions are based on the domain plan as mentioned in [Availability](#
 - **Interactive Challenge**: Visitor must pass an Interactive Challenge. If passed, Cloudflare allows the request.
 - **Log**: Requests are logged in [Cloudflare Logs](/logs/). This helps test rules before applying to production.
 
-For more information on challenge actions, refer to [Cloudflare challenges](/fundamentals/get-started/concepts/cloudflare-challenges/).
+For more information on challenge actions, refer to [Cloudflare challenges](/firewall/cf-firewall-rules/cloudflare-challenges/).
 
 #### Ban duration
 
diff --git a/content/waf/reference/legacy/old-waf-managed-rules/troubleshooting.md b/content/waf/reference/legacy/old-waf-managed-rules/troubleshooting.md
index 4bbbd197c4..b6a3c4db9d 100644
--- a/content/waf/reference/legacy/old-waf-managed-rules/troubleshooting.md
+++ b/content/waf/reference/legacy/old-waf-managed-rules/troubleshooting.md
@@ -46,4 +46,4 @@ To identify false negatives, review the HTTP logs on your origin web server. To
 - Are DNS records that serve HTTP traffic proxied through Cloudflare?
 - Is a firewall rule [bypassing](/firewall/cf-firewall-rules/actions/#supported-actions) managed rules? 
 - Does an allowed country, ASN, IP range, or IP address in [IP Access rules](/waf/tools/ip-access-rules/) or [firewall rules](/firewall/cf-firewall-rules/) match the attack traffic?
-- Is the malicious traffic reaching your origin IP addresses directly to bypass Cloudflare protection? Block all traffic except from [Cloudflare's IP addresses](/fundamentals/get-started/setup/allow-cloudflare-ip-addresses/) at your origin web server.
+- Is the malicious traffic reaching your origin IP addresses directly to bypass Cloudflare protection? Block all traffic except from [Cloudflare's IP addresses](/fundamentals/setup/allow-cloudflare-ip-addresses/) at your origin web server.
diff --git a/content/waf/security-events/_index.md b/content/waf/security-events/_index.md
index e8cce68f90..27f3a05a78 100644
--- a/content/waf/security-events/_index.md
+++ b/content/waf/security-events/_index.md
@@ -18,7 +18,7 @@ Users on a Free plan can view summarized security events by date in the **Activi
 *   **Top events by source**: Provides details of the traffic flagged or actioned by a Cloudflare security feature (for example, IP addresses, User Agents, Paths, Countries, Hosts, ASNs).
 *   **Activity log**: Summarizes security events by date to show the action taken and the applied Cloudflare security product.
 
-Security Events displays information about requests actioned or flagged by Cloudflare security products, including features such as [Browser Integrity Check](/fundamentals/security/browser-integrity-check/). Each incoming HTTP request might generate one or more security events. The Security Events dashboard only shows these events, not the HTTP requests themselves.
+Security Events displays information about requests actioned or flagged by Cloudflare security products, including features such as [Browser Integrity Check](/waf/tools/browser-integrity-check/). Each incoming HTTP request might generate one or more security events. The Security Events dashboard only shows these events, not the HTTP requests themselves.
 
 ## Availability
 
diff --git a/content/waf/tools/browser-integrity-check.md b/content/waf/tools/browser-integrity-check.md
index 0de4a4d6ec..1b43e692e2 100644
--- a/content/waf/tools/browser-integrity-check.md
+++ b/content/waf/tools/browser-integrity-check.md
@@ -2,8 +2,6 @@
 pcx_content_type: reference
 source: https://support.cloudflare.com/hc/en-us/articles/200170086-Understanding-the-Cloudflare-Browser-Integrity-Check
 title: Browser Integrity Check
-aliases:
-- /fundamentals/security/browser-integrity-check/
 ---
 
 # Browser Integrity Check
diff --git a/content/waf/tools/challenge-passage.md b/content/waf/tools/challenge-passage.md
index b2c3f72546..ebfe2a6680 100644
--- a/content/waf/tools/challenge-passage.md
+++ b/content/waf/tools/challenge-passage.md
@@ -1,13 +1,11 @@
 ---
 pcx_content_type: reference
 title: Challenge Passage
-aliases:
-- /fundamentals/security/challenge-passage/
 ---
 
 # Challenge Passage
 
-When a visitor solves a [Cloudflare challenge](/fundamentals/get-started/concepts/cloudflare-challenges/) - as part of a [WAF custom rule](/waf/custom-rules/) or [IP Access rule](/waf/tools/ip-access-rules/) - you can set the **Challenge Passage** to prevent them from having to solve future challenges for a specified period of time.
+When a visitor solves a [Cloudflare challenge](/firewall/cf-firewall-rules/cloudflare-challenges/) - as part of a [WAF custom rule](/waf/custom-rules/) or [IP Access rule](/waf/tools/ip-access-rules/) - you can set the **Challenge Passage** to prevent them from having to solve future challenges for a specified period of time.
 
 ## How it works
 
diff --git a/content/waf/tools/ip-access-rules/_index.md b/content/waf/tools/ip-access-rules/_index.md
index 2f7219af53..af3cd6f263 100644
--- a/content/waf/tools/ip-access-rules/_index.md
+++ b/content/waf/tools/ip-access-rules/_index.md
@@ -12,7 +12,7 @@ Use IP Access rules to allowlist, block, and challenge traffic based on the visi
 {{<Aside type="warning">}}
 If you wish to perform IP-based or geography-based blocking (geoblocking), Cloudflare recommends that you create [WAF custom rules](/waf/custom-rules/) instead of IP Access rules:
 
-- For IP-based blocking, use an [IP List](/fundamentals/global-configurations/lists/ip-lists/) in the custom rule expression.
+- For IP-based blocking, use an [IP List](/waf/tools/lists/ip-lists/) in the custom rule expression.
 - For geoblocking, use fields such as _AS Num_, _Country_, and _Continent_ in the custom rule expression.
 {{</Aside>}}
 
diff --git a/content/waf/tools/ip-access-rules/actions.md b/content/waf/tools/ip-access-rules/actions.md
index 48ed071350..265757ee4b 100644
--- a/content/waf/tools/ip-access-rules/actions.md
+++ b/content/waf/tools/ip-access-rules/actions.md
@@ -12,7 +12,7 @@ An IP Access rule can perform one of the following actions:
 
 * **Block**: Prevents a visitor from visiting your site.
 
-* **Allow**: Excludes visitors from all security checks, including [Browser Integrity Check](/fundamentals/security/browser-integrity-check/), [I'm Under Attack Mode](/fundamentals/security/under-attack-mode/), and the WAF. Use this option when a trusted visitor is being blocked by Cloudflare's default security features. The _Allow_ action takes precedence over the _Block_ action. Note that allowing a given country code will not bypass WAF managed rules (previous and new versions).
+* **Allow**: Excludes visitors from all security checks, including [Browser Integrity Check](/waf/tools/browser-integrity-check/), [I'm Under Attack Mode](/fundamentals/reference/under-attack-mode/), and the WAF. Use this option when a trusted visitor is being blocked by Cloudflare's default security features. The _Allow_ action takes precedence over the _Block_ action. Note that allowing a given country code will not bypass WAF managed rules (previous and new versions).
 
 * **Managed Challenge**: Depending on the characteristics of a request, Cloudflare will dynamically choose the appropriate type of challenge from a list of possible actions. For more information, refer to [Cloudflare challenges](/firewall/cf-firewall-rules/cloudflare-challenges/#managed-challenge-recommended).
 
diff --git a/content/waf/tools/lists/_index.md b/content/waf/tools/lists/_index.md
index 0bd8093c69..d0103195f5 100644
--- a/content/waf/tools/lists/_index.md
+++ b/content/waf/tools/lists/_index.md
@@ -3,8 +3,6 @@ title: Lists
 pcx_content_type: overview
 weight: 2
 layout: single
-aliases:
-- /fundamentals/global-configurations/lists/
 ---
 
 # Lists
@@ -25,7 +23,7 @@ Cloudflare stores your lists at the account level. You can use the same list in
 
 Cloudflare supports the following types of lists:
 
-* [IP Lists](/fundamentals/global-configurations/lists/ip-lists/)
+* [IP Lists](/waf/tools/lists/ip-lists/)
 * [Bulk Redirect Lists](/rules/url-forwarding/bulk-redirects/concepts/#bulk-redirect-lists)
 
 Refer to the page about each list type for details.
@@ -40,7 +38,7 @@ The name of a list must comply with the following requirements:
 
 ### Creating and editing lists
 
-You can [create lists in the Cloudflare dashboard](/fundamentals/global-configurations/lists/create-dashboard/) or using the [Lists API](/fundamentals/global-configurations/lists/lists-api/).
+You can [create lists in the Cloudflare dashboard](/rules/url-forwarding/bulk-redirects/create-dashboard/) or using the [Lists API](/waf/tools/lists/lists-api/).
 
 After creating a list, you can add and remove items from the list, but you cannot change the list name or type.
 
@@ -48,7 +46,7 @@ After creating a list, you can add and remove items from the list, but you canno
 
 Both the Cloudflare dashboard and the Cloudflare API support lists:
 
-* To use lists in an expression from the Cloudflare dashboard, refer to [Use lists in expressions](/fundamentals/global-configurations/lists/use-in-expressions/).
+* To use lists in an expression from the Cloudflare dashboard, refer to [Use lists in expressions](/waf/tools/lists/use-in-expressions/).
 * To reference a list in an API expression, refer to [Values: Lists](/ruleset-engine/rules-language/values/#lists) in the Rules language reference.
 
 {{<Aside type="warning">}}
@@ -83,6 +81,6 @@ You can only delete a list when there are no rules (enabled or disabled) that re
 
 {{<render file="_lists-import-notes.md" productFolder="fundamentals">}}
 
-To replace the entire contents of a list, format the data as an array and use the [Update all list items](/api/operations/lists-update-all-list-items) operation in the [Lists API](/fundamentals/global-configurations/lists/lists-api/endpoints/).
+To replace the entire contents of a list, format the data as an array and use the [Update all list items](/api/operations/lists-update-all-list-items) operation in the [Lists API](/waf/tools/lists/lists-api/endpoints/).
 
 You cannot download a list in CSV format from the Cloudflare dashboard. If you need to download the contents of a list, use the [Get list items](/api/operations/lists-get-list-items) operation to fetch the list items.
diff --git a/content/waf/tools/lists/create-dashboard.md b/content/waf/tools/lists/create-dashboard.md
index 7f9fec02d3..7a5e6a4a6c 100644
--- a/content/waf/tools/lists/create-dashboard.md
+++ b/content/waf/tools/lists/create-dashboard.md
@@ -2,8 +2,6 @@
 pcx_content_type: how-to
 title: Create in the dashboard
 weight: 5
-aliases:
-- /fundamentals/global-configurations/lists/create-dashboard/
 ---
 
 # Create a list in the dashboard
diff --git a/content/waf/tools/lists/ip-lists.md b/content/waf/tools/lists/ip-lists.md
index 2866598f33..efafe1534d 100644
--- a/content/waf/tools/lists/ip-lists.md
+++ b/content/waf/tools/lists/ip-lists.md
@@ -2,8 +2,6 @@
 pcx_content_type: concept
 title: IP Lists
 weight: 2
-aliases:
-- /fundamentals/global-configurations/lists/ip-lists/
 ---
 
 # IP Lists
@@ -12,7 +10,7 @@ Use an IP List to reference a group of IP addresses collectively, by name, in ru
 
 ## Create an IP List
 
-Refer to [Create a list in the dashboard](/fundamentals/global-configurations/lists/create-dashboard/) or to the [Lists API](/fundamentals/global-configurations/lists/lists-api/) page.
+Refer to [Create a list in the dashboard](/rules/url-forwarding/bulk-redirects/create-dashboard/) or to the [Lists API](/waf/tools/lists/lists-api/) page.
 
 ## Managed IP Lists
 
diff --git a/content/waf/tools/lists/link-bulk-redirect-lists.md b/content/waf/tools/lists/link-bulk-redirect-lists.md
index 986593608b..471e42ef5d 100644
--- a/content/waf/tools/lists/link-bulk-redirect-lists.md
+++ b/content/waf/tools/lists/link-bulk-redirect-lists.md
@@ -2,8 +2,6 @@
 pcx_content_type: navigation
 title: Bulk Redirect Lists
 external_link: /rules/url-forwarding/bulk-redirects/concepts/#bulk-redirect-lists
-aliases:
-- /fundamentals/global-configurations/lists/link-bulk-redirect-lists/
 weight: 3
 _build:
   publishResources: false
diff --git a/content/waf/tools/lists/lists-api/_index.md b/content/waf/tools/lists/lists-api/_index.md
index b1e01f894b..a7dc1ea90f 100644
--- a/content/waf/tools/lists/lists-api/_index.md
+++ b/content/waf/tools/lists/lists-api/_index.md
@@ -3,15 +3,13 @@ pcx_content_type: navigation
 title: Lists API
 weight: 7
 layout: single
-aliases:
-- /fundamentals/global-configurations/lists/lists-api/
 ---
 
 # Lists API
 
 The [Lists API](/api/operations/lists-get-lists) provides an interface for programmatically managing the following types of lists:
 
-* [IP Lists](/fundamentals/global-configurations/lists/ip-lists/): Contain IP addresses that you can reference collectively, by name, in rule expressions.
+* [IP Lists](/waf/tools/lists/ip-lists/): Contain IP addresses that you can reference collectively, by name, in rule expressions.
 
 * [Bulk Redirect Lists](/rules/url-forwarding/bulk-redirects/concepts/#bulk-redirect-lists): Contain URL redirects that you enable by creating a Bulk Redirect Rule.
 
@@ -19,4 +17,4 @@ To use a list in a rule expression, refer to [Values: Lists](/ruleset-engine/rul
 
 ## Get started
 
-To get started, review the Lists [JSON object](/fundamentals/global-configurations/lists/lists-api/json-object/) and [Endpoints](/fundamentals/global-configurations/lists/lists-api/endpoints/).
+To get started, review the Lists [JSON object](/waf/tools/lists/lists-api/json-object/) and [Endpoints](/waf/tools/lists/lists-api/endpoints/).
diff --git a/content/waf/tools/lists/lists-api/endpoints.md b/content/waf/tools/lists/lists-api/endpoints.md
index 24ae23c053..1c316ed1bf 100644
--- a/content/waf/tools/lists/lists-api/endpoints.md
+++ b/content/waf/tools/lists/lists-api/endpoints.md
@@ -3,8 +3,6 @@ title: Endpoints
 pcx_content_type: reference
 weight: 2
 layout: list
-aliases:
-- /fundamentals/global-configurations/lists/lists-api/endpoints/
 ---
 
 # Endpoints
diff --git a/content/waf/tools/lists/lists-api/json-object.md b/content/waf/tools/lists/lists-api/json-object.md
index ba20d998f9..cf1988210a 100644
--- a/content/waf/tools/lists/lists-api/json-object.md
+++ b/content/waf/tools/lists/lists-api/json-object.md
@@ -5,8 +5,6 @@ weight: 1
 meta:
   title: List JSON object
   description: Reference information on the JSON object used in Lists API calls.
-aliases:
-- /fundamentals/global-configurations/lists/lists-api/json-object/
 ---
 
 # List JSON object
diff --git a/content/waf/tools/lists/use-in-expressions.md b/content/waf/tools/lists/use-in-expressions.md
index 0a42a950f5..0f12906e8a 100644
--- a/content/waf/tools/lists/use-in-expressions.md
+++ b/content/waf/tools/lists/use-in-expressions.md
@@ -4,8 +4,6 @@ title: Use lists in expressions
 weight: 6
 meta:
     description: Learn how to use lists in rule expressions.
-aliases:
-- /fundamentals/global-configurations/lists/use-in-expressions/
 ---
 
 # Use lists in expressions
diff --git a/content/waf/tools/privacy-pass.md b/content/waf/tools/privacy-pass.md
index dc854bd646..440759ba72 100644
--- a/content/waf/tools/privacy-pass.md
+++ b/content/waf/tools/privacy-pass.md
@@ -2,8 +2,6 @@
 pcx_content_type: reference
 source: https://support.cloudflare.com/hc/en-us/articles/115001992652-Using-Privacy-Pass-with-Cloudflare
 title: Privacy Pass
-aliases:
-- /fundamentals/security/privacy-pass/
 ---
 
 # Privacy Pass
@@ -38,7 +36,7 @@ Report general Privacy Pass issues to [privacy-pass-support@cloudflare.com](mai
 
 ## Privacy Pass with Under Attack mode
 
-Privacy Pass allows a user to bypass CAPTCHAs. To help mitigate malicious usage of this feature, we automatically disable Privacy Pass anytime a domain is placed into [I'm Under Attack!](/fundamentals/security/under-attack-mode/) mode. A few key points you need to keep in mind when enabling the **I'm Under Attack!** mode:
+Privacy Pass allows a user to bypass CAPTCHAs. To help mitigate malicious usage of this feature, we automatically disable Privacy Pass anytime a domain is placed into [I'm Under Attack!](/fundamentals/reference/under-attack-mode/) mode. A few key points you need to keep in mind when enabling the **I'm Under Attack!** mode:
 
 1.  When **I'm Under Attack!** mode is enabled on a domain, then Privacy Pass is disabled.
 2.  When **I'm Under Attack!**  mode is disabled on a domain, then Privacy Pass is re-enabled if it was enabled before **I'm Under Attack!**  mode was turned on. 
diff --git a/content/waf/tools/security-level.md b/content/waf/tools/security-level.md
index 14a9618775..4da93b5036 100644
--- a/content/waf/tools/security-level.md
+++ b/content/waf/tools/security-level.md
@@ -2,8 +2,6 @@
 pcx_content_type: reference
 source: https://support.cloudflare.com/hc/en-us/articles/200170056-Understanding-the-Cloudflare-Security-Level
 title: Security Level
-aliases:
-- /fundamentals/security/security-level/
 ---
 
 # Security Level
@@ -11,7 +9,7 @@ aliases:
 Cloudflare's **Security Level** uses the IP reputation of a visitor to decide whether to present a [Managed Challenge](/firewall/cf-firewall-rules/cloudflare-challenges/#managed-challenge-recommended) page. Once the visitor enters the correct Managed Challenge, they receive the appropriate website resources.
 
 {{<Aside type="note">}}
-When [I'm Under Attack mode](/fundamentals/security/under-attack-mode/) is enabled, Security Level presents a JS challenge page.
+When [I'm Under Attack mode](/fundamentals/reference/under-attack-mode/) is enabled, Security Level presents a JS challenge page.
 {{</Aside>}}
 
 ---
@@ -56,7 +54,7 @@ If you wanted to set the Security level more selectively:
 ## Recommendations
 
 To prevent bot IPs from attacking a website:
-- A new website owner might set a _Medium_ or _High_ **Security Level** and lower [**Challenge Passage**](/fundamentals/security/challenge-passage/) to a value below **30 minutes** to ensure that Cloudflare is constantly protecting the site.
-- An experienced website administrator confident in their security settings might set **Security Level** to _Essentially Off_ or _Low_ while setting a higher [**Challenge Passage**](/fundamentals/security/challenge-passage/) for a week, month, or even year to provide a less obtrusive visitor experience.
+- A new website owner might set a _Medium_ or _High_ **Security Level** and lower [**Challenge Passage**](/waf/tools/challenge-passage/) to a value below **30 minutes** to ensure that Cloudflare is constantly protecting the site.
+- An experienced website administrator confident in their security settings might set **Security Level** to _Essentially Off_ or _Low_ while setting a higher [**Challenge Passage**](/waf/tools/challenge-passage/) for a week, month, or even year to provide a less obtrusive visitor experience.
 
-Only use [**I'm Under Attack!**](/fundamentals/security/under-attack-mode/) mode when a website is under a DDoS attack. **I'm Under Attack!** mode may affect some actions on your domain, such as your API traffic.  Set a custom **Security Level** for your API or any other part of your domain by creating a [Configuration Rule](/rules/configuration-rules/) for that portion of your site traffic.
\ No newline at end of file
+Only use [**I'm Under Attack!**](/fundamentals/reference/under-attack-mode/) mode when a website is under a DDoS attack. **I'm Under Attack!** mode may affect some actions on your domain, such as your API traffic.  Set a custom **Security Level** for your API or any other part of your domain by creating a [Configuration Rule](/rules/configuration-rules/) for that portion of your site traffic.
\ No newline at end of file
diff --git a/content/web3/get-started.md b/content/web3/get-started.md
index 54fd2555d6..abe7e86443 100644
--- a/content/web3/get-started.md
+++ b/content/web3/get-started.md
@@ -10,7 +10,7 @@ Use this tutorial to start using Cloudflare's Web3 Gateways to the IPFS and Ethe
 
 ## Before you begin
 
-Before you start, make sure the you have [set up an account](/fundamentals/account-and-billing/account-setup/) and [added your website](/fundamentals/get-started/setup/add-site/) to Cloudflare.
+Before you start, make sure the you have [set up an account](/fundamentals/setup/account-setup/) and [added your website](/fundamentals/setup/account-setup/add-site/) to Cloudflare.
 
 ## Step 1 - Subscribe to a gateway
 
diff --git a/content/web3/reference/migration-guide.md b/content/web3/reference/migration-guide.md
index 5a0b1527df..43daffb664 100644
--- a/content/web3/reference/migration-guide.md
+++ b/content/web3/reference/migration-guide.md
@@ -16,7 +16,7 @@ If you created a hostname pointing to these gateways during the [private beta](h
 
 The migration is a simple process.
 
-First, create a [Cloudflare account](/fundamentals/account-and-billing/account-setup/create-account/).
+First, create a [Cloudflare account](/fundamentals/setup/account-setup/create-account/).
 
 Then create a new [Web3 custom gateway](/web3/how-to/manage-gateways/#create-a-gateway) with your existing hostname.
 
diff --git a/content/workers/learning/playground.md b/content/workers/learning/playground.md
index c17e21dbeb..86f4883ded 100644
--- a/content/workers/learning/playground.md
+++ b/content/workers/learning/playground.md
@@ -75,7 +75,7 @@ The console displays the output of any calls to `console.log` that were called f
 
 ## Deploy
 
-There are two ways to preview and deploy a Workers script: on [a site on Cloudflare](/fundamentals/get-started/setup/add-site/) or on a [workers.dev](https://workers.dev/) account. If you'd like to only explore Workers capabilities, you can avoid any setup through the [playground](#playground).
+There are two ways to preview and deploy a Workers script: on [a site on Cloudflare](/fundamentals/setup/account-setup/add-site/) or on a [workers.dev](https://workers.dev/) account. If you'd like to only explore Workers capabilities, you can avoid any setup through the [playground](#playground).
 
 ### Cloudflare dashboard
 
diff --git a/content/workers/runtime-apis/headers.md b/content/workers/runtime-apis/headers.md
index 9ad8adddf6..ebdbe14309 100644
--- a/content/workers/runtime-apis/headers.md
+++ b/content/workers/runtime-apis/headers.md
@@ -48,7 +48,7 @@ console.log(headers.getAll("Set-Cookie"));
 
 Cloudflare sets a number of its own custom headers on incoming requests and outgoing responses. While some may be used for its own tracking and bookkeeping, many of these can be useful to your own applications – or Workers – too.
 
-For a list of documented Cloudflare request headers, refer to [HTTP request headers](/fundamentals/get-started/reference/http-request-headers/).
+For a list of documented Cloudflare request headers, refer to [HTTP request headers](/fundamentals/reference/http-request-headers/).
 
 ## Related resources
 
diff --git a/content/workers/tutorials/generate-youtube-thumbnails-with-workers-and-images/index.md b/content/workers/tutorials/generate-youtube-thumbnails-with-workers-and-images/index.md
index a9dea866ef..d4c71eeb09 100644
--- a/content/workers/tutorials/generate-youtube-thumbnails-with-workers-and-images/index.md
+++ b/content/workers/tutorials/generate-youtube-thumbnails-with-workers-and-images/index.md
@@ -400,7 +400,7 @@ export default {
 }
 ```
 
-Update `env.CLOUDFLARE_ACCOUNT_HASH` with your [Cloudflare account ID](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/). Update `env.IMAGE_ID` with your [image ID](/images/cloudflare-images/api-request/).
+Update `env.CLOUDFLARE_ACCOUNT_HASH` with your [Cloudflare account ID](/fundamentals/setup/find-account-and-zone-ids/). Update `env.IMAGE_ID` with your [image ID](/images/cloudflare-images/api-request/).
 
 Run your Worker and go to the `/original-image` route to review your image.
 
diff --git a/content/workers/tutorials/localize-a-website/index.md b/content/workers/tutorials/localize-a-website/index.md
index c869571146..f8372cc847 100644
--- a/content/workers/tutorials/localize-a-website/index.md
+++ b/content/workers/tutorials/localize-a-website/index.md
@@ -257,7 +257,7 @@ async function handleEvent(event) {
 
 Your i18n tool built on Cloudflare Workers is complete and it is time to deploy it to your domain.
 
-To deploy your `*.workers.dev` subdomain, you need to configure the `wrangler.toml` configuration file in your project. First, add your Cloudflare [account ID](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/). Set this ID at the top part of your project’s `wrangler.toml` file:
+To deploy your `*.workers.dev` subdomain, you need to configure the `wrangler.toml` configuration file in your project. First, add your Cloudflare [account ID](/fundamentals/setup/find-account-and-zone-ids/). Set this ID at the top part of your project’s `wrangler.toml` file:
 
 ```toml
 ---
diff --git a/content/workers/wrangler/ci-cd.md b/content/workers/wrangler/ci-cd.md
index faaa34c33a..28b687e805 100644
--- a/content/workers/wrangler/ci-cd.md
+++ b/content/workers/wrangler/ci-cd.md
@@ -5,7 +5,7 @@ title: Run in CI/CD
 
 # Run Wrangler in CI/CD
 
-To run Wrangler in a continuous integration/continuous deployment (CI/CD) environment, you must provide a [Cloudflare API token](/fundamentals/api/get-started/create-token/) and [account ID](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/).
+To run Wrangler in a continuous integration/continuous deployment (CI/CD) environment, you must provide a [Cloudflare API token](/fundamentals/api/get-started/create-token/) and [account ID](/fundamentals/setup/find-account-and-zone-ids/).
 
 ## Create a Cloudflare API token
 
diff --git a/content/workers/wrangler/configuration.md b/content/workers/wrangler/configuration.md
index f0a1201cd3..bea47476c7 100644
--- a/content/workers/wrangler/configuration.md
+++ b/content/workers/wrangler/configuration.md
@@ -220,7 +220,7 @@ routes = [
 
 - `zone_id` {{<type>}}string{{</type>}} {{<prop-meta>}}required{{</prop-meta>}}
 
-  - The ID of the zone that your `pattern` is associated with. Refer to [Find zone and account IDs](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/).
+  - The ID of the zone that your `pattern` is associated with. Refer to [Find zone and account IDs](/fundamentals/setup/find-account-and-zone-ids/).
 
 {{</definitions>}}
 
diff --git a/content/workers/wrangler/system-environment-variables.md b/content/workers/wrangler/system-environment-variables.md
index b9d1349469..b052b6209e 100644
--- a/content/workers/wrangler/system-environment-variables.md
+++ b/content/workers/wrangler/system-environment-variables.md
@@ -21,7 +21,7 @@ Wrangler supports the following environment variables:
 
 - `CLOUDFLARE_ACCOUNT_ID` {{<type>}}string{{</type>}} {{<prop-meta>}}optional{{</prop-meta>}}
 
-  - The [account ID](/fundamentals/get-started/basic-tasks/find-account-and-zone-ids/) for the Workers related account.
+  - The [account ID](/fundamentals/setup/find-account-and-zone-ids/) for the Workers related account.
 
 - `CLOUDFLARE_API_TOKEN` {{<type>}}string{{</type>}} {{<prop-meta>}}optional{{</prop-meta>}}
 
diff --git a/content/zaraz/get-started/_index.md b/content/zaraz/get-started/_index.md
index 0ae5c86882..c0088f9453 100644
--- a/content/zaraz/get-started/_index.md
+++ b/content/zaraz/get-started/_index.md
@@ -7,7 +7,7 @@ weight: 2
 
 # Get started
 
-Before being able to use Zaraz, it is recommended that you proxy your website through Cloudflare. Refer to [Set up Cloudflare](/fundamentals/get-started/setup/) for more information. If you do not want to proxy your website through Cloudflare, refer to [Use Zaraz on domains not proxied by Cloudflare](/zaraz/advanced/domains-not-proxied/).
+Before being able to use Zaraz, it is recommended that you proxy your website through Cloudflare. Refer to [Set up Cloudflare](/fundamentals/setup/) for more information. If you do not want to proxy your website through Cloudflare, refer to [Use Zaraz on domains not proxied by Cloudflare](/zaraz/advanced/domains-not-proxied/).
 
 ## Events, triggers, actions and tools
 
diff --git a/data/fundamentals.yml b/data/fundamentals.yml
index 505fb6d224..521e5a0082 100644
--- a/data/fundamentals.yml
+++ b/data/fundamentals.yml
@@ -15,7 +15,7 @@ meta:
 
 externals:
   - title: How Cloudflare works
-    url: /fundamentals/get-started/concepts/how-cloudflare-works/
+    url: /fundamentals/concepts/how-cloudflare-works/
   - title: Cloudflare homepage
     url: https://cloudflare.com
 
diff --git a/data/learning-paths/application-security.json b/data/learning-paths/application-security.json
index 4f3a44d9b4..87eeced11a 100644
--- a/data/learning-paths/application-security.json
+++ b/data/learning-paths/application-security.json
@@ -62,7 +62,7 @@
         "estimated_time": 15,
         "pages": [
           {
-            "url_path": "/fundamentals/account-and-billing/account-setup/verify-email-address/",
+            "url_path": "/fundamentals/setup/account-setup/verify-email-address/",
             "link_title": "Verify your email address"
           },
           {
@@ -71,7 +71,7 @@
             "link_title": "Set up two-factor authentication (2FA)"
           },
           {
-            "url_path": "/fundamentals/account-and-billing/members/manage/",
+            "url_path": "/fundamentals/setup/manage-members/manage/",
             "link_title": "Manage account access"
           },
           {
@@ -106,7 +106,7 @@
           {
             "url_path": "/dns/manage-dns-records/reference/proxied-dns-records/",
             "link_title": "Proxy your DNS records",
-            "additional_description": "As long as your traffic is <a href='/fundamentals/get-started/concepts/how-cloudflare-works/'>proxied by Cloudflare</a>, Cloudflare automatically protects your application from <a href='/ddos-protection/'>DDoS attacks</a>."
+            "additional_description": "As long as your traffic is <a href='/fundamentals/concepts/how-cloudflare-works/'>proxied by Cloudflare</a>, Cloudflare automatically protects your application from <a href='/ddos-protection/'>DDoS attacks</a>."
           },
           {
             "url_path": "/dns/dnssec/",
@@ -174,12 +174,12 @@
           },
           {
             "external_link": true,
-            "url_path": "/fundamentals/security/security-level/",
+            "url_path": "/waf/tools/security-level/",
             "link_title": "Customize security level",
             "additional_description": "Use the IP reputation of a visitor to determine whether to present a <a href='/firewall/cf-firewall-rules/cloudflare-challenges/#managed-challenge-recommended'>Managed Challenge</a> page."
           },
           {
-            "url_path": "/fundamentals/security/challenge-passage/",
+            "url_path": "/waf/tools/challenge-passage/",
             "link_title": "Customize challenge passage",
             "additional_description": "Specify the length of time that a visitor can access your website after completing a security challenge."
           },
@@ -190,7 +190,7 @@
             "additional_description": "Reduce the number of challenges presented to visitors using the <strong>Privacy Pass</strong> browser extension."
           },
           {
-            "url_path": "/fundamentals/security/browser-integrity-check/",
+            "url_path": "/waf/tools/browser-integrity-check/",
             "link_title": "Browser Integrity Check",
             "additional_description": "Browser Integrity Check evaluates incoming HTTP headers based on known threats — such as requests with a missing or non-standard user agent — and present a challenge page if needed."
           },
@@ -252,7 +252,7 @@
         "title": "Next steps",
         "pages": [
           {
-            "url_path": "/fundamentals/get-started/task-guides/origin-health/",
+            "url_path": "/fundamentals/basic-tasks/protect-your-origin-server/",
             "link_title": "Protect your origin server"
           }
         ]
diff --git a/data/learning-paths/get-started.json b/data/learning-paths/get-started.json
index 983c342203..8d89f3e691 100644
--- a/data/learning-paths/get-started.json
+++ b/data/learning-paths/get-started.json
@@ -24,23 +24,23 @@
             "link_title": "What is a Content Delivery Network (CDN)?"
           },
           {
-            "url_path": "/fundamentals/get-started/concepts/what-is-cloudflare/",
+            "url_path": "/fundamentals/concepts/what-is-cloudflare/",
             "link_title": "What is Cloudflare?"
           },
           {
-            "url_path": "/fundamentals/get-started/concepts/how-cloudflare-works/",
+            "url_path": "/fundamentals/concepts/how-cloudflare-works/",
             "link_title": "How does Cloudflare work?"
           },
           {
-            "url_path": "/fundamentals/get-started/concepts/cloudflare-ip-addresses/",
+            "url_path": "/fundamentals/concepts/cloudflare-ip-addresses/",
             "link_title": "Cloudflare IP addresses"
           },
           {
-            "url_path": "/fundamentals/get-started/concepts/cloudflare-challenges/",
+            "url_path": "/firewall/cf-firewall-rules/cloudflare-challenges/",
             "link_title": "Cloudflare challenges"
           },
           {
-            "url_path": "/fundamentals/get-started/concepts/network-layers/",
+            "url_path": "/fundamentals/concepts/network-layers/",
             "link_title": "How Cloudflare protects different layers of your network"
           }
         ]
@@ -52,7 +52,7 @@
         "estimated_time": 10,
         "pages": [
           {
-            "url_path": "/fundamentals/account-and-billing/account-setup/create-account/",
+            "url_path": "/fundamentals/setup/account-setup/create-account/",
             "link_title": "Create an account"
           },
           {
@@ -66,11 +66,11 @@
             "link_title": "Add billing information"
           },
           {
-            "url_path": "/fundamentals/account-and-billing/account-setup/customize-account/",
+            "url_path": "/fundamentals/setup/account-setup/customize-account/",
             "link_title": "Customize your account"
           },
           {
-            "url_path": "/fundamentals/account-and-billing/members/manage/",
+            "url_path": "/fundamentals/setup/manage-members/manage/",
             "link_title": "Add other account members"
           },
           {
@@ -209,16 +209,16 @@
             "postpone_evaluation": true
           }
         ],
-        "description": "Make a few updates at your registrar and within Cloudflare to improve your domain's <a target='_blank' href='/fundamentals/get-started/concepts/how-cloudflare-works/#benefits'>speed, security, and reliability</a>.",
+        "description": "Make a few updates at your registrar and within Cloudflare to improve your domain's <a target='_blank' href='/fundamentals/concepts/how-cloudflare-works/#benefits'>speed, security, and reliability</a>.",
         "estimated_time": 5,
         "pages": [
           {
-            "url_path": "/fundamentals/get-started/setup/minimize-downtime/",
+            "url_path": "/fundamentals/basic-tasks/minimize-downtime/",
             "link_title": "(For some) Minimize downtime",
             "additional_description": "If your domain is particularly sensitive to downtime, you may want to do a bit of pre-work before adding it to Cloudflare."
           },
           {
-            "url_path": "/fundamentals/get-started/setup/allow-cloudflare-ip-addresses/",
+            "url_path": "/fundamentals/setup/allow-cloudflare-ip-addresses/",
             "link_title": "Allow Cloudflare IP addresses",
             "additional_description": "If you control your <a href='https://www.cloudflare.com/learning/cdn/glossary/origin-server/'>origin server</a> and plan on using <a href='/dns/manage-dns-records/reference/proxied-dns-records/'>Cloudflare’s proxy</a>, review your server configuration to avoid accidentally blocking Cloudflare IP addresses."
           },
@@ -228,12 +228,12 @@
             "additional_description": "Make sure DNSSEC is disabled at your registrar (where you purchased your domain name). Otherwise, your domain will experience connectivity errors when you change your nameservers."
           },
           {
-            "url_path": "/fundamentals/get-started/setup/add-site/",
+            "url_path": "/fundamentals/setup/account-setup/add-site/",
             "link_title": "Add a site",
             "additional_description": "<strong>Note</strong>: If do not already have a domain name, start with <a href='/registrar/get-started/register-domain/'>Cloudflare Registrar</a> instead."
           },
           {
-            "url_path": "/fundamentals/get-started/setup/add-site/#step-2--update-nameservers",
+            "url_path": "/fundamentals/setup/account-setup/add-site/#step-2--update-nameservers",
             "link_title": "Update your nameservers",
             "additional_description": "Before your domain can begin using Cloudflare for DNS resolution, you need to update your nameservers at your registrar."
           }
@@ -268,7 +268,7 @@
             "additional_description": "Beyond having a domain (<code>example.com</code>), you may want to make sure visitors can access content on a subdomain, such as <code>www.example.com</code> or <code>blog.example.com</code>."
           },
           {
-            "url_path": "/fundamentals/get-started/basic-tasks/manage-domains/redirect-domain/",
+            "url_path": "/fundamentals/setup/manage-domains/redirect-domain/",
             "link_title": "Redirect one domain to another"
           },
           {
@@ -364,7 +364,7 @@
             "link_title": "Optimize site speed (Learning Path)"
           },
           {
-            "url_path": "/fundamentals/get-started/task-guides/origin-health/",
+            "url_path": "/fundamentals/basic-tasks/protect-your-origin-server/",
             "link_title": "Secure your origin server"
           },
           {
@@ -385,7 +385,7 @@
         ],
         "pages": [
           {
-            "url_path": "/fundamentals/get-started/basic-tasks/manage-domains/redirect-domain/",
+            "url_path": "/fundamentals/setup/manage-domains/redirect-domain/",
             "link_title": "Redirect one domain to another"
           },
           {
@@ -393,15 +393,15 @@
             "link_title": "Create a custom email address"
           },
           {
-            "url_path": "/fundamentals/get-started/reference/",
+            "url_path": "/fundamentals/reference/",
             "link_title": "Review Cloudflare-wide reference information"
           },
           {
-            "url_path": "/fundamentals/get-started/basic-tasks/access-cloudflare-resources/",
+            "url_path": "/fundamentals/",
             "link_title": "What resources does Cloudflare offer?"
           },
           {
-            "url_path": "/fundamentals/get-started/basic-tasks/interact-with-cloudflare/",
+            "url_path": "/fundamentals/basic-tasks/interact-with-cloudflare/",
             "link_title": "How can I interact with Cloudflare?"
           }
         ]
diff --git a/data/learning-paths/optimize-site-speed.json b/data/learning-paths/optimize-site-speed.json
index 94a7ff1437..6c9595bd3b 100644
--- a/data/learning-paths/optimize-site-speed.json
+++ b/data/learning-paths/optimize-site-speed.json
@@ -167,7 +167,7 @@
         "title": "Next steps",
         "pages": [
           {
-            "url_path": "/fundamentals/get-started/task-guides/improve-seo/",
+            "url_path": "/fundamentals/basic-tasks/improve-seo/",
             "link_title": "Optimize SEO"
           }
         ]
diff --git a/data/learning-paths/replace-vpn.json b/data/learning-paths/replace-vpn.json
index 0ec7e6157f..e66f9f9a8c 100644
--- a/data/learning-paths/replace-vpn.json
+++ b/data/learning-paths/replace-vpn.json
@@ -17,7 +17,7 @@
         "description": "Concepts explain the basic ideas behind how Cloudflare Zero Trust works. <br />",
         "pages": [
           {
-            "url_path": "/fundamentals/get-started/concepts/what-is-cloudflare/",
+            "url_path": "/fundamentals/concepts/what-is-cloudflare/",
             "link_title": "What is Cloudflare?"
           },
           {
@@ -58,7 +58,7 @@
         "estimated_time": 20,
         "pages": [
           {
-            "url_path": "/fundamentals/account-and-billing/account-setup/create-account/",
+            "url_path": "/fundamentals/setup/account-setup/create-account/",
             "link_title": "Create a Cloudflare account",
             "additional_description": "If you have a Cloudflare contact (Enterprise only), ask them to set up your account as a multi-user organization after you finish this step."
           },
@@ -68,7 +68,7 @@
             "link_title": "Set up two-factor authentication (2FA)"
           },
           {
-            "url_path": "/fundamentals/account-and-billing/members/manage/",
+            "url_path": "/fundamentals/setup/manage-members/manage/",
             "link_title": "(Optional) Add public domains and subdomains to Cloudflare",
             "additional_description": "You will use these domains to test agentless access to web services. Alternatively, you could purchase a new testing domain through <a href='/registrar/get-started/register-domain/'>Cloudflare Registrar</a>."
           }
diff --git a/data/plans.json b/data/plans.json
index e1626178b4..15cc09694a 100644
--- a/data/plans.json
+++ b/data/plans.json
@@ -975,7 +975,7 @@
     },
     "true_client_ip_header": {
       "title": "True Client IP Header",
-      "link": "/fundamentals/get-started/reference/http-request-headers/",
+      "link": "/fundamentals/reference/http-request-headers/",
       "properties": {
         "availability": {
           "title": "Availability",
diff --git a/layouts/shortcodes/product-grid.html b/layouts/shortcodes/product-grid.html
index 0142a97ebb..e5a10aab2b 100644
--- a/layouts/shortcodes/product-grid.html
+++ b/layouts/shortcodes/product-grid.html
@@ -372,7 +372,7 @@ span a img {
     </fieldset>
     <fieldset>
       <legend class="FilterLegend">Enterprise preview
-        <span><a href="/fundamentals/account-and-billing/non-contract-products/" target="_blank"><img src="/icons/help.svg" alt="More details" title="More details"></a></span>
+        <span><a href="/fundamentals/account-and-billing/preview-services/" target="_blank"><img src="/icons/help.svg" alt="More details" title="More details"></a></span>
       </legend>
       <div>
         <input class="ProductCheckboxItem" type="checkbox" id="preview-available" value="true" name="preview-available">