diff --git a/docker-cinder-controller/.gitignore b/cinder-controller/.gitignore
similarity index 100%
rename from docker-cinder-controller/.gitignore
rename to cinder-controller/.gitignore
diff --git a/docker-cinder-controller/Dockerfile b/cinder-controller/Dockerfile
similarity index 100%
rename from docker-cinder-controller/Dockerfile
rename to cinder-controller/Dockerfile
diff --git a/docker-cinder-controller/README.md b/cinder-controller/README.md
similarity index 100%
rename from docker-cinder-controller/README.md
rename to cinder-controller/README.md
diff --git a/docker-cinder-controller/admin-openrc.sh b/cinder-controller/admin-openrc.sh
similarity index 100%
rename from docker-cinder-controller/admin-openrc.sh
rename to cinder-controller/admin-openrc.sh
diff --git a/docker-cinder-controller/bootstrap.sh b/cinder-controller/bootstrap.sh
similarity index 100%
rename from docker-cinder-controller/bootstrap.sh
rename to cinder-controller/bootstrap.sh
diff --git a/docker-cinder-controller/run.sh b/cinder-controller/run.sh
similarity index 100%
rename from docker-cinder-controller/run.sh
rename to cinder-controller/run.sh
diff --git a/docker-cinder-controller/write_conf.sh b/cinder-controller/write_conf.sh
similarity index 100%
rename from docker-cinder-controller/write_conf.sh
rename to cinder-controller/write_conf.sh
diff --git a/docker-cinder-storage/.gitignore b/cinder-storage/.gitignore
similarity index 100%
rename from docker-cinder-storage/.gitignore
rename to cinder-storage/.gitignore
diff --git a/docker-cinder-storage/Dockerfile b/cinder-storage/Dockerfile
similarity index 100%
rename from docker-cinder-storage/Dockerfile
rename to cinder-storage/Dockerfile
diff --git a/docker-cinder-storage/README.md b/cinder-storage/README.md
similarity index 100%
rename from docker-cinder-storage/README.md
rename to cinder-storage/README.md
diff --git a/docker-cinder-storage/admin-openrc.sh b/cinder-storage/admin-openrc.sh
similarity index 100%
rename from docker-cinder-storage/admin-openrc.sh
rename to cinder-storage/admin-openrc.sh
diff --git a/docker-cinder-storage/bootstrap.sh b/cinder-storage/bootstrap.sh
similarity index 100%
rename from docker-cinder-storage/bootstrap.sh
rename to cinder-storage/bootstrap.sh
diff --git a/docker-cinder-storage/lvm.conf b/cinder-storage/lvm.conf
similarity index 100%
rename from docker-cinder-storage/lvm.conf
rename to cinder-storage/lvm.conf
diff --git a/docker-cinder-storage/run.sh b/cinder-storage/run.sh
similarity index 100%
rename from docker-cinder-storage/run.sh
rename to cinder-storage/run.sh
diff --git a/docker-cinder-storage/write_conf.sh b/cinder-storage/write_conf.sh
similarity index 100%
rename from docker-cinder-storage/write_conf.sh
rename to cinder-storage/write_conf.sh
diff --git a/docker-glance/.gitignore b/glance/.gitignore
similarity index 100%
rename from docker-glance/.gitignore
rename to glance/.gitignore
diff --git a/docker-glance/Dockerfile b/glance/Dockerfile
similarity index 100%
rename from docker-glance/Dockerfile
rename to glance/Dockerfile
diff --git a/docker-glance/README.md b/glance/README.md
similarity index 100%
rename from docker-glance/README.md
rename to glance/README.md
diff --git a/docker-glance/admin-openrc.sh b/glance/admin-openrc.sh
similarity index 100%
rename from docker-glance/admin-openrc.sh
rename to glance/admin-openrc.sh
diff --git a/docker-glance/bootstrap.sh b/glance/bootstrap.sh
similarity index 100%
rename from docker-glance/bootstrap.sh
rename to glance/bootstrap.sh
diff --git a/docker-glance/run.sh b/glance/run.sh
similarity index 100%
rename from docker-glance/run.sh
rename to glance/run.sh
diff --git a/docker-glance/write_conf.sh b/glance/write_conf.sh
similarity index 100%
rename from docker-glance/write_conf.sh
rename to glance/write_conf.sh
diff --git a/docker-heat/.gitignore b/heat/.gitignore
similarity index 100%
rename from docker-heat/.gitignore
rename to heat/.gitignore
diff --git a/docker-heat/Dockerfile b/heat/Dockerfile
similarity index 100%
rename from docker-heat/Dockerfile
rename to heat/Dockerfile
diff --git a/docker-heat/README.md b/heat/README.md
similarity index 100%
rename from docker-heat/README.md
rename to heat/README.md
diff --git a/docker-heat/admin-openrc.sh b/heat/admin-openrc.sh
similarity index 100%
rename from docker-heat/admin-openrc.sh
rename to heat/admin-openrc.sh
diff --git a/docker-heat/bootstrap.sh b/heat/bootstrap.sh
similarity index 100%
rename from docker-heat/bootstrap.sh
rename to heat/bootstrap.sh
diff --git a/docker-heat/run.sh b/heat/run.sh
similarity index 100%
rename from docker-heat/run.sh
rename to heat/run.sh
diff --git a/docker-heat/write_conf.sh b/heat/write_conf.sh
similarity index 100%
rename from docker-heat/write_conf.sh
rename to heat/write_conf.sh
diff --git a/docker-horizon/.gitignore b/horizon/.gitignore
similarity index 100%
rename from docker-horizon/.gitignore
rename to horizon/.gitignore
diff --git a/docker-horizon/000-default.conf b/horizon/000-default.conf
similarity index 100%
rename from docker-horizon/000-default.conf
rename to horizon/000-default.conf
diff --git a/docker-horizon/Dockerfile b/horizon/Dockerfile
similarity index 100%
rename from docker-horizon/Dockerfile
rename to horizon/Dockerfile
diff --git a/docker-horizon/README.md b/horizon/README.md
similarity index 100%
rename from docker-horizon/README.md
rename to horizon/README.md
diff --git a/docker-horizon/admin-openrc.sh b/horizon/admin-openrc.sh
similarity index 100%
rename from docker-horizon/admin-openrc.sh
rename to horizon/admin-openrc.sh
diff --git a/docker-horizon/local_settings.py b/horizon/local_settings.py
similarity index 100%
rename from docker-horizon/local_settings.py
rename to horizon/local_settings.py
diff --git a/docker-keystone/.gitignore b/keystone/.gitignore
similarity index 100%
rename from docker-keystone/.gitignore
rename to keystone/.gitignore
diff --git a/docker-keystone/Dockerfile b/keystone/Dockerfile
similarity index 100%
rename from docker-keystone/Dockerfile
rename to keystone/Dockerfile
diff --git a/docker-keystone/README.md b/keystone/README.md
similarity index 100%
rename from docker-keystone/README.md
rename to keystone/README.md
diff --git a/docker-keystone/bootstrap.sh b/keystone/bootstrap.sh
similarity index 100%
rename from docker-keystone/bootstrap.sh
rename to keystone/bootstrap.sh
diff --git a/docker-keystone/keystone.conf b/keystone/keystone.conf
similarity index 100%
rename from docker-keystone/keystone.conf
rename to keystone/keystone.conf
diff --git a/docker-keystone/keystone.service b/keystone/keystone.service
similarity index 100%
rename from docker-keystone/keystone.service
rename to keystone/keystone.service
diff --git a/docker-neutron-controller/.gitignore b/neutron-controller/.gitignore
similarity index 100%
rename from docker-neutron-controller/.gitignore
rename to neutron-controller/.gitignore
diff --git a/docker-neutron-controller/Dockerfile b/neutron-controller/Dockerfile
similarity index 100%
rename from docker-neutron-controller/Dockerfile
rename to neutron-controller/Dockerfile
diff --git a/docker-neutron-controller/README.md b/neutron-controller/README.md
similarity index 100%
rename from docker-neutron-controller/README.md
rename to neutron-controller/README.md
diff --git a/docker-neutron-controller/bootstrap.sh b/neutron-controller/bootstrap.sh
similarity index 100%
rename from docker-neutron-controller/bootstrap.sh
rename to neutron-controller/bootstrap.sh
diff --git a/docker-neutron-controller/db_base_plugin_v2.py b/neutron-controller/db_base_plugin_v2.py
similarity index 100%
rename from docker-neutron-controller/db_base_plugin_v2.py
rename to neutron-controller/db_base_plugin_v2.py
diff --git a/docker-neutron-controller/run.sh b/neutron-controller/run.sh
similarity index 100%
rename from docker-neutron-controller/run.sh
rename to neutron-controller/run.sh
diff --git a/docker-neutron-controller/write_conf.sh b/neutron-controller/write_conf.sh
similarity index 100%
rename from docker-neutron-controller/write_conf.sh
rename to neutron-controller/write_conf.sh
diff --git a/docker-nova-compute/.drone.yml b/nova-compute/.drone.yml
similarity index 100%
rename from docker-nova-compute/.drone.yml
rename to nova-compute/.drone.yml
diff --git a/docker-nova-compute/Dockerfile b/nova-compute/Dockerfile
similarity index 100%
rename from docker-nova-compute/Dockerfile
rename to nova-compute/Dockerfile
diff --git a/docker-nova-compute/README.md b/nova-compute/README.md
similarity index 100%
rename from docker-nova-compute/README.md
rename to nova-compute/README.md
diff --git a/docker-nova-compute/run.sh b/nova-compute/run.sh
similarity index 100%
rename from docker-nova-compute/run.sh
rename to nova-compute/run.sh
diff --git a/docker-nova-compute/write_conf.sh b/nova-compute/write_conf.sh
similarity index 100%
rename from docker-nova-compute/write_conf.sh
rename to nova-compute/write_conf.sh
diff --git a/docker-nova-service/.gitignore b/nova-service/.gitignore
similarity index 100%
rename from docker-nova-service/.gitignore
rename to nova-service/.gitignore
diff --git a/docker-nova-service/Dockerfile b/nova-service/Dockerfile
similarity index 100%
rename from docker-nova-service/Dockerfile
rename to nova-service/Dockerfile
diff --git a/docker-nova-service/README.md b/nova-service/README.md
similarity index 100%
rename from docker-nova-service/README.md
rename to nova-service/README.md
diff --git a/docker-nova-service/bootstrap.sh b/nova-service/bootstrap.sh
similarity index 100%
rename from docker-nova-service/bootstrap.sh
rename to nova-service/bootstrap.sh
diff --git a/docker-nova-service/run.sh b/nova-service/run.sh
similarity index 100%
rename from docker-nova-service/run.sh
rename to nova-service/run.sh
diff --git a/docker-nova-service/write_conf.sh b/nova-service/write_conf.sh
similarity index 100%
rename from docker-nova-service/write_conf.sh
rename to nova-service/write_conf.sh
diff --git a/docker-openstack-client/.gitignore b/openstack-client/.gitignore
similarity index 100%
rename from docker-openstack-client/.gitignore
rename to openstack-client/.gitignore
diff --git a/docker-openstack-client/Dockerfile b/openstack-client/Dockerfile
similarity index 100%
rename from docker-openstack-client/Dockerfile
rename to openstack-client/Dockerfile
diff --git a/docker-openstack-client/README.md b/openstack-client/README.md
similarity index 100%
rename from docker-openstack-client/README.md
rename to openstack-client/README.md
diff --git a/docker-openstack-client/bootstrap.sh b/openstack-client/bootstrap.sh
similarity index 100%
rename from docker-openstack-client/bootstrap.sh
rename to openstack-client/bootstrap.sh
diff --git a/docker-openstack-client/demo-openrc.sh b/openstack-client/demo-openrc.sh
similarity index 100%
rename from docker-openstack-client/demo-openrc.sh
rename to openstack-client/demo-openrc.sh