diff --git a/docs/01-app/01-getting-started/01-installation.mdx b/docs/01-app/01-getting-started/01-installation.mdx
index e3f055c5ebbad..e86216945cc7b 100644
--- a/docs/01-app/01-getting-started/01-installation.mdx
+++ b/docs/01-app/01-getting-started/01-installation.mdx
@@ -242,7 +242,7 @@ Now, when editing files, the custom plugin will be enabled. When running `next b
 
 </AppOnly>
 
-See the [TypeScript configuration](/docs/app/api-reference/next-config-js/typescript) page for more information on how to use TypeScript in your project.
+See the [TypeScript configuration](/docs/app/api-reference/config/next-config-js/typescript) page for more information on how to use TypeScript in your project.
 
 ## Set up ESLint
 
@@ -280,7 +280,7 @@ If either of the two configuration options are selected, Next.js will automatica
 
 You can now run `next lint` every time you want to run ESLint to catch errors. Once ESLint has been set up, it will also automatically run during every build (`next build`). Errors will fail the build, while warnings will not.
 
-See the [ESLint Plugin](/docs/app/api-reference/next-config-js/eslint) page for more information on how to configure ESLint in your project.
+See the [ESLint Plugin](/docs/app/api-reference/config/next-config-js/eslint) page for more information on how to configure ESLint in your project.
 
 ## Set up Absolute Imports and Module Path Aliases
 
diff --git a/docs/01-app/01-getting-started/02-project-structure.mdx b/docs/01-app/01-getting-started/02-project-structure.mdx
index 7369d5daa28ef..4bdf2129d14d3 100644
--- a/docs/01-app/01-getting-started/02-project-structure.mdx
+++ b/docs/01-app/01-getting-started/02-project-structure.mdx
@@ -34,7 +34,7 @@ Top-level files are used to configure your application, manage dependencies, run
 |                                                                                             |                                         |
 | ------------------------------------------------------------------------------------------- | --------------------------------------- |
 | **Next.js**                                                                                 |                                         |
-| [`next.config.js`](/docs/app/api-reference/next-config-js)                                  | Configuration file for Next.js          |
+| [`next.config.js`](/docs/app/api-reference/config/next-config-js)                           | Configuration file for Next.js          |
 | [`package.json`](/docs/app/getting-started/installation#manual-installation)                | Project dependencies and scripts        |
 | [`instrumentation.ts`](/docs/app/building-your-application/optimizing/instrumentation)      | OpenTelemetry and Instrumentation file  |
 | [`middleware.ts`](/docs/app/building-your-application/routing/middleware)                   | Next.js request middleware              |
diff --git a/docs/01-app/02-building-your-application/01-routing/07-redirecting.mdx b/docs/01-app/02-building-your-application/01-routing/07-redirecting.mdx
index 36c901d69bc93..3a0a8de49c259 100644
--- a/docs/01-app/02-building-your-application/01-routing/07-redirecting.mdx
+++ b/docs/01-app/02-building-your-application/01-routing/07-redirecting.mdx
@@ -6,7 +6,7 @@ related:
     - app/api-reference/functions/redirect
     - app/api-reference/functions/permanentRedirect
     - app/building-your-application/routing/middleware
-    - app/api-reference/next-config-js/redirects
+    - app/api-reference/config/next-config-js/redirects
 ---
 
 There are a few ways you can handle redirects in Next.js. This page will go through each available option, use cases, and how to manage large numbers of redirects.
@@ -233,7 +233,7 @@ See the [`useRouter` API reference](/docs/pages/api-reference/functions/use-rout
 
 The `redirects` option in the `next.config.js` file allows you to redirect an incoming request path to a different destination path. This is useful when you change the URL structure of pages or have a list of redirects that are known ahead of time.
 
-`redirects` supports [path](/docs/app/api-reference/next-config-js/redirects#path-matching), [header, cookie, and query matching](/docs/app/api-reference/next-config-js/redirects#header-cookie-and-query-matching), giving you the flexibility to redirect users based on an incoming request.
+`redirects` supports [path](/docs/app/api-reference/config/next-config-js/redirects#path-matching), [header, cookie, and query matching](/docs/app/api-reference/config/next-config-js/redirects#header-cookie-and-query-matching), giving you the flexibility to redirect users based on an incoming request.
 
 To use `redirects`, add the option to your `next.config.js` file:
 
@@ -258,7 +258,7 @@ module.exports = {
 }
 ```
 
-See the [`redirects` API reference](/docs/app/api-reference/next-config-js/redirects) for more information.
+See the [`redirects` API reference](/docs/app/api-reference/config/next-config-js/redirects) for more information.
 
 > **Good to know**:
 >
diff --git a/docs/01-app/02-building-your-application/01-routing/13-route-handlers.mdx b/docs/01-app/02-building-your-application/01-routing/13-route-handlers.mdx
index 9813880eb1e85..1bce5f603356d 100644
--- a/docs/01-app/02-building-your-application/01-routing/13-route-handlers.mdx
+++ b/docs/01-app/02-building-your-application/01-routing/13-route-handlers.mdx
@@ -508,7 +508,7 @@ export async function GET(request) {
 
 > **Good to know**:
 >
-> - To add CORS headers to multiple Route Handlers, you can use [Middleware](/docs/app/building-your-application/routing/middleware#cors) or the [`next.config.js` file](/docs/app/api-reference/next-config-js/headers#cors).
+> - To add CORS headers to multiple Route Handlers, you can use [Middleware](/docs/app/building-your-application/routing/middleware#cors) or the [`next.config.js` file](/docs/app/api-reference/config/next-config-js/headers#cors).
 > - Alternatively, see our [CORS example](https://github.com/vercel/examples/blob/main/edge-functions/cors/lib/cors.ts) package.
 
 ### Webhooks
diff --git a/docs/01-app/02-building-your-application/02-data-fetching/03-server-actions-and-mutations.mdx b/docs/01-app/02-building-your-application/02-data-fetching/03-server-actions-and-mutations.mdx
index 291b854c95ce0..46b8c1200af1a 100644
--- a/docs/01-app/02-building-your-application/02-data-fetching/03-server-actions-and-mutations.mdx
+++ b/docs/01-app/02-building-your-application/02-data-fetching/03-server-actions-and-mutations.mdx
@@ -5,7 +5,7 @@ description: Learn how to handle form submissions and data mutations with Next.j
 related:
   description: Learn how to configure Server Actions in Next.js
   links:
-    - app/api-reference/next-config-js/serverActions
+    - app/api-reference/config/next-config-js/serverActions
 ---
 
 [Server Actions](https://react.dev/reference/rsc/server-actions) are **asynchronous functions** that are executed on the server. They can be called in Server and Client Components to handle form submissions and data mutations in Next.js applications.
@@ -970,7 +970,7 @@ Behind the scenes, Server Actions use the `POST` method, and only this HTTP meth
 
 As an additional protection, Server Actions in Next.js also compare the [Origin header](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Origin) to the [Host header](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Host) (or `X-Forwarded-Host`). If these don't match, the request will be aborted. In other words, Server Actions can only be invoked on the same host as the page that hosts it.
 
-For large applications that use reverse proxies or multi-layered backend architectures (where the server API differs from the production domain), it's recommended to use the configuration option [`serverActions.allowedOrigins`](/docs/app/api-reference/next-config-js/serverActions) option to specify a list of safe origins. The option accepts an array of strings.
+For large applications that use reverse proxies or multi-layered backend architectures (where the server API differs from the production domain), it's recommended to use the configuration option [`serverActions.allowedOrigins`](/docs/app/api-reference/config/next-config-js/serverActions) option to specify a list of safe origins. The option accepts an array of strings.
 
 ```js filename="next.config.js"
 /** @type {import('next').NextConfig} */
diff --git a/docs/01-app/02-building-your-application/02-data-fetching/04-incremental-static-regeneration.mdx b/docs/01-app/02-building-your-application/02-data-fetching/04-incremental-static-regeneration.mdx
index ea3d174e99174..142dcc9cbd770 100644
--- a/docs/01-app/02-building-your-application/02-data-fetching/04-incremental-static-regeneration.mdx
+++ b/docs/01-app/02-building-your-application/02-data-fetching/04-incremental-static-regeneration.mdx
@@ -543,7 +543,7 @@ You can configure the Next.js cache location if you want to persist cached pages
 
 ### Debugging cached data in local development
 
-If you are using the `fetch` API, you can add additional logging to understand which requests are cached or uncached. [Learn more about the `logging` option](/docs/app/api-reference/next-config-js/logging).
+If you are using the `fetch` API, you can add additional logging to understand which requests are cached or uncached. [Learn more about the `logging` option](/docs/app/api-reference/config/next-config-js/logging).
 
 ```jsx filename="next.config.js"
 module.exports = {
diff --git a/docs/01-app/02-building-your-application/03-rendering/04-partial-prerendering.mdx b/docs/01-app/02-building-your-application/03-rendering/04-partial-prerendering.mdx
index c1d9d1f695cf8..439f05e664e43 100644
--- a/docs/01-app/02-building-your-application/03-rendering/04-partial-prerendering.mdx
+++ b/docs/01-app/02-building-your-application/03-rendering/04-partial-prerendering.mdx
@@ -31,7 +31,7 @@ To prevent creating many HTTP requests for each dynamic component, PPR is able t
 
 ### Incremental Adoption (Version 15)
 
-In Next.js 15, you can incrementally adopt Partial Prerendering in [layouts](/docs/app/building-your-application/routing/layouts-and-templates) and [pages](/docs/app/building-your-application/routing/pages) by setting the [`ppr`](/docs/app/api-reference/next-config-js/ppr) option in `next.config.js` to `incremental`, and exporting the `experimental_ppr` [route config option](/docs/app/api-reference/file-conventions/route-segment-config) at the top of the file:
+In Next.js 15, you can incrementally adopt Partial Prerendering in [layouts](/docs/app/building-your-application/routing/layouts-and-templates) and [pages](/docs/app/building-your-application/routing/pages) by setting the [`ppr`](/docs/app/api-reference/config/next-config-js/ppr) option in `next.config.js` to `incremental`, and exporting the `experimental_ppr` [route config option](/docs/app/api-reference/file-conventions/route-segment-config) at the top of the file:
 
 ```ts filename="next.config.ts" switcher
 import type { NextConfig } from 'next'
diff --git a/docs/01-app/02-building-your-application/04-caching/index.mdx b/docs/01-app/02-building-your-application/04-caching/index.mdx
index f1ea00988703d..795e3a9e1c81b 100644
--- a/docs/01-app/02-building-your-application/04-caching/index.mdx
+++ b/docs/01-app/02-building-your-application/04-caching/index.mdx
@@ -320,7 +320,7 @@ With the Router Cache:
 
 - **Layouts** are cached and reused on navigation ([partial rendering](/docs/app/building-your-application/routing/linking-and-navigating#4-partial-rendering)).
 - **Loading states** are cached and reused on navigation for [instant navigation](/docs/app/building-your-application/routing/loading-ui-and-streaming#instant-loading-states).
-- **Pages** are not cached by default, but are reused during browser backward and forward navigation. You can enable caching for page segments by using the experimental [`staleTimes`](/docs/app/api-reference/next-config-js/staleTimes) config option.
+- **Pages** are not cached by default, but are reused during browser backward and forward navigation. You can enable caching for page segments by using the experimental [`staleTimes`](/docs/app/api-reference/config/next-config-js/staleTimes) config option.
 
 {/* TODO: Update diagram to match v15 behavior */}
 
@@ -337,7 +337,7 @@ The cache is stored in the browser's temporary memory. Two factors determine how
 
 While a page refresh will clear **all** cached segments, the automatic invalidation period only affects the individual segment from the time it was prefetched.
 
-> **Good to know**: The experimental [`staleTimes`](/docs/app/api-reference/next-config-js/staleTimes) config option can be used to adjust the automatic invalidation times mentioned above.
+> **Good to know**: The experimental [`staleTimes`](/docs/app/api-reference/config/next-config-js/staleTimes) config option can be used to adjust the automatic invalidation times mentioned above.
 
 ### Invalidation
 
diff --git a/docs/01-app/02-building-your-application/05-styling/01-css.mdx b/docs/01-app/02-building-your-application/05-styling/01-css.mdx
index abd40f67a1979..2806a67ff2a02 100644
--- a/docs/01-app/02-building-your-application/05-styling/01-css.mdx
+++ b/docs/01-app/02-building-your-application/05-styling/01-css.mdx
@@ -354,7 +354,7 @@ To maintain a predictable order, we recommend the following:
 > **Good to know:**
 >
 > - CSS ordering can behave differently in development mode, always ensure to check the build (`next build`) to verify the final CSS order.
-> - You can use the [`cssChunking`](/docs/app/api-reference/next-config-js/cssChunking) option in `next.config.js` to control how CSS is chunked.
+> - You can use the [`cssChunking`](/docs/app/api-reference/config/next-config-js/cssChunking) option in `next.config.js` to control how CSS is chunked.
 
 </AppOnly>
 
diff --git a/docs/01-app/02-building-your-application/06-optimizing/01-images.mdx b/docs/01-app/02-building-your-application/06-optimizing/01-images.mdx
index 485fc5fd9d104..fce709518f7cd 100644
--- a/docs/01-app/02-building-your-application/06-optimizing/01-images.mdx
+++ b/docs/01-app/02-building-your-application/06-optimizing/01-images.mdx
@@ -367,6 +367,6 @@ For examples of the Image component used with the various styles, see the [Image
 
 ## Configuration
 
-The `next/image` component and Next.js Image Optimization API can be configured in the [`next.config.js` file](/docs/app/api-reference/next-config-js). These configurations allow you to [enable remote images](/docs/app/api-reference/components/image#remotepatterns), [define custom image breakpoints](/docs/app/api-reference/components/image#devicesizes), [change caching behavior](/docs/app/api-reference/components/image#caching-behavior) and more.
+The `next/image` component and Next.js Image Optimization API can be configured in the [`next.config.js` file](/docs/app/api-reference/config/next-config-js). These configurations allow you to [enable remote images](/docs/app/api-reference/components/image#remotepatterns), [define custom image breakpoints](/docs/app/api-reference/components/image#devicesizes), [change caching behavior](/docs/app/api-reference/components/image#caching-behavior) and more.
 
 [**Read the full image configuration documentation for more information.**](/docs/app/api-reference/components/image#configuration-options)
diff --git a/docs/01-app/02-building-your-application/06-optimizing/05-scripts.mdx b/docs/01-app/02-building-your-application/06-optimizing/05-scripts.mdx
index c216df896df3c..ffb8b4e54398c 100644
--- a/docs/01-app/02-building-your-application/06-optimizing/05-scripts.mdx
+++ b/docs/01-app/02-building-your-application/06-optimizing/05-scripts.mdx
@@ -216,7 +216,7 @@ In order to modify Partytown's configuration, the following conditions must be m
 1. The `data-partytown-config` attribute must be used in order to overwrite the default configuration used by Next.js
 2. Unless you decide to save Partytown's library files in a separate directory, the `lib: "/_next/static/~partytown/"` property and value must be included in the configuration object in order to let Partytown know where Next.js stores the necessary static files.
 
-> **Note**: If you are using an [asset prefix](/docs/pages/api-reference/next-config-js/assetPrefix) and would like to modify Partytown's default configuration, you must include it as part of the `lib` path.
+> **Note**: If you are using an [asset prefix](/docs/pages/api-reference/config/next-config-js/assetPrefix) and would like to modify Partytown's default configuration, you must include it as part of the `lib` path.
 
 Take a look at Partytown's [configuration options](https://partytown.builder.io/configuration) to see the full list of other properties that can be added.
 
diff --git a/docs/01-app/02-building-your-application/06-optimizing/06-package-bundling.mdx b/docs/01-app/02-building-your-application/06-optimizing/06-package-bundling.mdx
index ff23b4bbae5fe..86721b8996af4 100644
--- a/docs/01-app/02-building-your-application/06-optimizing/06-package-bundling.mdx
+++ b/docs/01-app/02-building-your-application/06-optimizing/06-package-bundling.mdx
@@ -57,7 +57,7 @@ The report will open three new tabs in your browser, which you can inspect. Peri
 
 Some packages, such as icon libraries, can export hundreds of modules, which can cause performance issues in development and production.
 
-You can optimize how these packages are imported by adding the [`optimizePackageImports`](/docs/app/api-reference/next-config-js/optimizePackageImports) option to your `next.config.js`. This option will only load the modules you _actually_ use, while still giving you the convenience of writing import statements with many named exports.
+You can optimize how these packages are imported by adding the [`optimizePackageImports`](/docs/app/api-reference/config/next-config-js/optimizePackageImports) option to your `next.config.js`. This option will only load the modules you _actually_ use, while still giving you the convenience of writing import statements with many named exports.
 
 ```js filename="next.config.js"
 /** @type {import('next').NextConfig} */
@@ -70,13 +70,13 @@ const nextConfig = {
 module.exports = nextConfig
 ```
 
-Next.js also optimizes some libraries automatically, thus they do not need to be included in the optimizePackageImports list. See the [full list](https://nextjs.org/docs/app/api-reference/next-config-js/optimizePackageImports).
+Next.js also optimizes some libraries automatically, thus they do not need to be included in the optimizePackageImports list. See the [full list](https://nextjs.org/docs/app/api-reference/config/next-config-js/optimizePackageImports).
 
 <PagesOnly>
 
 ## Bundling specific packages
 
-To bundle specific packages, you can use the [`transpilePackages`](/docs/app/api-reference/next-config-js/transpilePackages) option in your `next.config.js`. This option is useful for bundling external packages that are not pre-bundled, for example, in a monorepo or imported from `node_modules`.
+To bundle specific packages, you can use the [`transpilePackages`](/docs/app/api-reference/config/next-config-js/transpilePackages) option in your `next.config.js`. This option is useful for bundling external packages that are not pre-bundled, for example, in a monorepo or imported from `node_modules`.
 
 ```js filename="next.config.js"
 /** @type {import('next').NextConfig} */
@@ -89,7 +89,7 @@ module.exports = nextConfig
 
 ## Bundling all packages
 
-To automatically bundle all packages (default behavior in the App Router), you can use the [`bundlePagesRouterDependencies`](/docs/pages/api-reference/next-config-js/bundlePagesRouterDependencies) option in your `next.config.js`.
+To automatically bundle all packages (default behavior in the App Router), you can use the [`bundlePagesRouterDependencies`](/docs/pages/api-reference/config/next-config-js/bundlePagesRouterDependencies) option in your `next.config.js`.
 
 ```js filename="next.config.js"
 /** @type {import('next').NextConfig} */
@@ -102,7 +102,7 @@ module.exports = nextConfig
 
 ## Opting specific packages out of bundling
 
-If you have the [`bundlePagesRouterDependencies`](/docs/pages/api-reference/next-config-js/bundlePagesRouterDependencies) option enabled, you can opt specific packages out of automatic bundling using the [`serverExternalPackages`](/docs/pages/api-reference/next-config-js/serverExternalPackages) option in your `next.config.js`:
+If you have the [`bundlePagesRouterDependencies`](/docs/pages/api-reference/config/next-config-js/bundlePagesRouterDependencies) option enabled, you can opt specific packages out of automatic bundling using the [`serverExternalPackages`](/docs/pages/api-reference/config/next-config-js/serverExternalPackages) option in your `next.config.js`:
 
 ```js filename="next.config.js"
 /** @type {import('next').NextConfig} */
@@ -122,7 +122,7 @@ module.exports = nextConfig
 
 ## Opting specific packages out of bundling
 
-Since packages imported inside Server Components and Route Handlers are automatically bundled by Next.js, you can opt specific packages out of bundling using the [`serverExternalPackages`](/docs/app/api-reference/next-config-js/serverExternalPackages) option in your `next.config.js`.
+Since packages imported inside Server Components and Route Handlers are automatically bundled by Next.js, you can opt specific packages out of bundling using the [`serverExternalPackages`](/docs/app/api-reference/config/next-config-js/serverExternalPackages) option in your `next.config.js`.
 
 ```js filename="next.config.js"
 /** @type {import('next').NextConfig} */
@@ -133,6 +133,6 @@ const nextConfig = {
 module.exports = nextConfig
 ```
 
-Next.js includes a list of popular packages that currently are working on compatibility and automatically opt-ed out. See the [full list](/docs/app/api-reference/next-config-js/serverExternalPackages).
+Next.js includes a list of popular packages that currently are working on compatibility and automatically opt-ed out. See the [full list](/docs/app/api-reference/config/next-config-js/serverExternalPackages).
 
 </AppOnly>
diff --git a/docs/01-app/02-building-your-application/06-optimizing/09-instrumentation.mdx b/docs/01-app/02-building-your-application/06-optimizing/09-instrumentation.mdx
index a2e92ed34defc..f4113ac6bfa0a 100644
--- a/docs/01-app/02-building-your-application/06-optimizing/09-instrumentation.mdx
+++ b/docs/01-app/02-building-your-application/06-optimizing/09-instrumentation.mdx
@@ -40,7 +40,7 @@ See the [Next.js with OpenTelemetry example](https://github.com/vercel/next.js/t
 > **Good to know**:
 >
 > - The `instrumentation` file should be in the root of your project and not inside the `app` or `pages` directory. If you're using the `src` folder, then place the file inside `src` alongside `pages` and `app`.
-> - If you use the [`pageExtensions` config option](/docs/app/api-reference/next-config-js/pageExtensions) to add a suffix, you will also need to update the `instrumentation` filename to match.
+> - If you use the [`pageExtensions` config option](/docs/app/api-reference/config/next-config-js/pageExtensions) to add a suffix, you will also need to update the `instrumentation` filename to match.
 
 ## Examples
 
diff --git a/docs/01-app/02-building-your-application/06-optimizing/10-open-telemetry.mdx b/docs/01-app/02-building-your-application/06-optimizing/10-open-telemetry.mdx
index 270105d3a87a0..39839f5fc1c2a 100644
--- a/docs/01-app/02-building-your-application/06-optimizing/10-open-telemetry.mdx
+++ b/docs/01-app/02-building-your-application/06-optimizing/10-open-telemetry.mdx
@@ -66,7 +66,7 @@ See the [`@vercel/otel` documentation](https://www.npmjs.com/package/@vercel/ote
 > **Good to know**:
 >
 > - The `instrumentation` file should be in the root of your project and not inside the `app` or `pages` directory. If you're using the `src` folder, then place the file inside `src` alongside `pages` and `app`.
-> - If you use the [`pageExtensions` config option](/docs/app/api-reference/next-config-js/pageExtensions) to add a suffix, you will also need to update the `instrumentation` filename to match.
+> - If you use the [`pageExtensions` config option](/docs/app/api-reference/config/next-config-js/pageExtensions) to add a suffix, you will also need to update the `instrumentation` filename to match.
 > - We have created a basic [with-opentelemetry](https://github.com/vercel/next.js/tree/canary/examples/with-opentelemetry) example that you can use.
 
 </AppOnly>
@@ -76,7 +76,7 @@ See the [`@vercel/otel` documentation](https://www.npmjs.com/package/@vercel/ote
 > **Good to know**:
 >
 > - The `instrumentation` file should be in the root of your project and not inside the `app` or `pages` directory. If you're using the `src` folder, then place the file inside `src` alongside `pages` and `app`.
-> - If you use the [`pageExtensions` config option](/docs/pages/api-reference/next-config-js/pageExtensions) to add a suffix, you will also need to update the `instrumentation` filename to match.
+> - If you use the [`pageExtensions` config option](/docs/pages/api-reference/config/next-config-js/pageExtensions) to add a suffix, you will also need to update the `instrumentation` filename to match.
 > - We have created a basic [with-opentelemetry](https://github.com/vercel/next.js/tree/canary/examples/with-opentelemetry) example that you can use.
 
 </PagesOnly>
diff --git a/docs/01-app/02-building-your-application/06-optimizing/13-memory-usage.mdx b/docs/01-app/02-building-your-application/06-optimizing/13-memory-usage.mdx
index b4e1bdab3f34b..46011e262c17c 100644
--- a/docs/01-app/02-building-your-application/06-optimizing/13-memory-usage.mdx
+++ b/docs/01-app/02-building-your-application/06-optimizing/13-memory-usage.mdx
@@ -69,7 +69,7 @@ If you are using an older version of Next.js or you have a custom Webpack config
 The [Webpack cache](https://webpack.js.org/configuration/cache/) saves generated Webpack modules in memory and/or to disk to improve the speed of builds. This can
 help with performance, but it will also increase the memory usage of your application to store the cached data.
 
-You can disable this behavior by adding a [custom Webpack configuration](/docs/app/api-reference/next-config-js/webpack) to your application:
+You can disable this behavior by adding a [custom Webpack configuration](/docs/app/api-reference/config/next-config-js/webpack) to your application:
 
 ```js filename="next.config.mjs"
 /** @type {import('next').NextConfig} */
@@ -118,7 +118,7 @@ export default nextConfig
 ```
 
 - [Ignoring TypeScript Errors](/docs/app/api-reference/config/typescript#disabling-typescript-errors-in-production)
-- [ESLint in Next.js config](/docs/pages/api-reference/next-config-js/eslint)
+- [ESLint in Next.js config](/docs/pages/api-reference/config/next-config-js/eslint)
 
 Keep in mind that this may produce faulty deploys due to type errors or linting issues.
 We strongly recommend only promoting builds to production after static analysis has completed.
diff --git a/docs/01-app/02-building-your-application/07-configuring/03-environment-variables.mdx b/docs/01-app/02-building-your-application/07-configuring/03-environment-variables.mdx
index 6c41834932b85..82426438a978a 100644
--- a/docs/01-app/02-building-your-application/07-configuring/03-environment-variables.mdx
+++ b/docs/01-app/02-building-your-application/07-configuring/03-environment-variables.mdx
@@ -232,7 +232,7 @@ This allows you to use a singular Docker image that can be promoted through mult
 **Good to know:**
 
 - You can run code on server startup using the [`register` function](/docs/app/building-your-application/optimizing/instrumentation).
-- We do not recommend using the [runtimeConfig](/docs/pages/api-reference/next-config-js/runtime-configuration) option, as this does not work with the standalone output mode. Instead, we recommend [incrementally adopting](/docs/app/building-your-application/upgrading/app-router-migration) the App Router.
+- We do not recommend using the [runtimeConfig](/docs/pages/api-reference/config/next-config-js/runtime-configuration) option, as this does not work with the standalone output mode. Instead, we recommend [incrementally adopting](/docs/app/building-your-application/upgrading/app-router-migration) the App Router.
 
 ## Default Environment Variables
 
diff --git a/docs/01-app/02-building-your-application/07-configuring/15-content-security-policy.mdx b/docs/01-app/02-building-your-application/07-configuring/15-content-security-policy.mdx
index 84ba41ab82f70..7dc4de821d9d6 100644
--- a/docs/01-app/02-building-your-application/07-configuring/15-content-security-policy.mdx
+++ b/docs/01-app/02-building-your-application/07-configuring/15-content-security-policy.mdx
@@ -209,7 +209,7 @@ export default async function Page() {
 
 ## Without Nonces
 
-For applications that do not require nonces, you can set the CSP header directly in your [`next.config.js`](/docs/app/api-reference/next-config-js) file:
+For applications that do not require nonces, you can set the CSP header directly in your [`next.config.js`](/docs/app/api-reference/config/next-config-js) file:
 
 ```js filename="next.config.js"
 const cspHeader = `
diff --git a/docs/01-app/02-building-your-application/10-deploying/02-static-exports.mdx b/docs/01-app/02-building-your-application/10-deploying/02-static-exports.mdx
index 8c8ca465f848f..9a91d2220ca56 100644
--- a/docs/01-app/02-building-your-application/10-deploying/02-static-exports.mdx
+++ b/docs/01-app/02-building-your-application/10-deploying/02-static-exports.mdx
@@ -280,9 +280,9 @@ Features that require a Node.js server, or dynamic logic that cannot be computed
 - [Dynamic Routes](/docs/app/building-your-application/routing/dynamic-routes) without `generateStaticParams()`
 - [Route Handlers](/docs/app/building-your-application/routing/route-handlers) that rely on Request
 - [Cookies](/docs/app/api-reference/functions/cookies)
-- [Rewrites](/docs/app/api-reference/next-config-js/rewrites)
-- [Redirects](/docs/app/api-reference/next-config-js/redirects)
-- [Headers](/docs/app/api-reference/next-config-js/headers)
+- [Rewrites](/docs/app/api-reference/config/next-config-js/rewrites)
+- [Redirects](/docs/app/api-reference/config/next-config-js/redirects)
+- [Headers](/docs/app/api-reference/config/next-config-js/headers)
 - [Middleware](/docs/app/building-your-application/routing/middleware)
 - [Incremental Static Regeneration](/docs/app/building-your-application/data-fetching/incremental-static-regeneration)
 - [Image Optimization](/docs/app/building-your-application/optimizing/images) with the default `loader`
@@ -301,9 +301,9 @@ export const dynamic = 'error'
 
 - [Internationalized Routing](/docs/pages/building-your-application/routing/internationalization)
 - [API Routes](/docs/pages/building-your-application/routing/api-routes)
-- [Rewrites](/docs/pages/api-reference/next-config-js/rewrites)
-- [Redirects](/docs/pages/api-reference/next-config-js/redirects)
-- [Headers](/docs/pages/api-reference/next-config-js/headers)
+- [Rewrites](/docs/pages/api-reference/config/next-config-js/rewrites)
+- [Redirects](/docs/pages/api-reference/config/next-config-js/redirects)
+- [Headers](/docs/pages/api-reference/config/next-config-js/headers)
 - [Middleware](/docs/pages/building-your-application/routing/middleware)
 - [Incremental Static Regeneration](/docs/pages/building-your-application/data-fetching/incremental-static-regeneration)
 - [Image Optimization](/docs/pages/building-your-application/optimizing/images) with the default `loader`
diff --git a/docs/01-app/02-building-your-application/10-deploying/03-multi-zones.mdx b/docs/01-app/02-building-your-application/10-deploying/03-multi-zones.mdx
index 6084912ab5348..2fd14edd49602 100644
--- a/docs/01-app/02-building-your-application/10-deploying/03-multi-zones.mdx
+++ b/docs/01-app/02-building-your-application/10-deploying/03-multi-zones.mdx
@@ -36,7 +36,7 @@ Navigating from a page in one zone to a page in another zone, such as from `/` t
 
 ## How to define a zone
 
-A zone is a normal Next.js application where you also configure an [assetPrefix](/docs/app/api-reference/next-config-js/assetPrefix) to avoid conflicts with pages and static files in other zones.
+A zone is a normal Next.js application where you also configure an [assetPrefix](/docs/app/api-reference/config/next-config-js/assetPrefix) to avoid conflicts with pages and static files in other zones.
 
 ```js filename="next.config.js"
 /** @type {import('next').NextConfig} */
@@ -72,7 +72,7 @@ const nextConfig = {
 
 With the Multi Zones set-up, you need to route the paths to the correct zone since they are served by different applications. You can use any HTTP proxy to do this, but one of the Next.js applications can also be used to route requests for the entire domain.
 
-To route to the correct zone using a Next.js application, you can use [`rewrites`](/docs/app/api-reference/next-config-js/rewrites). For each path served by a different zone, you would add a rewrite rule to send that path to the domain of the other zone. For example:
+To route to the correct zone using a Next.js application, you can use [`rewrites`](/docs/app/api-reference/config/next-config-js/rewrites). For each path served by a different zone, you would add a rewrite rule to send that path to the domain of the other zone. For example:
 
 ```js filename="next.config.js"
 async rewrites() {
@@ -95,7 +95,7 @@ async rewrites() {
 
 ### Routing requests using middleware
 
-Routing requests through [`rewrites`](/docs/app/api-reference/next-config-js/rewrites) is recommended to minimize latency overhead for the requests, but middleware can also be used when there is a need for a dynamic decision when routing. For example, if you are using a feature flag to decide where a path should be routed such as during a migration, you can use middleware.
+Routing requests through [`rewrites`](/docs/app/api-reference/config/next-config-js/rewrites) is recommended to minimize latency overhead for the requests, but middleware can also be used when there is a need for a dynamic decision when routing. For example, if you are using a feature flag to decide where a path should be routed such as during a migration, you can use middleware.
 
 ```js filename="middleware.js"
 export async function middleware(request) {
@@ -134,6 +134,6 @@ const nextConfig = {
 }
 ```
 
-See [`serverActions.allowedOrigins`](/docs/app/api-reference/next-config-js/serverActions#allowedorigins) for more information.
+See [`serverActions.allowedOrigins`](/docs/app/api-reference/config/next-config-js/serverActions#allowedorigins) for more information.
 
 </AppOnly>
diff --git a/docs/01-app/02-building-your-application/10-deploying/index.mdx b/docs/01-app/02-building-your-application/10-deploying/index.mdx
index d09dd8ce81a27..7452831a0b594 100644
--- a/docs/01-app/02-building-your-application/10-deploying/index.mdx
+++ b/docs/01-app/02-building-your-application/10-deploying/index.mdx
@@ -104,7 +104,7 @@ Image Optimization can be used with a [static export](/docs/app/building-your-ap
 
 Middleware uses a [runtime](/docs/app/building-your-application/rendering/edge-and-nodejs-runtimes) that is a subset of all available Node.js APIs to help ensure low latency, since it may run in front of every route or asset in your application. This runtime does not require running “at the edge” and works in a single-region server. Additional configuration and infrastructure are required to run Middleware in multiple regions.
 
-If you are looking to add logic (or use an external package) that requires all Node.js APIs, you might be able to move this logic to a [layout](/docs/app/building-your-application/routing/layouts-and-templates#layouts) as a [Server Component](/docs/app/building-your-application/rendering/server-components). For example, checking [headers](/docs/app/api-reference/functions/headers) and [redirecting](/docs/app/api-reference/functions/redirect). You can also use headers, cookies, or query parameters to [redirect](/docs/app/api-reference/next-config-js/redirects#header-cookie-and-query-matching) or [rewrite](/docs/app/api-reference/next-config-js/rewrites#header-cookie-and-query-matching) through `next.config.js`. If that does not work, you can also use a [custom server](/docs/pages/building-your-application/configuring/custom-server).
+If you are looking to add logic (or use an external package) that requires all Node.js APIs, you might be able to move this logic to a [layout](/docs/app/building-your-application/routing/layouts-and-templates#layouts) as a [Server Component](/docs/app/building-your-application/rendering/server-components). For example, checking [headers](/docs/app/api-reference/functions/headers) and [redirecting](/docs/app/api-reference/functions/redirect). You can also use headers, cookies, or query parameters to [redirect](/docs/app/api-reference/config/next-config-js/redirects#header-cookie-and-query-matching) or [rewrite](/docs/app/api-reference/config/next-config-js/rewrites#header-cookie-and-query-matching) through `next.config.js`. If that does not work, you can also use a [custom server](/docs/pages/building-your-application/configuring/custom-server).
 
 ### Environment Variables
 
@@ -155,7 +155,7 @@ This allows you to use a singular Docker image that can be promoted through mult
 > **Good to know:**
 >
 > - You can run code on server startup using the [`register` function](/docs/app/building-your-application/optimizing/instrumentation).
-> - We do not recommend using the [runtimeConfig](/docs/pages/api-reference/next-config-js/runtime-configuration) option, as this does not work with the standalone output mode. Instead, we recommend [incrementally adopting](/docs/app/building-your-application/upgrading/app-router-migration) the App Router.
+> - We do not recommend using the [runtimeConfig](/docs/pages/api-reference/config/next-config-js/runtime-configuration) option, as this does not work with the standalone output mode. Instead, we recommend [incrementally adopting](/docs/app/building-your-application/upgrading/app-router-migration) the App Router.
 
 ### Caching and ISR
 
@@ -173,9 +173,9 @@ You can configure the Next.js cache location if you want to persist cached pages
 
 #### Static Assets
 
-If you want to host static assets on a different domain or CDN, you can use the `assetPrefix` [configuration](/docs/app/api-reference/next-config-js/assetPrefix) in `next.config.js`. Next.js will use this asset prefix when retrieving JavaScript or CSS files. Separating your assets to a different domain does come with the downside of extra time spent on DNS and TLS resolution.
+If you want to host static assets on a different domain or CDN, you can use the `assetPrefix` [configuration](/docs/app/api-reference/config/next-config-js/assetPrefix) in `next.config.js`. Next.js will use this asset prefix when retrieving JavaScript or CSS files. Separating your assets to a different domain does come with the downside of extra time spent on DNS and TLS resolution.
 
-[Learn more about `assetPrefix`](/docs/app/api-reference/next-config-js/assetPrefix).
+[Learn more about `assetPrefix`](/docs/app/api-reference/config/next-config-js/assetPrefix).
 
 #### Configuring Caching
 
diff --git a/docs/01-app/02-building-your-application/11-upgrading/02-version-15.mdx b/docs/01-app/02-building-your-application/11-upgrading/02-version-15.mdx
index 48e37a6bf891b..6b84fd4be456b 100644
--- a/docs/01-app/02-building-your-application/11-upgrading/02-version-15.mdx
+++ b/docs/01-app/02-building-your-application/11-upgrading/02-version-15.mdx
@@ -498,7 +498,7 @@ export async function GET() {}
 
 When navigating between pages via `<Link>` or `useRouter`, [page](/docs/app/api-reference/file-conventions/page) segments are no longer reused from the client-side router cache. However, they are still reused during browser backward and forward navigation and for shared layouts.
 
-To opt page segments into caching, you can use the [`staleTimes`](/docs/app/api-reference/next-config-js/staleTimes) config option:
+To opt page segments into caching, you can use the [`staleTimes`](/docs/app/api-reference/config/next-config-js/staleTimes) config option:
 
 ```js filename="next.config.js"
 /** @type {import('next').NextConfig} */
diff --git a/docs/01-app/02-building-your-application/11-upgrading/05-from-create-react-app.mdx b/docs/01-app/02-building-your-application/11-upgrading/05-from-create-react-app.mdx
index f16ea4e6b89cb..5a49b1c2870ff 100644
--- a/docs/01-app/02-building-your-application/11-upgrading/05-from-create-react-app.mdx
+++ b/docs/01-app/02-building-your-application/11-upgrading/05-from-create-react-app.mdx
@@ -58,7 +58,7 @@ npm install next@latest
 
 ### Step 2: Create the Next.js Configuration File
 
-Create a `next.config.mjs` at the root of your project. This file will hold your [Next.js configuration options](/docs/app/api-reference/next-config-js).
+Create a `next.config.mjs` at the root of your project. This file will hold your [Next.js configuration options](/docs/app/api-reference/config/next-config-js).
 
 ```js filename="next.config.mjs"
 /** @type {import('next').NextConfig} */
@@ -478,9 +478,9 @@ You can now clean up your codebase from Create React App related artifacts:
 
 Create React App and Next.js both default to using webpack for bundling.
 
-When migrating your CRA application to Next.js, you might have a custom webpack configuration you're looking to migrate. Next.js supports providing a [custom webpack configuration](/docs/app/api-reference/next-config-js/webpack).
+When migrating your CRA application to Next.js, you might have a custom webpack configuration you're looking to migrate. Next.js supports providing a [custom webpack configuration](/docs/app/api-reference/config/next-config-js/webpack).
 
-Further, Next.js has support for [Turbopack](/docs/app/api-reference/next-config-js/turbo) through `next dev --turbopack` to improve your local dev performance. Turbopack supports some [webpack loaders](/docs/app/api-reference/next-config-js/turbo) as well for compatibility and incremental adoption.
+Further, Next.js has support for [Turbopack](/docs/app/api-reference/config/next-config-js/turbo) through `next dev --turbopack` to improve your local dev performance. Turbopack supports some [webpack loaders](/docs/app/api-reference/config/next-config-js/turbo) as well for compatibility and incremental adoption.
 
 ## Next Steps
 
diff --git a/docs/01-app/02-building-your-application/11-upgrading/06-from-vite.mdx b/docs/01-app/02-building-your-application/11-upgrading/06-from-vite.mdx
index ccd109a6ccc7d..c14b192acc836 100644
--- a/docs/01-app/02-building-your-application/11-upgrading/06-from-vite.mdx
+++ b/docs/01-app/02-building-your-application/11-upgrading/06-from-vite.mdx
@@ -62,7 +62,7 @@ npm install next@latest
 ### Step 2: Create the Next.js Configuration File
 
 Create a `next.config.mjs` at the root of your project. This file will hold your
-[Next.js configuration options](/docs/app/api-reference/next-config-js).
+[Next.js configuration options](/docs/app/api-reference/config/next-config-js).
 
 ```js filename="next.config.mjs"
 /** @type {import('next').NextConfig} */
@@ -537,7 +537,7 @@ configure one, if you need it:
 NEXT_PUBLIC_BASE_PATH="/some-base-path"
 ```
 
-2. **Set [`basePath`](/docs/app/api-reference/next-config-js/basePath) to `process.env.NEXT_PUBLIC_BASE_PATH` in your `next.config.mjs` file:**
+2. **Set [`basePath`](/docs/app/api-reference/config/next-config-js/basePath) to `process.env.NEXT_PUBLIC_BASE_PATH` in your `next.config.mjs` file:**
 
 ```js filename="next.config.mjs"
 /** @type {import('next').NextConfig} */
diff --git a/docs/01-app/03-api-reference/01-directives/use-cache.mdx b/docs/01-app/03-api-reference/01-directives/use-cache.mdx
index 9f9df5d335145..bb3f02779380a 100644
--- a/docs/01-app/03-api-reference/01-directives/use-cache.mdx
+++ b/docs/01-app/03-api-reference/01-directives/use-cache.mdx
@@ -6,8 +6,8 @@ related:
   title: Related
   description: View related API references.
   links:
-    - app/api-reference/next-config-js/dynamicIO
-    - app/api-reference/next-config-js/cacheLife
+    - app/api-reference/config/next-config-js/dynamicIO
+    - app/api-reference/config/next-config-js/cacheLife
     - app/api-reference/functions/cacheTag
     - app/api-reference/functions/cacheLife
     - app/api-reference/functions/revalidateTag
@@ -17,7 +17,7 @@ The `use cache` directive designates a component and/or a function to be cached.
 
 ## Usage
 
-Enable support for the `use cache` directive with the [`dynamicIO`](/docs/app/api-reference/next-config-js/dynamicIO) flag in your `next.config.ts` file:
+Enable support for the `use cache` directive with the [`dynamicIO`](/docs/app/api-reference/config/next-config-js/dynamicIO) flag in your `next.config.ts` file:
 
 ```ts filename="next.config.ts"
 import type { NextConfig } from 'next'
@@ -64,7 +64,7 @@ export async function getData() {
 - The return value of the cacheable function must also be serializable. This ensures that the cached data can be stored and retrieved correctly.
 - Functions that use the `use cache` directive must not have any side-effects, such as modifying state, directly manipulating the DOM, or setting timers to execute code at intervals.
 - If used alongside [Partial Prerendering](/docs/app/building-your-application/rendering/partial-prerendering), segments that have `use cache` will be prerendered as part of the static HTML shell.
-- The `use cache` directive will be available separately from the [`dynamicIO`](/docs/app/api-reference/next-config-js/dynamicIO) flag in the future.
+- The `use cache` directive will be available separately from the [`dynamicIO`](/docs/app/api-reference/config/next-config-js/dynamicIO) flag in the future.
 - Unlike [`unstable_cache`](/docs/app/api-reference/functions/unstable_cache) which only supports JSON data, `use cache` can cache any serializable data React can render, including the render output of components.
 
 ## Examples
diff --git a/docs/01-app/03-api-reference/02-components/form.mdx b/docs/01-app/03-api-reference/02-components/form.mdx
index d77c718f2d046..7acd835ce6700 100644
--- a/docs/01-app/03-api-reference/02-components/form.mdx
+++ b/docs/01-app/03-api-reference/02-components/form.mdx
@@ -152,7 +152,7 @@ When `action` is a function, the `<Form>` component supports the following prop:
 <AppOnly>
 
 - **`formAction`**: Can be used in a `<button>` or `<input type="submit">` fields to override the `action` prop. Next.js will perform a client-side navigation, however, this approach doesn't support prefetching.
-  - When using [`basePath`](/docs/app/api-reference/next-config-js/basePath), you must also include it in the `formAction` path. e.g. `formAction="/base-path/search"`.
+  - When using [`basePath`](/docs/app/api-reference/config/next-config-js/basePath), you must also include it in the `formAction` path. e.g. `formAction="/base-path/search"`.
 - **`key`**: Passing a `key` prop to a string `action` is not supported. If you'd like to trigger a re-render or perform a mutation, consider using a function `action` instead.
 
 </AppOnly>
diff --git a/docs/01-app/03-api-reference/02-components/image.mdx b/docs/01-app/03-api-reference/02-components/image.mdx
index 2a2c0bace7a5f..5fbb48e5a2085 100644
--- a/docs/01-app/03-api-reference/02-components/image.mdx
+++ b/docs/01-app/03-api-reference/02-components/image.mdx
@@ -638,7 +638,7 @@ Alternatively, you can use the [`loader` prop](#loader) to configure each instan
 
 Examples:
 
-- [Custom Image Loader Configuration](/docs/app/api-reference/next-config-js/images#example-loader-configuration)
+- [Custom Image Loader Configuration](/docs/app/api-reference/config/next-config-js/images#example-loader-configuration)
 
 <AppOnly>
 
@@ -743,7 +743,7 @@ module.exports = {
 
 The expiration (or rather Max Age) of the optimized image is defined by either the `minimumCacheTTL` or the upstream image `Cache-Control` header, whichever is larger.
 
-If you need to change the caching behavior per image, you can configure [`headers`](/docs/app/api-reference/next-config-js/headers) to set the `Cache-Control` header on the upstream image (e.g. `/some-asset.jpg`, not `/_next/image` itself).
+If you need to change the caching behavior per image, you can configure [`headers`](/docs/app/api-reference/config/next-config-js/headers) to set the `Cache-Control` header on the upstream image (e.g. `/some-asset.jpg`, not `/_next/image` itself).
 
 There is no mechanism to invalidate the cache at this time, so its best to keep `minimumCacheTTL` low. Otherwise you may need to manually change the [`src`](#src) prop or delete `<distDir>/cache/images`.
 
@@ -765,7 +765,7 @@ module.exports = {
 
 ### `dangerouslyAllowSVG`
 
-The default [loader](#loader) does not optimize SVG images for a few reasons. First, SVG is a vector format meaning it can be resized losslessly. Second, SVG has many of the same features as HTML/CSS, which can lead to vulnerabilities without proper [Content Security Policy (CSP) headers](/docs/app/api-reference/next-config-js/headers#content-security-policy).
+The default [loader](#loader) does not optimize SVG images for a few reasons. First, SVG is a vector format meaning it can be resized losslessly. Second, SVG has many of the same features as HTML/CSS, which can lead to vulnerabilities without proper [Content Security Policy (CSP) headers](/docs/app/api-reference/config/next-config-js/headers#content-security-policy).
 
 Therefore, we recommended using the [`unoptimized`](#unoptimized) prop when the [`src`](#src) prop is known to be SVG. This happens automatically when `src` ends with `".svg"`.
 
diff --git a/docs/01-app/03-api-reference/03-file-conventions/route-segment-config.mdx b/docs/01-app/03-api-reference/03-file-conventions/route-segment-config.mdx
index e4755bc11b335..f0f9d1f2d9019 100644
--- a/docs/01-app/03-api-reference/03-file-conventions/route-segment-config.mdx
+++ b/docs/01-app/03-api-reference/03-file-conventions/route-segment-config.mdx
@@ -3,7 +3,7 @@ title: Route Segment Config
 description: Learn about how to configure options for Next.js route segments.
 ---
 
-> The options outlined on this page are disabled if the [`dynamicIO`](/docs/app/api-reference/next-config-js/dynamicIO) flag is on, and will eventually be deprecated in the future.
+> The options outlined on this page are disabled if the [`dynamicIO`](/docs/app/api-reference/config/next-config-js/dynamicIO) flag is on, and will eventually be deprecated in the future.
 
 The Route Segment options allows you to configure the behavior of a [Page](/docs/app/building-your-application/routing/layouts-and-templates), [Layout](/docs/app/building-your-application/routing/layouts-and-templates), or [Route Handler](/docs/app/building-your-application/routing/route-handlers) by directly exporting the following variables:
 
diff --git a/docs/01-app/03-api-reference/04-functions/cacheLife.mdx b/docs/01-app/03-api-reference/04-functions/cacheLife.mdx
index 247e60e10e25b..18952d72a2cad 100644
--- a/docs/01-app/03-api-reference/04-functions/cacheLife.mdx
+++ b/docs/01-app/03-api-reference/04-functions/cacheLife.mdx
@@ -6,7 +6,7 @@ related:
   title: Related
   description: View related API references.
   links:
-    - app/api-reference/next-config-js/dynamicIO
+    - app/api-reference/config/next-config-js/dynamicIO
     - app/api-reference/directives/use-cache
     - app/api-reference/functions/revalidateTag
     - app/api-reference/functions/cacheTag
@@ -16,7 +16,7 @@ The `cacheLife` function is used to set the cache lifetime of a function or comp
 
 ## Usage
 
-To use `cacheLife`, enable the [`dynamicIO` flag](/docs/app/api-reference/next-config-js/dynamicIO) in your `next.config.js` file:
+To use `cacheLife`, enable the [`dynamicIO` flag](/docs/app/api-reference/config/next-config-js/dynamicIO) in your `next.config.js` file:
 
 ```ts filename="next.config.ts" switcher
 import type { NextConfig } from 'next'
@@ -84,7 +84,7 @@ The string values used to reference cache profiles don't carry inherent meaning;
 
 ### Custom cache profiles
 
-You can configure custom cache profiles by adding them to the [`cacheLife`](/docs/app/api-reference/next-config-js/cacheLife) option in your `next.config.ts` file.
+You can configure custom cache profiles by adding them to the [`cacheLife`](/docs/app/api-reference/config/next-config-js/cacheLife) option in your `next.config.ts` file.
 
 Cache profiles are objects that contain the following properties:
 
@@ -94,7 +94,7 @@ Cache profiles are objects that contain the following properties:
 | `revalidate` | `number`  | Frequency at which the cache should refresh on the server; stale values may be served while revalidating.                   | Optional                                    |
 | `expire`     | `number`  | Maximum duration for which a value can remain stale before switching to dynamic fetching; must be longer than `revalidate`. | Optional - Must be longer than `revalidate` |
 
-The "stale" property differs from the [`staleTimes`](/docs/app/api-reference/next-config-js/staleTimes) setting in that it specifically controls client-side router caching. While `staleTimes` is a global setting that affects all instances of both dynamic and static data, the `cacheLife` configuration allows you to define "stale" times on a per-function or per-route basis.
+The "stale" property differs from the [`staleTimes`](/docs/app/api-reference/config/next-config-js/staleTimes) setting in that it specifically controls client-side router caching. While `staleTimes` is a global setting that affects all instances of both dynamic and static data, the `cacheLife` configuration allows you to define "stale" times on a per-function or per-route basis.
 
 > **Good to know**: The “stale” property does not set the `Cache-control: max-age` header. It instead controls the client-side router cache.
 
diff --git a/docs/01-app/03-api-reference/04-functions/cacheTag.mdx b/docs/01-app/03-api-reference/04-functions/cacheTag.mdx
index db90a2e7199ce..00c46b70d2f53 100644
--- a/docs/01-app/03-api-reference/04-functions/cacheTag.mdx
+++ b/docs/01-app/03-api-reference/04-functions/cacheTag.mdx
@@ -6,7 +6,7 @@ related:
   title: Related
   description: View related API references.
   links:
-    - app/api-reference/next-config-js/dynamicIO
+    - app/api-reference/config/next-config-js/dynamicIO
     - app/api-reference/directives/use-cache
     - app/api-reference/functions/revalidateTag
     - app/api-reference/functions/cacheLife
@@ -16,7 +16,7 @@ The `cacheTag` function allows you to tag cached data for on-demand invalidation
 
 ## Usage
 
-To use `cacheTag`, enable the [`dynamicIO` flag](/docs/app/api-reference/next-config-js/dynamicIO) in your `next.config.js` file:
+To use `cacheTag`, enable the [`dynamicIO` flag](/docs/app/api-reference/config/next-config-js/dynamicIO) in your `next.config.js` file:
 
 ```ts filename="next.config.ts" switcher
 import type { NextConfig } from 'next'
diff --git a/docs/01-app/03-api-reference/04-functions/fetch.mdx b/docs/01-app/03-api-reference/04-functions/fetch.mdx
index bbc3e9f3f8ca7..d7154959b92a7 100644
--- a/docs/01-app/03-api-reference/04-functions/fetch.mdx
+++ b/docs/01-app/03-api-reference/04-functions/fetch.mdx
@@ -87,9 +87,9 @@ Set the cache tags of a resource. Data can then be revalidated on-demand using [
 
 Next.js caches `fetch` responses in Server Components across Hot Module Replacement (HMR) in local development for faster responses and to reduce costs for billed API calls.
 
-By default, the [HMR cache](/docs/app/api-reference/next-config-js/serverComponentsHmrCache) applies to all fetch requests, including those with the `cache: 'no-store'` option. This means uncached requests will not show fresh data between HMR refreshes. However, the cache will be cleared on navigation or full-page reloads.
+By default, the [HMR cache](/docs/app/api-reference/config/next-config-js/serverComponentsHmrCache) applies to all fetch requests, including those with the `cache: 'no-store'` option. This means uncached requests will not show fresh data between HMR refreshes. However, the cache will be cleared on navigation or full-page reloads.
 
-See the [`serverComponentsHmrCache`](/docs/app/api-reference/next-config-js/serverComponentsHmrCache) docs for more information.
+See the [`serverComponentsHmrCache`](/docs/app/api-reference/config/next-config-js/serverComponentsHmrCache) docs for more information.
 
 ## Version History
 
diff --git a/docs/01-app/03-api-reference/04-functions/generate-metadata.mdx b/docs/01-app/03-api-reference/04-functions/generate-metadata.mdx
index 6c80aa4e1bcbb..f3f52baee15ef 100644
--- a/docs/01-app/03-api-reference/04-functions/generate-metadata.mdx
+++ b/docs/01-app/03-api-reference/04-functions/generate-metadata.mdx
@@ -1022,17 +1022,17 @@ export const metadata = {
 
 The following metadata types do not currently have built-in support. However, they can still be rendered in the layout or page itself.
 
-| Metadata                      | Recommendation                                                                                                                                                                                                                                     |
-| ----------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `<meta http-equiv="...">`     | Use appropriate HTTP Headers via [`redirect()`](/docs/app/api-reference/functions/redirect), [Middleware](/docs/app/building-your-application/routing/middleware#nextresponse), [Security Headers](/docs/app/api-reference/next-config-js/headers) |
-| `<base>`                      | Render the tag in the layout or page itself.                                                                                                                                                                                                       |
-| `<noscript>`                  | Render the tag in the layout or page itself.                                                                                                                                                                                                       |
-| `<style>`                     | Learn more about [styling in Next.js](/docs/app/building-your-application/styling/css).                                                                                                                                                            |
-| `<script>`                    | Learn more about [using scripts](/docs/app/building-your-application/optimizing/scripts).                                                                                                                                                          |
-| `<link rel="stylesheet" />`   | `import` stylesheets directly in the layout or page itself.                                                                                                                                                                                        |
-| `<link rel="preload />`       | Use [ReactDOM preload method](#link-relpreload)                                                                                                                                                                                                    |
-| `<link rel="preconnect" />`   | Use [ReactDOM preconnect method](#link-relpreconnect)                                                                                                                                                                                              |
-| `<link rel="dns-prefetch" />` | Use [ReactDOM prefetchDNS method](#link-reldns-prefetch)                                                                                                                                                                                           |
+| Metadata                      | Recommendation                                                                                                                                                                                                                                            |
+| ----------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `<meta http-equiv="...">`     | Use appropriate HTTP Headers via [`redirect()`](/docs/app/api-reference/functions/redirect), [Middleware](/docs/app/building-your-application/routing/middleware#nextresponse), [Security Headers](/docs/app/api-reference/config/next-config-js/headers) |
+| `<base>`                      | Render the tag in the layout or page itself.                                                                                                                                                                                                              |
+| `<noscript>`                  | Render the tag in the layout or page itself.                                                                                                                                                                                                              |
+| `<style>`                     | Learn more about [styling in Next.js](/docs/app/building-your-application/styling/css).                                                                                                                                                                   |
+| `<script>`                    | Learn more about [using scripts](/docs/app/building-your-application/optimizing/scripts).                                                                                                                                                                 |
+| `<link rel="stylesheet" />`   | `import` stylesheets directly in the layout or page itself.                                                                                                                                                                                               |
+| `<link rel="preload />`       | Use [ReactDOM preload method](#link-relpreload)                                                                                                                                                                                                           |
+| `<link rel="preconnect" />`   | Use [ReactDOM preconnect method](#link-relpreconnect)                                                                                                                                                                                                     |
+| `<link rel="dns-prefetch" />` | Use [ReactDOM prefetchDNS method](#link-reldns-prefetch)                                                                                                                                                                                                  |
 
 ### Resource hints
 
diff --git a/docs/01-app/03-api-reference/04-functions/next-request.mdx b/docs/01-app/03-api-reference/04-functions/next-request.mdx
index 24c2f2e482bee..07510dac3efb7 100644
--- a/docs/01-app/03-api-reference/04-functions/next-request.mdx
+++ b/docs/01-app/03-api-reference/04-functions/next-request.mdx
@@ -88,29 +88,29 @@ The following options are available:
 
 <PagesOnly>
 
-| Property          | Type                      | Description                                                                                                                     |
-| ----------------- | ------------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
-| `basePath`        | `string`                  | The [base path](/docs/pages/api-reference/next-config-js/basePath) of the URL.                                                  |
-| `buildId`         | `string` \| `undefined`   | The build identifier of the Next.js application. Can be [customized](/docs/pages/api-reference/next-config-js/generateBuildId). |
-| `defaultLocale`   | `string` \| `undefined`   | The default locale for [internationalization](/docs/pages/building-your-application/routing/internationalization).              |
-| `domainLocale`    |                           |                                                                                                                                 |
-| - `defaultLocale` | `string`                  | The default locale within a domain.                                                                                             |
-| - `domain`        | `string`                  | The domain associated with a specific locale.                                                                                   |
-| - `http`          | `boolean` \| `undefined`  | Indicates if the domain is using HTTP.                                                                                          |
-| `locales`         | `string[]` \| `undefined` | An array of available locales.                                                                                                  |
-| `locale`          | `string` \| `undefined`   | The currently active locale.                                                                                                    |
-| `url`             | `URL`                     | The URL object.                                                                                                                 |
+| Property          | Type                      | Description                                                                                                                            |
+| ----------------- | ------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- |
+| `basePath`        | `string`                  | The [base path](/docs/pages/api-reference/config/next-config-js/basePath) of the URL.                                                  |
+| `buildId`         | `string` \| `undefined`   | The build identifier of the Next.js application. Can be [customized](/docs/pages/api-reference/config/next-config-js/generateBuildId). |
+| `defaultLocale`   | `string` \| `undefined`   | The default locale for [internationalization](/docs/pages/building-your-application/routing/internationalization).                     |
+| `domainLocale`    |                           |                                                                                                                                        |
+| - `defaultLocale` | `string`                  | The default locale within a domain.                                                                                                    |
+| - `domain`        | `string`                  | The domain associated with a specific locale.                                                                                          |
+| - `http`          | `boolean` \| `undefined`  | Indicates if the domain is using HTTP.                                                                                                 |
+| `locales`         | `string[]` \| `undefined` | An array of available locales.                                                                                                         |
+| `locale`          | `string` \| `undefined`   | The currently active locale.                                                                                                           |
+| `url`             | `URL`                     | The URL object.                                                                                                                        |
 
 </PagesOnly>
 
 <AppOnly>
 
-| Property       | Type                    | Description                                                                                                                   |
-| -------------- | ----------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
-| `basePath`     | `string`                | The [base path](/docs/app/api-reference/next-config-js/basePath) of the URL.                                                  |
-| `buildId`      | `string` \| `undefined` | The build identifier of the Next.js application. Can be [customized](/docs/app/api-reference/next-config-js/generateBuildId). |
-| `pathname`     | `string`                | The pathname of the URL.                                                                                                      |
-| `searchParams` | `Object`                | The search parameters of the URL.                                                                                             |
+| Property       | Type                    | Description                                                                                                                          |
+| -------------- | ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------ |
+| `basePath`     | `string`                | The [base path](/docs/app/api-reference/config/next-config-js/basePath) of the URL.                                                  |
+| `buildId`      | `string` \| `undefined` | The build identifier of the Next.js application. Can be [customized](/docs/app/api-reference/config/next-config-js/generateBuildId). |
+| `pathname`     | `string`                | The pathname of the URL.                                                                                                             |
+| `searchParams` | `Object`                | The search parameters of the URL.                                                                                                    |
 
 > **Note:** The internationalization properties from the Pages Router are not available for usage in the App Router. Learn more about [internationalization with the App Router](/docs/app/building-your-application/routing/internationalization).
 
diff --git a/docs/01-app/03-api-reference/04-functions/use-pathname.mdx b/docs/01-app/03-api-reference/04-functions/use-pathname.mdx
index 7c83af95a38fe..058cbc3592abd 100644
--- a/docs/01-app/03-api-reference/04-functions/use-pathname.mdx
+++ b/docs/01-app/03-api-reference/04-functions/use-pathname.mdx
@@ -36,7 +36,7 @@ For example, a Client Component with `usePathname` will be rendered into HTML on
 > - Reading the current URL from a [Server Component](/docs/app/building-your-application/rendering/server-components) is not supported. This design is intentional to support layout state being preserved across page navigations.
 > - Compatibility mode:
 >   - `usePathname` can return `null` when a [fallback route](/docs/pages/api-reference/functions/get-static-paths#fallback-true) is being rendered or when a `pages` directory page has been [automatically statically optimized](/docs/pages/building-your-application/rendering/automatic-static-optimization) by Next.js and the router is not ready.
->   - When using `usePathname` with rewrites in [`next.config`](/docs/app/api-reference/next-config-js/rewrites) or [`Middleware`](/docs/app/building-your-application/routing/middleware), `useState` and `useEffect` must also be used in order to avoid hydration mismatch errors. See the [rewrites example](https://github.com/vercel/next.js/tree/canary/examples/rewrites) for more information.
+>   - When using `usePathname` with rewrites in [`next.config`](/docs/app/api-reference/config/next-config-js/rewrites) or [`Middleware`](/docs/app/building-your-application/routing/middleware), `useState` and `useEffect` must also be used in order to avoid hydration mismatch errors. See the [rewrites example](https://github.com/vercel/next.js/tree/canary/examples/rewrites) for more information.
 >   - Next.js will automatically update your types if it detects both an `app` and `pages` directory in your project.
 
 ## Parameters
diff --git a/docs/01-app/03-api-reference/05-next-config-js/appDir.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/appDir.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/appDir.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/appDir.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/assetPrefix.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/assetPrefix.mdx
similarity index 95%
rename from docs/01-app/03-api-reference/05-next-config-js/assetPrefix.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/assetPrefix.mdx
index 40a1db9d946e9..14a5ebe1781e8 100644
--- a/docs/01-app/03-api-reference/05-next-config-js/assetPrefix.mdx
+++ b/docs/01-app/03-api-reference/05-config/01-next-config-js/assetPrefix.mdx
@@ -19,7 +19,7 @@ description: Learn how to use the assetPrefix config option to configure your CD
 
 </PagesOnly>
 
-> **Good to know**: Next.js 9.5+ added support for a customizable [Base Path](/docs/app/api-reference/next-config-js/basePath), which is better
+> **Good to know**: Next.js 9.5+ added support for a customizable [Base Path](/docs/app/api-reference/config/next-config-js/basePath), which is better
 > suited for hosting your application on a sub-path like `/docs`.
 > We do not suggest you use a custom Asset Prefix for this use case.
 
@@ -27,7 +27,7 @@ description: Learn how to use the assetPrefix config option to configure your CD
 
 To set up a [CDN](https://en.wikipedia.org/wiki/Content_delivery_network), you can set up an asset prefix and configure your CDN's origin to resolve to the domain that Next.js is hosted on.
 
-Open `next.config.mjs` and add the `assetPrefix` config based on the [phase](/docs/app/api-reference/next-config-js#async-configuration):
+Open `next.config.mjs` and add the `assetPrefix` config based on the [phase](/docs/app/api-reference/config/next-config-js#async-configuration):
 
 ```js filename="next.config.mjs"
 // @ts-check
diff --git a/docs/01-app/03-api-reference/05-next-config-js/basePath.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/basePath.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/basePath.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/basePath.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/cacheLife.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/cacheLife.mdx
similarity index 94%
rename from docs/01-app/03-api-reference/05-next-config-js/cacheLife.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/cacheLife.mdx
index 87eb2670c3a86..1ef3aee8aea49 100644
--- a/docs/01-app/03-api-reference/05-next-config-js/cacheLife.mdx
+++ b/docs/01-app/03-api-reference/05-config/01-next-config-js/cacheLife.mdx
@@ -8,7 +8,7 @@ The `cacheLife` option allows you to define **custom cache profiles** when using
 
 ## Usage
 
-To define a profile, enable the [`dynamicIO` flag](/docs/app/api-reference/next-config-js/dynamicIO) and add the cache profile in the `cacheLife` object in the `next.config.js` file. For example, a `blog` profile:
+To define a profile, enable the [`dynamicIO` flag](/docs/app/api-reference/config/next-config-js/dynamicIO) and add the cache profile in the `cacheLife` object in the `next.config.js` file. For example, a `blog` profile:
 
 ```ts filename="next.config.ts" switcher
 import type { NextConfig } from 'next'
diff --git a/docs/01-app/03-api-reference/05-next-config-js/compress.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/compress.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/compress.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/compress.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/crossOrigin.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/crossOrigin.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/crossOrigin.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/crossOrigin.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/cssChunking.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/cssChunking.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/cssChunking.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/cssChunking.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/devIndicators.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/devIndicators.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/devIndicators.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/devIndicators.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/distDir.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/distDir.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/distDir.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/distDir.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/dynamicIO.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/dynamicIO.mdx
similarity index 93%
rename from docs/01-app/03-api-reference/05-next-config-js/dynamicIO.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/dynamicIO.mdx
index aee2fd998223b..7d7d541bbf7b2 100644
--- a/docs/01-app/03-api-reference/05-next-config-js/dynamicIO.mdx
+++ b/docs/01-app/03-api-reference/05-config/01-next-config-js/dynamicIO.mdx
@@ -29,7 +29,7 @@ export default nextConfig
 When `dynamicIO` is enabled, you can use the following cache functions and configurations:
 
 - The [`use cache` directive](/docs/app/api-reference/directives/use-cache)
-- The [`cacheLife` function](/docs/app/api-reference/next-config-js/cacheLife) with `use cache`
+- The [`cacheLife` function](/docs/app/api-reference/config/next-config-js/cacheLife) with `use cache`
 - The [`cacheTag` function](/docs/app/api-reference/functions/cacheTag)
 
 ## Notes
diff --git a/docs/01-app/03-api-reference/05-next-config-js/env.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/env.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/env.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/env.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/eslint.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/eslint.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/eslint.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/eslint.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/expireTime.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/expireTime.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/expireTime.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/expireTime.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/exportPathMap.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/exportPathMap.mdx
similarity index 97%
rename from docs/01-app/03-api-reference/05-next-config-js/exportPathMap.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/exportPathMap.mdx
index e4df55e283fc2..ebd30801e40de 100644
--- a/docs/01-app/03-api-reference/05-next-config-js/exportPathMap.mdx
+++ b/docs/01-app/03-api-reference/05-config/01-next-config-js/exportPathMap.mdx
@@ -44,7 +44,7 @@ The pages will then be exported as HTML files, for example, `/about` will become
 - `dev` - `true` when `exportPathMap` is being called in development. `false` when running `next export`. In development `exportPathMap` is used to define routes.
 - `dir` - Absolute path to the project directory
 - `outDir` - Absolute path to the `out/` directory ([configurable with `-o`](#customizing-the-output-directory)). When `dev` is `true` the value of `outDir` will be `null`.
-- `distDir` - Absolute path to the `.next/` directory (configurable with the [`distDir`](/docs/pages/api-reference/next-config-js/distDir) config)
+- `distDir` - Absolute path to the `.next/` directory (configurable with the [`distDir`](/docs/pages/api-reference/config/next-config-js/distDir) config)
 - `buildId` - The generated build id
 
 The returned object is a map of pages where the `key` is the `pathname` and the `value` is an object that accepts the following fields:
diff --git a/docs/01-app/03-api-reference/05-next-config-js/generateBuildId.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/generateBuildId.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/generateBuildId.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/generateBuildId.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/generateEtags.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/generateEtags.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/generateEtags.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/generateEtags.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/headers.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/headers.mdx
similarity index 98%
rename from docs/01-app/03-api-reference/05-next-config-js/headers.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/headers.mdx
index cdc99cf789b10..624eb303d96ba 100644
--- a/docs/01-app/03-api-reference/05-next-config-js/headers.mdx
+++ b/docs/01-app/03-api-reference/05-config/01-next-config-js/headers.mdx
@@ -284,7 +284,7 @@ module.exports = {
 
 ## Headers with basePath support
 
-When leveraging [`basePath` support](/docs/app/api-reference/next-config-js/basePath) with headers each `source` is automatically prefixed with the `basePath` unless you add `basePath: false` to the header:
+When leveraging [`basePath` support](/docs/app/api-reference/config/next-config-js/basePath) with headers each `source` is automatically prefixed with the `basePath` unless you add `basePath: false` to the header:
 
 ```js filename="next.config.js"
 module.exports = {
diff --git a/docs/01-app/03-api-reference/05-next-config-js/httpAgentOptions.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/httpAgentOptions.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/httpAgentOptions.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/httpAgentOptions.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/images.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/images.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/images.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/images.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/incrementalCacheHandlerPath.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/incrementalCacheHandlerPath.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/incrementalCacheHandlerPath.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/incrementalCacheHandlerPath.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/index.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/index.mdx
similarity index 92%
rename from docs/01-app/03-api-reference/05-next-config-js/index.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/index.mdx
index 72045a02d643f..4c5d15ee8a235 100644
--- a/docs/01-app/03-api-reference/05-next-config-js/index.mdx
+++ b/docs/01-app/03-api-reference/05-config/01-next-config-js/index.mdx
@@ -1,5 +1,5 @@
 ---
-title: next.config.js Options
+title: next.config.js
 description: Learn how to configure your application with next.config.js.
 ---
 
@@ -123,7 +123,7 @@ This page documents all the available configuration options:
 
 Starting in Next.js 15.1, the `next/experimental/testing/server` package contains utilities to help unit test `next.config.js` files.
 
-The `unstable_getResponseFromNextConfig` function runs the [`headers`](/docs/app/api-reference/next-config-js/headers), [`redirects`](/docs/app/api-reference/next-config-js/redirects), and [`rewrites`](/docs/app/api-reference/next-config-js/rewrites) functions from `next.config.js` with the provided request information and returns `NextResponse` with the results of the routing.
+The `unstable_getResponseFromNextConfig` function runs the [`headers`](/docs/app/api-reference/config/next-config-js/headers), [`redirects`](/docs/app/api-reference/config/next-config-js/redirects), and [`rewrites`](/docs/app/api-reference/config/next-config-js/rewrites) functions from `next.config.js` with the provided request information and returns `NextResponse` with the results of the routing.
 
 > The response from `unstable_getResponseFromNextConfig` only considers `next.config.js` fields and does not consider middleware or filesystem routes, so the result in production may be different than the unit test.
 
diff --git a/docs/01-app/03-api-reference/05-next-config-js/logging.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/logging.mdx
similarity index 85%
rename from docs/01-app/03-api-reference/05-next-config-js/logging.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/logging.mdx
index 969be64bf1de8..c381c9ff10f75 100644
--- a/docs/01-app/03-api-reference/05-next-config-js/logging.mdx
+++ b/docs/01-app/03-api-reference/05-config/01-next-config-js/logging.mdx
@@ -19,7 +19,7 @@ module.exports = {
 }
 ```
 
-Any `fetch` requests that are restored from the [Server Components HMR cache](/docs/app/api-reference/next-config-js/serverComponentsHmrCache) are not logged by default. However, this can be enabled by setting `logging.fetches.hmrRefreshes` to `true`.
+Any `fetch` requests that are restored from the [Server Components HMR cache](/docs/app/api-reference/config/next-config-js/serverComponentsHmrCache) are not logged by default. However, this can be enabled by setting `logging.fetches.hmrRefreshes` to `true`.
 
 ```js filename="next.config.js"
 module.exports = {
diff --git a/docs/01-app/03-api-reference/05-next-config-js/mdxRs.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/mdxRs.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/mdxRs.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/mdxRs.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/onDemandEntries.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/onDemandEntries.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/onDemandEntries.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/onDemandEntries.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/optimizePackageImports.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/optimizePackageImports.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/optimizePackageImports.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/optimizePackageImports.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/output.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/output.mdx
similarity index 98%
rename from docs/01-app/03-api-reference/05-next-config-js/output.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/output.mdx
index 344c6ea3d6ce3..81f4fba753c81 100644
--- a/docs/01-app/03-api-reference/05-next-config-js/output.mdx
+++ b/docs/01-app/03-api-reference/05-config/01-next-config-js/output.mdx
@@ -59,7 +59,7 @@ node .next/standalone/server.js
 
 > **Good to know**:
 >
-> - `next.config.js` is read during `next build` and serialized into the `server.js` output file. If the legacy [`serverRuntimeConfig` or `publicRuntimeConfig` options](/docs/pages/api-reference/next-config-js/runtime-configuration) are being used, the values will be specific to values at build time.
+> - `next.config.js` is read during `next build` and serialized into the `server.js` output file. If the legacy [`serverRuntimeConfig` or `publicRuntimeConfig` options](/docs/pages/api-reference/config/next-config-js/runtime-configuration) are being used, the values will be specific to values at build time.
 > - If your project needs to listen to a specific port or hostname, you can define `PORT` or `HOSTNAME` environment variables before running `server.js`. For example, run `PORT=8080 HOSTNAME=0.0.0.0 node server.js` to start the server on `http://0.0.0.0:8080`.
 
 </PagesOnly>
diff --git a/docs/01-app/03-api-reference/05-next-config-js/pageExtensions.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/pageExtensions.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/pageExtensions.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/pageExtensions.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/poweredByHeader.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/poweredByHeader.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/poweredByHeader.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/poweredByHeader.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/ppr.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/ppr.mdx
similarity index 90%
rename from docs/01-app/03-api-reference/05-next-config-js/ppr.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/ppr.mdx
index 7a276eb1f2e5e..6b804ca59e8b4 100644
--- a/docs/01-app/03-api-reference/05-next-config-js/ppr.mdx
+++ b/docs/01-app/03-api-reference/05-config/01-next-config-js/ppr.mdx
@@ -14,7 +14,7 @@ Partial Prerendering (PPR) enables you to combine static and dynamic components
 
 ### Incremental Adoption (Version 15)
 
-In Next.js 15, you can incrementally adopt Partial Prerendering in [layouts](/docs/app/building-your-application/routing/layouts-and-templates) and [pages](/docs/app/building-your-application/routing/pages) by setting the [`ppr`](/docs/app/api-reference/next-config-js/ppr) option in `next.config.js` to `incremental`, and exporting the `experimental_ppr` [route config option](/docs/app/api-reference/file-conventions/route-segment-config) at the top of the file:
+In Next.js 15, you can incrementally adopt Partial Prerendering in [layouts](/docs/app/building-your-application/routing/layouts-and-templates) and [pages](/docs/app/building-your-application/routing/pages) by setting the [`ppr`](/docs/app/api-reference/config/next-config-js/ppr) option in `next.config.js` to `incremental`, and exporting the `experimental_ppr` [route config option](/docs/app/api-reference/file-conventions/route-segment-config) at the top of the file:
 
 ```ts filename="next.config.ts" switcher
 import type { NextConfig } from 'next'
diff --git a/docs/01-app/03-api-reference/05-next-config-js/productionBrowserSourceMaps.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/productionBrowserSourceMaps.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/productionBrowserSourceMaps.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/productionBrowserSourceMaps.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/reactCompiler.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/reactCompiler.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/reactCompiler.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/reactCompiler.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/reactMaxHeadersLength.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/reactMaxHeadersLength.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/reactMaxHeadersLength.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/reactMaxHeadersLength.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/reactStrictMode.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/reactStrictMode.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/reactStrictMode.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/reactStrictMode.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/redirects.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/redirects.mdx
similarity index 97%
rename from docs/01-app/03-api-reference/05-next-config-js/redirects.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/redirects.mdx
index d8c4fc6c5880e..fe073f949364a 100644
--- a/docs/01-app/03-api-reference/05-next-config-js/redirects.mdx
+++ b/docs/01-app/03-api-reference/05-config/01-next-config-js/redirects.mdx
@@ -219,7 +219,7 @@ module.exports = {
 
 ### Redirects with basePath support
 
-When leveraging [`basePath` support](/docs/app/api-reference/next-config-js/basePath) with redirects each `source` and `destination` is automatically prefixed with the `basePath` unless you add `basePath: false` to the redirect:
+When leveraging [`basePath` support](/docs/app/api-reference/config/next-config-js/basePath) with redirects each `source` and `destination` is automatically prefixed with the `basePath` unless you add `basePath: false` to the redirect:
 
 ```js filename="next.config.js"
 module.exports = {
diff --git a/docs/01-app/03-api-reference/05-next-config-js/rewrites.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/rewrites.mdx
similarity index 94%
rename from docs/01-app/03-api-reference/05-next-config-js/rewrites.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/rewrites.mdx
index 786a5611a03d1..5d49b63b0f162 100644
--- a/docs/01-app/03-api-reference/05-next-config-js/rewrites.mdx
+++ b/docs/01-app/03-api-reference/05-config/01-next-config-js/rewrites.mdx
@@ -9,13 +9,13 @@ Rewrites allow you to map an incoming request path to a different destination pa
 
 <AppOnly>
 
-Rewrites act as a URL proxy and mask the destination path, making it appear the user hasn't changed their location on the site. In contrast, [redirects](/docs/app/api-reference/next-config-js/redirects) will reroute to a new page and show the URL changes.
+Rewrites act as a URL proxy and mask the destination path, making it appear the user hasn't changed their location on the site. In contrast, [redirects](/docs/app/api-reference/config/next-config-js/redirects) will reroute to a new page and show the URL changes.
 
 </AppOnly>
 
 <PagesOnly>
 
-Rewrites act as a URL proxy and mask the destination path, making it appear the user hasn't changed their location on the site. In contrast, [redirects](/docs/pages/api-reference/next-config-js/redirects) will reroute to a new page and show the URL changes.
+Rewrites act as a URL proxy and mask the destination path, making it appear the user hasn't changed their location on the site. In contrast, [redirects](/docs/pages/api-reference/config/next-config-js/redirects) will reroute to a new page and show the URL changes.
 
 </PagesOnly>
 
@@ -88,8 +88,8 @@ The order Next.js routes are checked is:
 
 <AppOnly>
 
-1. [headers](/docs/app/api-reference/next-config-js/headers) are checked/applied
-2. [redirects](/docs/app/api-reference/next-config-js/redirects) are checked/applied
+1. [headers](/docs/app/api-reference/config/next-config-js/headers) are checked/applied
+2. [redirects](/docs/app/api-reference/config/next-config-js/redirects) are checked/applied
 3. `beforeFiles` rewrites are checked/applied
 4. static files from the [public directory](/docs/app/building-your-application/optimizing/static-assets), `_next/static` files, and non-dynamic pages are checked/served
 5. `afterFiles` rewrites are checked/applied, if one of these rewrites is matched we check dynamic routes/static files after each match
@@ -99,8 +99,8 @@ The order Next.js routes are checked is:
 
 <PagesOnly>
 
-1. [headers](/docs/pages/api-reference/next-config-js/headers) are checked/applied
-2. [redirects](/docs/pages/api-reference/next-config-js/redirects) are checked/applied
+1. [headers](/docs/pages/api-reference/config/next-config-js/headers) are checked/applied
+2. [redirects](/docs/pages/api-reference/config/next-config-js/redirects) are checked/applied
 3. `beforeFiles` rewrites are checked/applied
 4. static files from the [public directory](/docs/pages/building-your-application/optimizing/static-assets), `_next/static` files, and non-dynamic pages are checked/served
 5. `afterFiles` rewrites are checked/applied, if one of these rewrites is matched we check dynamic routes/static files after each match
@@ -388,7 +388,7 @@ module.exports = {
 
 ### Rewrites with basePath support
 
-When leveraging [`basePath` support](/docs/app/api-reference/next-config-js/basePath) with rewrites each `source` and `destination` is automatically prefixed with the `basePath` unless you add `basePath: false` to the rewrite:
+When leveraging [`basePath` support](/docs/app/api-reference/config/next-config-js/basePath) with rewrites each `source` and `destination` is automatically prefixed with the `basePath` unless you add `basePath: false` to the rewrite:
 
 ```js filename="next.config.js"
 module.exports = {
diff --git a/docs/01-app/03-api-reference/05-next-config-js/sassOptions.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/sassOptions.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/sassOptions.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/sassOptions.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/serverActions.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/serverActions.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/serverActions.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/serverActions.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/serverComponentsHmrCache.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/serverComponentsHmrCache.mdx
similarity index 89%
rename from docs/01-app/03-api-reference/05-next-config-js/serverComponentsHmrCache.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/serverComponentsHmrCache.mdx
index 72a13fef95788..ea9594f0fedbc 100644
--- a/docs/01-app/03-api-reference/05-next-config-js/serverComponentsHmrCache.mdx
+++ b/docs/01-app/03-api-reference/05-config/01-next-config-js/serverComponentsHmrCache.mdx
@@ -33,4 +33,4 @@ const nextConfig = {
 module.exports = nextConfig
 ```
 
-> **Good to know:** For better observability, we recommend using the [`logging.fetches`](/docs/app/api-reference/next-config-js/logging) option which logs fetch cache hits and misses in the console during development.
+> **Good to know:** For better observability, we recommend using the [`logging.fetches`](/docs/app/api-reference/config/next-config-js/logging) option which logs fetch cache hits and misses in the console during development.
diff --git a/docs/01-app/03-api-reference/05-next-config-js/serverExternalPackages.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/serverExternalPackages.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/serverExternalPackages.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/serverExternalPackages.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/staleTimes.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/staleTimes.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/staleTimes.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/staleTimes.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/staticGeneration.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/staticGeneration.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/staticGeneration.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/staticGeneration.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/trailingSlash.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/trailingSlash.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/trailingSlash.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/trailingSlash.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/transpilePackages.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/transpilePackages.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/transpilePackages.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/transpilePackages.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/turbo.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/turbo.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/turbo.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/turbo.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/typedRoutes.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/typedRoutes.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/typedRoutes.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/typedRoutes.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/typescript.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/typescript.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/typescript.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/typescript.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/urlImports.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/urlImports.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/urlImports.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/urlImports.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/useLightningcss.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/useLightningcss.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/useLightningcss.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/useLightningcss.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/webVitalsAttribution.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/webVitalsAttribution.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/webVitalsAttribution.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/webVitalsAttribution.mdx
diff --git a/docs/01-app/03-api-reference/05-next-config-js/webpack.mdx b/docs/01-app/03-api-reference/05-config/01-next-config-js/webpack.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/05-next-config-js/webpack.mdx
rename to docs/01-app/03-api-reference/05-config/01-next-config-js/webpack.mdx
diff --git a/docs/01-app/03-api-reference/06-config/01-typescript.mdx b/docs/01-app/03-api-reference/05-config/02-typescript.mdx
similarity index 98%
rename from docs/01-app/03-api-reference/06-config/01-typescript.mdx
rename to docs/01-app/03-api-reference/05-config/02-typescript.mdx
index 4caa0b3565200..d38fa56224de4 100644
--- a/docs/01-app/03-api-reference/06-config/01-typescript.mdx
+++ b/docs/01-app/03-api-reference/05-config/02-typescript.mdx
@@ -72,7 +72,7 @@ For _complete_ end-to-end type safety, this also requires your database or conte
 
 </AppOnly>
 
-## Examples
+## Examples
 
 ### Type checking `next.config.ts`
 
@@ -160,7 +160,7 @@ function Card<T extends string>({ href }: { href: Route<T> | URL }) {
 >
 > When running `next dev` or `next build`, Next.js generates a hidden `.d.ts` file inside `.next` that contains information about all existing routes in your application (all valid routes as the `href` type of `Link`). This `.d.ts` file is included in `tsconfig.json` and the TypeScript compiler will check that `.d.ts` and provide feedback in your editor about invalid links.
 
-## With Async Server Componens
+### With Async Server Componens
 
 To use an `async` Server Component with TypeScript, ensure you are using TypeScript `5.1.3` or higher and `@types/react` `18.2.8` or higher.
 
@@ -170,7 +170,7 @@ If you are using an older version of TypeScript, you may see a `'Promise<Element
 
 <PagesOnly>
 
-## Static Generation and Server-side Rendering
+### Static Generation and Server-side Rendering
 
 For [`getStaticProps`](/docs/pages/api-reference/functions/get-static-props), [`getStaticPaths`](/docs/pages/api-reference/functions/get-static-paths), and [`getServerSideProps`](/docs/pages/api-reference/functions/get-server-side-props), you can use the `GetStaticProps`, `GetStaticPaths`, and `GetServerSideProps` types respectively:
 
@@ -192,7 +192,7 @@ export const getServerSideProps = (async (context) => {
 
 > **Good to know:** `satisfies` was added to TypeScript in [4.9](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-4-9.html). We recommend upgrading to the latest version of TypeScript.
 
-## With API Routes
+### With API Routes
 
 The following is an example of how to use the built-in types for API routes:
 
@@ -221,7 +221,7 @@ export default function handler(
 }
 ```
 
-## With custom `App`
+### With custom `App`
 
 If you have a [custom `App`](/docs/pages/building-your-application/routing/custom-app), you can use the built-in type `AppProps` and change file name to `./pages/_app.tsx` like so:
 
@@ -235,11 +235,11 @@ export default function MyApp({ Component, pageProps }: AppProps) {
 
 </PagesOnly>
 
-## Incremental type checking
+### Incremental type checking
 
 Since `v10.2.1` Next.js supports [incremental type checking](https://www.typescriptlang.org/tsconfig#incremental) when enabled in your `tsconfig.json`, this can help speed up type checking in larger applications.
 
-## Disabling TypeScript errors in production
+### Disabling TypeScript errors in production
 
 Next.js fails your **production build** (`next build`) when TypeScript errors are present in your project.
 
@@ -267,7 +267,7 @@ export default nextConfig
 
 > **Good to know**: You can run `tsc --noEmit` to check for TypeScript errors yourself before building. This is useful for CI/CD pipelines where you'd like to check for TypeScript errors before deploying.
 
-## Custom type declarations
+### Custom type declarations
 
 When you need to declare custom types, you might be tempted to modify `next-env.d.ts`. However, this file is automatically generated, so any changes you make will be overwritten. Instead, you should create a new file, let's call it `new-types.d.ts`, and reference it in your `tsconfig.json`:
 
diff --git a/docs/01-app/03-api-reference/06-config/02-eslint.mdx b/docs/01-app/03-api-reference/05-config/03-eslint.mdx
similarity index 98%
rename from docs/01-app/03-api-reference/06-config/02-eslint.mdx
rename to docs/01-app/03-api-reference/05-config/03-eslint.mdx
index 6ab007c801b33..ae8bc2d9766ae 100644
--- a/docs/01-app/03-api-reference/06-config/02-eslint.mdx
+++ b/docs/01-app/03-api-reference/05-config/03-eslint.mdx
@@ -87,7 +87,7 @@ If you're using `eslint-plugin-next` in a project where Next.js isn't installed
 
 ### Disabling the cache
 
-To improve performance, information of files processed by ESLint are cached by default. This is stored in `.next/cache` or in your defined [build directory](/docs/app/api-reference/next-config-js/distDir). If you include any ESLint rules that depend on more than the contents of a single source file and need to disable the cache, use the `--no-cache` flag with `next lint`.
+To improve performance, information of files processed by ESLint are cached by default. This is stored in `.next/cache` or in your defined [build directory](/docs/app/api-reference/config/next-config-js/distDir). If you include any ESLint rules that depend on more than the contents of a single source file and need to disable the cache, use the `--no-cache` flag with `next lint`.
 
 ```bash filename="Terminal"
 next lint --no-cache
diff --git a/docs/01-app/03-api-reference/05-config/index.mdx b/docs/01-app/03-api-reference/05-config/index.mdx
new file mode 100644
index 0000000000000..e80f5d3532ac0
--- /dev/null
+++ b/docs/01-app/03-api-reference/05-config/index.mdx
@@ -0,0 +1,4 @@
+---
+title: Configuration
+description: Learn how to configure Next.js applications.
+---
diff --git a/docs/01-app/03-api-reference/07-cli/create-next-app.mdx b/docs/01-app/03-api-reference/06-cli/create-next-app.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/07-cli/create-next-app.mdx
rename to docs/01-app/03-api-reference/06-cli/create-next-app.mdx
diff --git a/docs/01-app/03-api-reference/07-cli/index.mdx b/docs/01-app/03-api-reference/06-cli/index.mdx
similarity index 100%
rename from docs/01-app/03-api-reference/07-cli/index.mdx
rename to docs/01-app/03-api-reference/06-cli/index.mdx
diff --git a/docs/01-app/03-api-reference/07-cli/next.mdx b/docs/01-app/03-api-reference/06-cli/next.mdx
similarity index 99%
rename from docs/01-app/03-api-reference/07-cli/next.mdx
rename to docs/01-app/03-api-reference/06-cli/next.mdx
index cf25a2678c933..16b390013d40d 100644
--- a/docs/01-app/03-api-reference/07-cli/next.mdx
+++ b/docs/01-app/03-api-reference/06-cli/next.mdx
@@ -70,7 +70,7 @@ Route (app)                              Size     First Load JS
 - **Size**: The size of assets downloaded when navigating to the page client-side. The size for each route only includes its dependencies.
 - **First Load JS**: The size of assets downloaded when visiting the page from the server. The amount of JS shared by all is shown as a separate metric.
 
-Both of these values are [**compressed with gzip**](/docs/app/api-reference/next-config-js/compress). The first load is indicated by green, yellow, or red. Aim for green for performant applications.
+Both of these values are [**compressed with gzip**](/docs/app/api-reference/config/next-config-js/compress). The first load is indicated by green, yellow, or red. Aim for green for performant applications.
 
 The following options are available for the `next build` command:
 
diff --git a/docs/02-pages/02-building-your-application/01-routing/07-api-routes.mdx b/docs/02-pages/02-building-your-application/01-routing/07-api-routes.mdx
index f16ee65190f74..1595f4a452d1e 100644
--- a/docs/02-pages/02-building-your-application/01-routing/07-api-routes.mdx
+++ b/docs/02-pages/02-building-your-application/01-routing/07-api-routes.mdx
@@ -47,7 +47,7 @@ export default function handler(req, res) {
 > - API Routes [do not specify CORS headers](https://developer.mozilla.org/docs/Web/HTTP/CORS), meaning they are **same-origin only** by default. You can customize such behavior by wrapping the request handler with the [CORS request helpers](https://github.com/vercel/next.js/tree/canary/examples/api-routes-cors).
 
 - API Routes can't be used with [static exports](/docs/pages/building-your-application/deploying/static-exports). However, [Route Handlers](/docs/app/building-your-application/routing/route-handlers) in the App Router can.
-  > - API Routes will be affected by [`pageExtensions` configuration](/docs/pages/api-reference/next-config-js/pageExtensions) in `next.config.js`.
+  > - API Routes will be affected by [`pageExtensions` configuration](/docs/pages/api-reference/config/next-config-js/pageExtensions) in `next.config.js`.
 
 ## Parameters
 
diff --git a/docs/02-pages/02-building-your-application/02-rendering/04-automatic-static-optimization.mdx b/docs/02-pages/02-building-your-application/02-rendering/04-automatic-static-optimization.mdx
index 09520d91785ff..257905a59a4b0 100644
--- a/docs/02-pages/02-building-your-application/02-rendering/04-automatic-static-optimization.mdx
+++ b/docs/02-pages/02-building-your-application/02-rendering/04-automatic-static-optimization.mdx
@@ -23,7 +23,7 @@ The cases where the query will be updated after hydration triggering another ren
 
 - The page is a [dynamic-route](/docs/pages/building-your-application/routing/dynamic-routes).
 - The page has query values in the URL.
-- [Rewrites](/docs/pages/api-reference/next-config-js/rewrites) are configured in your `next.config.js` since these can have parameters that may need to be parsed and provided in the `query`.
+- [Rewrites](/docs/pages/api-reference/config/next-config-js/rewrites) are configured in your `next.config.js` since these can have parameters that may need to be parsed and provided in the `query`.
 
 To be able to distinguish if the query is fully updated and ready for use, you can leverage the `isReady` field on [`next/router`](/docs/pages/api-reference/functions/use-router#router-object).
 
diff --git a/docs/02-pages/02-building-your-application/06-configuring/07-amp.mdx b/docs/02-pages/02-building-your-application/06-configuring/07-amp.mdx
index 07155ee025a68..b81b40a8be592 100644
--- a/docs/02-pages/02-building-your-application/06-configuring/07-amp.mdx
+++ b/docs/02-pages/02-building-your-application/06-configuring/07-amp.mdx
@@ -144,7 +144,7 @@ And the AMP version of your page will include a link to the HTML page:
 <link rel="canonical" href="/about" />
 ```
 
-When [`trailingSlash`](/docs/pages/api-reference/next-config-js/trailingSlash) is enabled the exported pages for `pages/about.js` would be:
+When [`trailingSlash`](/docs/pages/api-reference/config/next-config-js/trailingSlash) is enabled the exported pages for `pages/about.js` would be:
 
 - `out/about/index.html` - HTML page
 - `out/about.amp/index.html` - AMP page
diff --git a/docs/02-pages/02-building-your-application/10-upgrading/06-version-13.mdx b/docs/02-pages/02-building-your-application/10-upgrading/06-version-13.mdx
index f58193db64ad7..337008d8f26dc 100644
--- a/docs/02-pages/02-building-your-application/10-upgrading/06-version-13.mdx
+++ b/docs/02-pages/02-building-your-application/10-upgrading/06-version-13.mdx
@@ -33,7 +33,7 @@ bun add next@13 react@latest react-dom@latest eslint-config-next@13
 - The `swcMinify` configuration property was changed from `false` to `true`. See [Next.js Compiler](/docs/architecture/nextjs-compiler) for more info.
 - The `next/image` import was renamed to `next/legacy/image`. The `next/future/image` import was renamed to `next/image`. A [codemod is available](/docs/pages/building-your-application/upgrading/codemods#next-image-to-legacy-image) to safely and automatically rename your imports.
 - The `next/link` child can no longer be `<a>`. Add the `legacyBehavior` prop to use the legacy behavior or remove the `<a>` to upgrade. A [codemod is available](/docs/pages/building-your-application/upgrading/codemods#new-link) to automatically upgrade your code.
-- The `target` configuration property has been removed and superseded by [Output File Tracing](/docs/pages/api-reference/next-config-js/output).
+- The `target` configuration property has been removed and superseded by [Output File Tracing](/docs/pages/api-reference/config/next-config-js/output).
 
 ## Migrating shared features
 
diff --git a/docs/02-pages/02-building-your-application/10-upgrading/07-version-12.mdx b/docs/02-pages/02-building-your-application/10-upgrading/07-version-12.mdx
index 6a4bb67e2e716..7627474c258a0 100644
--- a/docs/02-pages/02-building-your-application/10-upgrading/07-version-12.mdx
+++ b/docs/02-pages/02-building-your-application/10-upgrading/07-version-12.mdx
@@ -149,4 +149,4 @@ The target option has been deprecated in favor of built-in support for tracing w
 
 During `next build`, Next.js will automatically trace each page and its dependencies to determine all of the files that are needed for deploying a production version of your application.
 
-If you are currently using the `target` option set to `serverless`, please read the [documentation on how to leverage the new output](/docs/pages/api-reference/next-config-js/output).
+If you are currently using the `target` option set to `serverless`, please read the [documentation on how to leverage the new output](/docs/pages/api-reference/config/next-config-js/output).
diff --git a/docs/02-pages/03-api-reference/01-components/image-legacy.mdx b/docs/02-pages/03-api-reference/01-components/image-legacy.mdx
index 9adb632cae93e..4299fb641da6c 100644
--- a/docs/02-pages/03-api-reference/01-components/image-legacy.mdx
+++ b/docs/02-pages/03-api-reference/01-components/image-legacy.mdx
@@ -555,7 +555,7 @@ module.exports = {
 
 The expiration (or rather Max Age) of the optimized image is defined by either the `minimumCacheTTL` or the upstream image `Cache-Control` header, whichever is larger.
 
-If you need to change the caching behavior per image, you can configure [`headers`](/docs/pages/api-reference/next-config-js/headers) to set the `Cache-Control` header on the upstream image (e.g. `/some-asset.jpg`, not `/_next/image` itself).
+If you need to change the caching behavior per image, you can configure [`headers`](/docs/pages/api-reference/config/next-config-js/headers) to set the `Cache-Control` header on the upstream image (e.g. `/some-asset.jpg`, not `/_next/image` itself).
 
 There is no mechanism to invalidate the cache at this time, so its best to keep `minimumCacheTTL` low. Otherwise you may need to manually change the [`src`](#src) prop or delete `<distDir>/cache/images`.
 
@@ -577,7 +577,7 @@ module.exports = {
 
 ### Dangerously Allow SVG
 
-The default [loader](#loader) does not optimize SVG images for a few reasons. First, SVG is a vector format meaning it can be resized losslessly. Second, SVG has many of the same features as HTML/CSS, which can lead to vulnerabilities without proper [Content Security Policy (CSP) headers](/docs/app/api-reference/next-config-js/headers#content-security-policy).
+The default [loader](#loader) does not optimize SVG images for a few reasons. First, SVG is a vector format meaning it can be resized losslessly. Second, SVG has many of the same features as HTML/CSS, which can lead to vulnerabilities without proper [Content Security Policy (CSP) headers](/docs/app/api-reference/config/next-config-js/headers#content-security-policy).
 
 Therefore, we recommended using the [`unoptimized`](#unoptimized) prop when the [`src`](#src) prop is known to be SVG. This happens automatically when `src` ends with `".svg"`.
 
diff --git a/docs/02-pages/03-api-reference/03-functions/get-static-props.mdx b/docs/02-pages/03-api-reference/03-functions/get-static-props.mdx
index 413f482dc619f..5f0a40d6e6966 100644
--- a/docs/02-pages/03-api-reference/03-functions/get-static-props.mdx
+++ b/docs/02-pages/03-api-reference/03-functions/get-static-props.mdx
@@ -155,7 +155,7 @@ export async function getStaticProps(context) {
 }
 ```
 
-If the redirects are known at build-time, they should be added in [`next.config.js`](/docs/pages/api-reference/next-config-js/redirects) instead.
+If the redirects are known at build-time, they should be added in [`next.config.js`](/docs/pages/api-reference/config/next-config-js/redirects) instead.
 
 ## Reading files: Use `process.cwd()`
 
diff --git a/docs/02-pages/03-api-reference/03-functions/use-router.mdx b/docs/02-pages/03-api-reference/03-functions/use-router.mdx
index 296165ff11954..d356604daee67 100644
--- a/docs/02-pages/03-api-reference/03-functions/use-router.mdx
+++ b/docs/02-pages/03-api-reference/03-functions/use-router.mdx
@@ -40,7 +40,7 @@ The following is the definition of the `router` object returned by both [`useRou
 - `query`: `Object` - The query string parsed to an object, including [dynamic route](/docs/pages/building-your-application/routing/dynamic-routes) parameters. It will be an empty object during prerendering if the page doesn't use [Server-side Rendering](/docs/pages/building-your-application/data-fetching/get-server-side-props). Defaults to `{}`
 - `asPath`: `String` - The path as shown in the browser including the search params and respecting the `trailingSlash` configuration. `basePath` and `locale` are not included.
 - `isFallback`: `boolean` - Whether the current page is in [fallback mode](/docs/pages/api-reference/functions/get-static-paths#fallback-true).
-- `basePath`: `String` - The active [basePath](/docs/app/api-reference/next-config-js/basePath) (if enabled).
+- `basePath`: `String` - The active [basePath](/docs/app/api-reference/config/next-config-js/basePath) (if enabled).
 - `locale`: `String` - The active locale (if enabled).
 - `locales`: `String[]` - All supported locales (if enabled).
 - `defaultLocale`: `String` - The current default locale (if enabled).
@@ -363,7 +363,7 @@ You can listen to different events happening inside the Next.js Router. Here's a
 - `hashChangeStart(url, { shallow })` - Fires when the hash will change but not the page
 - `hashChangeComplete(url, { shallow })` - Fires when the hash has changed but not the page
 
-> **Good to know**: Here `url` is the URL shown in the browser, including the [`basePath`](/docs/app/api-reference/next-config-js/basePath).
+> **Good to know**: Here `url` is the URL shown in the browser, including the [`basePath`](/docs/app/api-reference/config/next-config-js/basePath).
 
 For example, to listen to the router event `routeChangeStart`, open or create `pages/_app.js` and subscribe to the event, like so:
 
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/assetPrefix.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/assetPrefix.mdx
similarity index 87%
rename from docs/02-pages/03-api-reference/04-next-config-js/assetPrefix.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/assetPrefix.mdx
index 26bc90f1f36bb..7bbb797784b71 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/assetPrefix.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/assetPrefix.mdx
@@ -1,7 +1,7 @@
 ---
 title: assetPrefix
 description: Learn how to use the assetPrefix config option to configure your CDN.
-source: app/api-reference/next-config-js/assetPrefix
+source: app/api-reference/config/next-config-js/assetPrefix
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/basePath.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/basePath.mdx
similarity index 88%
rename from docs/02-pages/03-api-reference/04-next-config-js/basePath.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/basePath.mdx
index 7438af94001d4..3e01cef656f09 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/basePath.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/basePath.mdx
@@ -1,7 +1,7 @@
 ---
 title: basePath
 description: Use `basePath` to deploy a Next.js application under a sub-path of a domain.
-source: app/api-reference/next-config-js/basePath
+source: app/api-reference/config/next-config-js/basePath
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/bundlePagesRouterDependencies.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/bundlePagesRouterDependencies.mdx
similarity index 88%
rename from docs/02-pages/03-api-reference/04-next-config-js/bundlePagesRouterDependencies.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/bundlePagesRouterDependencies.mdx
index 1dd936986dffc..e8448f2ba07a7 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/bundlePagesRouterDependencies.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/bundlePagesRouterDependencies.mdx
@@ -14,7 +14,7 @@ const nextConfig = {
 module.exports = nextConfig
 ```
 
-Explicitly opt-out certain packages from being bundled using the [`serverExternalPackages`](/docs/pages/api-reference/next-config-js/serverExternalPackages) option.
+Explicitly opt-out certain packages from being bundled using the [`serverExternalPackages`](/docs/pages/api-reference/config/next-config-js/serverExternalPackages) option.
 
 ## Version History
 
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/compress.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/compress.mdx
similarity index 89%
rename from docs/02-pages/03-api-reference/04-next-config-js/compress.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/compress.mdx
index 37a0e351eaf7e..f3f9653e3d54f 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/compress.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/compress.mdx
@@ -1,7 +1,7 @@
 ---
 title: compress
 description: Next.js provides gzip compression to compress rendered content and static files, it only works with the server target. Learn more about it here.
-source: app/api-reference/next-config-js/compress
+source: app/api-reference/config/next-config-js/compress
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/crossOrigin.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/crossOrigin.mdx
similarity index 87%
rename from docs/02-pages/03-api-reference/04-next-config-js/crossOrigin.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/crossOrigin.mdx
index 90a197f00f909..f966da8dd4038 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/crossOrigin.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/crossOrigin.mdx
@@ -1,7 +1,7 @@
 ---
 title: crossOrigin
 description: Use the `crossOrigin` option to add a crossOrigin tag on the `script` tags generated by `next/script` and `next/head`.
-source: app/api-reference/next-config-js/crossOrigin
+source: app/api-reference/config/next-config-js/crossOrigin
 ---
 
 {/* The content of this doc is shared between the app and pages router. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/devIndicators.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/devIndicators.mdx
similarity index 88%
rename from docs/02-pages/03-api-reference/04-next-config-js/devIndicators.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/devIndicators.mdx
index f240e771d226f..6bd1cab65866c 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/devIndicators.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/devIndicators.mdx
@@ -1,7 +1,7 @@
 ---
 title: devIndicators
 description: Optimized pages include an indicator to let you know if it's being statically optimized. You can opt-out of it here.
-source: app/api-reference/next-config-js/devIndicators
+source: app/api-reference/config/next-config-js/devIndicators
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/distDir.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/distDir.mdx
similarity index 88%
rename from docs/02-pages/03-api-reference/04-next-config-js/distDir.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/distDir.mdx
index 98cb261ab975e..a137fcc495b06 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/distDir.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/distDir.mdx
@@ -1,7 +1,7 @@
 ---
 title: distDir
 description: Set a custom build directory to use instead of the default .next directory.
-source: app/api-reference/next-config-js/distDir
+source: app/api-reference/config/next-config-js/distDir
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/env.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/env.mdx
similarity index 89%
rename from docs/02-pages/03-api-reference/04-next-config-js/env.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/env.mdx
index 9b4203fb3e056..fc153936a3ec9 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/env.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/env.mdx
@@ -1,7 +1,7 @@
 ---
 title: env
 description: Learn to add and access environment variables in your Next.js application at build time.
-source: app/api-reference/next-config-js/env
+source: app/api-reference/config/next-config-js/env
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/eslint.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/eslint.mdx
similarity index 89%
rename from docs/02-pages/03-api-reference/04-next-config-js/eslint.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/eslint.mdx
index 06557b3c724d6..0c8d6f6d104cf 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/eslint.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/eslint.mdx
@@ -1,7 +1,7 @@
 ---
 title: eslint
 description: Next.js reports ESLint errors and warnings during builds by default. Learn how to opt-out of this behavior here.
-source: app/api-reference/next-config-js/eslint
+source: app/api-reference/config/next-config-js/eslint
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/exportPathMap.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/exportPathMap.mdx
similarity index 87%
rename from docs/02-pages/03-api-reference/04-next-config-js/exportPathMap.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/exportPathMap.mdx
index 045bc265b851d..5e9f97f1e1af1 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/exportPathMap.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/exportPathMap.mdx
@@ -1,7 +1,7 @@
 ---
 title: exportPathMap
 description: Customize the pages that will be exported as HTML files when using `next export`.
-source: app/api-reference/next-config-js/exportPathMap
+source: app/api-reference/config/next-config-js/exportPathMap
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/generateBuildId.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/generateBuildId.mdx
similarity index 88%
rename from docs/02-pages/03-api-reference/04-next-config-js/generateBuildId.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/generateBuildId.mdx
index 79a31d9a9de83..43a8996593196 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/generateBuildId.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/generateBuildId.mdx
@@ -1,7 +1,7 @@
 ---
 title: generateBuildId
 description: Configure the build id, which is used to identify the current build in which your application is being served.
-source: app/api-reference/next-config-js/generateBuildId
+source: app/api-reference/config/next-config-js/generateBuildId
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/generateEtags.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/generateEtags.mdx
similarity index 88%
rename from docs/02-pages/03-api-reference/04-next-config-js/generateEtags.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/generateEtags.mdx
index 987c8ce3a1aeb..d42aee381314d 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/generateEtags.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/generateEtags.mdx
@@ -1,7 +1,7 @@
 ---
 title: generateEtags
 description: Next.js will generate etags for every page by default. Learn more about how to disable etag generation here.
-source: app/api-reference/next-config-js/generateEtags
+source: app/api-reference/config/next-config-js/generateEtags
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/headers.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/headers.mdx
similarity index 87%
rename from docs/02-pages/03-api-reference/04-next-config-js/headers.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/headers.mdx
index 40acf46735bbe..c5dbc9e0ed448 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/headers.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/headers.mdx
@@ -1,7 +1,7 @@
 ---
 title: headers
 description: Add custom HTTP headers to your Next.js app.
-source: app/api-reference/next-config-js/headers
+source: app/api-reference/config/next-config-js/headers
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/httpAgentOptions.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/httpAgentOptions.mdx
similarity index 88%
rename from docs/02-pages/03-api-reference/04-next-config-js/httpAgentOptions.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/httpAgentOptions.mdx
index a795c97189f1c..ce0834850c54f 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/httpAgentOptions.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/httpAgentOptions.mdx
@@ -1,7 +1,7 @@
 ---
 title: httpAgentOptions
 description: Next.js will automatically use HTTP Keep-Alive by default. Learn more about how to disable HTTP Keep-Alive here.
-source: app/api-reference/next-config-js/httpAgentOptions
+source: app/api-reference/config/next-config-js/httpAgentOptions
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/images.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/images.mdx
similarity index 88%
rename from docs/02-pages/03-api-reference/04-next-config-js/images.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/images.mdx
index 579a32e783c7c..691ab3204c7a2 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/images.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/images.mdx
@@ -1,7 +1,7 @@
 ---
 title: images
 description: Custom configuration for the next/image loader
-source: app/api-reference/next-config-js/images
+source: app/api-reference/config/next-config-js/images
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/index.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/index.mdx
similarity index 90%
rename from docs/02-pages/03-api-reference/04-next-config-js/index.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/index.mdx
index f40cffd16f07c..c157a5d4ccea3 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/index.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/index.mdx
@@ -1,7 +1,7 @@
 ---
 title: next.config.js Options
 description: Learn about the options available in next.config.js for the Pages Router.
-source: app/api-reference/next-config-js
+source: app/api-reference/config/next-config-js
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/onDemandEntries.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/onDemandEntries.mdx
similarity index 87%
rename from docs/02-pages/03-api-reference/04-next-config-js/onDemandEntries.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/onDemandEntries.mdx
index f163090511798..88d8a0a220d10 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/onDemandEntries.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/onDemandEntries.mdx
@@ -1,7 +1,7 @@
 ---
 title: onDemandEntries
 description: Configure how Next.js will dispose and keep in memory pages created in development.
-source: app/api-reference/next-config-js/onDemandEntries
+source: app/api-reference/config/next-config-js/onDemandEntries
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/optimizePackageImports.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/optimizePackageImports.mdx
similarity index 86%
rename from docs/02-pages/03-api-reference/04-next-config-js/optimizePackageImports.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/optimizePackageImports.mdx
index ba2785f70a37a..6be6bc74817dd 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/optimizePackageImports.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/optimizePackageImports.mdx
@@ -1,7 +1,7 @@
 ---
 title: optimizePackageImports
 description: API Reference for optimizePackageImports Next.js Config Option
-source: app/api-reference/next-config-js/optimizePackageImports
+source: app/api-reference/config/next-config-js/optimizePackageImports
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/output.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/output.mdx
similarity index 90%
rename from docs/02-pages/03-api-reference/04-next-config-js/output.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/output.mdx
index 4c6a5e4a03efc..9e60593a90f1c 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/output.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/output.mdx
@@ -1,7 +1,7 @@
 ---
 title: output
 description: Next.js automatically traces which files are needed by each page to allow for easy deployment of your application. Learn how it works here.
-source: app/api-reference/next-config-js/output
+source: app/api-reference/config/next-config-js/output
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/pageExtensions.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/pageExtensions.mdx
similarity index 88%
rename from docs/02-pages/03-api-reference/04-next-config-js/pageExtensions.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/pageExtensions.mdx
index 29d1d513b36fb..747178da4e9ec 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/pageExtensions.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/pageExtensions.mdx
@@ -1,7 +1,7 @@
 ---
 title: pageExtensions
 description: Extend the default page extensions used by Next.js when resolving pages in the Pages Router.
-source: app/api-reference/next-config-js/pageExtensions
+source: app/api-reference/config/next-config-js/pageExtensions
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/poweredByHeader.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/poweredByHeader.mdx
similarity index 87%
rename from docs/02-pages/03-api-reference/04-next-config-js/poweredByHeader.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/poweredByHeader.mdx
index 3604b44229e69..914b3ccab23c3 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/poweredByHeader.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/poweredByHeader.mdx
@@ -1,7 +1,7 @@
 ---
 title: poweredByHeader
 description: Next.js will add the `x-powered-by` header by default. Learn to opt-out of it here.
-source: app/api-reference/next-config-js/poweredByHeader
+source: app/api-reference/config/next-config-js/poweredByHeader
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/productionBrowserSourceMaps.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/productionBrowserSourceMaps.mdx
similarity index 85%
rename from docs/02-pages/03-api-reference/04-next-config-js/productionBrowserSourceMaps.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/productionBrowserSourceMaps.mdx
index ccd261b9a2735..51b11cd366be6 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/productionBrowserSourceMaps.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/productionBrowserSourceMaps.mdx
@@ -1,7 +1,7 @@
 ---
 title: productionBrowserSourceMaps
 description: Enables browser source map generation during the production build.
-source: app/api-reference/next-config-js/productionBrowserSourceMaps
+source: app/api-reference/config/next-config-js/productionBrowserSourceMaps
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/reactStrictMode.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/reactStrictMode.mdx
similarity index 87%
rename from docs/02-pages/03-api-reference/04-next-config-js/reactStrictMode.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/reactStrictMode.mdx
index 5dce38239222a..97de1c86dab88 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/reactStrictMode.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/reactStrictMode.mdx
@@ -1,7 +1,7 @@
 ---
 title: reactStrictMode
 description: The complete Next.js runtime is now Strict Mode-compliant, learn how to opt-in
-source: app/api-reference/next-config-js/reactStrictMode
+source: app/api-reference/config/next-config-js/reactStrictMode
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/redirects.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/redirects.mdx
similarity index 87%
rename from docs/02-pages/03-api-reference/04-next-config-js/redirects.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/redirects.mdx
index 53662dc5c796d..45e28d9863200 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/redirects.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/redirects.mdx
@@ -1,7 +1,7 @@
 ---
 title: redirects
 description: Add redirects to your Next.js app.
-source: app/api-reference/next-config-js/redirects
+source: app/api-reference/config/next-config-js/redirects
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/rewrites.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/rewrites.mdx
similarity index 87%
rename from docs/02-pages/03-api-reference/04-next-config-js/rewrites.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/rewrites.mdx
index 58830f7982a22..ef8c388c5f90b 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/rewrites.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/rewrites.mdx
@@ -1,7 +1,7 @@
 ---
 title: rewrites
 description: Add rewrites to your Next.js app.
-source: app/api-reference/next-config-js/rewrites
+source: app/api-reference/config/next-config-js/rewrites
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/runtime-configuration.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/runtime-configuration.mdx
similarity index 93%
rename from docs/02-pages/03-api-reference/04-next-config-js/runtime-configuration.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/runtime-configuration.mdx
index e9b0e87f1fd8b..1c40279c8e377 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/runtime-configuration.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/runtime-configuration.mdx
@@ -7,7 +7,7 @@ description: Add client and server runtime configuration to your Next.js app.
 >
 > - **This feature is deprecated.** We recommend using [environment variables](/docs/pages/building-your-application/configuring/environment-variables) instead, which also can support reading runtime values.
 > - You can run code on server startup using the [`register` function](/docs/app/building-your-application/optimizing/instrumentation).
-> - This feature does not work with [Automatic Static Optimization](/docs/pages/building-your-application/rendering/automatic-static-optimization), [Output File Tracing](/docs/pages/api-reference/next-config-js/output#automatically-copying-traced-files), or [React Server Components](/docs/app/building-your-application/rendering/server-components).
+> - This feature does not work with [Automatic Static Optimization](/docs/pages/building-your-application/rendering/automatic-static-optimization), [Output File Tracing](/docs/pages/api-reference/config/next-config-js/output#automatically-copying-traced-files), or [React Server Components](/docs/app/building-your-application/rendering/server-components).
 
 To add runtime configuration to your app, open `next.config.js` and add the `publicRuntimeConfig` and `serverRuntimeConfig` configs:
 
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/serverExternalPackages.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/serverExternalPackages.mdx
similarity index 95%
rename from docs/02-pages/03-api-reference/04-next-config-js/serverExternalPackages.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/serverExternalPackages.mdx
index 005878f6c4f5e..30a0912bc34e6 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/serverExternalPackages.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/serverExternalPackages.mdx
@@ -3,7 +3,7 @@ title: serverExternalPackages
 description: Opt-out specific dependencies from the dependency bundling enabled by `bundlePagesRouterDependencies`.
 ---
 
-Opt-out specific dependencies from being included in the automatic bundling of the [`bundlePagesRouterDependencies`](/docs/pages/api-reference/next-config-js/bundlePagesRouterDependencies) option.
+Opt-out specific dependencies from being included in the automatic bundling of the [`bundlePagesRouterDependencies`](/docs/pages/api-reference/config/next-config-js/bundlePagesRouterDependencies) option.
 
 These pages will then use native Node.js `require` to resolve the dependency.
 
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/trailingSlash.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/trailingSlash.mdx
similarity index 87%
rename from docs/02-pages/03-api-reference/04-next-config-js/trailingSlash.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/trailingSlash.mdx
index 3967089e7f92d..4e272ce94c9c3 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/trailingSlash.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/trailingSlash.mdx
@@ -1,7 +1,7 @@
 ---
 title: trailingSlash
 description: Configure Next.js pages to resolve with or without a trailing slash.
-source: app/api-reference/next-config-js/trailingSlash
+source: app/api-reference/config/next-config-js/trailingSlash
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/transpilePackages.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/transpilePackages.mdx
similarity index 88%
rename from docs/02-pages/03-api-reference/04-next-config-js/transpilePackages.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/transpilePackages.mdx
index 4c2209de1200d..478db1a0a103b 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/transpilePackages.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/transpilePackages.mdx
@@ -1,7 +1,7 @@
 ---
 title: transpilePackages
 description: Automatically transpile and bundle dependencies from local packages (like monorepos) or from external dependencies (`node_modules`).
-source: app/api-reference/next-config-js/transpilePackages
+source: app/api-reference/config/next-config-js/transpilePackages
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/turbo.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/turbo.mdx
similarity index 88%
rename from docs/02-pages/03-api-reference/04-next-config-js/turbo.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/turbo.mdx
index 4595dbdb5ac17..1be780969309f 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/turbo.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/turbo.mdx
@@ -2,7 +2,7 @@
 title: turbo
 description: Configure Next.js with Turbopack-specific options
 version: experimental
-source: app/api-reference/next-config-js/turbo
+source: app/api-reference/config/next-config-js/turbo
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/typescript.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/typescript.mdx
similarity index 88%
rename from docs/02-pages/03-api-reference/04-next-config-js/typescript.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/typescript.mdx
index 56fe54cf5e293..898684caa4e72 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/typescript.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/typescript.mdx
@@ -1,7 +1,7 @@
 ---
 title: typescript
 description: Next.js reports TypeScript errors by default. Learn to opt-out of this behavior here.
-source: app/api-reference/next-config-js/typescript
+source: app/api-reference/config/next-config-js/typescript
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/urlImports.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/urlImports.mdx
similarity index 88%
rename from docs/02-pages/03-api-reference/04-next-config-js/urlImports.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/urlImports.mdx
index dacfffadf07dd..79537910c6dd9 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/urlImports.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/urlImports.mdx
@@ -2,7 +2,7 @@
 title: urlImports
 description: Configure Next.js to allow importing modules from external URLs.
 version: experimental
-source: app/api-reference/next-config-js/urlImports
+source: app/api-reference/config/next-config-js/urlImports
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/useLightningcss.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/useLightningcss.mdx
similarity index 87%
rename from docs/02-pages/03-api-reference/04-next-config-js/useLightningcss.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/useLightningcss.mdx
index 9aff9d4428d4b..e302abc953eb4 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/useLightningcss.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/useLightningcss.mdx
@@ -2,7 +2,7 @@
 title: useLightningcss
 description: Enable experimental support for Lightning CSS.
 version: experimental
-source: app/api-reference/next-config-js/useLightningcss
+source: app/api-reference/config/next-config-js/useLightningcss
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/webVitalsAttribution.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/webVitalsAttribution.mdx
similarity index 87%
rename from docs/02-pages/03-api-reference/04-next-config-js/webVitalsAttribution.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/webVitalsAttribution.mdx
index 07b424e86d8eb..890899ce9758d 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/webVitalsAttribution.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/webVitalsAttribution.mdx
@@ -1,7 +1,7 @@
 ---
 title: webVitalsAttribution
 description: Learn how to use the webVitalsAttribution option to pinpoint the source of Web Vitals issues.
-source: app/api-reference/next-config-js/webVitalsAttribution
+source: app/api-reference/config/next-config-js/webVitalsAttribution
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/04-next-config-js/webpack.mdx b/docs/02-pages/03-api-reference/04-config/01-next-config-js/webpack.mdx
similarity index 89%
rename from docs/02-pages/03-api-reference/04-next-config-js/webpack.mdx
rename to docs/02-pages/03-api-reference/04-config/01-next-config-js/webpack.mdx
index 16d9cea1c064a..8f0713dd2a6a9 100644
--- a/docs/02-pages/03-api-reference/04-next-config-js/webpack.mdx
+++ b/docs/02-pages/03-api-reference/04-config/01-next-config-js/webpack.mdx
@@ -2,7 +2,7 @@
 title: Custom Webpack Config
 nav_title: webpack
 description: Learn how to customize the webpack config used by Next.js
-source: app/api-reference/next-config-js/webpack
+source: app/api-reference/config/next-config-js/webpack
 ---
 
 {/* DO NOT EDIT. The content of this doc is generated from the source above. To edit the content of this page, navigate to the source page in your editor. You can use the `<PagesOnly>Content</PagesOnly>` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/02-pages/03-api-reference/06-config/01-typescript.mdx b/docs/02-pages/03-api-reference/04-config/01-typescript.mdx
similarity index 100%
rename from docs/02-pages/03-api-reference/06-config/01-typescript.mdx
rename to docs/02-pages/03-api-reference/04-config/01-typescript.mdx
diff --git a/docs/02-pages/03-api-reference/06-config/02-eslint.mdx b/docs/02-pages/03-api-reference/04-config/02-eslint.mdx
similarity index 100%
rename from docs/02-pages/03-api-reference/06-config/02-eslint.mdx
rename to docs/02-pages/03-api-reference/04-config/02-eslint.mdx
diff --git a/docs/02-pages/03-api-reference/04-config/index.mdx b/docs/02-pages/03-api-reference/04-config/index.mdx
new file mode 100644
index 0000000000000..f2028e65f81ed
--- /dev/null
+++ b/docs/02-pages/03-api-reference/04-config/index.mdx
@@ -0,0 +1,4 @@
+---
+title: Configuration
+description: Learn how to configure your Next.js application.
+---
diff --git a/docs/02-pages/03-api-reference/07-cli/create-next-app.mdx b/docs/02-pages/03-api-reference/05-cli/create-next-app.mdx
similarity index 100%
rename from docs/02-pages/03-api-reference/07-cli/create-next-app.mdx
rename to docs/02-pages/03-api-reference/05-cli/create-next-app.mdx
diff --git a/docs/02-pages/03-api-reference/07-cli/index.mdx b/docs/02-pages/03-api-reference/05-cli/index.mdx
similarity index 100%
rename from docs/02-pages/03-api-reference/07-cli/index.mdx
rename to docs/02-pages/03-api-reference/05-cli/index.mdx
diff --git a/docs/02-pages/03-api-reference/07-cli/next.mdx b/docs/02-pages/03-api-reference/05-cli/next.mdx
similarity index 100%
rename from docs/02-pages/03-api-reference/07-cli/next.mdx
rename to docs/02-pages/03-api-reference/05-cli/next.mdx
diff --git a/docs/02-pages/03-api-reference/05-edge.mdx b/docs/02-pages/03-api-reference/06-edge.mdx
similarity index 100%
rename from docs/02-pages/03-api-reference/05-edge.mdx
rename to docs/02-pages/03-api-reference/06-edge.mdx
diff --git a/docs/03-architecture/fast-refresh.mdx b/docs/03-architecture/fast-refresh.mdx
index 08d6fab3258c2..5f5bcffab6dbb 100644
--- a/docs/03-architecture/fast-refresh.mdx
+++ b/docs/03-architecture/fast-refresh.mdx
@@ -105,5 +105,5 @@ with an empty array of dependencies would still re-run once during Fast Refresh.
 
 However, writing code resilient to occasional re-running of `useEffect` is a good practice even
 without Fast Refresh. It will make it easier for you to introduce new dependencies to it later on
-and it's enforced by [React Strict Mode](/docs/pages/api-reference/next-config-js/reactStrictMode),
+and it's enforced by [React Strict Mode](/docs/pages/api-reference/config/next-config-js/reactStrictMode),
 which we highly recommend enabling.
diff --git a/docs/03-architecture/nextjs-compiler.mdx b/docs/03-architecture/nextjs-compiler.mdx
index a862610bd41e7..abc35034d1f12 100644
--- a/docs/03-architecture/nextjs-compiler.mdx
+++ b/docs/03-architecture/nextjs-compiler.mdx
@@ -264,7 +264,7 @@ module.exports = {
 
 ### Modularize Imports
 
-This option has been superseded by [`optimizePackageImports`](/docs/app/api-reference/next-config-js/optimizePackageImports) in Next.js 13.5. We recommend upgrading to use the new option that does not require manual configuration of import paths.
+This option has been superseded by [`optimizePackageImports`](/docs/app/api-reference/config/next-config-js/optimizePackageImports) in Next.js 13.5. We recommend upgrading to use the new option that does not require manual configuration of import paths.
 
 ## Experimental Features
 
diff --git a/docs/03-architecture/turbopack.mdx b/docs/03-architecture/turbopack.mdx
index c405aa0f07ba3..9228eddc415ba 100644
--- a/docs/03-architecture/turbopack.mdx
+++ b/docs/03-architecture/turbopack.mdx
@@ -22,7 +22,7 @@ Turbopack can be used in Next.js in both the `pages` and `app` directories for f
 
 ## Supported features
 
-Turbopack in Next.js requires zero-configuration for most users and can be extended for more advanced use cases. To learn more about the currently supported features for Turbopack, view the [API Reference](/docs/app/api-reference/next-config-js/turbo).
+Turbopack in Next.js requires zero-configuration for most users and can be extended for more advanced use cases. To learn more about the currently supported features for Turbopack, view the [API Reference](/docs/app/api-reference/config/next-config-js/turbo).
 
 ## Unsupported features
 
@@ -37,14 +37,14 @@ These features are currently not supported:
 - [Invalid CSS comment syntax](https://stackoverflow.com/questions/51843506/are-double-slash-comments-valid-in-css) such as `//`
   - CSS comments should be written as `/* comment */` per the specification.
   - Preprocessors such as Sass do support this alternative syntax for comments.
-- [`webpack()`](/docs/app/api-reference/next-config-js/webpack) configuration in `next.config.js`
+- [`webpack()`](/docs/app/api-reference/config/next-config-js/webpack) configuration in `next.config.js`
   - Turbopack replaces Webpack, this means that webpack configuration is not supported.
-  - To configure Turbopack, [see the documentation](/docs/app/api-reference/next-config-js/turbo).
-  - A subset of [Webpack loaders](/docs/app/api-reference/next-config-js/turbo#configuring-webpack-loaders) are supported in Turbopack.
+  - To configure Turbopack, [see the documentation](/docs/app/api-reference/config/next-config-js/turbo).
+  - A subset of [Webpack loaders](/docs/app/api-reference/config/next-config-js/turbo#configuring-webpack-loaders) are supported in Turbopack.
 - Babel (`.babelrc`)
   - Turbopack leverages the [SWC](/docs/architecture/nextjs-compiler#why-swc) compiler for all transpilation and optimizations. This means that Babel is not included by default.
   - If you have a `.babelrc` file, you might no longer need it because Next.js includes common Babel plugins as SWC transforms that can be enabled. You can read more about this in the [compiler documentation](/docs/architecture/nextjs-compiler#supported-features).
-  - If you still need to use Babel after verifying your particular use case is not covered, you can leverage Turbopack's [support for custom webpack loaders](/docs/app/api-reference/next-config-js/turbo#configuring-webpack-loaders) to include `babel-loader`.
+  - If you still need to use Babel after verifying your particular use case is not covered, you can leverage Turbopack's [support for custom webpack loaders](/docs/app/api-reference/config/next-config-js/turbo#configuring-webpack-loaders) to include `babel-loader`.
 - Creating a root layout automatically in App Router.
   - This behavior is currently not supported since it changes input files, instead, an error will be shown for you to manually add a root layout in the desired location.
 - `@next/font` (legacy font support).
@@ -54,7 +54,7 @@ These features are currently not supported:
 - Blocking `.css` imports in `pages/_document.tsx`
   - Currently with webpack Next.js blocks importing `.css` files in `pages/_document.tsx`
   - We are planning to implement this warning in the future.
-- [`experimental.typedRoutes`](https://nextjs.org/docs/app/api-reference/next-config-js/typedRoutes)
+- [`experimental.typedRoutes`](https://nextjs.org/docs/app/api-reference/config/next-config-js/typedRoutes)
   - We are planning to implement this in the future.
 - `experimental.nextScriptWorkers`
   - We are planning to implement this in the future.
@@ -68,7 +68,7 @@ These features are currently not supported:
   - We are currently not planning to support AMP in Next.js with Turbopack.
 - Yarn PnP
   - We are currently not planning to support Yarn PnP in Next.js with Turbopack.
-- [`experimental.urlImports`](/docs/app/api-reference/next-config-js/urlImports)
+- [`experimental.urlImports`](/docs/app/api-reference/config/next-config-js/urlImports)
   - We are currently not planning to support `experimental.urlImports` in Next.js with Turbopack.
 - [`:import` and `:export` ICSS rules](https://github.com/css-modules/icss)
   - We are currently not planning to support `:import` and `:export` ICSS rules in Next.js with Turbopack as [Lightning CSS](https://lightningcss.dev/css-modules.html) the CSS parser Turbopack uses does not support these rules.
diff --git a/errors/built-in-css-disabled.mdx b/errors/built-in-css-disabled.mdx
index ddaeb516070cb..4f3054fae77f5 100644
--- a/errors/built-in-css-disabled.mdx
+++ b/errors/built-in-css-disabled.mdx
@@ -18,4 +18,4 @@ On the other hand, if you choose not to use the built-in support, you can safely
 ## Useful Links
 
 - [Built-in CSS Support docs](/docs/pages/building-your-application/styling) - Learn more about the built-in CSS/SCSS support in Next.js and how to use it effectively.
-- [Custom webpack config docs](/docs/pages/api-reference/next-config-js/webpack) - Get more information on customizing your webpack configuration in Next.js.
+- [Custom webpack config docs](/docs/pages/api-reference/config/next-config-js/webpack) - Get more information on customizing your webpack configuration in Next.js.
diff --git a/errors/deprecated-target-config.mdx b/errors/deprecated-target-config.mdx
index e944864350a5d..140aa9f28d0c4 100644
--- a/errors/deprecated-target-config.mdx
+++ b/errors/deprecated-target-config.mdx
@@ -12,4 +12,4 @@ For serverless targets, please use the Output File Tracing or deploy your applic
 
 ## Useful Links
 
-- [Output File Tracing Documentation](/docs/pages/api-reference/next-config-js/output)
+- [Output File Tracing Documentation](/docs/pages/api-reference/config/next-config-js/output)
diff --git a/errors/empty-configuration.mdx b/errors/empty-configuration.mdx
index d3cc163aaf6df..88c7f3225494b 100644
--- a/errors/empty-configuration.mdx
+++ b/errors/empty-configuration.mdx
@@ -18,4 +18,4 @@ module.exports = {
 
 ## Useful Links
 
-- [Introduction to next.config.js](/docs/pages/api-reference/next-config-js)
+- [Introduction to next.config.js](/docs/pages/api-reference/config/next-config-js)
diff --git a/errors/export-no-custom-routes.mdx b/errors/export-no-custom-routes.mdx
index 840ba66846a54..39fda9bb304f9 100644
--- a/errors/export-no-custom-routes.mdx
+++ b/errors/export-no-custom-routes.mdx
@@ -17,6 +17,6 @@ These configs do not apply when exporting your Next.js application manually.
 
 - [Deployment Documentation](/docs/pages/building-your-application/deploying)
 - [`output: 'export'` Documentation](/docs/pages/building-your-application/deploying/static-exports)
-- [Rewrites Documentation](/docs/pages/api-reference/next-config-js/rewrites)
-- [Redirects Documentation](/docs/pages/api-reference/next-config-js/redirects)
-- [Headers Documentation](/docs/pages/api-reference/next-config-js/headers)
+- [Rewrites Documentation](/docs/pages/api-reference/config/next-config-js/rewrites)
+- [Redirects Documentation](/docs/pages/api-reference/config/next-config-js/redirects)
+- [Headers Documentation](/docs/pages/api-reference/config/next-config-js/headers)
diff --git a/errors/export-path-mismatch.mdx b/errors/export-path-mismatch.mdx
index aa5c46420052b..9db44daf99170 100644
--- a/errors/export-path-mismatch.mdx
+++ b/errors/export-path-mismatch.mdx
@@ -25,4 +25,4 @@ module.exports = {
 
 ## Useful Links
 
-- [exportPathMap](/docs/pages/api-reference/next-config-js/exportPathMap) documentation
+- [exportPathMap](/docs/pages/api-reference/config/next-config-js/exportPathMap) documentation
diff --git a/errors/gssp-export.mdx b/errors/gssp-export.mdx
index 57e3617af8c12..6f6cc7c7077c9 100644
--- a/errors/gssp-export.mdx
+++ b/errors/gssp-export.mdx
@@ -47,4 +47,4 @@ It is not possible to use `getServerSideProps` without a server, so you'll need
 
 - [Automatic Static Optimization](/docs/pages/building-your-application/rendering/automatic-static-optimization)
 - [`getStaticProps` documentation](/docs/pages/building-your-application/data-fetching/get-static-props)
-- [`exportPathMap` documentation](/docs/pages/api-reference/next-config-js/exportPathMap)
+- [`exportPathMap` documentation](/docs/pages/api-reference/config/next-config-js/exportPathMap)
diff --git a/errors/invalid-external-rewrite.mdx b/errors/invalid-external-rewrite.mdx
index 997e63c9f595a..cc8cb19d0dd1f 100644
--- a/errors/invalid-external-rewrite.mdx
+++ b/errors/invalid-external-rewrite.mdx
@@ -12,4 +12,4 @@ Look for any rewrite where `basePath` is `false` and make sure its `destination`
 
 ## Useful Links
 
-- [Rewrites section in Documentation](/docs/pages/api-reference/next-config-js/rewrites)
+- [Rewrites section in Documentation](/docs/pages/api-reference/config/next-config-js/rewrites)
diff --git a/errors/invalid-next-config.mdx b/errors/invalid-next-config.mdx
index 07c698d45663e..bee6bed9c080b 100644
--- a/errors/invalid-next-config.mdx
+++ b/errors/invalid-next-config.mdx
@@ -29,4 +29,4 @@ The root value has an unexpected property, rewritess, which is not in the list o
 
 ## Useful Links
 
-- [`next.config.js`](/docs/pages/api-reference/next-config-js)
+- [`next.config.js`](/docs/pages/api-reference/config/next-config-js)
diff --git a/errors/max-custom-routes-reached.mdx b/errors/max-custom-routes-reached.mdx
index f88e9ef5ad387..929dc73e7e3c3 100644
--- a/errors/max-custom-routes-reached.mdx
+++ b/errors/max-custom-routes-reached.mdx
@@ -14,6 +14,6 @@ The number of combined routes from `headers`, `redirects`, and `rewrites` exceed
 ## Useful Links
 
 - [Dynamic Routes documentation](/docs/pages/building-your-application/routing/dynamic-routes)
-- [Rewrites documentation](/docs/pages/api-reference/next-config-js/rewrites)
-- [Redirects documentation](/docs/pages/api-reference/next-config-js/redirects)
-- [Headers documentation](/docs/pages/api-reference/next-config-js/headers)
+- [Rewrites documentation](/docs/pages/api-reference/config/next-config-js/rewrites)
+- [Redirects documentation](/docs/pages/api-reference/config/next-config-js/redirects)
+- [Headers documentation](/docs/pages/api-reference/config/next-config-js/headers)
diff --git a/errors/next-config-error.mdx b/errors/next-config-error.mdx
index 8212c0e91bd04..9a280b894572e 100644
--- a/errors/next-config-error.mdx
+++ b/errors/next-config-error.mdx
@@ -14,5 +14,5 @@ See the error message in your terminal where you started `next` to see more cont
 
 ## Useful Links
 
-- [next.config.js documentation](/docs/pages/api-reference/next-config-js)
+- [next.config.js documentation](/docs/pages/api-reference/config/next-config-js)
 - [Node.js version feature chart](https://node.green/)
diff --git a/errors/next-image-missing-loader.mdx b/errors/next-image-missing-loader.mdx
index 98435478b7d99..6b031ab12fb17 100644
--- a/errors/next-image-missing-loader.mdx
+++ b/errors/next-image-missing-loader.mdx
@@ -4,12 +4,12 @@ title: 'Missing `loader` Prop on `next/image`'
 
 ## Why This Error Occurred
 
-When using the `next/image` component with [`loader="custom"`](/docs/app/api-reference/next-config-js/images) in `next.config.js`, you must provide the [`loader`](/docs/pages/api-reference/components/image#loader) prop to the component with your custom implementation.
+When using the `next/image` component with [`loader="custom"`](/docs/app/api-reference/config/next-config-js/images) in `next.config.js`, you must provide the [`loader`](/docs/pages/api-reference/components/image#loader) prop to the component with your custom implementation.
 
 ## Possible Ways to Fix It
 
 - Add the [`loader`](/docs/pages/api-reference/components/image#loader) prop to all usages of the `next/image` component.
-- Change the [`loader`](/docs/app/api-reference/next-config-js/images) configuration in `next.config.js`.
+- Change the [`loader`](/docs/app/api-reference/config/next-config-js/images) configuration in `next.config.js`.
 
 ## Useful Links
 
diff --git a/errors/page-without-valid-component.mdx b/errors/page-without-valid-component.mdx
index 85932420d0fce..499a41f9430cf 100644
--- a/errors/page-without-valid-component.mdx
+++ b/errors/page-without-valid-component.mdx
@@ -17,4 +17,4 @@ If the file is not meant to be a page, and instead, is a shared component or fil
 
 If the file is meant to be a page, double check you have an `export default` with the React Component instead of an `export`. If you're already using `export default`, make sure the returned value is a valid React Component.
 
-If you need to support a different file extension for a page component (such as `.mdx`) or would like to include non-page files in the `pages` directory, configure [Custom Page Extensions](/docs/pages/api-reference/next-config-js/pageExtensions) in the `next.config.js`.
+If you need to support a different file extension for a page component (such as `.mdx`) or would like to include non-page files in the `pages` directory, configure [Custom Page Extensions](/docs/pages/api-reference/config/next-config-js/pageExtensions) in the `next.config.js`.
diff --git a/errors/sharp-missing-in-production.mdx b/errors/sharp-missing-in-production.mdx
index 41de0bafceb7c..a1e688a4ffbe8 100644
--- a/errors/sharp-missing-in-production.mdx
+++ b/errors/sharp-missing-in-production.mdx
@@ -44,4 +44,4 @@ Then, build your project with `next build`. Finally, restart the server with eit
 
 - [Image Optimization Documentation](/docs/pages/building-your-application/optimizing/images)
 - [`next/image` Documentation](/docs/pages/api-reference/components/image)
-- [Output File Tracing](/docs/pages/api-reference/next-config-js/output)
+- [Output File Tracing](/docs/pages/api-reference/config/next-config-js/output)
diff --git a/errors/undefined-webpack-config.mdx b/errors/undefined-webpack-config.mdx
index a4c9487650ceb..77a5b7699c64d 100644
--- a/errors/undefined-webpack-config.mdx
+++ b/errors/undefined-webpack-config.mdx
@@ -25,4 +25,4 @@ module.exports = {
 
 ## Useful Links
 
-- [Custom webpack config Documentation](/docs/pages/api-reference/next-config-js/webpack)
+- [Custom webpack config Documentation](/docs/pages/api-reference/config/next-config-js/webpack)
diff --git a/errors/webpack5.mdx b/errors/webpack5.mdx
index 2e5abe0dfb5e7..008c3ebae66d2 100644
--- a/errors/webpack5.mdx
+++ b/errors/webpack5.mdx
@@ -40,7 +40,7 @@ In case you do have custom webpack configuration, either through custom plugins
 - When using `next-transpile-modules` make sure you use the latest version which includes [this patch](https://github.com/martpie/next-transpile-modules/pull/179)
 - When using `@zeit/next-css` / `@zeit/next-sass` make sure you use the [built-in CSS/Sass support](/docs/pages/building-your-application/styling) instead
 - When using `@zeit/next-preact` use [this example](https://github.com/vercel/next.js/tree/canary/examples/using-preact) instead
-- When using `@zeit/next-source-maps` use the [built-in production Source Map support](/docs/pages/api-reference/next-config-js/productionBrowserSourceMaps)
+- When using `@zeit/next-source-maps` use the [built-in production Source Map support](/docs/pages/api-reference/config/next-config-js/productionBrowserSourceMaps)
 - When using webpack plugins make sure they're upgraded to the latest version, in most cases the latest version will include webpack 5 support. In some cases these upgraded webpack plugins will only support webpack 5.
 
 ## Useful Links
diff --git a/scripts/validate-externals-doc.js b/scripts/validate-externals-doc.js
index 1b904d4376847..e716702acb723 100644
--- a/scripts/validate-externals-doc.js
+++ b/scripts/validate-externals-doc.js
@@ -55,10 +55,10 @@ function validate(docPath) {
 }
 
 const appRouterValid = validate(
-  `docs/01-app/03-api-reference/05-next-config-js/serverExternalPackages.mdx`
+  `docs/01-app/03-api-reference/05-config/01-next-config-js/serverExternalPackages.mdx`
 )
 const pagesRouterValid = validate(
-  `docs/02-pages/03-api-reference/04-next-config-js/serverExternalPackages.mdx`
+  `docs/02-pages/03-api-reference/04-config/01-next-config-js/serverExternalPackages.mdx`
 )
 
 if (appRouterValid && pagesRouterValid) {