diff --git a/setup/www/README.md b/ansible/www-standalone/README.md
similarity index 100%
rename from setup/www/README.md
rename to ansible/www-standalone/README.md
diff --git a/setup/www/ansible-playbook.yaml b/ansible/www-standalone/ansible-playbook.yaml
similarity index 100%
rename from setup/www/ansible-playbook.yaml
rename to ansible/www-standalone/ansible-playbook.yaml
diff --git a/setup/www/ansible-vars.yaml b/ansible/www-standalone/ansible-vars.yaml
similarity index 100%
rename from setup/www/ansible-vars.yaml
rename to ansible/www-standalone/ansible-vars.yaml
diff --git a/setup/www/host_vars/.gitignore b/ansible/www-standalone/host_vars/.gitignore
similarity index 100%
rename from setup/www/host_vars/.gitignore
rename to ansible/www-standalone/host_vars/.gitignore
diff --git a/setup/www/host_vars/node-www.tmpl b/ansible/www-standalone/host_vars/node-www.tmpl
similarity index 100%
rename from setup/www/host_vars/node-www.tmpl
rename to ansible/www-standalone/host_vars/node-www.tmpl
diff --git a/setup/www/resources/.gitignore b/ansible/www-standalone/resources/.gitignore
similarity index 100%
rename from setup/www/resources/.gitignore
rename to ansible/www-standalone/resources/.gitignore
diff --git a/setup/www/resources/config/benchmarking.nodejs.org b/ansible/www-standalone/resources/config/benchmarking.nodejs.org
similarity index 100%
rename from setup/www/resources/config/benchmarking.nodejs.org
rename to ansible/www-standalone/resources/config/benchmarking.nodejs.org
diff --git a/setup/www/resources/config/coverage.nodejs.org b/ansible/www-standalone/resources/config/coverage.nodejs.org
similarity index 100%
rename from setup/www/resources/config/coverage.nodejs.org
rename to ansible/www-standalone/resources/config/coverage.nodejs.org
diff --git a/setup/www/resources/config/github-webhook.json.j2 b/ansible/www-standalone/resources/config/github-webhook.json.j2
similarity index 100%
rename from setup/www/resources/config/github-webhook.json.j2
rename to ansible/www-standalone/resources/config/github-webhook.json.j2
diff --git a/setup/www/resources/config/github-webhook.service.j2 b/ansible/www-standalone/resources/config/github-webhook.service.j2
similarity index 100%
rename from setup/www/resources/config/github-webhook.service.j2
rename to ansible/www-standalone/resources/config/github-webhook.service.j2
diff --git a/setup/www/resources/config/iojs.org b/ansible/www-standalone/resources/config/iojs.org
similarity index 100%
rename from setup/www/resources/config/iojs.org
rename to ansible/www-standalone/resources/config/iojs.org
diff --git a/setup/www/resources/config/libuv.org b/ansible/www-standalone/resources/config/libuv.org
similarity index 100%
rename from setup/www/resources/config/libuv.org
rename to ansible/www-standalone/resources/config/libuv.org
diff --git a/setup/www/resources/config/logrotate-nginx b/ansible/www-standalone/resources/config/logrotate-nginx
similarity index 100%
rename from setup/www/resources/config/logrotate-nginx
rename to ansible/www-standalone/resources/config/logrotate-nginx
diff --git a/setup/www/resources/config/nightly-builder-chakracore.json.j2 b/ansible/www-standalone/resources/config/nightly-builder-chakracore.json.j2
similarity index 100%
rename from setup/www/resources/config/nightly-builder-chakracore.json.j2
rename to ansible/www-standalone/resources/config/nightly-builder-chakracore.json.j2
diff --git a/setup/www/resources/config/nightly-builder-v8-canary.json.j2 b/ansible/www-standalone/resources/config/nightly-builder-v8-canary.json.j2
similarity index 100%
rename from setup/www/resources/config/nightly-builder-v8-canary.json.j2
rename to ansible/www-standalone/resources/config/nightly-builder-v8-canary.json.j2
diff --git a/setup/www/resources/config/nightly-builder.json.j2 b/ansible/www-standalone/resources/config/nightly-builder.json.j2
similarity index 100%
rename from setup/www/resources/config/nightly-builder.json.j2
rename to ansible/www-standalone/resources/config/nightly-builder.json.j2
diff --git a/setup/www/resources/config/nodejs.org b/ansible/www-standalone/resources/config/nodejs.org
similarity index 100%
rename from setup/www/resources/config/nodejs.org
rename to ansible/www-standalone/resources/config/nodejs.org
diff --git a/setup/www/resources/config/nodejs_ssh_config b/ansible/www-standalone/resources/config/nodejs_ssh_config
similarity index 100%
rename from setup/www/resources/config/nodejs_ssh_config
rename to ansible/www-standalone/resources/config/nodejs_ssh_config
diff --git a/setup/www/resources/config/nodejs_ssh_config.j2 b/ansible/www-standalone/resources/config/nodejs_ssh_config.j2
similarity index 100%
rename from setup/www/resources/config/nodejs_ssh_config.j2
rename to ansible/www-standalone/resources/config/nodejs_ssh_config.j2
diff --git a/setup/www/resources/config/old_mime.types b/ansible/www-standalone/resources/config/old_mime.types
similarity index 100%
rename from setup/www/resources/config/old_mime.types
rename to ansible/www-standalone/resources/config/old_mime.types
diff --git a/setup/www/resources/config/old_nodejs.org.conf b/ansible/www-standalone/resources/config/old_nodejs.org.conf
similarity index 100%
rename from setup/www/resources/config/old_nodejs.org.conf
rename to ansible/www-standalone/resources/config/old_nodejs.org.conf
diff --git a/setup/www/resources/config/open-file-cache.conf b/ansible/www-standalone/resources/config/open-file-cache.conf
similarity index 100%
rename from setup/www/resources/config/open-file-cache.conf
rename to ansible/www-standalone/resources/config/open-file-cache.conf
diff --git a/setup/www/resources/config/ssl-defaults.conf b/ansible/www-standalone/resources/config/ssl-defaults.conf
similarity index 100%
rename from setup/www/resources/config/ssl-defaults.conf
rename to ansible/www-standalone/resources/config/ssl-defaults.conf
diff --git a/setup/www/resources/scripts/build-benchmarking-site.sh b/ansible/www-standalone/resources/scripts/build-benchmarking-site.sh
similarity index 100%
rename from setup/www/resources/scripts/build-benchmarking-site.sh
rename to ansible/www-standalone/resources/scripts/build-benchmarking-site.sh
diff --git a/setup/www/resources/scripts/build-site.sh b/ansible/www-standalone/resources/scripts/build-site.sh
similarity index 100%
rename from setup/www/resources/scripts/build-site.sh
rename to ansible/www-standalone/resources/scripts/build-site.sh
diff --git a/setup/www/resources/scripts/cdn-purge.sh.j2 b/ansible/www-standalone/resources/scripts/cdn-purge.sh.j2
similarity index 100%
rename from setup/www/resources/scripts/cdn-purge.sh.j2
rename to ansible/www-standalone/resources/scripts/cdn-purge.sh.j2
diff --git a/setup/www/resources/scripts/check-build-site.sh b/ansible/www-standalone/resources/scripts/check-build-site.sh
similarity index 100%
rename from setup/www/resources/scripts/check-build-site.sh
rename to ansible/www-standalone/resources/scripts/check-build-site.sh
diff --git a/setup/www/resources/scripts/queue-cdn-purge.sh b/ansible/www-standalone/resources/scripts/queue-cdn-purge.sh
similarity index 100%
rename from setup/www/resources/scripts/queue-cdn-purge.sh
rename to ansible/www-standalone/resources/scripts/queue-cdn-purge.sh
diff --git a/setup/www/resources/scripts/sync-benchmarking.sh b/ansible/www-standalone/resources/scripts/sync-benchmarking.sh
similarity index 100%
rename from setup/www/resources/scripts/sync-benchmarking.sh
rename to ansible/www-standalone/resources/scripts/sync-benchmarking.sh
diff --git a/setup/www/resources/secrets/makesecrets.sh b/ansible/www-standalone/resources/secrets/makesecrets.sh
similarity index 100%
rename from setup/www/resources/secrets/makesecrets.sh
rename to ansible/www-standalone/resources/secrets/makesecrets.sh
diff --git a/setup/www/tasks/base.yaml b/ansible/www-standalone/tasks/base.yaml
similarity index 100%
rename from setup/www/tasks/base.yaml
rename to ansible/www-standalone/tasks/base.yaml
diff --git a/setup/www/tasks/docker.yaml b/ansible/www-standalone/tasks/docker.yaml
similarity index 100%
rename from setup/www/tasks/docker.yaml
rename to ansible/www-standalone/tasks/docker.yaml
diff --git a/setup/www/tasks/metrics.yaml b/ansible/www-standalone/tasks/metrics.yaml
similarity index 100%
rename from setup/www/tasks/metrics.yaml
rename to ansible/www-standalone/tasks/metrics.yaml
diff --git a/setup/www/tasks/nginx.yaml b/ansible/www-standalone/tasks/nginx.yaml
similarity index 100%
rename from setup/www/tasks/nginx.yaml
rename to ansible/www-standalone/tasks/nginx.yaml
diff --git a/setup/www/tasks/promote.yaml b/ansible/www-standalone/tasks/promote.yaml
similarity index 100%
rename from setup/www/tasks/promote.yaml
rename to ansible/www-standalone/tasks/promote.yaml
diff --git a/setup/www/tasks/site-setup.yaml b/ansible/www-standalone/tasks/site-setup.yaml
similarity index 100%
rename from setup/www/tasks/site-setup.yaml
rename to ansible/www-standalone/tasks/site-setup.yaml
diff --git a/setup/www/tasks/tools.yaml b/ansible/www-standalone/tasks/tools.yaml
similarity index 100%
rename from setup/www/tasks/tools.yaml
rename to ansible/www-standalone/tasks/tools.yaml
diff --git a/setup/www/tasks/user.yaml b/ansible/www-standalone/tasks/user.yaml
similarity index 100%
rename from setup/www/tasks/user.yaml
rename to ansible/www-standalone/tasks/user.yaml
diff --git a/setup/www/tasks/webhook.yaml b/ansible/www-standalone/tasks/webhook.yaml
similarity index 100%
rename from setup/www/tasks/webhook.yaml
rename to ansible/www-standalone/tasks/webhook.yaml
diff --git a/setup/www/tools/dist/dist-promotable b/ansible/www-standalone/tools/dist/dist-promotable
similarity index 100%
rename from setup/www/tools/dist/dist-promotable
rename to ansible/www-standalone/tools/dist/dist-promotable
diff --git a/setup/www/tools/dist/dist-promote b/ansible/www-standalone/tools/dist/dist-promote
similarity index 100%
rename from setup/www/tools/dist/dist-promote
rename to ansible/www-standalone/tools/dist/dist-promote
diff --git a/setup/www/tools/dist/dist-sign b/ansible/www-standalone/tools/dist/dist-sign
similarity index 100%
rename from setup/www/tools/dist/dist-sign
rename to ansible/www-standalone/tools/dist/dist-sign
diff --git a/setup/www/tools/metrics/country-lookup.py b/ansible/www-standalone/tools/metrics/country-lookup.py
similarity index 100%
rename from setup/www/tools/metrics/country-lookup.py
rename to ansible/www-standalone/tools/metrics/country-lookup.py
diff --git a/setup/www/tools/metrics/download-counts.awk b/ansible/www-standalone/tools/metrics/download-counts.awk
similarity index 100%
rename from setup/www/tools/metrics/download-counts.awk
rename to ansible/www-standalone/tools/metrics/download-counts.awk
diff --git a/setup/www/tools/metrics/download-counts.sh b/ansible/www-standalone/tools/metrics/download-counts.sh
similarity index 100%
rename from setup/www/tools/metrics/download-counts.sh
rename to ansible/www-standalone/tools/metrics/download-counts.sh
diff --git a/setup/www/tools/metrics/download-summaries.awk b/ansible/www-standalone/tools/metrics/download-summaries.awk
similarity index 100%
rename from setup/www/tools/metrics/download-summaries.awk
rename to ansible/www-standalone/tools/metrics/download-summaries.awk
diff --git a/setup/www/tools/metrics/plot.gp b/ansible/www-standalone/tools/metrics/plot.gp
similarity index 100%
rename from setup/www/tools/metrics/plot.gp
rename to ansible/www-standalone/tools/metrics/plot.gp
diff --git a/setup/www/tools/metrics/public-index.html b/ansible/www-standalone/tools/metrics/public-index.html
similarity index 100%
rename from setup/www/tools/metrics/public-index.html
rename to ansible/www-standalone/tools/metrics/public-index.html
diff --git a/setup/www/tools/metrics/public-index.md b/ansible/www-standalone/tools/metrics/public-index.md
similarity index 100%
rename from setup/www/tools/metrics/public-index.md
rename to ansible/www-standalone/tools/metrics/public-index.md
diff --git a/setup/www/tools/metrics/summary-arch.awk b/ansible/www-standalone/tools/metrics/summary-arch.awk
similarity index 100%
rename from setup/www/tools/metrics/summary-arch.awk
rename to ansible/www-standalone/tools/metrics/summary-arch.awk
diff --git a/setup/www/tools/metrics/summary-country.awk b/ansible/www-standalone/tools/metrics/summary-country.awk
similarity index 100%
rename from setup/www/tools/metrics/summary-country.awk
rename to ansible/www-standalone/tools/metrics/summary-country.awk
diff --git a/setup/www/tools/metrics/summary-os.awk b/ansible/www-standalone/tools/metrics/summary-os.awk
similarity index 100%
rename from setup/www/tools/metrics/summary-os.awk
rename to ansible/www-standalone/tools/metrics/summary-os.awk
diff --git a/setup/www/tools/metrics/summary-total.awk b/ansible/www-standalone/tools/metrics/summary-total.awk
similarity index 100%
rename from setup/www/tools/metrics/summary-total.awk
rename to ansible/www-standalone/tools/metrics/summary-total.awk
diff --git a/setup/www/tools/metrics/summary-version.awk b/ansible/www-standalone/tools/metrics/summary-version.awk
similarity index 100%
rename from setup/www/tools/metrics/summary-version.awk
rename to ansible/www-standalone/tools/metrics/summary-version.awk
diff --git a/setup/www/tools/metrics/update-geoipdb.sh b/ansible/www-standalone/tools/metrics/update-geoipdb.sh
similarity index 100%
rename from setup/www/tools/metrics/update-geoipdb.sh
rename to ansible/www-standalone/tools/metrics/update-geoipdb.sh
diff --git a/setup/www/tools/promote/README.md b/ansible/www-standalone/tools/promote/README.md
similarity index 100%
rename from setup/www/tools/promote/README.md
rename to ansible/www-standalone/tools/promote/README.md
diff --git a/setup/www/tools/promote/_promote.sh b/ansible/www-standalone/tools/promote/_promote.sh
similarity index 100%
rename from setup/www/tools/promote/_promote.sh
rename to ansible/www-standalone/tools/promote/_promote.sh
diff --git a/setup/www/tools/promote/_resha.sh b/ansible/www-standalone/tools/promote/_resha.sh
similarity index 100%
rename from setup/www/tools/promote/_resha.sh
rename to ansible/www-standalone/tools/promote/_resha.sh
diff --git a/setup/www/tools/promote/check_assets.js b/ansible/www-standalone/tools/promote/check_assets.js
similarity index 100%
rename from setup/www/tools/promote/check_assets.js
rename to ansible/www-standalone/tools/promote/check_assets.js
diff --git a/setup/www/tools/promote/expected_assets/v10.x b/ansible/www-standalone/tools/promote/expected_assets/v10.x
similarity index 100%
rename from setup/www/tools/promote/expected_assets/v10.x
rename to ansible/www-standalone/tools/promote/expected_assets/v10.x
diff --git a/setup/www/tools/promote/expected_assets/v11.x b/ansible/www-standalone/tools/promote/expected_assets/v11.x
similarity index 100%
rename from setup/www/tools/promote/expected_assets/v11.x
rename to ansible/www-standalone/tools/promote/expected_assets/v11.x
diff --git a/setup/www/tools/promote/expected_assets/v6.x b/ansible/www-standalone/tools/promote/expected_assets/v6.x
similarity index 100%
rename from setup/www/tools/promote/expected_assets/v6.x
rename to ansible/www-standalone/tools/promote/expected_assets/v6.x
diff --git a/setup/www/tools/promote/expected_assets/v8.x b/ansible/www-standalone/tools/promote/expected_assets/v8.x
similarity index 100%
rename from setup/www/tools/promote/expected_assets/v8.x
rename to ansible/www-standalone/tools/promote/expected_assets/v8.x
diff --git a/setup/www/tools/promote/promote_nightly.sh b/ansible/www-standalone/tools/promote/promote_nightly.sh
similarity index 100%
rename from setup/www/tools/promote/promote_nightly.sh
rename to ansible/www-standalone/tools/promote/promote_nightly.sh
diff --git a/setup/www/tools/promote/promote_release.sh b/ansible/www-standalone/tools/promote/promote_release.sh
similarity index 100%
rename from setup/www/tools/promote/promote_release.sh
rename to ansible/www-standalone/tools/promote/promote_release.sh
diff --git a/setup/www/tools/promote/resha_release.sh b/ansible/www-standalone/tools/promote/resha_release.sh
similarity index 100%
rename from setup/www/tools/promote/resha_release.sh
rename to ansible/www-standalone/tools/promote/resha_release.sh
diff --git a/setup/www/tools/promote/settings b/ansible/www-standalone/tools/promote/settings
similarity index 100%
rename from setup/www/tools/promote/settings
rename to ansible/www-standalone/tools/promote/settings
diff --git a/setup/www/tools/update-download-stats.sh b/ansible/www-standalone/tools/update-download-stats.sh
similarity index 100%
rename from setup/www/tools/update-download-stats.sh
rename to ansible/www-standalone/tools/update-download-stats.sh
diff --git a/setup/www/tools/promote/expected_assets/v12.x b/setup/www/tools/promote/expected_assets/v12.x
deleted file mode 100644
index 828365528..000000000
--- a/setup/www/tools/promote/expected_assets/v12.x
+++ /dev/null
@@ -1,39 +0,0 @@
-docs/
-docs/apilinks.json
-docs/api/
-node-{VERSION}-aix-ppc64.tar.gz
-node-{VERSION}-darwin-x64.tar.gz
-node-{VERSION}-darwin-x64.tar.xz
-node-{VERSION}-headers.tar.gz
-node-{VERSION}-headers.tar.xz
-node-{VERSION}-linux-arm64.tar.gz
-node-{VERSION}-linux-arm64.tar.xz
-node-{VERSION}-linux-armv7l.tar.gz
-node-{VERSION}-linux-armv7l.tar.xz
-node-{VERSION}-linux-ppc64le.tar.gz
-node-{VERSION}-linux-ppc64le.tar.xz
-node-{VERSION}-linux-s390x.tar.gz
-node-{VERSION}-linux-s390x.tar.xz
-node-{VERSION}-linux-x64.tar.gz
-node-{VERSION}-linux-x64.tar.xz
-node-{VERSION}.pkg
-node-{VERSION}-sunos-x64.tar.gz
-node-{VERSION}-sunos-x64.tar.xz
-node-{VERSION}.tar.gz
-node-{VERSION}.tar.xz
-node-{VERSION}-win-x64.7z
-node-{VERSION}-win-x64.zip
-node-{VERSION}-win-x86.7z
-node-{VERSION}-win-x86.zip
-node-{VERSION}-x64.msi
-node-{VERSION}-x86.msi
-win-x64/
-win-x64/node.exe
-win-x64/node.lib
-win-x64/node_pdb.7z
-win-x64/node_pdb.zip
-win-x86/
-win-x86/node.exe
-win-x86/node.lib
-win-x86/node_pdb.7z
-win-x86/node_pdb.zip