diff --git a/public/__redirects b/public/__redirects
index b2654a029e939e..f7a14a408aef6d 100644
--- a/public/__redirects
+++ b/public/__redirects
@@ -1136,8 +1136,8 @@
/support/third-party-software/others/using-kubernetes-on-gke-and-aws-with-cloudflare-load-balancer/ /load-balancing/additional-options/ 301
/support/troubleshooting/general-troubleshooting/contacting-cloudflare-support/ /support/contacting-cloudflare-support/ 301
/support/troubleshooting/performance/http2-and-enhanced-http2-prioritization-options-may-affect-content-loading-on-iossafari-devices/ /speed/optimization/protocol/troubleshooting/enhanced-http2-prioritization-ios-safari/ 301
-/support/troubleshooting/planned-maintenance/ /support/troubleshooting/disruptive-maintenance/ 301
-/support/troubleshooting/planned-maintenance/disruptive-maintenance-windows/ /support/troubleshooting/disruptive-maintenance/ 301
+/support/troubleshooting/planned-maintenance/ /support/disruptive-maintenance/ 301
+/support/troubleshooting/planned-maintenance/disruptive-maintenance-windows/ /support/disruptive-maintenance/ 301
/support/page-rules/ /rules/page-rules/ 301
/support/page-rules/configuring-url-forwarding-or-redirects-with-page-rules/ /rules/page-rules/how-to/url-forwarding/ 301
/support/page-rules/how-do-i-include-or-exclude-a-specific-url-from-cloudflares-page-rules/ /rules/page-rules/reference/wildcard-matching/ 301
@@ -1184,6 +1184,17 @@
/support/more-dashboard-apps/cloudflare-apps/removing-cloudflare-apps/ /workers/ 301
/support/troubleshooting/http-status-codes/http-status-codes/ /support/troubleshooting/http-status-codes/ 301
/support/troubleshooting/cloudflare-errors/troubleshooting-other-errors/ /speed/optimization/protocol/http2/#err_http2_protocol_error 301
+/support/troubleshooting/disruptive-maintenance/ /support/disruptive-maintenance/ 301
+/support/about-cloudflare/ /support/ 301
+/support/about-cloudflare/enterprise-documentation/ /support/ 301
+/support/about-cloudflare/enterprise-documentation/customer-incident-management-policy/ /support/customer-incident-management-policy/ 301
+/support/about-cloudflare/cloudflare-status/ /support/cloudflare-status/ 301
+/support/account-management-billing/billing-cloudflare-plans/ /support/account-management-billing/ 301
+/support/account-management-billing/billing-cloudflare-plans/understanding-cloudflare-sales-tax/ /support/account-management-billing/understanding-cloudflare-sales-tax/ 301
+/support/account-management-billing/billing-cloudflare-plans/cloudflare-billing-policy/ /support/account-management-billing/cloudflare-billing-policy/ 301
+/support/partners/ /support/ 301
+/support/partners/reduce-data-transfer-egress-costs-between-azure-and-cloudflare/ /support/third-party-software/others/reduce-data-transfer-egress-costs-between-azure-and-cloudflare/ 301
+/support/more-dashboard-apps/cloudflare-stream/ /support/more-dashboard-apps/ 301
# r2
/r2/platform/s3-compatibility/api/ /r2/api/s3/api/ 301
diff --git a/src/content/docs/fundamentals/api/reference/deprecations.mdx b/src/content/docs/fundamentals/api/reference/deprecations.mdx
index eb4e5f0cd29b41..3a2e038ba2bc71 100644
--- a/src/content/docs/fundamentals/api/reference/deprecations.mdx
+++ b/src/content/docs/fundamentals/api/reference/deprecations.mdx
@@ -22,5 +22,5 @@ Subscribe to all API deprecation posts via [RSS](/fundamentals/api/reference/dep
## Related resources
- [Available RSS feeds](/fundamentals/new-features/available-rss-feeds/) (for the [Cloudflare changelog](/changelog/))
-- [Subscribe to Cloudflare Status](/support/about-cloudflare/cloudflare-status/)
-- [Planned maintenance windows](/support/troubleshooting/disruptive-maintenance/)
+- [Subscribe to Cloudflare Status](/support/cloudflare-status/)
+- [Planned maintenance windows](/support/disruptive-maintenance/)
diff --git a/src/content/docs/fundamentals/new-features/available-rss-feeds.mdx b/src/content/docs/fundamentals/new-features/available-rss-feeds.mdx
index cdae29a532676e..d4c3dc4bce702c 100644
--- a/src/content/docs/fundamentals/new-features/available-rss-feeds.mdx
+++ b/src/content/docs/fundamentals/new-features/available-rss-feeds.mdx
@@ -14,5 +14,5 @@ For more details on how these feeds are structured, refer to [Consuming RSS Feed
## Related resources
-- [Planned maintenance windows](/support/troubleshooting/disruptive-maintenance/)
-- [Subscribe to Cloudflare Status](/support/about-cloudflare/cloudflare-status/)
+- [Planned maintenance windows](/support/disruptive-maintenance/)
+- [Subscribe to Cloudflare Status](/support/cloudflare-status/)
diff --git a/src/content/docs/fundamentals/setup/manage-domains/remove-domain.mdx b/src/content/docs/fundamentals/setup/manage-domains/remove-domain.mdx
index 7ae1ef1dd2d032..59098585433bc1 100644
--- a/src/content/docs/fundamentals/setup/manage-domains/remove-domain.mdx
+++ b/src/content/docs/fundamentals/setup/manage-domains/remove-domain.mdx
@@ -7,7 +7,7 @@ head:
---
-Consider the following sections on how you can remove domains from Cloudflare. Removing your domain cancels all active subscriptions, which will not be refunded per our [billing policy](/support/account-management-billing/billing-cloudflare-plans/cloudflare-billing-policy/). If you add this domain back to Cloudflare later, you will need to re-purchase all subscriptions. Removing your domain from Cloudflare does not change your domain registration.
+Consider the following sections on how you can remove domains from Cloudflare. Removing your domain cancels all active subscriptions, which will not be refunded per our [billing policy](/support/account-management-billing/cloudflare-billing-policy/). If you add this domain back to Cloudflare later, you will need to re-purchase all subscriptions. Removing your domain from Cloudflare does not change your domain registration.
## Before removing your domain
diff --git a/src/content/docs/fundamentals/subscriptions-and-billing/change-plan.mdx b/src/content/docs/fundamentals/subscriptions-and-billing/change-plan.mdx
index 7f2299deb6a942..12dc5e32fe5410 100644
--- a/src/content/docs/fundamentals/subscriptions-and-billing/change-plan.mdx
+++ b/src/content/docs/fundamentals/subscriptions-and-billing/change-plan.mdx
@@ -11,7 +11,7 @@ Occasionally, you may want to upgrade or downgrade the plan associated with a sp
Only Super Administrators can manage changes to domain plans.
-If you decide to downgrade or remove a domain, Cloudflare does not issue refunds. Refer to our [billing policy](/support/account-management-billing/billing-cloudflare-plans/cloudflare-billing-policy/) for more information.
+If you decide to downgrade or remove a domain, Cloudflare does not issue refunds. Refer to our [billing policy](/support/account-management-billing/cloudflare-billing-policy/) for more information.
Upgrades are processed immediately, but downgrades are not processed until the end of the billing period. You will not be able to upgrade if you have an unpaid invoice. When downgrading, you are allowed to continue using the higher plans' products until the new billing period begins.
diff --git a/src/content/docs/fundamentals/subscriptions-and-billing/troubleshooting-failed-payments.mdx b/src/content/docs/fundamentals/subscriptions-and-billing/troubleshooting-failed-payments.mdx
index 647c09bdec1b29..1690ea61c62fda 100644
--- a/src/content/docs/fundamentals/subscriptions-and-billing/troubleshooting-failed-payments.mdx
+++ b/src/content/docs/fundamentals/subscriptions-and-billing/troubleshooting-failed-payments.mdx
@@ -82,6 +82,6 @@ Contact your financial institution to ensure that this payment will be processed
## Related resources
-* [Cloudflare billing policy](/support/account-management-billing/billing-cloudflare-plans/cloudflare-billing-policy/)
+* [Cloudflare billing policy](/support/account-management-billing/cloudflare-billing-policy/)
* [Understand Cloudflare invoices](/fundamentals/subscriptions-and-billing/understand-invoices/)
* [Update your Cloudflare billing information](/fundamentals/subscriptions-and-billing/update-billing-info/)
diff --git a/src/content/docs/r2/pricing.mdx b/src/content/docs/r2/pricing.mdx
index 16173085e81495..daff7ce3615ffb 100644
--- a/src/content/docs/r2/pricing.mdx
+++ b/src/content/docs/r2/pricing.mdx
@@ -138,7 +138,7 @@ If a user writes 100,000 files with an average size of 100 KB object and reads 1
## Cloudflare billing policy
-To learn more about how usage is billed, refer to [Cloudflare Billing Policy](/support/account-management-billing/billing-cloudflare-plans/cloudflare-billing-policy/).
+To learn more about how usage is billed, refer to [Cloudflare Billing Policy](/support/account-management-billing/cloudflare-billing-policy/).
## Frequently asked questions
@@ -146,4 +146,4 @@ To learn more about how usage is billed, refer to [Cloudflare Billing Policy](/s
No. You are not charged for operations when the caller does not have permission to make the request (HTTP 401 `Unauthorized` response status code).
-[^1]: Egressing directly from R2, including via the [Workers API](/r2/api/workers/), [S3 API](/r2/api/s3/), and [`r2.dev` domains](/r2/buckets/public-buckets/#enable-managed-public-access) does not incur data transfer (egress) charges and is free. If you connect other metered services to an R2 bucket, you may be charged by those services.
\ No newline at end of file
+[^1]: Egressing directly from R2, including via the [Workers API](/r2/api/workers/), [S3 API](/r2/api/s3/), and [`r2.dev` domains](/r2/buckets/public-buckets/#enable-managed-public-access) does not incur data transfer (egress) charges and is free. If you connect other metered services to an R2 bucket, you may be charged by those services.
diff --git a/src/content/docs/rules/page-rules/troubleshooting/billing-and-subscription.mdx b/src/content/docs/rules/page-rules/troubleshooting/billing-and-subscription.mdx
index 0e4c1eea563079..0c02604d2ec042 100644
--- a/src/content/docs/rules/page-rules/troubleshooting/billing-and-subscription.mdx
+++ b/src/content/docs/rules/page-rules/troubleshooting/billing-and-subscription.mdx
@@ -36,4 +36,4 @@ When you change plans, you will keep your Page Rules add-on subscription.
You will be billed for and have access to your additional Page Rules until the end of your current billing cycle.
-Your plan will adjust at the start of your next billing cycle. For more details, refer to our [billing policy](/support/account-management-billing/billing-cloudflare-plans/cloudflare-billing-policy/).
+Your plan will adjust at the start of your next billing cycle. For more details, refer to our [billing policy](/support/account-management-billing/cloudflare-billing-policy/).
diff --git a/src/content/docs/support/about-cloudflare/enterprise-documentation/index.mdx b/src/content/docs/support/about-cloudflare/enterprise-documentation/index.mdx
deleted file mode 100644
index 0040b2af36134e..00000000000000
--- a/src/content/docs/support/about-cloudflare/enterprise-documentation/index.mdx
+++ /dev/null
@@ -1,13 +0,0 @@
----
-pcx_content_type: navigation
-title: Support - Enterprise Documentation
-sidebar:
- order: 1
-
----
-
-import { DirectoryListing } from "~/components"
-
-Below you will find links to the relevant sections for Support - Enterprise Documentation focused material.
-
-
diff --git a/src/content/docs/support/about-cloudflare/index.mdx b/src/content/docs/support/about-cloudflare/index.mdx
deleted file mode 100644
index 91c570d091cc58..00000000000000
--- a/src/content/docs/support/about-cloudflare/index.mdx
+++ /dev/null
@@ -1,13 +0,0 @@
----
-pcx_content_type: navigation
-title: About Cloudflare
-sidebar:
- order: 2
-
----
-
-import { DirectoryListing } from "~/components"
-
-Below you will find links to the relevant sections for Support About Cloudflare focused material.
-
-
diff --git a/src/content/docs/support/account-management-billing/billing-cloudflare-plans/index.mdx b/src/content/docs/support/account-management-billing/billing-cloudflare-plans/index.mdx
deleted file mode 100644
index b9987f78227d26..00000000000000
--- a/src/content/docs/support/account-management-billing/billing-cloudflare-plans/index.mdx
+++ /dev/null
@@ -1,13 +0,0 @@
----
-pcx_content_type: navigation
-title: Billing Cloudflare Plans
-sidebar:
- order: 1
-
----
-
-import { DirectoryListing } from "~/components"
-
-Below you will find links to the relevant sections for Billing Cloudflare Plans support-focused material.
-
-
diff --git a/src/content/docs/support/account-management-billing/billing-cloudflare-plans/cloudflare-billing-policy.mdx b/src/content/docs/support/account-management-billing/cloudflare-billing-policy.mdx
similarity index 96%
rename from src/content/docs/support/account-management-billing/billing-cloudflare-plans/cloudflare-billing-policy.mdx
rename to src/content/docs/support/account-management-billing/cloudflare-billing-policy.mdx
index a1e77c5863c577..6ab3efd5d305e2 100644
--- a/src/content/docs/support/account-management-billing/billing-cloudflare-plans/cloudflare-billing-policy.mdx
+++ b/src/content/docs/support/account-management-billing/cloudflare-billing-policy.mdx
@@ -20,7 +20,7 @@ Cloudflare also collects sales tax as governed by local laws. Sales taxes are co
:::note
If you are a US-based customer, you can [file for sales tax
-exemption](/support/account-management-billing/billing-cloudflare-plans/understanding-cloudflare-sales-tax/#filing-for-us-sales-tax-exemption).
+exemption](/support/account-management-billing/understanding-cloudflare-sales-tax/#filing-for-us-sales-tax-exemption).
:::
Cloudflare issues a separate invoice for plans and subscriptions (or add-on services) for every domain added to a Cloudflare account.
@@ -125,4 +125,4 @@ For assistance, visit our [Support Portal](https://support.cloudflare.com/hc/en-
* [Cloudflare Self-Serve Subscription Agreement](https://www.cloudflare.com/terms/)
* [Understanding Cloudflare Invoices](/fundamentals/subscriptions-and-billing/understand-invoices/)
-* [Understanding Cloudflare sales tax](/support/account-management-billing/billing-cloudflare-plans/understanding-cloudflare-sales-tax/)
+* [Understanding Cloudflare sales tax](/support/account-management-billing/understanding-cloudflare-sales-tax/)
diff --git a/src/content/docs/support/account-management-billing/billing-cloudflare-plans/understanding-cloudflare-sales-tax.mdx b/src/content/docs/support/account-management-billing/understanding-cloudflare-sales-tax.mdx
similarity index 100%
rename from src/content/docs/support/account-management-billing/billing-cloudflare-plans/understanding-cloudflare-sales-tax.mdx
rename to src/content/docs/support/account-management-billing/understanding-cloudflare-sales-tax.mdx
diff --git a/src/content/docs/support/about-cloudflare/cloudflare-status.mdx b/src/content/docs/support/cloudflare-status.mdx
similarity index 93%
rename from src/content/docs/support/about-cloudflare/cloudflare-status.mdx
rename to src/content/docs/support/cloudflare-status.mdx
index 368d7dd63638ac..29a88e575c47f0 100644
--- a/src/content/docs/support/about-cloudflare/cloudflare-status.mdx
+++ b/src/content/docs/support/cloudflare-status.mdx
@@ -23,4 +23,4 @@ Endpoints are displayed with examples using cURL and our embeded JavaScript widg
- [Available RSS feeds](/fundamentals/new-features/available-rss-feeds/) (for the [Cloudflare changelog](/changelog/))
- [API deprecations](/fundamentals/api/reference/deprecations/)
-- [Planned maintenance windows](/support/troubleshooting/disruptive-maintenance/)
+- [Planned maintenance windows](/support/disruptive-maintenance/)
diff --git a/src/content/docs/support/about-cloudflare/enterprise-documentation/customer-incident-management-policy.mdx b/src/content/docs/support/customer-incident-management-policy.mdx
similarity index 100%
rename from src/content/docs/support/about-cloudflare/enterprise-documentation/customer-incident-management-policy.mdx
rename to src/content/docs/support/customer-incident-management-policy.mdx
diff --git a/src/content/docs/support/troubleshooting/disruptive-maintenance/index.mdx b/src/content/docs/support/disruptive-maintenance.mdx
similarity index 97%
rename from src/content/docs/support/troubleshooting/disruptive-maintenance/index.mdx
rename to src/content/docs/support/disruptive-maintenance.mdx
index a0f2301b6d617b..2b5087c5fe0ced 100644
--- a/src/content/docs/support/troubleshooting/disruptive-maintenance/index.mdx
+++ b/src/content/docs/support/disruptive-maintenance.mdx
@@ -48,5 +48,5 @@ In the Magic family of products, the routing is defined explicitly using [static
## Related resources
- [Available RSS feeds](/fundamentals/new-features/available-rss-feeds/) (for the [Cloudflare changelog](/changelog/))
-- [Subscribe to Cloudflare Status](/support/about-cloudflare/cloudflare-status/)
+- [Subscribe to Cloudflare Status](/support/cloudflare-status/)
- [API deprecations](/fundamentals/api/reference/deprecations/)
diff --git a/src/content/docs/support/more-dashboard-apps/cloudflare-stream/index.mdx b/src/content/docs/support/more-dashboard-apps/cloudflare-stream/index.mdx
deleted file mode 100644
index 8f37e2178a4882..00000000000000
--- a/src/content/docs/support/more-dashboard-apps/cloudflare-stream/index.mdx
+++ /dev/null
@@ -1,13 +0,0 @@
----
-pcx_content_type: navigation
-title: Cloudflare Stream
-sidebar:
- order: 3
-
----
-
-import { DirectoryListing } from "~/components"
-
-Below you will find links to the relevant sections for Cloudflare Stream support-focused material.
-
-
diff --git a/src/content/docs/support/partners/index.mdx b/src/content/docs/support/partners/index.mdx
deleted file mode 100644
index 4c872157d2f723..00000000000000
--- a/src/content/docs/support/partners/index.mdx
+++ /dev/null
@@ -1,13 +0,0 @@
----
-pcx_content_type: navigation
-title: Partners Support
-sidebar:
- order: 2
-
----
-
-import { DirectoryListing } from "~/components"
-
-Below you will find links to the relevant sections for Partners support-focused material.
-
-
diff --git a/src/content/docs/support/partners/reduce-data-transfer-egress-costs-between-azure-and-cloudflare.mdx b/src/content/docs/support/third-party-software/others/reduce-data-transfer-egress-costs-between-azure-and-cloudflare.mdx
similarity index 100%
rename from src/content/docs/support/partners/reduce-data-transfer-egress-costs-between-azure-and-cloudflare.mdx
rename to src/content/docs/support/third-party-software/others/reduce-data-transfer-egress-costs-between-azure-and-cloudflare.mdx