diff --git a/README.rst b/README.rst
index 5904a24e75..2e581c0a21 100644
--- a/README.rst
+++ b/README.rst
@@ -70,7 +70,9 @@ Directories
    community members which want to use Kolla container content without
    Ansible.
 -  demos - Contains a few demos to use with Kolla.
--  devenv - Contains an OpenStack-Heat based development environment.
+-  dev/heat - Contains an OpenStack-Heat based development environment.
+-  dev/vagrant - Contains a vagrant VirtualBox/Libvirt based development
+   environment.
 -  doc - Contains documentation.
 -  etc - Contains a reference etc directory structure which requires
    configuration of a small number of configuration variables to achieve
@@ -80,8 +82,6 @@ Directories
 -  specs - Contains the Kolla communities key arguments about
    architectural shifts in the code base.
 -  tests - Contains functional testing tools.
--  vagrant - Contains a vagrant VirtualBox-based development
-   environment.
 
 Getting Involved
 ================
diff --git a/devenv/get-image.sh b/dev/heat/get-image.sh
similarity index 100%
rename from devenv/get-image.sh
rename to dev/heat/get-image.sh
diff --git a/devenv/kollacluster.yaml b/dev/heat/kollacluster.yaml
similarity index 100%
rename from devenv/kollacluster.yaml
rename to dev/heat/kollacluster.yaml
diff --git a/devenv/kollanode.yaml b/dev/heat/kollanode.yaml
similarity index 100%
rename from devenv/kollanode.yaml
rename to dev/heat/kollanode.yaml
diff --git a/devenv/local.yaml.example b/dev/heat/local.yaml.example
similarity index 100%
rename from devenv/local.yaml.example
rename to dev/heat/local.yaml.example
diff --git a/vagrant/Vagrantfile b/dev/vagrant/Vagrantfile
similarity index 100%
rename from vagrant/Vagrantfile
rename to dev/vagrant/Vagrantfile
diff --git a/vagrant/bootstrap.sh b/dev/vagrant/bootstrap.sh
similarity index 100%
rename from vagrant/bootstrap.sh
rename to dev/vagrant/bootstrap.sh