diff --git a/content/enterprise_influxdb/v1.9/tools/api.md b/content/enterprise_influxdb/v1.9/tools/api.md
index 69eef889d..941d95dbb 100644
--- a/content/enterprise_influxdb/v1.9/tools/api.md
+++ b/content/enterprise_influxdb/v1.9/tools/api.md
@@ -48,7 +48,7 @@ The following forward compatible APIs are available:
 ### `/api/v2/query/` HTTP endpoint
 
 The `/api/v2/query` endpoint accepts `POST` HTTP requests.
-Use this endpoint to query data using [Flux](/enterprise_influxdb/v1.9/flux/) and [InfluxDB 2.0 client libraries](/influxdb/v2.0/tools/client-libraries/).
+Use this endpoint to query data using [Flux](/enterprise_influxdb/v1.9/flux/) and [InfluxDB 2.0 client libraries](/influxdb/v2.0/api-guide/client-libraries/).
  Flux is the primary language for working with data in InfluxDB 2.0.
 
 **Include the following HTTP headers:**
@@ -90,7 +90,7 @@ curl -XPOST localhost:8086/api/v2/query -sS \
 ### `/api/v2/write/` HTTP endpoint
 
 The `/api/v2/write` endpoint accepts `POST` HTTP requests.
-Use this endpoint to write to an InfluxDB 1.8.0+ database using [InfluxDB 2.0 client libraries](/influxdb/v2.0/tools/client-libraries/).
+Use this endpoint to write to an InfluxDB 1.8.0+ database using [InfluxDB 2.0 client libraries](/influxdb/v2.0/api-guide/client-libraries/).
 
 Both InfluxDB 1.x and 2.0 APIs support the same line protocol format for raw time series data.
 For the purposes of writing data, the APIs differ only in the URL parameters and request headers.
diff --git a/content/enterprise_influxdb/v1.9/tools/api_client_libraries.md b/content/enterprise_influxdb/v1.9/tools/api_client_libraries.md
index c812ea9b7..04f516f05 100644
--- a/content/enterprise_influxdb/v1.9/tools/api_client_libraries.md
+++ b/content/enterprise_influxdb/v1.9/tools/api_client_libraries.md
@@ -10,7 +10,7 @@ menu:
   enterprise_influxdb_1_9:
     weight: 30
     parent: Tools
-v2: /influxdb/v2.0/tools/client-libraries/
+v2: /influxdb/v2.0/api-guide/client-libraries/
 ---
 
 InfluxDB client libraries are language-specific packages that integrate with the InfluxDB 2.0 API and support both **InfluxDB 1.8+** and **InfluxDB 2.0**.
diff --git a/content/influxdb/cloud/api-guide/_index.md b/content/influxdb/cloud/api-guide/_index.md
index 80a437541..93387f500 100644
--- a/content/influxdb/cloud/api-guide/_index.md
+++ b/content/influxdb/cloud/api-guide/_index.md
@@ -14,7 +14,7 @@ Access the InfluxDB API using the `/api/v2/` endpoint.
 
 ## InfluxDB client libraries
 InfluxDB client libraries are language-specific packages that integrate with the InfluxDB v2 API.
-For information about supported client libraries, see [InfluxDB client libraries](/influxdb/cloud/tools/client-libraries/).
+For information about supported client libraries, see [InfluxDB client libraries](/influxdb/cloud/api-guide/client-libraries/).
 
 ## InfluxDB Cloud API documentation
 <a class="btn" href="/influxdb/cloud/api/">InfluxDB Cloud API documentation</a>
diff --git a/content/influxdb/cloud/reference/api/_index.md b/content/influxdb/cloud/reference/api/_index.md
index 76e2a18dd..75be3385a 100644
--- a/content/influxdb/cloud/reference/api/_index.md
+++ b/content/influxdb/cloud/reference/api/_index.md
@@ -12,7 +12,7 @@ The InfluxDB v2 API provides a programmatic interface for interactions with Infl
 Access the InfluxDB API using the `/api/v2/` endpoint.
 
 ## InfluxDB client libraries
-[InfluxDB client libraries](/influxdb/cloud/tools/client-libraries/) are language-specific packages that integrate with the InfluxDB v2 API.
+[InfluxDB client libraries](/influxdb/cloud/api-guide/client-libraries/) are language-specific packages that integrate with the InfluxDB v2 API.
 
 ## Authentication
 {{% cloud-token-auth %}}
diff --git a/content/influxdb/cloud/reference/regions.md b/content/influxdb/cloud/reference/regions.md
index 861d66566..e2555b575 100644
--- a/content/influxdb/cloud/reference/regions.md
+++ b/content/influxdb/cloud/reference/regions.md
@@ -14,7 +14,7 @@ menu:
 InfluxDB Cloud is available on multiple cloud providers and in multiple regions.
 Each region has a unique InfluxDB Cloud URL and API endpoint.
 Use the URLs below to interact with your InfluxDB Cloud instances with the
-[InfluxDB API](/influxdb/cloud/reference/api/), [InfluxDB client libraries](/influxdb/cloud/tools/client-libraries/),
+[InfluxDB API](/influxdb/cloud/reference/api/), [InfluxDB client libraries](/influxdb/cloud/api-guide/client-libraries/),
 [`influx` CLI](/influxdb/cloud/reference/cli/influx/), or [Telegraf](/influxdb/cloud/write-data/no-code/use-telegraf/).
 
 <a href="https://www.influxdata.com/influxdb-cloud-2-0-provider-region/" target="_blank" class="btn">Request a cloud region</a>
diff --git a/content/influxdb/cloud/write-data/best-practices/optimize-writes.md b/content/influxdb/cloud/write-data/best-practices/optimize-writes.md
index 43d427751..1ee84f5b0 100644
--- a/content/influxdb/cloud/write-data/best-practices/optimize-writes.md
+++ b/content/influxdb/cloud/write-data/best-practices/optimize-writes.md
@@ -22,7 +22,7 @@ Use these tips to optimize performance and system overhead when writing data to
 The following tools write to InfluxDB and employ _most_ write optimizations by default:
 
 - [Telegraf](/influxdb/cloud/write-data/no-code/use-telegraf/)
-- [InfluxDB client libraries](/influxdb/cloud/tools/client-libraries/)
+- [InfluxDB client libraries](/influxdb/cloud/api-guide/client-libraries/)
 {{% /note %}}
 
 ## Batch writes
@@ -81,10 +81,10 @@ In the `influxdb_v2` output plugin configuration in your `telegraf.conf`, set th
 {{% tab-content %}}
 ### Enable gzip compression in InfluxDB client libraries
 
-Each [InfluxDB client library](/influxdb/cloud/tools/client-libraries/) provides
+Each [InfluxDB client library](/influxdb/cloud/api-guide/client-libraries/) provides
 options for compressing write requests or enforces compression by default.
 The method for enabling compression is different for each library.
-For specific instructions, see the [InfluxDB client libraries documentation](/influxdb/cloud/tools/client-libraries/).
+For specific instructions, see the [InfluxDB client libraries documentation](/influxdb/cloud/api-guide/client-libraries/).
 {{% /tab-content %}}
 {{% tab-content %}}
 ### Use gzip compression with the InfluxDB API
diff --git a/content/influxdb/cloud/write-data/developer-tools/client-libraries.md b/content/influxdb/cloud/write-data/developer-tools/client-libraries.md
index 4dece2780..d9b4e0b0b 100644
--- a/content/influxdb/cloud/write-data/developer-tools/client-libraries.md
+++ b/content/influxdb/cloud/write-data/developer-tools/client-libraries.md
@@ -12,4 +12,4 @@ menu:
 
 Use language-specific client libraries to integrate with the InfluxDB v2 API.
 
-See [Client libraries reference](/influxdb/cloud/tools/client-libraries/) for more information.
+See [Client libraries reference](/influxdb/cloud/api-guide/client-libraries/) for more information.
diff --git a/content/influxdb/v1.7/tools/api_client_libraries.md b/content/influxdb/v1.7/tools/api_client_libraries.md
index 46609186e..348d8e9bd 100644
--- a/content/influxdb/v1.7/tools/api_client_libraries.md
+++ b/content/influxdb/v1.7/tools/api_client_libraries.md
@@ -9,7 +9,7 @@ menu:
   influxdb_1_7:
     weight: 30
     parent: Tools
-v2: /influxdb/v2.0/tools/client-libraries/
+v2: /influxdb/v2.0/api-guide/client-libraries/
 ---
 
 InfluxDB client libraries are developed by the open source community. These client libraries support the InfluxDB 1.7 API and should be fully compatible with InfluxDB 1.5+. Functionality will vary as there are no standard features that all libraries must implement in order to be listed here.
diff --git a/content/influxdb/v1.8/tools/api.md b/content/influxdb/v1.8/tools/api.md
index dc80d4012..ab58b489b 100644
--- a/content/influxdb/v1.8/tools/api.md
+++ b/content/influxdb/v1.8/tools/api.md
@@ -48,7 +48,7 @@ The following forward compatible APIs are available:
 ### `/api/v2/query/` HTTP endpoint
 
 The `/api/v2/query` endpoint accepts `POST` HTTP requests.
-Use this endpoint to query data using [Flux](/influxdb/v1.8/flux/) and [InfluxDB 2.0 client libraries](/influxdb/v2.0/tools/client-libraries/).
+Use this endpoint to query data using [Flux](/influxdb/v1.8/flux/) and [InfluxDB 2.0 client libraries](/influxdb/v2.0/api-guide/client-libraries/).
  Flux is the primary language for working with data in InfluxDB 2.0.
 
 **Include the following HTTP headers:**
@@ -90,7 +90,7 @@ curl -XPOST localhost:8086/api/v2/query -sS \
 ### `/api/v2/write/` HTTP endpoint
 
 The `/api/v2/write` endpoint accepts `POST` HTTP requests.
-Use this endpoint to write to an InfluxDB 1.8.0+ database using [InfluxDB 2.0 client libraries](/influxdb/v2.0/tools/client-libraries/).
+Use this endpoint to write to an InfluxDB 1.8.0+ database using [InfluxDB 2.0 client libraries](/influxdb/v2.0/api-guide/client-libraries/).
 
 Both InfluxDB 1.x and 2.0 APIs support the same line protocol format for raw time series data.
 For the purposes of writing data, the APIs differ only in the URL parameters and request headers.
diff --git a/content/influxdb/v1.8/tools/api_client_libraries.md b/content/influxdb/v1.8/tools/api_client_libraries.md
index 593b52bea..ff47f017c 100644
--- a/content/influxdb/v1.8/tools/api_client_libraries.md
+++ b/content/influxdb/v1.8/tools/api_client_libraries.md
@@ -10,7 +10,7 @@ menu:
   influxdb_1_8:
     weight: 30
     parent: Tools
-v2: /influxdb/v2.0/tools/client-libraries/
+v2: /influxdb/v2.0/api-guide/client-libraries/
 ---
 
 InfluxDB client libraries are language-specific packages that integrate with the InfluxDB 2.0 API and support both **InfluxDB 1.8+** and **InfluxDB 2.0**.
diff --git a/content/influxdb/v2.0/write-data/best-practices/optimize-writes.md b/content/influxdb/v2.0/write-data/best-practices/optimize-writes.md
index 547b08237..c8c09ff95 100644
--- a/content/influxdb/v2.0/write-data/best-practices/optimize-writes.md
+++ b/content/influxdb/v2.0/write-data/best-practices/optimize-writes.md
@@ -22,7 +22,7 @@ Use these tips to optimize performance and system overhead when writing data to
 The following tools write to InfluxDB and employ _most_ write optimizations by default:
 
 - [Telegraf](/influxdb/v2.0/write-data/no-code/use-telegraf/)
-- [InfluxDB client libraries](/influxdb/v2.0/tools/client-libraries/)
+- [InfluxDB client libraries](/influxdb/v2.0/api-guide/client-libraries/)
 - [InfluxDB scrapers](/influxdb/v2.0/write-data/no-code/scrape-data/)
 {{% /note %}}
 
@@ -82,10 +82,10 @@ In the `influxdb_v2` output plugin configuration in your `telegraf.conf`, set th
 {{% tab-content %}}
 ### Enable gzip compression in InfluxDB client libraries
 
-Each [InfluxDB client library](/influxdb/v2.0/tools/client-libraries/) provides
+Each [InfluxDB client library](/influxdb/v2.0/api-guide/client-libraries/) provides
 options for compressing write requests or enforces compression by default.
 The method for enabling compression is different for each library.
-For specific instructions, see the [InfluxDB client libraries documentation](/influxdb/v2.0/tools/client-libraries/).
+For specific instructions, see the [InfluxDB client libraries documentation](/influxdb/v2.0/api-guide/client-libraries/).
 {{% /tab-content %}}
 {{% tab-content %}}
 ### Use gzip compression with the InfluxDB API
diff --git a/content/influxdb/v2.0/write-data/developer-tools/client-libraries.md b/content/influxdb/v2.0/write-data/developer-tools/client-libraries.md
index 7944c6fc6..0ab5f959e 100644
--- a/content/influxdb/v2.0/write-data/developer-tools/client-libraries.md
+++ b/content/influxdb/v2.0/write-data/developer-tools/client-libraries.md
@@ -12,4 +12,4 @@ menu:
 
 Use language-specific client libraries to integrate with the InfluxDB v2 API.
 
-See [Client libraries reference](/influxdb/v2.0/tools/client-libraries/) for more information.
+See [Client libraries reference](/influxdb/v2.0/api-guide/client-libraries/) for more information.