diff --git a/www/.htaccess b/www/.htaccess
index e9dba93..cb66149 100644
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -2,83 +2,3 @@
 redirectmatch 302 ^/start(/)?$ /get-started.html
 
 # Permanent redirects for documents which have moved in the past
-redirectmatch 301 ^/docs/zuul/admin/centos7_setup.html /docs/zuul/howtos/centos7_setup.html
-redirectmatch 301 ^/docs/zuul/admin/client.html /docs/zuul/reference/client.html
-redirectmatch 301 ^/docs/zuul/admin/components.html /docs/zuul/discussion/components.html
-redirectmatch 301 ^/docs/zuul/admin/connections.html /docs/zuul/reference/connections.html
-redirectmatch 301 ^/docs/zuul/admin/drivers/gerrit.html /docs/zuul/reference/drivers/gerrit.html
-redirectmatch 301 ^/docs/zuul/admin/drivers/git.html /docs/zuul/reference/drivers/git.html
-redirectmatch 301 ^/docs/zuul/admin/drivers/github.html /docs/zuul/reference/drivers/github.html
-redirectmatch 301 ^/docs/zuul/admin/drivers/mqtt.html /docs/zuul/reference/drivers/mqtt.html
-redirectmatch 301 ^/docs/zuul/admin/drivers/pagure.html /docs/zuul/reference/drivers/pagure.html
-redirectmatch 301 ^/docs/zuul/admin/drivers/smtp.html /docs/zuul/reference/drivers/smtp.html
-redirectmatch 301 ^/docs/zuul/admin/drivers/sql.html /docs/zuul/reference/drivers/sql.html
-redirectmatch 301 ^/docs/zuul/admin/drivers/timer.html /docs/zuul/reference/drivers/timer.html
-redirectmatch 301 ^/docs/zuul/admin/drivers/zuul.html /docs/zuul/reference/drivers/zuul.html
-redirectmatch 301 ^/docs/zuul/admin/fedora27_setup.html /docs/zuul/howtos/fedora27_setup.html
-redirectmatch 301 ^/docs/zuul/admin/gerrit_setup.html /docs/zuul/howtos/gerrit_setup.html
-redirectmatch 301 ^/docs/zuul/admin/github_setup.html /docs/zuul/howtos/github_setup.html
-redirectmatch 301 ^/docs/zuul/admin/installation.html /docs/zuul/howtos/installation.html
-redirectmatch 301 ^/docs/zuul/admin/monitoring.html /docs/zuul/reference/monitoring.html
-redirectmatch 301 ^/docs/zuul/admin/nodepool_install.html /docs/zuul/howtos/nodepool_install.html
-redirectmatch 301 ^/docs/zuul/admin/nodepool_openstack.html /docs/zuul/howtos/nodepool_openstack.html
-redirectmatch 301 ^/docs/zuul/admin/nodepool_static.html /docs/zuul/howtos/nodepool_static.html
-redirectmatch 301 ^/docs/zuul/admin/opensuse_leap15_setup.html /docs/zuul/howtos/admins/opensuse_leap15_setup.html
-redirectmatch 301 ^/docs/zuul/admin/quick-start.html /docs/zuul/tutorials/quick-start.html
-redirectmatch 301 ^/docs/zuul/admin/tenant-scoped-rest-api.html /docs/zuul/discussion/tenant-scoped-rest-api.html
-redirectmatch 301 ^/docs/zuul/admin/tenants.html /docs/zuul/reference/tenants.html
-redirectmatch 301 ^/docs/zuul/admin/troubleshooting.html /docs/zuul/howtos/troubleshooting.html
-redirectmatch 301 ^/docs/zuul/admin/zuul-from-scratch.html /docs/zuul/howtos/zuul-from-scratch.html
-redirectmatch 301 ^/docs/zuul/admin/zuul_install.html /docs/zuul/howtos/zuul_install.html
-redirectmatch 301 ^/docs/zuul/developer/ansible.html /docs/zuul/reference/developer/ansible.html
-redirectmatch 301 ^/docs/zuul/developer/datamodel.html /docs/zuul/reference/developer/datamodel.html
-redirectmatch 301 ^/docs/zuul/developer/docs.html /docs/zuul/reference/developer/docs.html
-redirectmatch 301 ^/docs/zuul/developer/drivers.html /docs/zuul/reference/developer/drivers.html
-redirectmatch 301 ^/docs/zuul/developer/index.html /docs/zuul/reference/developer/index.html
-redirectmatch 301 ^/docs/zuul/developer/javascript.html /docs/zuul/reference/developer/javascript.html
-redirectmatch 301 ^/docs/zuul/developer/releasenotes.html /docs/zuul/reference/developer/releasenotes.html
-redirectmatch 301 ^/docs/zuul/developer/specs/container-build-resources.html /docs/zuul/reference/developer/specs/container-build-resources.html
-redirectmatch 301 ^/docs/zuul/developer/specs/index.html /docs/zuul/reference/developer/specs/index.html
-redirectmatch 301 ^/docs/zuul/developer/specs/kubernetes-operator.html /docs/zuul/reference/developer/specs/kubernetes-operator.html
-redirectmatch 301 ^/docs/zuul/developer/specs/logs.html /docs/zuul/reference/developer/specs/logs.html
-redirectmatch 301 ^/docs/zuul/developer/specs/multiple-ansible-versions.html /docs/zuul/reference/developer/specs/multiple-ansible-versions.html
-redirectmatch 301 ^/docs/zuul/developer/specs/tenant-scoped-admin-web-API.html /docs/zuul/reference/developer/specs/tenant-scoped-admin-web-API.html
-redirectmatch 301 ^/docs/zuul/developer/testing.html /docs/zuul/reference/developer/testing.html
-redirectmatch 301 ^/docs/zuul/developer/triggers.html /docs/zuul/reference/developer/triggers.html
-redirectmatch 301 ^/docs/zuul/glossary.html /docs/zuul/reference/glossary.html
-redirectmatch 301 ^/docs/zuul/governance.html /docs/zuul/reference/governance.html
-redirectmatch 301 ^/docs/zuul/releasenotes.html /docs/zuul/reference/releasenotes.html
-redirectmatch 301 ^/docs/zuul/user/badges.html /docs/zuul/howtos/badges.html
-redirectmatch 301 ^/docs/zuul/user/client-user.html /docs/zuul/reference/client.html
-redirectmatch 301 ^/docs/zuul/user/concepts.html /docs/zuul/discussion/concepts.html
-redirectmatch 301 ^/docs/zuul/user/config.html /docs/zuul/reference/config.html
-redirectmatch 301 ^/docs/zuul/user/encryption.html /docs/zuul/discussion/encryption.html
-redirectmatch 301 ^/docs/zuul/user/gating.html /docs/zuul/discussion/gating.html
-redirectmatch 301 ^/docs/zuul/user/howtos/cross-project-gating.html /docs/zuul/howtos/users/cross-project-gating.html
-redirectmatch 301 ^/docs/zuul/user/howtos/pti.html /docs/zuul/howtos/users/pti.html
-redirectmatch 301 ^/docs/zuul/user/ /docs/zuul/index.html
-redirectmatch 301 ^/docs/zuul/user/index.html /docs/zuul/index.html
-redirectmatch 301 ^/docs/zuul/user/jobs.html /docs/zuul/reference/jobs.html
-redirectmatch 301 ^/docs/zuul/user/vulnerabilities.html /docs/zuul/reference/vulnerabilities.html
-redirectmatch 301 ^/docs/zuul/user/web.html /docs/zuul/reference/web.html
-
-redirectmatch 301 ^/docs/zuul/howtos/admins/centos7_setup.html /docs/zuul/howtos/centos7_setup.html
-redirectmatch 301 ^/docs/zuul/howtos/admins/fedora27_setup.html /docs/zuul/howtos/fedora27_setup.html
-redirectmatch 301 ^/docs/zuul/howtos/admins/gerrit_setup.html /docs/zuul/howtos/gerrit_setup.html
-redirectmatch 301 ^/docs/zuul/howtos/admins/github_setup.html /docs/zuul/howtos/github_setup.html
-redirectmatch 301 ^/docs/zuul/howtos/admins/installation.html /docs/zuul/howtos/installation.html
-redirectmatch 301 ^/docs/zuul/howtos/admins/nodepool_install.html /docs/zuul/howtos/nodepool_install.html
-redirectmatch 301 ^/docs/zuul/howtos/admins/nodepool_openstack.html /docs/zuul/howtos/nodepool_openstack.html
-redirectmatch 301 ^/docs/zuul/howtos/admins/nodepool_static.html /docs/zuul/howtos/nodepool_static.html
-redirectmatch 301 ^/docs/zuul/howtos/admins/opensuse_leap15_setup.html /docs/zuul/howtos/opensuse_leap15_setup.html
-redirectmatch 301 ^/docs/zuul/howtos/admins/troubleshooting.html /docs/zuul/howtos/troubleshooting.html
-redirectmatch 301 ^/docs/zuul/howtos/admins/zuul-from-scratch.html /docs/zuul/howtos/zuul-from-scratch.html
-redirectmatch 301 ^/docs/zuul/howtos/admins/zuul_install.html /docs/zuul/howtos/zuul_install.html
-redirectmatch 301 ^/docs/zuul/howtos/users/badges.html /docs/zuul/howtos/badges.html
-redirectmatch 301 ^/docs/zuul/howtos/users/cross-project-gating.html /docs/zuul/howtos/cross-project-gating.html
-redirectmatch 301 ^/docs/zuul/howtos/users/pti.html /docs/zuul/howtos/users/pti.html
-redirectmatch 301 ^/docs/zuul/tutorials/admins/quick-start.html /docs/zuul/tutorials/quick-start.html
-redirectmatch 301 ^/docs/zuul/discussion/tenants.html /docs/zuul/reference/tenants.html
-redirectmatch 301 ^/docs/zuul/overview/governance.html /docs/zuul/reference/governance.html
-redirectmatch 301 ^/docs/zuul/overview/releasenotes.html /docs/zuul/reference/releasenotes.html
-redirectmatch 301 ^/docs/zuul/overview/vulnerabilities.html /docs/zuul/reference/vulnerabilities.html