diff --git a/Makefile b/Makefile
index 973934e80b6dc..01d0b0361b96b 100644
--- a/Makefile
+++ b/Makefile
@@ -6,9 +6,9 @@ BRANCH = $(shell git rev-parse --abbrev-ref HEAD)
 
 markdowns = $(shell find docs -name '*.md' | grep -v 'index') README.md
 
-cli_mandocs = $(shell find docs/content/cli-commands -name '*.md' \
+cli_mandocs = $(shell find docs/content/commands -name '*.md' \
                |sed 's|.md|.1|g' \
-               |sed 's|docs/content/cli-commands/|man/man1/|g' ) \
+               |sed 's|docs/content/commands/|man/man1/|g' ) \
                man/man1/npm-README.1
 
 files_mandocs = $(shell find docs/content/configuring-npm -name '*.md' \
@@ -79,7 +79,7 @@ man/man1/npm-README.1: README.md scripts/docs-build.js package.json $(build-doc-
 	@[ -d man/man1 ] || mkdir -p man/man1
 	node scripts/docs-build.js $< $@
 
-man/man1/%.1: docs/content/cli-commands/%.md scripts/docs-build.js package.json $(build-doc-tools)
+man/man1/%.1: docs/content/commands/%.md scripts/docs-build.js package.json $(build-doc-tools)
 	@[ -d man/man1 ] || mkdir -p man/man1
 	node scripts/docs-build.js $< $@
 
diff --git a/docs/content/commands/npm-access.md b/docs/content/commands/npm-access.md
index 3d3bc869f2568..e3ef24ae28e3e 100644
--- a/docs/content/commands/npm-access.md
+++ b/docs/content/commands/npm-access.md
@@ -84,7 +84,7 @@ Management of teams and team memberships is done with the `npm team` command.
 ### See Also
 
 * [`libnpmaccess`](https://npm.im/libnpmaccess)
-* [npm team](/cli-commands/team)
-* [npm publish](/cli-commands/publish)
-* [npm config](/cli-commands/config)
+* [npm team](/commands/team)
+* [npm publish](/commands/publish)
+* [npm config](/commands/config)
 * [npm registry](/using-npm/registry)
diff --git a/docs/content/commands/npm-adduser.md b/docs/content/commands/npm-adduser.md
index 6c77b83788d52..e4f8e31367540 100644
--- a/docs/content/commands/npm-adduser.md
+++ b/docs/content/commands/npm-adduser.md
@@ -85,7 +85,7 @@ username/password entry in legacy npm.
 ### See Also
 
 * [npm registry](/using-npm/registry)
-* [npm config](/cli-commands/config)
+* [npm config](/commands/config)
 * [npmrc](/configuring-npm/npmrc)
-* [npm owner](/cli-commands/owner)
-* [npm whoami](/cli-commands/whoami)
+* [npm owner](/commands/owner)
+* [npm whoami](/commands/whoami)
diff --git a/docs/content/commands/npm-audit.md b/docs/content/commands/npm-audit.md
index cae532cde3f60..d8981f7322393 100644
--- a/docs/content/commands/npm-audit.md
+++ b/docs/content/commands/npm-audit.md
@@ -189,6 +189,6 @@ $ npm audit --audit-level=moderate
 
 ### See Also
 
-* [npm install](/cli-commands/install)
+* [npm install](/commands/install)
 * [package-locks](/configuring-npm/package-locks)
 * [config](/using-npm/config)
diff --git a/docs/content/commands/npm-bin.md b/docs/content/commands/npm-bin.md
index 0f3d405175a4b..c72a6a2fc4aba 100644
--- a/docs/content/commands/npm-bin.md
+++ b/docs/content/commands/npm-bin.md
@@ -16,8 +16,8 @@ Print the folder where npm will install executables.
 
 ### See Also
 
-* [npm prefix](/cli-commands/prefix)
-* [npm root](/cli-commands/root)
+* [npm prefix](/commands/prefix)
+* [npm root](/commands/root)
 * [npm folders](/configuring-npm/folders)
-* [npm config](/cli-commands/config)
+* [npm config](/commands/config)
 * [npmrc](/configuring-npm/npmrc)
diff --git a/docs/content/commands/npm-bugs.md b/docs/content/commands/npm-bugs.md
index 82d6d1d9749e8..6dfbe70f51a57 100644
--- a/docs/content/commands/npm-bugs.md
+++ b/docs/content/commands/npm-bugs.md
@@ -42,10 +42,10 @@ The base URL of the npm package registry.
 
 ### See Also
 
-* [npm docs](/cli-commands/docs)
-* [npm view](/cli-commands/view)
-* [npm publish](/cli-commands/publish)
+* [npm docs](/commands/docs)
+* [npm view](/commands/view)
+* [npm publish](/commands/publish)
 * [npm registry](/using-npm/registry)
-* [npm config](/cli-commands/config)
+* [npm config](/commands/config)
 * [npmrc](/configuring-npm/npmrc)
 * [package.json](/configuring-npm/package-json)
diff --git a/docs/content/commands/npm-cache.md b/docs/content/commands/npm-cache.md
index bb5bc34646450..6a4e6a1229dfa 100644
--- a/docs/content/commands/npm-cache.md
+++ b/docs/content/commands/npm-cache.md
@@ -82,11 +82,11 @@ The root cache folder.
 ### See Also
 
 * [npm folders](/configuring-npm/folders)
-* [npm config](/cli-commands/config)
+* [npm config](/commands/config)
 * [npmrc](/configuring-npm/npmrc)
-* [npm install](/cli-commands/install)
-* [npm publish](/cli-commands/publish)
-* [npm pack](/cli-commands/pack)
+* [npm install](/commands/install)
+* [npm publish](/commands/publish)
+* [npm pack](/commands/pack)
 * https://npm.im/cacache
 * https://npm.im/pacote
 * https://npm.im/@npmcli/arborist
diff --git a/docs/content/commands/npm-ci.md b/docs/content/commands/npm-ci.md
index 3200ef8835a50..1c7cc2b24c6a8 100644
--- a/docs/content/commands/npm-ci.md
+++ b/docs/content/commands/npm-ci.md
@@ -67,5 +67,5 @@ cache:
 
 ### See Also
 
-* [npm install](/cli-commands/install)
+* [npm install](/commands/install)
 * [package-locks](/configuring-npm/package-locks)
diff --git a/docs/content/commands/npm-completion.md b/docs/content/commands/npm-completion.md
index 284c4635c5686..53737c8033194 100644
--- a/docs/content/commands/npm-completion.md
+++ b/docs/content/commands/npm-completion.md
@@ -36,4 +36,4 @@ completions based on the arguments.
 ### See Also
 
 * [npm developers](/using-npm/developers)
-* [npm](/cli-commands/npm)
+* [npm](/commands/npm)
diff --git a/docs/content/commands/npm-config.md b/docs/content/commands/npm-config.md
index cb9ff1dd2f40a..acd706b37be6f 100644
--- a/docs/content/commands/npm-config.md
+++ b/docs/content/commands/npm-config.md
@@ -83,7 +83,7 @@ global config.
 ### See Also
 
 * [npm folders](/configuring-npm/folders)
-* [npm config](/cli-commands/config)
+* [npm config](/commands/config)
 * [package.json](/configuring-npm/package-json)
 * [npmrc](/configuring-npm/npmrc)
-* [npm](/cli-commands/npm)
+* [npm](/commands/npm)
diff --git a/docs/content/commands/npm-deprecate.md b/docs/content/commands/npm-deprecate.md
index a03021690807c..93aa56b9ea66b 100644
--- a/docs/content/commands/npm-deprecate.md
+++ b/docs/content/commands/npm-deprecate.md
@@ -31,7 +31,7 @@ format an empty string.
 
 ### See Also
 
-* [npm publish](/cli-commands/publish)
+* [npm publish](/commands/publish)
 * [npm registry](/using-npm/registry)
 * [npm owner](/cli-commands/owner)
 * [npm owner](/cli-commands/adduser)
diff --git a/docs/content/commands/npm-dist-tag.md b/docs/content/commands/npm-dist-tag.md
index f48490277d7c2..9c347ea938067 100644
--- a/docs/content/commands/npm-dist-tag.md
+++ b/docs/content/commands/npm-dist-tag.md
@@ -90,9 +90,9 @@ not begin with a number or the letter `v`.
 
 ### See Also
 
-* [npm publish](/cli-commands/publish)
-* [npm install](/cli-commands/install)
-* [npm dedupe](/cli-commands/dedupe)
+* [npm publish](/commands/publish)
+* [npm install](/commands/install)
+* [npm dedupe](/commands/dedupe)
 * [npm registry](/using-npm/registry)
-* [npm config](/cli-commands/config)
+* [npm config](/commands/config)
 * [npmrc](/configuring-npm/npmrc)
diff --git a/docs/content/commands/npm-docs.md b/docs/content/commands/npm-docs.md
index bad8ab6a9aef2..fd7c7a7f7d53e 100644
--- a/docs/content/commands/npm-docs.md
+++ b/docs/content/commands/npm-docs.md
@@ -43,9 +43,9 @@ The base URL of the npm package registry.
 
 ### See Also
 
-* [npm view](/cli-commands/view)
-* [npm publish](/cli-commands/publish)
+* [npm view](/commands/view)
+* [npm publish](/commands/publish)
 * [npm registry](/using-npm/registry)
-* [npm config](/cli-commands/config)
+* [npm config](/commands/config)
 * [npmrc](/configuring-npm/npmrc)
 * [package.json](/configuring-npm/package-json)
diff --git a/docs/content/commands/npm-doctor.md b/docs/content/commands/npm-doctor.md
index 728c12a540d6e..f69bfc4576585 100644
--- a/docs/content/commands/npm-doctor.md
+++ b/docs/content/commands/npm-doctor.md
@@ -102,6 +102,6 @@ reset the cache.
 
 ### See Also
 
-* [npm bugs](/cli-commands/bugs)
-* [npm help](/cli-commands/help)
-* [npm ping](/cli-commands/ping)
+* [npm bugs](/commands/bugs)
+* [npm help](/commands/help)
+* [npm ping](/commands/ping)
diff --git a/docs/content/commands/npm-edit.md b/docs/content/commands/npm-edit.md
index 2dd8281ce47e1..53cb61f82c87c 100644
--- a/docs/content/commands/npm-edit.md
+++ b/docs/content/commands/npm-edit.md
@@ -36,7 +36,7 @@ The command to run for `npm edit` or `npm config edit`.
 ### See Also
 
 * [npm folders](/configuring-npm/folders)
-* [npm explore](/cli-commands/explore)
-* [npm install](/cli-commands/install)
-* [npm config](/cli-commands/config)
+* [npm explore](/commands/explore)
+* [npm install](/commands/install)
+* [npm config](/commands/config)
 * [npmrc](/configuring-npm/npmrc)
diff --git a/docs/content/commands/npm-exec.md b/docs/content/commands/npm-exec.md
index 2baa64b29f8a6..69c679d9636c5 100644
--- a/docs/content/commands/npm-exec.md
+++ b/docs/content/commands/npm-exec.md
@@ -167,10 +167,10 @@ This resulted in some shifts in its functionality:
 
 ### See Also
 
-* [npm run-script](/cli-commands/run-script)
+* [npm run-script](/commands/run-script)
 * [npm scripts](/using-npm/scripts)
-* [npm test](/cli-commands/test)
-* [npm start](/cli-commands/start)
-* [npm restart](/cli-commands/restart)
-* [npm stop](/cli-commands/stop)
-* [npm config](/cli-commands/config)
+* [npm test](/commands/test)
+* [npm start](/commands/start)
+* [npm restart](/commands/restart)
+* [npm stop](/commands/stop)
+* [npm config](/commands/config)
diff --git a/docs/content/commands/npm-explain.md b/docs/content/commands/npm-explain.md
index 83d9a3a1aee73..b9b683a2dad40 100644
--- a/docs/content/commands/npm-explain.md
+++ b/docs/content/commands/npm-explain.md
@@ -62,12 +62,12 @@ Show information in JSON format.
 
 ### See Also
 
-* [npm config](/cli-commands/config)
+* [npm config](/commands/config)
 * [npmrc](/configuring-npm/npmrc)
 * [npm folders](/configuring-npm/folders)
-* [npm ls](/cli-commands/ls)
-* [npm install](/cli-commands/install)
-* [npm link](/cli-commands/link)
-* [npm prune](/cli-commands/prune)
-* [npm outdated](/cli-commands/outdated)
-* [npm update](/cli-commands/update)
+* [npm ls](/commands/ls)
+* [npm install](/commands/install)
+* [npm link](/commands/link)
+* [npm prune](/commands/prune)
+* [npm outdated](/commands/outdated)
+* [npm update](/commands/update)
diff --git a/docs/content/commands/npm-explore.md b/docs/content/commands/npm-explore.md
index 2466407b75942..762cc1a7509e9 100644
--- a/docs/content/commands/npm-explore.md
+++ b/docs/content/commands/npm-explore.md
@@ -40,7 +40,7 @@ The shell to run for the `npm explore` command.
 ### See Also
 
 * [npm folders](/configuring-npm/folders)
-* [npm edit](/cli-commands/edit)
-* [npm rebuild](/cli-commands/rebuild)
-* [npm build](/cli-commands/build)
-* [npm install](/cli-commands/install)
+* [npm edit](/commands/edit)
+* [npm rebuild](/commands/rebuild)
+* [npm build](/commands/build)
+* [npm install](/commands/install)
diff --git a/docs/content/commands/npm-fund.md b/docs/content/commands/npm-fund.md
index f9637f3cac48c..162878aab5b31 100644
--- a/docs/content/commands/npm-fund.md
+++ b/docs/content/commands/npm-fund.md
@@ -57,7 +57,7 @@ If there are multiple funding sources, which 1-indexed source URL to open.
 
 ## See Also
 
-* [npm docs](/cli-commands/docs)
-* [npm config](/cli-commands/config)
-* [npm install](/cli-commands/install)
-* [npm ls](/cli-commands/ls)
+* [npm install](/commands/install)
+* [npm docs](/commands/docs)
+* [npm ls](/commands/ls)
+* [npm config](/commands/config)
diff --git a/docs/content/commands/npm-help-search.md b/docs/content/commands/npm-help-search.md
index 872e180a0ef4f..92dfc1eff793f 100644
--- a/docs/content/commands/npm-help-search.md
+++ b/docs/content/commands/npm-help-search.md
@@ -35,5 +35,5 @@ If false, then help-search will just list out the help topics found.
 
 ### See Also
 
-* [npm](/cli-commands/npm)
-* [npm help](/cli-commands/help)
+* [npm](/commands/npm)
+* [npm help](/commands/help)
diff --git a/docs/content/commands/npm-help.md b/docs/content/commands/npm-help.md
index 2da1724fb8199..2d7997638554a 100644
--- a/docs/content/commands/npm-help.md
+++ b/docs/content/commands/npm-help.md
@@ -32,9 +32,9 @@ Set to `"browser"` to view html help content in the default web browser.
 
 ### See Also
 
-* [npm](/cli-commands/npm)
+* [npm](/commands/npm)
 * [npm folders](/configuring-npm/folders)
-* [npm config](/cli-commands/config)
+* [npm config](/commands/config)
 * [npmrc](/configuring-npm/npmrc)
 * [package.json](/configuring-npm/package-json)
-* [npm help-search](/cli-commands/help-search)
+* [npm help-search](/commands/help-search)
diff --git a/docs/content/commands/npm-init.md b/docs/content/commands/npm-init.md
index 934639d0ed7bc..b8cc4ed2e3d92 100644
--- a/docs/content/commands/npm-init.md
+++ b/docs/content/commands/npm-init.md
@@ -75,5 +75,5 @@ $ npm init -y
 
 * [init-package-json module](http://npm.im/init-package-json)
 * [package.json](/configuring-npm/package-json)
-* [npm version](/cli-commands/version)
+* [npm version](/commands/version)
 * [npm scope](/using-npm/scope)
diff --git a/docs/content/commands/npm-install-ci-test.md b/docs/content/commands/npm-install-ci-test.md
index a42e36c750b56..5ff3bd6d39a8b 100644
--- a/docs/content/commands/npm-install-ci-test.md
+++ b/docs/content/commands/npm-install-ci-test.md
@@ -18,6 +18,6 @@ This command runs `npm ci` followed immediately by `npm test`.
 
 ### See Also
 
-* [npm install-test](/cli-commands/install-test)
-* [npm ci](/cli-commands/ci)
-* [npm test](/cli-commands/test)
+* [npm install-test](/commands/install-test)
+* [npm ci](/commands/ci)
+* [npm test](/commands/test)
diff --git a/docs/content/commands/npm-install-test.md b/docs/content/commands/npm-install-test.md
index 8350673564b98..058afe5b77e5f 100644
--- a/docs/content/commands/npm-install-test.md
+++ b/docs/content/commands/npm-install-test.md
@@ -27,6 +27,6 @@ takes exactly the same arguments as `npm install`.
 
 ### See Also
 
-* [npm install](/cli-commands/install)
-* [npm install-ci-test](/cli-commands/install-ci-test)
-* [npm test](/cli-commands/test)
+* [npm install](/commands/install)
+* [npm install-ci-test](/commands/install-ci-test)
+* [npm test](/commands/test)
diff --git a/docs/content/commands/npm-install.md b/docs/content/commands/npm-install.md
index 59ac78cb174fd..7cd0288859250 100644
--- a/docs/content/commands/npm-install.md
+++ b/docs/content/commands/npm-install.md
@@ -35,7 +35,7 @@ following order of precedence:
 * `yarn.lock`
 
 See [package-lock.json](/configuring-npm/package-lock-json) and [`npm
-shrinkwrap`](/cli-commands/shrinkwrap).
+shrinkwrap`](/commands/shrinkwrap).
 
 A `package` is:
 
@@ -45,7 +45,7 @@ A `package` is:
 * c) a url that resolves to (b)
 * d) a `<name>@<version>` that is published on the registry (see
   [`registry`](/using-npm/registry)) with (c)
-* e) a `<name>@<tag>` (see [`npm dist-tag`](/cli-commands/dist-tag)) that
+* e) a `<name>@<tag>` (see [`npm dist-tag`](/commands/dist-tag)) that
   points to (d)
 * f) a `<name>` that has a "latest" tag satisfying (e)
 * g) a `<git remote url>` that resolves to (a)
@@ -88,7 +88,7 @@ into a tarball (b).
 
     Install a package that is sitting on the filesystem.  Note: if you just
     want to link a dev directory into your npm root, you can do this more
-    easily by using [`npm link`](/cli-commands/npm-link).
+    easily by using [`npm link`](/commands/npm-link).
 
     Tarball requirements:
     * The filename *must* use `.tar`, `.tar.gz`, or `.tgz` as the
@@ -487,7 +487,7 @@ Legacy shorthands for `omit` settings are:
 
 * `--no-fund`: suppress the message displayed at the end of each install
   that acknowledges the number of dependencies looking for funding.  See
-  [`npm-fund`](/cli-commands/npm-fund)
+  [`npm-fund`](/commands/npm-fund)
 
 * `--dry-run`: Do not actually install anything into the `node_modules`
   folder.  Just build the intended tree in memory, and report on it.
@@ -532,18 +532,18 @@ the specific folder structures that npm creates.
 ### See Also
 
 * [npm folders](/configuring-npm/folders)
-* [npm update](/cli-commands/update)
-* [npm audit](/cli-commands/audit)
-* [npm fund](/cli-commands/fund)
-* [npm link](/cli-commands/link)
-* [npm rebuild](/cli-commands/rebuild)
+* [npm update](/commands/update)
+* [npm audit](/commands/audit)
+* [npm fund](/commands/fund)
+* [npm link](/commands/link)
+* [npm rebuild](/commands/rebuild)
 * [npm scripts](/using-npm/scripts)
-* [npm build](/cli-commands/build)
-* [npm config](/cli-commands/config)
+* [npm build](/commands/build)
+* [npm config](/commands/config)
 * [npmrc](/configuring-npm/npmrc)
 * [npm registry](/using-npm/registry)
-* [npm dist-tag](/cli-commands/dist-tag)
-* [npm uninstall](/cli-commands/uninstall)
-* [npm shrinkwrap](/cli-commands/shrinkwrap)
+* [npm dist-tag](/commands/dist-tag)
+* [npm uninstall](/commands/uninstall)
+* [npm shrinkwrap](/commands/shrinkwrap)
 * [package.json](/configuring-npm/package-json)
 * [workspaces](/using-npm/workspaces)
diff --git a/docs/content/commands/npm-link.md b/docs/content/commands/npm-link.md
index 927f1ab635bf7..1a5925f3bd467 100644
--- a/docs/content/commands/npm-link.md
+++ b/docs/content/commands/npm-link.md
@@ -82,7 +82,7 @@ npm link @myorg/privatepackage
 
 * [npm developers](/using-npm/developers)
 * [package.json](/configuring-npm/package-json)
-* [npm- nstall](/cli-commands/install)
+* [npm- nstall](/commands/install)
 * [npm folders](/configuring-npm/folders)
-* [npm config](/cli-commands/config)
+* [npm config](/commands/config)
 * [npmrc](/configuring-npm/npmrc)
diff --git a/docs/content/commands/npm-logout.md b/docs/content/commands/npm-logout.md
index eb5b08029abea..4f6f0c31bf500 100644
--- a/docs/content/commands/npm-logout.md
+++ b/docs/content/commands/npm-logout.md
@@ -44,7 +44,7 @@ npm logout --scope=@myco
 
 ### See Also
 
-* [npm adduser](/cli-commands/adduser)
+* [npm adduser](/commands/adduser)
 * [npm registry](/using-npm/registry)
-* [npm config](/cli-commands/config)
-* [npm whoami](/cli-commands/whoami)
+* [npm config](/commands/config)
+* [npm whoami](/commands/whoami)
diff --git a/docs/content/commands/npm-ls.md b/docs/content/commands/npm-ls.md
index 119713ba57a43..3f5c17c94559a 100644
--- a/docs/content/commands/npm-ls.md
+++ b/docs/content/commands/npm-ls.md
@@ -115,12 +115,12 @@ Set it to false in order to use all-ansi output.
 
 ### See Also
 
-* [npm config](/cli-commands/config)
+* [npm config](/commands/config)
 * [npmrc](/configuring-npm/npmrc)
 * [npm folders](/configuring-npm/folders)
-* [npm explain](/cli-commands/explain)
-* [npm install](/cli-commands/install)
-* [npm link](/cli-commands/link)
-* [npm prune](/cli-commands/prune)
-* [npm outdated](/cli-commands/outdated)
-* [npm update](/cli-commands/update)
+* [npm explain](/commands/explain)
+* [npm install](/commands/install)
+* [npm link](/commands/link)
+* [npm prune](/commands/prune)
+* [npm outdated](/commands/outdated)
+* [npm update](/commands/update)
diff --git a/docs/content/commands/npm-outdated.md b/docs/content/commands/npm-outdated.md
index 8fa8a8a6b9d9e..396737fddd166 100644
--- a/docs/content/commands/npm-outdated.md
+++ b/docs/content/commands/npm-outdated.md
@@ -113,7 +113,7 @@ Display all outdated dependencies on the tree.
 
 ### See Also
 
-* [npm update](/cli-commands/update)
-* [npm dist-tag](/cli-commands/dist-tag)
+* [npm update](/commands/update)
+* [npm dist-tag](/commands/dist-tag)
 * [npm registry](/using-npm/registry)
 * [npm folders](/configuring-npm/folders)
diff --git a/docs/content/commands/npm-owner.md b/docs/content/commands/npm-owner.md
index 2400b34db45c0..f600cc03e0fda 100644
--- a/docs/content/commands/npm-owner.md
+++ b/docs/content/commands/npm-owner.md
@@ -38,7 +38,7 @@ with `--otp`.
 
 ### See Also
 
-* [npm publish](/cli-commands/publish)
+* [npm publish](/commands/publish)
 * [npm registry](/using-npm/registry)
-* [npm adduser](/cli-commands/adduser)
+* [npm adduser](/commands/adduser)
 * [npm disputes](/using-npm/disputes)
diff --git a/docs/content/commands/npm-pack.md b/docs/content/commands/npm-pack.md
index fddd1054f6045..a5c6b01e36004 100644
--- a/docs/content/commands/npm-pack.md
+++ b/docs/content/commands/npm-pack.md
@@ -28,7 +28,7 @@ actually packing anything. Reports on what would have gone into the tarball.
 
 ### See Also
 
-* [npm cache](/cli-commands/cache)
-* [npm publish](/cli-commands/publish)
-* [npm config](/cli-commands/config)
+* [npm cache](/commands/cache)
+* [npm publish](/commands/publish)
+* [npm config](/commands/config)
 * [npmrc](/configuring-npm/npmrc)
diff --git a/docs/content/commands/npm-ping.md b/docs/content/commands/npm-ping.md
index 38a42bc3d3125..271ecbfdd3036 100644
--- a/docs/content/commands/npm-ping.md
+++ b/docs/content/commands/npm-ping.md
@@ -25,5 +25,5 @@ Ping error: {*Detail about error}
 
 ### See Also
 
-* [npm config](/cli-commands/config)
+* [npm config](/commands/config)
 * [npmrc](/configuring-npm/npmrc)
diff --git a/docs/content/commands/npm-prefix.md b/docs/content/commands/npm-prefix.md
index e2bd52a18aaf5..a8720b2002317 100644
--- a/docs/content/commands/npm-prefix.md
+++ b/docs/content/commands/npm-prefix.md
@@ -17,12 +17,12 @@ to contain a `package.json` file or `node_modules` directory, unless `-g` is
 also specified.
 
 If `-g` is specified, this will be the value of the global prefix. See
-[`npm config`](/cli-commands/config) for more detail.
+[`npm config`](/commands/config) for more detail.
 
 ### See Also
 
-* [npm root](/cli-commands/root)
-* [npm bin](/cli-commands/bin)
+* [npm root](/commands/root)
+* [npm bin](/commands/bin)
 * [npm folders](/configuring-npm/folders)
-* [npm config](/cli-commands/config)
+* [npm config](/commands/config)
 * [npmrc](/configuring-npm/npmrc)
diff --git a/docs/content/commands/npm-profile.md b/docs/content/commands/npm-profile.md
index 3ff11f8e6402f..1050ccbc07207 100644
--- a/docs/content/commands/npm-profile.md
+++ b/docs/content/commands/npm-profile.md
@@ -76,4 +76,4 @@ available on non npmjs.com registries.
 
 ### See Also
 
-* [npm config](/cli-commands/config)
+* [npm config](/commands/config)
diff --git a/docs/content/commands/npm-prune.md b/docs/content/commands/npm-prune.md
index e8fdff91326fb..b948aa4459133 100644
--- a/docs/content/commands/npm-prune.md
+++ b/docs/content/commands/npm-prune.md
@@ -38,6 +38,6 @@ and it's up to you to run `npm prune` from time-to-time to remove them.
 
 ### See Also
 
-* [npm uninstall](/cli-commands/uninstall)
+* [npm uninstall](/commands/uninstall)
 * [npm folders](/configuring-npm/folders)
-* [npm ls](/cli-commands/ls)
+* [npm ls](/commands/ls)
diff --git a/docs/content/commands/npm-publish.md b/docs/content/commands/npm-publish.md
index 162aa13985280..5579bf9593e16 100644
--- a/docs/content/commands/npm-publish.md
+++ b/docs/content/commands/npm-publish.md
@@ -57,22 +57,22 @@ the specified registry.
 
 Once a package is published with a given name and version, that
 specific name and version combination can never be used again, even if
-it is removed with [`npm unpublish`](/cli-commands/unpublish).
+it is removed with [`npm unpublish`](/commands/unpublish).
 
 As of `npm@5`, both a sha1sum and an integrity field with a sha512sum of the
 tarball will be submitted to the registry during publication. Subsequent
 installs will use the strongest supported algorithm to verify downloads.
 
-Similar to `--dry-run` see [`npm pack`](/cli-commands/pack), which figures out the files to be
+Similar to `--dry-run` see [`npm pack`](/commands/pack), which figures out the files to be
 included and packs them into a tarball to be uploaded to the registry.
 
 ### See Also
 
 * [npm registry](/using-npm/registry)
 * [npm scope](/using-npm/scope)
-* [npm adduser](/cli-commands/adduser)
-* [npm owner](/cli-commands/owner)
-* [npm deprecate](/cli-commands/deprecate)
-* [npm dist-tag](/cli-commands/dist-tag)
-* [npm pack](/cli-commands/pack)
-* [npm profile](/cli-commands/profile)
+* [npm adduser](/commands/adduser)
+* [npm owner](/commands/owner)
+* [npm deprecate](/commands/deprecate)
+* [npm dist-tag](/commands/dist-tag)
+* [npm pack](/commands/pack)
+* [npm profile](/commands/profile)
diff --git a/docs/content/commands/npm-rebuild.md b/docs/content/commands/npm-rebuild.md
index f89983db9df41..cc03504c06ec8 100644
--- a/docs/content/commands/npm-rebuild.md
+++ b/docs/content/commands/npm-rebuild.md
@@ -18,5 +18,5 @@ This command runs the `npm build` command on the matched folders.  This is usefu
 
 ### See Also
 
-* [npm build](/cli-commands/build)
-* [npm install](/cli-commands/install)
+* [npm build](/commands/build)
+* [npm install](/commands/install)
diff --git a/docs/content/commands/npm-repo.md b/docs/content/commands/npm-repo.md
index 796b21f904041..7f60ee829ccbd 100644
--- a/docs/content/commands/npm-repo.md
+++ b/docs/content/commands/npm-repo.md
@@ -33,5 +33,5 @@ Set to `true` to use default system URL opener.
 
 ### See Also
 
-* [npm docs](/cli-commands/docs)
-* [npm config](/cli-commands/config)
+* [npm docs](/commands/docs)
+* [npm config](/commands/config)
diff --git a/docs/content/commands/npm-restart.md b/docs/content/commands/npm-restart.md
index d837936b1cdd4..427c4c5bea061 100644
--- a/docs/content/commands/npm-restart.md
+++ b/docs/content/commands/npm-restart.md
@@ -37,9 +37,9 @@ behavior will be accompanied by an increase in major version number
 
 ### See Also
 
-* [npm run-script](/cli-commands/run-script)
+* [npm run-script](/commands/run-script)
 * [npm scripts](/using-npm/scripts)
-* [npm test](/cli-commands/test)
-* [npm start](/cli-commands/start)
-* [npm stop](/cli-commands/stop)
-* [npm restart](/cli-commands/restart)
+* [npm test](/commands/test)
+* [npm start](/commands/start)
+* [npm stop](/commands/stop)
+* [npm restart](/commands/restart)
diff --git a/docs/content/commands/npm-root.md b/docs/content/commands/npm-root.md
index 6dedde0c5d350..6760768cdad58 100644
--- a/docs/content/commands/npm-root.md
+++ b/docs/content/commands/npm-root.md
@@ -15,8 +15,8 @@ Print the effective `node_modules` folder to standard out.
 
 ### See Also
 
-* [npm prefix](/cli-commands/prefix)
-* [npm bin](/cli-commands/bin)
+* [npm prefix](/commands/prefix)
+* [npm bin](/commands/bin)
 * [npm folders](/configuring-npm/folders)
-* [npm config](/cli-commands/config)
+* [npm config](/commands/config)
 * [npmrc](/configuring-npm/npmrc)
diff --git a/docs/content/commands/npm-run-script.md b/docs/content/commands/npm-run-script.md
index bbb7fde33d516..971089dae7ade 100644
--- a/docs/content/commands/npm-run-script.md
+++ b/docs/content/commands/npm-run-script.md
@@ -86,8 +86,8 @@ without breaking the execution chain.
 ### See Also
 
 * [npm scripts](/using-npm/scripts)
-* [npm test](/cli-commands/test)
-* [npm start](/cli-commands/start)
-* [npm restart](/cli-commands/restart)
-* [npm stop](/cli-commands/stop)
-* [npm config](/cli-commands/config)
+* [npm test](/commands/test)
+* [npm start](/commands/start)
+* [npm restart](/commands/restart)
+* [npm stop](/commands/stop)
+* [npm config](/commands/config)
diff --git a/docs/content/commands/npm-search.md b/docs/content/commands/npm-search.md
index f5606dfee8bea..2d5d3ac9b5bc9 100644
--- a/docs/content/commands/npm-search.md
+++ b/docs/content/commands/npm-search.md
@@ -105,6 +105,6 @@ setting.
 ### See Also
 
 * [npm registry](/using-npm/registry)
-* [npm config](/cli-commands/config)
+* [npm config](/commands/config)
 * [npmrc](/configuring-npm/npmrc)
-* [npm view](/cli-commands/view)
+* [npm view](/commands/view)
diff --git a/docs/content/commands/npm-shrinkwrap.md b/docs/content/commands/npm-shrinkwrap.md
index 5a357c9053f22..898d7adc9a453 100644
--- a/docs/content/commands/npm-shrinkwrap.md
+++ b/docs/content/commands/npm-shrinkwrap.md
@@ -20,11 +20,11 @@ of package locks in npm, see [package-locks](/configuring-npm/package-locks).
 
 ### See Also
 
-* [npm install](/cli-commands/install)
-* [npm run-script](/cli-commands/run-script)
+* [npm install](/commands/install)
+* [npm run-script](/commands/run-script)
 * [npm scripts](/using-npm/scripts)
 * [package.js](/configuring-npm/package-json)
 * [package-locks](/configuring-npm/package-locks)
 * [package-lock.json](/configuring-npm/package-lock-json)
 * [shrinkwrap.json](/configuring-npm/shrinkwrap-json)
-* [npm ls](/cli-commands/ls)
+* [npm ls](/commands/ls)
diff --git a/docs/content/commands/npm-star.md b/docs/content/commands/npm-star.md
index e49a809624a68..5b8298caf5d06 100644
--- a/docs/content/commands/npm-star.md
+++ b/docs/content/commands/npm-star.md
@@ -22,6 +22,6 @@ It's a boolean thing.  Starring repeatedly has no additional effect.
 
 ### See Also
 
-* [npm view](/cli-commands/view)
-* [npm whoami](/cli-commands/whoami)
-* [npm adduser](/cli-commands/adduser)
+* [npm view](/commands/view)
+* [npm whoami](/commands/whoami)
+* [npm adduser](/commands/adduser)
diff --git a/docs/content/commands/npm-stars.md b/docs/content/commands/npm-stars.md
index cfabfe41c22eb..96d6cd5ef429f 100644
--- a/docs/content/commands/npm-stars.md
+++ b/docs/content/commands/npm-stars.md
@@ -19,7 +19,7 @@ you will most certainly enjoy this command.
 
 ### See Also
 
-* [npm star](/cli-commands/star)
-* [npm view](/cli-commands/view)
-* [npm whoami](/cli-commands/whoami)
-* [npm adduser](/cli-commands/adduser)
+* [npm star](/commands/star)
+* [npm view](/commands/view)
+* [npm whoami](/commands/whoami)
+* [npm adduser](/commands/adduser)
diff --git a/docs/content/commands/npm-start.md b/docs/content/commands/npm-start.md
index baaf4ce4366d9..1ee85846a2af4 100644
--- a/docs/content/commands/npm-start.md
+++ b/docs/content/commands/npm-start.md
@@ -17,12 +17,12 @@ its `"scripts"` object. If no `"start"` property is specified on the
 `"scripts"` object, it will run `node server.js`.
 
 As of [`npm@2.0.0`](https://blog.npmjs.org/post/98131109725/npm-2-0-0), you can
-use custom arguments when executing scripts. Refer to [`npm run-script`](/cli-commands/run-script) for more details.
+use custom arguments when executing scripts. Refer to [`npm run-script`](/commands/run-script) for more details.
 
 ### See Also
 
-* [npm run-script](/cli-commands/run-script)
+* [npm run-script](/commands/run-script)
 * [npm scripts](/using-npm/scripts)
-* [npm test](/cli-commands/test)
-* [npm restart](/cli-commands/restart)
-* [npm stop](/cli-commands/stop)
+* [npm test](/commands/test)
+* [npm restart](/commands/restart)
+* [npm stop](/commands/stop)
diff --git a/docs/content/commands/npm-stop.md b/docs/content/commands/npm-stop.md
index 36a35be2d838a..d81fa32eaf619 100644
--- a/docs/content/commands/npm-stop.md
+++ b/docs/content/commands/npm-stop.md
@@ -16,8 +16,8 @@ This runs a package's "stop" script, if one was provided.
 
 ### See Also
 
-* [npm run-script](/cli-commands/run-script)
+* [npm run-script](/commands/run-script)
 * [npm scripts](/using-npm/scripts)
-* [npm test](/cli-commands/test)
-* [npm start](/cli-commands/start)
-* [npm restart](/cli-commands/restart)
+* [npm test](/commands/test)
+* [npm start](/commands/start)
+* [npm restart](/commands/restart)
diff --git a/docs/content/commands/npm-team.md b/docs/content/commands/npm-team.md
index 1301ca9883a38..b3ac93e75ca22 100644
--- a/docs/content/commands/npm-team.md
+++ b/docs/content/commands/npm-team.md
@@ -58,5 +58,5 @@ use the `npm access` command to grant or revoke the appropriate permissions.
 
 ### See Also
 
-* [npm access](/cli-commands/access)
+* [npm access](/commands/access)
 * [npm registry](/using-npm/registry)
diff --git a/docs/content/commands/npm-test.md b/docs/content/commands/npm-test.md
index bfe3bf6b93c83..a866009b0ae22 100644
--- a/docs/content/commands/npm-test.md
+++ b/docs/content/commands/npm-test.md
@@ -18,8 +18,8 @@ This runs a package's "test" script, if one was provided.
 
 ### See Also
 
-* [npm run-script](/cli-commands/run-script)
+* [npm run-script](/commands/run-script)
 * [npm scripts](/using-npm/scripts)
-* [npm start](/cli-commands/start)
-* [npm restart](/cli-commands/restart)
-* [npm stop](/cli-commands/stop)
+* [npm start](/commands/start)
+* [npm restart](/commands/restart)
+* [npm stop](/commands/stop)
diff --git a/docs/content/commands/npm-uninstall.md b/docs/content/commands/npm-uninstall.md
index ad9bb27a04546..42769263f7cd8 100644
--- a/docs/content/commands/npm-uninstall.md
+++ b/docs/content/commands/npm-uninstall.md
@@ -53,8 +53,8 @@ npm uninstall lodash --no-save
 
 ### See Also
 
-* [npm prune](/cli-commands/prune)
-* [npm install](/cli-commands/install)
+* [npm prune](/commands/prune)
+* [npm install](/commands/install)
 * [npm folders](/configuring-npm/folders)
-* [npm config](/cli-commands/config)
+* [npm config](/commands/config)
 * [npmrc](/configuring-npm/npmrc)
diff --git a/docs/content/commands/npm-unpublish.md b/docs/content/commands/npm-unpublish.md
index 965326334ae10..efb22098e25cb 100644
--- a/docs/content/commands/npm-unpublish.md
+++ b/docs/content/commands/npm-unpublish.md
@@ -39,8 +39,8 @@ To learn more about how unpublish is treated on the npm registry, see our <a hre
 
 ### See Also
 
-* [npm deprecate](/cli-commands/deprecate)
-* [npm publish](/cli-commands/publish)
+* [npm deprecate](/commands/deprecate)
+* [npm publish](/commands/publish)
 * [npm registry](/using-npm/registry)
-* [npm adduser](/cli-commands/adduser)
-* [npm owner](/cli-commands/owner)
+* [npm adduser](/commands/adduser)
+* [npm owner](/commands/owner)
diff --git a/docs/content/commands/npm-update.md b/docs/content/commands/npm-update.md
index f39713002fbd7..1a4c163faec18 100644
--- a/docs/content/commands/npm-update.md
+++ b/docs/content/commands/npm-update.md
@@ -128,9 +128,9 @@ be _downgraded_.
 
 ### See Also
 
-* [npm install](/cli-commands/install)
-* [npm outdated](/cli-commands/outdated)
-* [npm shrinkwrap](/cli-commands/shrinkwrap)
+* [npm install](/commands/install)
+* [npm outdated](/commands/outdated)
+* [npm shrinkwrap](/commands/shrinkwrap)
 * [npm registry](/using-npm/registry)
 * [npm folders](/configuring-npm/folders)
-* [npm ls](/cli-commands/ls)
+* [npm ls](/commands/ls)
diff --git a/docs/content/commands/npm-version.md b/docs/content/commands/npm-version.md
index 5de4e540840ad..9ece5e39c3108 100644
--- a/docs/content/commands/npm-version.md
+++ b/docs/content/commands/npm-version.md
@@ -122,8 +122,8 @@ Note that you must have a default GPG key set up in your git config for this to
 
 ### See Also
 
-* [npm init](/cli-commands/init)
-* [npm run-script](/cli-commands/run-script)
+* [npm init](/commands/init)
+* [npm run-script](/commands/run-script)
 * [npm scripts](/using-npm/scripts)
 * [package.json](/configuring-npm/package-json)
 * [semver](/using-npm/semver)
diff --git a/docs/content/commands/npm-view.md b/docs/content/commands/npm-view.md
index 949cfe46d388e..938a527821c32 100644
--- a/docs/content/commands/npm-view.md
+++ b/docs/content/commands/npm-view.md
@@ -113,8 +113,8 @@ the field name.
 
 ### See Also
 
-* [npm search](/cli-commands/search)
+* [npm search](/commands/search)
 * [npm registry](/using-npm/registry)
-* [npm config](/cli-commands/config)
+* [npm config](/commands/config)
 * [npmrc](/configuring-npm/npmrc)
-* [npm docs](/cli-commands/docs)
+* [npm docs](/commands/docs)
diff --git a/docs/content/commands/npm-whoami.md b/docs/content/commands/npm-whoami.md
index 62b8a1cd927c6..1f7e13f22b4af 100644
--- a/docs/content/commands/npm-whoami.md
+++ b/docs/content/commands/npm-whoami.md
@@ -16,6 +16,6 @@ Print the `username` config to standard output.
 
 ### See Also
 
-* [npm config](/cli-commands/config)
+* [npm config](/commands/config)
 * [npmrc](/configuring-npm/npmrc)
-* [npm adduser](/cli-commands/adduser)
+* [npm adduser](/commands/adduser)
diff --git a/docs/content/commands/npm.md b/docs/content/commands/npm.md
index 54c6294343cf5..37a4fca955fd0 100644
--- a/docs/content/commands/npm.md
+++ b/docs/content/commands/npm.md
@@ -41,7 +41,7 @@ terms of use.
 You probably got npm because you want to install stuff.
 
 Use `npm install blerg` to install the latest version of "blerg".  Check out
-[`npm install`](/cli-commands/npm-install) for more info.  It can do a lot of stuff.
+[`npm install`](/commands/npm-install) for more info.  It can do a lot of stuff.
 
 Use the `npm search` command to show everything that's available.
 Use `npm ls` to show everything you've installed.
@@ -158,8 +158,8 @@ reproduction to report.
 <i@izs.me>
 
 ### See Also
-* [npm help](/cli-commands/npm-help)
+* [npm help](/commands/npm-help)
 * [package.json](/configuring-npm/package-json)
-* [npm install](/cli-commands/npm-install)
-* [npm config](/cli-commands/npm-config)
+* [npm install](/commands/npm-install)
+* [npm config](/commands/npm-config)
 * [npmrc](/configuring-npm/npmrc)
diff --git a/docs/content/commands/npx.md b/docs/content/commands/npx.md
index 6b82dda7984c9..ece8638436645 100644
--- a/docs/content/commands/npx.md
+++ b/docs/content/commands/npx.md
@@ -166,10 +166,10 @@ This resulted in some shifts in its functionality:
 
 ### See Also
 
-* [npm run-script](/cli-commands/run-script)
+* [npm run-script](/commands/run-script)
 * [npm scripts](/using-npm/scripts)
-* [npm test](/cli-commands/test)
-* [npm start](/cli-commands/start)
-* [npm restart](/cli-commands/restart)
-* [npm stop](/cli-commands/stop)
-* [npm config](/cli-commands/config)
+* [npm test](/commands/test)
+* [npm start](/commands/start)
+* [npm restart](/commands/restart)
+* [npm stop](/commands/stop)
+* [npm config](/commands/config)
diff --git a/docs/content/configuring-npm/folders.md b/docs/content/configuring-npm/folders.md
index 438238eb8ed4d..959e7e4f70408 100644
--- a/docs/content/configuring-npm/folders.md
+++ b/docs/content/configuring-npm/folders.md
@@ -69,7 +69,7 @@ Man pages are not installed on Windows systems.
 
 #### Cache
 
-See [`npm cache`](/cli-commands/cache).  Cache files are stored in `~/.npm` on Posix, or
+See [`npm cache`](/commands/cache).  Cache files are stored in `~/.npm` on Posix, or
 `%AppData%/npm-cache` on Windows.
 
 This is controlled by the `cache` configuration param.
@@ -210,10 +210,10 @@ cannot be found elsewhere.  See [`package.json`](/configuring-npm/package.json)
 ### See also
 
 * [package.json](/configuring-npm/package-json)
-* [npm install](/cli-commands/install)
-* [npm pack](/cli-commands/pack)
-* [npm cache](/cli-commands/cache)
-* [npm config](/cli-commands/config)
+* [npm install](/commands/install)
+* [npm pack](/commands/pack)
+* [npm cache](/commands/cache)
+* [npm config](/commands/config)
 * [npmrc](/configuring-npm/npmrc)
 * [config](/using-npm/config)
-* [npm publish](/cli-commands/publish)
+* [npm publish](/commands/publish)
diff --git a/docs/content/configuring-npm/npmrc.md b/docs/content/configuring-npm/npmrc.md
index 83b3612e0df11..ab241cf59c75c 100644
--- a/docs/content/configuring-npm/npmrc.md
+++ b/docs/content/configuring-npm/npmrc.md
@@ -93,7 +93,7 @@ manner.
 ### See also
 
 * [npm folders](/configuring-npm/folders)
-* [npm config](/cli-commands/config)
+* [npm config](/commands/config)
 * [config](/using-npm/config)
 * [package.json](/configuring-npm/package-json)
-* [npm](/cli-commands/npm)
+* [npm](/commands/npm)
diff --git a/docs/content/configuring-npm/package-json.md b/docs/content/configuring-npm/package-json.md
index ef89d1221797f..f6d7985b0b98c 100644
--- a/docs/content/configuring-npm/package-json.md
+++ b/docs/content/configuring-npm/package-json.md
@@ -529,7 +529,7 @@ See [semver](/using-npm/semver) for more details about specifying version ranges
 * `range1 || range2` Passes if either range1 or range2 are satisfied.
 * `git...` See 'Git URLs as Dependencies' below
 * `user/repo` See 'GitHub URLs' below
-* `tag` A specific version tagged and published as `tag`  See [`npm dist-tag`](/cli-commands/dist-tag)
+* `tag` A specific version tagged and published as `tag`  See [`npm dist-tag`](/commands/dist-tag)
 * `path/path/path` See [Local Paths](#local-paths) below
 
 For example, these are all valid:
@@ -932,10 +932,10 @@ npm will default some values based on package contents.
 
 * [semver](/using-npm/semver)
 * [workspaces](/using-npm/workspaces)
-* [npm init](/cli-commands/init)
-* [npm version](/cli-commands/version)
-* [npm config](/cli-commands/config)
-* [npm help](/cli-commands/help)
-* [npm install](/cli-commands/install)
-* [npm publish](/cli-commands/publish)
-* [npm uninstall](/cli-commands/uninstall)
+* [npm init](/commands/init)
+* [npm version](/commands/version)
+* [npm config](/commands/config)
+* [npm help](/commands/help)
+* [npm install](/commands/install)
+* [npm publish](/commands/publish)
+* [npm uninstall](/commands/uninstall)
diff --git a/docs/content/configuring-npm/package-lock-json.md b/docs/content/configuring-npm/package-lock-json.md
index a6e6c5368ffd9..487aa6b4f82ea 100644
--- a/docs/content/configuring-npm/package-lock-json.md
+++ b/docs/content/configuring-npm/package-lock-json.md
@@ -138,8 +138,8 @@ The dependencies of this dependency, exactly as at the top level.
 
 ### See also
 
-* [npm shrinkwrap](/cli-commands/shrinkwrap)
+* [npm shrinkwrap](/commands/shrinkwrap)
 * [shrinkwrap.json](/configuring-npm/shrinkwrap-json)
 * [package-locks](/configuring-npm/package-locks)
 * [package.json](/configuring-npm/package-json)
-* [npm install](/cli-commands/install)
+* [npm install](/commands/install)
diff --git a/docs/content/configuring-npm/package-locks.md b/docs/content/configuring-npm/package-locks.md
index 56fd442f2c4de..4b8be38dff633 100644
--- a/docs/content/configuring-npm/package-locks.md
+++ b/docs/content/configuring-npm/package-locks.md
@@ -6,7 +6,7 @@ description: An explanation of npm lockfiles
 
 ### Description
 
-Conceptually, the "input" to [`npm install`](/cli-commands/install) is a [package.json](/configuring-npm/package-json), while its
+Conceptually, the "input" to [`npm install`](/commands/install) is a [package.json](/configuring-npm/package-json), while its
 "output" is a fully-formed `node_modules` tree: a representation of the
 dependencies you declared. In an ideal world, npm would work like a pure
 function: the same `package.json` should produce the exact same `node_modules`
@@ -175,4 +175,4 @@ pre-`npm@5.7.0` versions of npm 5, albeit a bit more noisily. Note that if
 * [package.json](/configuring-npm/package-json)
 * [package-lock.json](/configuring-npm/package-lock-json)
 * [shrinkwrap.json](/configuring-npm/shrinkwrap-json)
-* [npm shrinkwrap](/cli-commands/shrinkwrap)
+* [npm shrinkwrap](/commands/shrinkwrap)
diff --git a/docs/content/configuring-npm/shrinkwrap-json.md b/docs/content/configuring-npm/shrinkwrap-json.md
index 6484986e0ce7a..9409d21f8152a 100644
--- a/docs/content/configuring-npm/shrinkwrap-json.md
+++ b/docs/content/configuring-npm/shrinkwrap-json.md
@@ -6,7 +6,7 @@ description: A publishable lockfile
 
 ### Description
 
-`npm-shrinkwrap.json` is a file created by [`npm shrinkwrap`](/cli-commands/shrinkwrap). It is identical to
+`npm-shrinkwrap.json` is a file created by [`npm shrinkwrap`](/commands/shrinkwrap). It is identical to
 `package-lock.json`, with one major caveat: Unlike `package-lock.json`,
 `npm-shrinkwrap.json` may be included when publishing a package.
 
@@ -24,7 +24,7 @@ to the manual page for [package-lock.json](/configuring-npm/package-lock-json).
 
 ### See also
 
-* [npm shrinkwrap](/cli-commands/shrinkwrap)
+* [npm shrinkwrap](/commands/shrinkwrap)
 * [package-lock.json](/configuring-npm/package-lock-json)
 * [package.json](/configuring-npm/package-json)
-* [npm install](/cli-commands/install)
+* [npm install](/commands/install)
diff --git a/docs/content/using-npm/config.md b/docs/content/using-npm/config.md
index 0e00253c5bd97..0fcd4afc119de 100644
--- a/docs/content/using-npm/config.md
+++ b/docs/content/using-npm/config.md
@@ -157,7 +157,7 @@ When "dev" or "development" and running local `npm shrinkwrap`,
 
 When "true" submit audit reports alongside `npm install` runs to the default
 registry and all registries configured for scopes.  See the documentation
-for [`npm audit`](/cli-commands/audit) for details on what is submitted.
+for [`npm audit`](/commands/audit) for details on what is submitted.
 
 #### audit-level
 
@@ -253,7 +253,7 @@ well as for the CA information to be stored in a file on disk.
 * Default: Windows: `%AppData%\npm-cache`, Posix: `~/.npm`
 * Type: path
 
-The location of npm's cache directory.  See [`npm cache`](/cli-commands/cache)
+The location of npm's cache directory.  See [`npm cache`](/commands/cache)
 
 #### cache-lock-stale
 
@@ -580,7 +580,7 @@ Option that allows for defining which types of dependencies to install.
 A module that will be loaded by the `npm init` command.  See the
 documentation for the
 [init-package-json](https://github.com/npm/init-package-json) module
-for more information, or [npm init](/cli-commands/init).
+for more information, or [npm init](/commands/init).
 
 #### init-author-name
 
@@ -1247,7 +1247,7 @@ version of npm than the latest.
 * Type: Boolean
 
 Set to show short usage output (like the -H output)
-instead of complete help when doing [`npm help`](/cli-commands/help).
+instead of complete help when doing [`npm help`](/commands/help).
 
 #### userconfig
 
@@ -1305,8 +1305,8 @@ Set to `"browser"` to view html help content in the default web browser.
 
 ### See also
 
-* [npm config](/cli-commands/config)
+* [npm config](/commands/config)
 * [npmrc](/configuring-npm/npmrc)
 * [npm scripts](/using-npm/scripts)
 * [npm folders](/configuring-npm/folders)
-* [npm](/cli-commands/npm)
+* [npm](/commands/npm)
diff --git a/docs/content/using-npm/developers.md b/docs/content/using-npm/developers.md
index 01962c77f11f2..fcaa2c5dcae30 100644
--- a/docs/content/using-npm/developers.md
+++ b/docs/content/using-npm/developers.md
@@ -96,7 +96,7 @@ least, you need:
   they'll get installed just like these ones.
 
 You can use `npm init` in the root of your package in order to get you
-started with a pretty basic package.json file.  See [`npm init`](/cli-commands/npm-init) for
+started with a pretty basic package.json file.  See [`npm init`](/commands/npm-init) for
 more info.
 
 ### Keeping files *out* of your package
@@ -165,7 +165,7 @@ changes in real time without having to keep re-installing it.  (You do
 need to either re-link or `npm rebuild -g` to update compiled packages,
 of course.)
 
-More info at [`npm link`](/cli-commands/npm-link).
+More info at [`npm link`](/commands/npm-link).
 
 ### Before Publishing: Make Sure Your Package Installs and Works
 
@@ -213,7 +213,7 @@ npm adduser
 
 and then follow the prompts.
 
-This is documented better in [npm adduser](/cli-commands/npm-adduser).
+This is documented better in [npm adduser](/commands/npm-adduser).
 
 ### Publish your package
 
@@ -239,10 +239,10 @@ Tell the world how easy it is to install your program!
 
 ### See also
 
-* [npm](/cli-commands/npm)
-* [npm init](/cli-commands/npm-init)
+* [npm](/commands/npm)
+* [npm init](/commands/npm-init)
 * [package.json](/configuring-npm/package-json)
 * [npm scripts](/using-npm/scripts)
-* [npm publish](/cli-commands/npm-publish)
-* [npm adduser](/cli-commands/npm-adduser)
+* [npm publish](/commands/npm-publish)
+* [npm adduser](/commands/npm-adduser)
 * [npm registry](/using-npm/registry)
diff --git a/docs/content/using-npm/disputes.md b/docs/content/using-npm/disputes.md
index 76d9e9f0d05e9..ffa9015f341b7 100644
--- a/docs/content/using-npm/disputes.md
+++ b/docs/content/using-npm/disputes.md
@@ -130,4 +130,4 @@ License.
 ### See also
 
 * [npm registry](/using-npm/registry)
-* [npm owner](/cli-commands/owner)
+* [npm owner](/commands/owner)
diff --git a/docs/content/using-npm/orgs.md b/docs/content/using-npm/orgs.md
index ebb7c06d35c3d..268e14c9d2fb0 100644
--- a/docs/content/using-npm/orgs.md
+++ b/docs/content/using-npm/orgs.md
@@ -20,8 +20,8 @@ The developer will be able to access packages based on the teams they are on. Ac
 
 There are two main commands:
 
-1. `npm team` see [npm team](/cli-commands/team) for more details
-2. `npm access` see [npm access](/cli-commands/access) for more details
+1. `npm team` see [npm team](/commands/team) for more details
+2. `npm access` see [npm access](/commands/access) for more details
 
 ### Team Admins create teams
 
@@ -88,6 +88,6 @@ npm access ls-collaborators <pkg>
 
 ### See also
 
-* [npm team](/cli-commands/team)
-* [npm access](/cli-commands/access)
+* [npm team](/commands/team)
+* [npm access](/commands/access)
 * [npm scope](/using-npm/scope)
diff --git a/docs/content/using-npm/registry.md b/docs/content/using-npm/registry.md
index 06459db981bd4..b1a7513b74be2 100644
--- a/docs/content/using-npm/registry.md
+++ b/docs/content/using-npm/registry.md
@@ -29,7 +29,7 @@ available at <https://github.com/npm/npm-registry-couchapp>.
 
 The registry URL used is determined by the scope of the package (see
 [`scope`](/using-npm/scope). If no scope is specified, the default registry is used, which is
-supplied by the `registry` config parameter.  See [`npm config`](/cli-commands/config),
+supplied by the `registry` config parameter.  See [`npm config`](/commands/config),
 [`npmrc`](/configuring-npm/npmrc), and [`config`](/using-npm/config) for more on managing npm's configuration.
 
 ### Does npm send any information about me back to the registry?
@@ -96,7 +96,7 @@ Yes, head over to <https://www.npmjs.com/>
 
 ### See also
 
-* [npm config](/cli-commands/config)
+* [npm config](/commands/config)
 * [config](/using-npm/config)
 * [npmrc](/configuring-npm/npmrc)
 * [npm developers](/using-npm/developers)
diff --git a/docs/content/using-npm/removal.md b/docs/content/using-npm/removal.md
index bade6b7a472c2..572bdb74a981b 100644
--- a/docs/content/using-npm/removal.md
+++ b/docs/content/using-npm/removal.md
@@ -62,5 +62,5 @@ find /usr/local/{lib/node,bin} -exec grep -l npm \{\} \; ;
 
 ### See also
 
-* [npm uninstall](/cli-commands/uninstall)
-* [npm prune](/cli-commands/prune)
+* [npm uninstall](/commands/uninstall)
+* [npm prune](/commands/prune)
diff --git a/docs/content/using-npm/scope.md b/docs/content/using-npm/scope.md
index 8c3bac6e3dcf1..0db1722a8d7f9 100644
--- a/docs/content/using-npm/scope.md
+++ b/docs/content/using-npm/scope.md
@@ -52,7 +52,7 @@ Or in `package.json`:
 ```
 
 Note that if the `@` symbol is omitted, in either case, npm will instead attempt to
-install from GitHub; see [`npm install`](/cli-commands/install).
+install from GitHub; see [`npm install`](/commands/install).
 
 ### Requiring scoped packages
 
@@ -122,7 +122,7 @@ that registry instead.
 
 ### See also
 
-* [npm install](/cli-commands/install)
-* [npm publish](/cli-commands/publish)
-* [npm access](/cli-commands/access)
+* [npm install](/commands/install)
+* [npm publish](/commands/publish)
+* [npm access](/commands/access)
 * [npm registry](/using-npm/registry)
diff --git a/docs/content/using-npm/scripts.md b/docs/content/using-npm/scripts.md
index 5ea0fc1cb7c98..8e0183ad6fbd3 100644
--- a/docs/content/using-npm/scripts.md
+++ b/docs/content/using-npm/scripts.md
@@ -74,7 +74,7 @@ The advantage of doing these things at `prepublish` time is that they can be don
 
 ### Life Cycle Operation Order
 
-#### [`npm publish`](/cli-commands/publish)
+#### [`npm publish`](/commands/publish)
 
 * `prepublishOnly`
 * `prepare`
@@ -82,12 +82,12 @@ The advantage of doing these things at `prepublish` time is that they can be don
 * `publish`
 * `postpublish`
 
-#### [`npm pack`](/cli-commands/pack)
+#### [`npm pack`](/commands/pack)
 
 * `prepack`
 * `postpack`
 
-#### [`npm install`](/cli-commands/install)
+#### [`npm install`](/commands/install)
 
 * `preinstall`
 * `install`
@@ -98,7 +98,7 @@ Also triggers
 * `prepublish` (when on local)
 * `prepare` (when on local or workspaces)
 
-#### [`npm start`](/cli-commands/start)
+#### [`npm start`](/commands/start)
 
 `npm run start` has an `npm start` shorthand.
 
@@ -300,7 +300,7 @@ above.
 
 ### See Also
 
-* [npm run-script](/cli-commands/run-script)
+* [npm run-script](/commands/run-script)
 * [package.json](/configuring-npm/package-json)
 * [npm developers](/using-npm/developers)
-* [npm install](/cli-commands/install)
+* [npm install](/commands/install)
diff --git a/scripts/docs-build.js b/scripts/docs-build.js
index 89471a1f180dc..a1540ebb9b97c 100644
--- a/scripts/docs-build.js
+++ b/scripts/docs-build.js
@@ -29,7 +29,7 @@ fs.readFile(src, 'utf8', function (err, data) {
 
   var result = data.replace(/@VERSION@/g, npm.version)
     .replace(/^---\n([\s\S]+\n)---/, frontmatter)
-    .replace(/\[([^\]]+)\]\(\/cli-commands\/([^)]+)\)/g, replacer)
+    .replace(/\[([^\]]+)\]\(\/commands\/([^)]+)\)/g, replacer)
     .replace(/\[([^\]]+)\]\(\/configuring-npm\/([^)]+)\)/g, replacer)
     .replace(/\[([^\]]+)\]\(\/using-npm\/([^)]+)\)/g, replacer)
     .trim()