diff --git a/doc/arch-design/source/index.rst b/doc/arch-design/source/index.rst
index f24d7e8ed4..2d8b7b4e1e 100644
--- a/doc/arch-design/source/index.rst
+++ b/doc/arch-design/source/index.rst
@@ -35,7 +35,7 @@ Before reading this book, we recommend:
 * A basic understanding of networking principles and protocols.
 
 For information about deploying and operating OpenStack, see the
-`Installation Tutorials and Guides <https://docs.openstack.org/project-install-guide/ocata/>`_,
+`Installation Tutorials and Guides <https://docs.openstack.org/ocata/install/>`_,
 `Deployment Guides <https://docs.openstack.org/ocata/deploy/>`_,
 and the `OpenStack Operations Guide <https://docs.openstack.org/ops-guide/>`_.
 
diff --git a/doc/contributor-guide/source/project-install-guide.rst b/doc/contributor-guide/source/project-install-guide.rst
index 23b6fdbd2a..fc460d87ed 100644
--- a/doc/contributor-guide/source/project-install-guide.rst
+++ b/doc/contributor-guide/source/project-install-guide.rst
@@ -149,7 +149,6 @@ After these changes have merged, you can set up the jobs for building.
 #. Commit the changes to the infra repository for review.
 
 To create or update the master index file, create or update the
-``www/project-install-guide/RELEASE/index.html`` file and the
+``www/RELEASE/install/index.html`` file and the
 ``doc/install-guide/source/additional-services.rst`` at the
 ``openstack-manuals`` repository.
-For draft (unreleased) version, replace ``RELEASE`` with ``draft``.
diff --git a/doc/ha-guide-draft/source/compute-node-ha.rst b/doc/ha-guide-draft/source/compute-node-ha.rst
index b1fb659269..92e1149eb7 100644
--- a/doc/ha-guide-draft/source/compute-node-ha.rst
+++ b/doc/ha-guide-draft/source/compute-node-ha.rst
@@ -3,7 +3,7 @@ Configuring the compute node
 ============================
 
 The `Installation Tutorials and Guides
-<https://docs.openstack.org/project-install-guide/ocata/>`_
+<https://docs.openstack.org/ocata/install/>`_
 provide instructions for installing multiple compute nodes.
 To make the compute nodes highly available, you must configure the
 environment to include multiple instances of the API and other services.
diff --git a/doc/ha-guide-draft/source/intro-os-ha-memcached.rst b/doc/ha-guide-draft/source/intro-os-ha-memcached.rst
index 709c891199..dc1de6e98c 100644
--- a/doc/ha-guide-draft/source/intro-os-ha-memcached.rst
+++ b/doc/ha-guide-draft/source/intro-os-ha-memcached.rst
@@ -31,5 +31,5 @@ By default, ``controller1`` handles the caching service. If the host goes down,
 
 For more information about Memcached installation, see the
 *Environment -> Memcached* section in the
-`Installation Tutorials and Guides <https://docs.openstack.org/project-install-guide/ocata>`_
+`Installation Tutorials and Guides <https://docs.openstack.org/ocata/install/>`_
 depending on your distribution.
diff --git a/doc/ha-guide-draft/source/networking-ha.rst b/doc/ha-guide-draft/source/networking-ha.rst
index 0767455056..47f4864bac 100644
--- a/doc/ha-guide-draft/source/networking-ha.rst
+++ b/doc/ha-guide-draft/source/networking-ha.rst
@@ -4,7 +4,7 @@ Configuring the networking services
 
 Configure networking on each node. See the basic information about
 configuring networking in the Networking service section of the
-`Install Tutorials and Guides <https://docs.openstack.org/project-install-guide/ocata/>`_,
+`Install Tutorials and Guides <https://docs.openstack.org/ocata/install/>`_,
 depending on your distribution.
 
 OpenStack network nodes contain:
diff --git a/doc/ha-guide-draft/source/storage-ha-image.rst b/doc/ha-guide-draft/source/storage-ha-image.rst
index 362c65c5ac..cb775b1f3a 100644
--- a/doc/ha-guide-draft/source/storage-ha-image.rst
+++ b/doc/ha-guide-draft/source/storage-ha-image.rst
@@ -16,7 +16,7 @@ Prerequisites
 Before beginning, ensure that you are familiar with the
 documentation for installing the OpenStack Image API service.
 See the *Image service* section in the
-`Installation Tutorials and Guides <https://docs.openstack.org/project-install-guide/ocata>`_,
+`Installation Tutorials and Guides <https://docs.openstack.org/ocata/install>`_,
 depending on your distribution.
 
 .. _glance-api-pacemaker:
diff --git a/doc/ha-guide/source/compute-node-ha.rst b/doc/ha-guide/source/compute-node-ha.rst
index 5708d62671..04346c1b68 100644
--- a/doc/ha-guide/source/compute-node-ha.rst
+++ b/doc/ha-guide/source/compute-node-ha.rst
@@ -3,7 +3,7 @@ Configuring the compute node
 ============================
 
 The `Installation Tutorials and Guides
-<https://docs.openstack.org/project-install-guide/ocata/>`_
+<https://docs.openstack.org/ocata/install/>`_
 provide instructions for installing multiple compute nodes.
 To make the compute nodes highly available, you must configure the
 environment to include multiple instances of the API and other services.
diff --git a/doc/ha-guide/source/environment-hardware.rst b/doc/ha-guide/source/environment-hardware.rst
index f0c3d8230e..49bb06495a 100644
--- a/doc/ha-guide/source/environment-hardware.rst
+++ b/doc/ha-guide/source/environment-hardware.rst
@@ -12,11 +12,11 @@ The following are the standard hardware requirements:
 
 - Provider networks: See the *Overview -> Networking Option 1: Provider
   networks* section of the
-  `Install Tutorials and Guides <https://docs.openstack.org/project-install-guide/ocata>`_
+  `Install Tutorials and Guides <https://docs.openstack.org/ocata/install>`_
   depending on your distribution.
 - Self-service networks: See the *Overview -> Networking Option 2:
   Self-service networks* section of the
-  `Install Tutorials and Guides <https://docs.openstack.org/project-install-guide/ocata>`_
+  `Install Tutorials and Guides <https://docs.openstack.org/ocata/install>`_
   depending on your distribution.
 
 OpenStack does not require a significant amount of resources and the following
diff --git a/doc/ha-guide/source/environment-memcached.rst b/doc/ha-guide/source/environment-memcached.rst
index 1c7dbf0c0b..a71534ce2d 100644
--- a/doc/ha-guide/source/environment-memcached.rst
+++ b/doc/ha-guide/source/environment-memcached.rst
@@ -28,5 +28,5 @@ By default, ``controller1`` handles the caching service. If the host goes down,
 
 For more information about Memcached installation, see the
 *Environment -> Memcached* section in the
-`Installation Tutorials and Guides <https://docs.openstack.org/project-install-guide/ocata>`_
+`Installation Tutorials and Guides <https://docs.openstack.org/ocata/install/>`_
 depending on your distribution.
diff --git a/doc/ha-guide/source/environment-ntp.rst b/doc/ha-guide/source/environment-ntp.rst
index 37e5bfff07..ced0c2a605 100644
--- a/doc/ha-guide/source/environment-ntp.rst
+++ b/doc/ha-guide/source/environment-ntp.rst
@@ -7,4 +7,4 @@ We recommend that you configure the controller node to reference
 more accurate (lower stratum) servers and other nodes to reference
 the controller node. For more information, see the
 `Installation Tutorials and Guides
-<https://docs.openstack.org/project-install-guide/ocata/>`_.
+<https://docs.openstack.org/ocata/install/>`_.
diff --git a/doc/ha-guide/source/environment-operatingsystem.rst b/doc/ha-guide/source/environment-operatingsystem.rst
index b1f2f8cd32..a7f83a3bad 100644
--- a/doc/ha-guide/source/environment-operatingsystem.rst
+++ b/doc/ha-guide/source/environment-operatingsystem.rst
@@ -5,7 +5,7 @@ Installing the operating system
 The first step in setting up your highly available OpenStack cluster
 is to install the operating system on each node.
 Follow the instructions in the *Environment* section of the
-`Installation Tutorials and Guides <https://docs.openstack.org/project-install-guide/ocata>`_
+`Installation Tutorials and Guides <https://docs.openstack.org/ocata/install>`_
 depending on your distribution.
 
 The OpenStack Installation Tutorials and Guides also include a list of
diff --git a/doc/ha-guide/source/networking-ha.rst b/doc/ha-guide/source/networking-ha.rst
index 3ac71a2574..c50c3e2fa0 100644
--- a/doc/ha-guide/source/networking-ha.rst
+++ b/doc/ha-guide/source/networking-ha.rst
@@ -11,7 +11,7 @@ Configuring the networking services
 Configure networking on each node. See the basic information
 about configuring networking in the *Networking service*
 section of the
-`Install Tutorials and Guides <https://docs.openstack.org/project-install-guide/ocata>`_,
+`Install Tutorials and Guides <https://docs.openstack.org/ocata/install/>`_,
 depending on your distribution.
 
 OpenStack network nodes contain:
diff --git a/doc/ha-guide/source/storage-ha-image.rst b/doc/ha-guide/source/storage-ha-image.rst
index 362c65c5ac..0a5734c87d 100644
--- a/doc/ha-guide/source/storage-ha-image.rst
+++ b/doc/ha-guide/source/storage-ha-image.rst
@@ -16,7 +16,7 @@ Prerequisites
 Before beginning, ensure that you are familiar with the
 documentation for installing the OpenStack Image API service.
 See the *Image service* section in the
-`Installation Tutorials and Guides <https://docs.openstack.org/project-install-guide/ocata>`_,
+`Installation Tutorials and Guides <https://docs.openstack.org/ocata/install/>`_,
 depending on your distribution.
 
 .. _glance-api-pacemaker:
diff --git a/doc/install-guide/source/environment.rst b/doc/install-guide/source/environment.rst
index c8df83f15e..7ef6cc7aa9 100644
--- a/doc/install-guide/source/environment.rst
+++ b/doc/install-guide/source/environment.rst
@@ -9,7 +9,7 @@ Although most environments include Identity, Image service, Compute, at least
 one networking service, and the Dashboard, the Object Storage service can
 operate independently. If your use case only involves Object Storage, you can
 skip to `Object Storage Installation Guide
-<https://docs.openstack.org/project-install-guide/object-storage/draft/>`_
+<https://docs.openstack.org/swift/>`_
 after configuring the appropriate nodes for it.
 
 You must use an account with administrative privileges to configure each node.
diff --git a/doc/install-guide/source/launch-instance.rst b/doc/install-guide/source/launch-instance.rst
index e68cbfcdb8..25f3cc50b6 100644
--- a/doc/install-guide/source/launch-instance.rst
+++ b/doc/install-guide/source/launch-instance.rst
@@ -219,7 +219,7 @@ If your environment includes the Orchestration service, you can create
 a stack that launches an instance.
 
 For more information, see the
-`Orchestration installation guide <https://docs.openstack.org/project-install-guide/orchestration/ocata/launch-instance.html>`_.
+`Orchestration installation guide <https://docs.openstack.org/orchestration/>`_.
 
 Shared File Systems
 -------------------
@@ -229,4 +229,4 @@ a share and mount it in an instance.
 
 For more information, see the
 `Shared File Systems installation guide
-<https://docs.openstack.org/project-install-guide/shared-file-systems/ocata>`_.
+<https://docs.openstack.org/shared-file-system/>`_.
diff --git a/www/.htaccess b/www/.htaccess
index 68b89bb3d0..1229b732fb 100644
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -68,6 +68,10 @@ redirectmatch 301 "^/project-deploy-guide/openstack-ansible/$" /project-deploy-g
 redirectmatch 301 "^/project-deploy-guide/newton/" /newton/deploy/
 redirectmatch 301 "^/project-deploy-guide/ocata/" /ocata/deploy/
 
+# Redirect old install guide list pages to their new home
+redirectmatch 301 "^/project-install-guide/newton/" /newton/install/
+redirectmatch 301 "^/project-install-guide/ocata/(.*)$" /ocata/install/$1
+
 # Redirecting infra docs links to new developer location
 redirectmatch 301 "^/infra/shade(.*)$" /developer/shade$1
 
diff --git a/www/project-install-guide/newton/index.html b/www/newton/install/index.html
similarity index 100%
rename from www/project-install-guide/newton/index.html
rename to www/newton/install/index.html
diff --git a/www/ocata/index.html b/www/ocata/index.html
index 0af7201c39..c63bc6df0a 100644
--- a/www/ocata/index.html
+++ b/www/ocata/index.html
@@ -62,7 +62,7 @@
                 <div class="docs-link-sections">
                     <h3 id="install-guides"><i class="fa fa-cogs"></i> Installation Tutorials and Guides</h3>
                     <p>Getting started with the most commonly used OpenStack services</p>
-                    <a href="/project-install-guide/ocata/">Installation Tutorials and Guides</a>
+                    <a href="install">Installation Tutorials and Guides</a>
                 </div>
                 <div class="docs-link-sections">
                     <h3 id="project-deploy-guide"><i class="fa fa-cogs"></i> Deployment Guides</h3>
diff --git a/www/project-install-guide/ocata/index.html b/www/ocata/install/index.html
similarity index 100%
rename from www/project-install-guide/ocata/index.html
rename to www/ocata/install/index.html
diff --git a/www/project-install-guide/ocata/obs-services.html b/www/ocata/install/obs-services.html
similarity index 100%
rename from www/project-install-guide/ocata/obs-services.html
rename to www/ocata/install/obs-services.html
diff --git a/www/project-install-guide/ocata/rdo-services.html b/www/ocata/install/rdo-services.html
similarity index 100%
rename from www/project-install-guide/ocata/rdo-services.html
rename to www/ocata/install/rdo-services.html
diff --git a/www/project-install-guide/ocata/ubuntu-services.html b/www/ocata/install/ubuntu-services.html
similarity index 100%
rename from www/project-install-guide/ocata/ubuntu-services.html
rename to www/ocata/install/ubuntu-services.html