diff --git a/ansible-aws/README.md b/ansible/ansible-aws/README.md
similarity index 100%
rename from ansible-aws/README.md
rename to ansible/ansible-aws/README.md
diff --git a/ansible-aws/ansible.cfg b/ansible/ansible-aws/ansible.cfg
similarity index 100%
rename from ansible-aws/ansible.cfg
rename to ansible/ansible-aws/ansible.cfg
diff --git a/ansible-aws/create.yml b/ansible/ansible-aws/create.yml
similarity index 100%
rename from ansible-aws/create.yml
rename to ansible/ansible-aws/create.yml
diff --git a/ansible-aws/delete.yml b/ansible/ansible-aws/delete.yml
similarity index 100%
rename from ansible-aws/delete.yml
rename to ansible/ansible-aws/delete.yml
diff --git a/ansible-aws/ec2.ini b/ansible/ansible-aws/ec2.ini
similarity index 100%
rename from ansible-aws/ec2.ini
rename to ansible/ansible-aws/ec2.ini
diff --git a/ansible-aws/ec2.py b/ansible/ansible-aws/ec2.py
similarity index 100%
rename from ansible-aws/ec2.py
rename to ansible/ansible-aws/ec2.py
diff --git a/ansible-aws/inventory b/ansible/ansible-aws/inventory
similarity index 100%
rename from ansible-aws/inventory
rename to ansible/ansible-aws/inventory
diff --git a/consul-ansible/README.md b/consul/consul-ansible/README.md
similarity index 100%
rename from consul-ansible/README.md
rename to consul/consul-ansible/README.md
diff --git a/consul-ansible/Vagrantfile b/consul/consul-ansible/Vagrantfile
similarity index 100%
rename from consul-ansible/Vagrantfile
rename to consul/consul-ansible/Vagrantfile
diff --git a/consul-ansible/ansible.cfg b/consul/consul-ansible/ansible.cfg
similarity index 100%
rename from consul-ansible/ansible.cfg
rename to consul/consul-ansible/ansible.cfg
diff --git a/consul-ansible/config.json.j2 b/consul/consul-ansible/config.json.j2
similarity index 100%
rename from consul-ansible/config.json.j2
rename to consul/consul-ansible/config.json.j2
diff --git a/consul-ansible/consul.conf b/consul/consul-ansible/consul.conf
similarity index 100%
rename from consul-ansible/consul.conf
rename to consul/consul-ansible/consul.conf
diff --git a/consul-ansible/hosts b/consul/consul-ansible/hosts
similarity index 100%
rename from consul-ansible/hosts
rename to consul/consul-ansible/hosts
diff --git a/consul-ansible/machines.yml b/consul/consul-ansible/machines.yml
similarity index 100%
rename from consul-ansible/machines.yml
rename to consul/consul-ansible/machines.yml
diff --git a/consul-ansible/provision.yml b/consul/consul-ansible/provision.yml
similarity index 100%
rename from consul-ansible/provision.yml
rename to consul/consul-ansible/provision.yml
diff --git a/consul/README.md b/consul/consul/README.md
similarity index 100%
rename from consul/README.md
rename to consul/consul/README.md
diff --git a/consul/Vagrantfile b/consul/consul/Vagrantfile
similarity index 100%
rename from consul/Vagrantfile
rename to consul/consul/Vagrantfile
diff --git a/consul/consul.conf b/consul/consul/consul.conf
similarity index 100%
rename from consul/consul.conf
rename to consul/consul/consul.conf
diff --git a/consul/consul.sh b/consul/consul/consul.sh
similarity index 100%
rename from consul/consul.sh
rename to consul/consul/consul.sh
diff --git a/consul/machines.yml b/consul/consul/machines.yml
similarity index 100%
rename from consul/machines.yml
rename to consul/consul/machines.yml
diff --git a/consul/server.json b/consul/consul/server.json
similarity index 100%
rename from consul/server.json
rename to consul/consul/server.json
diff --git a/coreos-cloudinit-toolbox/README.md b/coreos/cloudinit-toolbox/README.md
similarity index 100%
rename from coreos-cloudinit-toolbox/README.md
rename to coreos/cloudinit-toolbox/README.md
diff --git a/coreos-cloudinit-toolbox/Vagrantfile b/coreos/cloudinit-toolbox/Vagrantfile
similarity index 100%
rename from coreos-cloudinit-toolbox/Vagrantfile
rename to coreos/cloudinit-toolbox/Vagrantfile
diff --git a/coreos-cloudinit-toolbox/machines.yml b/coreos/cloudinit-toolbox/machines.yml
similarity index 100%
rename from coreos-cloudinit-toolbox/machines.yml
rename to coreos/cloudinit-toolbox/machines.yml
diff --git a/coreos-cloudinit-toolbox/user-data b/coreos/cloudinit-toolbox/user-data
similarity index 100%
rename from coreos-cloudinit-toolbox/user-data
rename to coreos/cloudinit-toolbox/user-data
diff --git a/debian-generic/README.md b/debian/debian-generic/README.md
similarity index 100%
rename from debian-generic/README.md
rename to debian/debian-generic/README.md
diff --git a/debian-generic/Vagrantfile b/debian/debian-generic/Vagrantfile
similarity index 100%
rename from debian-generic/Vagrantfile
rename to debian/debian-generic/Vagrantfile
diff --git a/debian-generic/machines.yml b/debian/debian-generic/machines.yml
similarity index 100%
rename from debian-generic/machines.yml
rename to debian/debian-generic/machines.yml
diff --git a/containerd-runc/README.md b/docker/containerd-runc/README.md
similarity index 100%
rename from containerd-runc/README.md
rename to docker/containerd-runc/README.md
diff --git a/containerd-runc/Vagrantfile b/docker/containerd-runc/Vagrantfile
similarity index 100%
rename from containerd-runc/Vagrantfile
rename to docker/containerd-runc/Vagrantfile
diff --git a/containerd-runc/ansible.cfg b/docker/containerd-runc/ansible.cfg
similarity index 100%
rename from containerd-runc/ansible.cfg
rename to docker/containerd-runc/ansible.cfg
diff --git a/containerd-runc/machines.yml b/docker/containerd-runc/machines.yml
similarity index 100%
rename from containerd-runc/machines.yml
rename to docker/containerd-runc/machines.yml
diff --git a/containerd-runc/provision.yml b/docker/containerd-runc/provision.yml
similarity index 100%
rename from containerd-runc/provision.yml
rename to docker/containerd-runc/provision.yml
diff --git a/docker-ipvlan/README.md b/docker/ipvlan-l2/README.md
similarity index 100%
rename from docker-ipvlan/README.md
rename to docker/ipvlan-l2/README.md
diff --git a/docker-ipvlan/Vagrantfile b/docker/ipvlan-l2/Vagrantfile
similarity index 100%
rename from docker-ipvlan/Vagrantfile
rename to docker/ipvlan-l2/Vagrantfile
diff --git a/docker-ipvlan/docker-provision.sh b/docker/ipvlan-l2/docker-provision.sh
similarity index 100%
rename from docker-ipvlan/docker-provision.sh
rename to docker/ipvlan-l2/docker-provision.sh
diff --git a/docker-ipvlan/machines.yml b/docker/ipvlan-l2/machines.yml
similarity index 100%
rename from docker-ipvlan/machines.yml
rename to docker/ipvlan-l2/machines.yml
diff --git a/docker-ipvlan/remote-provision.sh b/docker/ipvlan-l2/remote-provision.sh
similarity index 100%
rename from docker-ipvlan/remote-provision.sh
rename to docker/ipvlan-l2/remote-provision.sh
diff --git a/docker-ipvlan-l3/README.md b/docker/ipvlan-l3/README.md
similarity index 100%
rename from docker-ipvlan-l3/README.md
rename to docker/ipvlan-l3/README.md
diff --git a/docker-ipvlan-l3/Vagrantfile b/docker/ipvlan-l3/Vagrantfile
similarity index 100%
rename from docker-ipvlan-l3/Vagrantfile
rename to docker/ipvlan-l3/Vagrantfile
diff --git a/docker-ipvlan-l3/docker-01-setup.sh b/docker/ipvlan-l3/docker-01-setup.sh
similarity index 100%
rename from docker-ipvlan-l3/docker-01-setup.sh
rename to docker/ipvlan-l3/docker-01-setup.sh
diff --git a/docker-ipvlan-l3/docker-02-setup.sh b/docker/ipvlan-l3/docker-02-setup.sh
similarity index 100%
rename from docker-ipvlan-l3/docker-02-setup.sh
rename to docker/ipvlan-l3/docker-02-setup.sh
diff --git a/docker-ipvlan-l3/machines.yml b/docker/ipvlan-l3/machines.yml
similarity index 100%
rename from docker-ipvlan-l3/machines.yml
rename to docker/ipvlan-l3/machines.yml
diff --git a/ipvs-docker/README.md b/docker/ipvs/README.md
similarity index 100%
rename from ipvs-docker/README.md
rename to docker/ipvs/README.md
diff --git a/ipvs-docker/Vagrantfile b/docker/ipvs/Vagrantfile
similarity index 100%
rename from ipvs-docker/Vagrantfile
rename to docker/ipvs/Vagrantfile
diff --git a/ipvs-docker/machines.yml b/docker/ipvs/machines.yml
similarity index 100%
rename from ipvs-docker/machines.yml
rename to docker/ipvs/machines.yml
diff --git a/ipvs-docker/provision.sh b/docker/ipvs/provision.sh
similarity index 100%
rename from ipvs-docker/provision.sh
rename to docker/ipvs/provision.sh
diff --git a/docker-macvlan/README.md b/docker/macvlan/README.md
similarity index 100%
rename from docker-macvlan/README.md
rename to docker/macvlan/README.md
diff --git a/docker-macvlan/Vagrantfile b/docker/macvlan/Vagrantfile
similarity index 100%
rename from docker-macvlan/Vagrantfile
rename to docker/macvlan/Vagrantfile
diff --git a/docker-macvlan/machines.yml b/docker/macvlan/machines.yml
similarity index 100%
rename from docker-macvlan/machines.yml
rename to docker/macvlan/machines.yml
diff --git a/docker-swarm/README.md b/docker/swarm-consul/README.md
similarity index 100%
rename from docker-swarm/README.md
rename to docker/swarm-consul/README.md
diff --git a/docker-swarm/Vagrantfile b/docker/swarm-consul/Vagrantfile
similarity index 100%
rename from docker-swarm/Vagrantfile
rename to docker/swarm-consul/Vagrantfile
diff --git a/docker-swarm-ha/config.json.erb b/docker/swarm-consul/config.json.erb
similarity index 100%
rename from docker-swarm-ha/config.json.erb
rename to docker/swarm-consul/config.json.erb
diff --git a/docker-swarm-ha/consul.conf b/docker/swarm-consul/consul.conf
similarity index 100%
rename from docker-swarm-ha/consul.conf
rename to docker/swarm-consul/consul.conf
diff --git a/docker-swarm-ha/consul.sh b/docker/swarm-consul/consul.sh
similarity index 100%
rename from docker-swarm-ha/consul.sh
rename to docker/swarm-consul/consul.sh
diff --git a/docker-swarm/machines.yml b/docker/swarm-consul/machines.yml
similarity index 100%
rename from docker-swarm/machines.yml
rename to docker/swarm-consul/machines.yml
diff --git a/docker-swarm-etcd/user-data b/docker/swarm-consul/user-data
similarity index 100%
rename from docker-swarm-etcd/user-data
rename to docker/swarm-consul/user-data
diff --git a/docker-swarm-etcd/.gitignore b/docker/swarm-etcd/.gitignore
similarity index 100%
rename from docker-swarm-etcd/.gitignore
rename to docker/swarm-etcd/.gitignore
diff --git a/docker-swarm-etcd/README.md b/docker/swarm-etcd/README.md
similarity index 100%
rename from docker-swarm-etcd/README.md
rename to docker/swarm-etcd/README.md
diff --git a/docker-swarm-etcd/Vagrantfile b/docker/swarm-etcd/Vagrantfile
similarity index 100%
rename from docker-swarm-etcd/Vagrantfile
rename to docker/swarm-etcd/Vagrantfile
diff --git a/docker-swarm-etcd/etcd.conf b/docker/swarm-etcd/etcd.conf
similarity index 100%
rename from docker-swarm-etcd/etcd.conf
rename to docker/swarm-etcd/etcd.conf
diff --git a/docker-swarm-etcd/etcd.defaults.erb b/docker/swarm-etcd/etcd.defaults.erb
similarity index 100%
rename from docker-swarm-etcd/etcd.defaults.erb
rename to docker/swarm-etcd/etcd.defaults.erb
diff --git a/docker-swarm-etcd/machines.yml b/docker/swarm-etcd/machines.yml
similarity index 100%
rename from docker-swarm-etcd/machines.yml
rename to docker/swarm-etcd/machines.yml
diff --git a/docker-swarm-etcd/provision.sh b/docker/swarm-etcd/provision.sh
similarity index 100%
rename from docker-swarm-etcd/provision.sh
rename to docker/swarm-etcd/provision.sh
diff --git a/docker-swarm/user-data b/docker/swarm-etcd/user-data
similarity index 100%
rename from docker-swarm/user-data
rename to docker/swarm-etcd/user-data
diff --git a/etcd-2.0/.gitignore b/docker/swarm-etcd2-photon/.gitignore
similarity index 100%
rename from etcd-2.0/.gitignore
rename to docker/swarm-etcd2-photon/.gitignore
diff --git a/swarm-etcd2-photon/README.md b/docker/swarm-etcd2-photon/README.md
similarity index 100%
rename from swarm-etcd2-photon/README.md
rename to docker/swarm-etcd2-photon/README.md
diff --git a/swarm-etcd2-photon/Vagrantfile b/docker/swarm-etcd2-photon/Vagrantfile
similarity index 100%
rename from swarm-etcd2-photon/Vagrantfile
rename to docker/swarm-etcd2-photon/Vagrantfile
diff --git a/kvm-macvtap/ansible.cfg b/docker/swarm-etcd2-photon/ansible.cfg
similarity index 100%
rename from kvm-macvtap/ansible.cfg
rename to docker/swarm-etcd2-photon/ansible.cfg
diff --git a/swarm-etcd2-photon/cfg-docker.yml b/docker/swarm-etcd2-photon/cfg-docker.yml
similarity index 100%
rename from swarm-etcd2-photon/cfg-docker.yml
rename to docker/swarm-etcd2-photon/cfg-docker.yml
diff --git a/swarm-etcd2-photon/cfg-etcd.yml b/docker/swarm-etcd2-photon/cfg-etcd.yml
similarity index 100%
rename from swarm-etcd2-photon/cfg-etcd.yml
rename to docker/swarm-etcd2-photon/cfg-etcd.yml
diff --git a/photon-ansible/docker-tcp.socket b/docker/swarm-etcd2-photon/docker-tcp.socket
similarity index 100%
rename from photon-ansible/docker-tcp.socket
rename to docker/swarm-etcd2-photon/docker-tcp.socket
diff --git a/swarm-etcd2-photon/docker.service b/docker/swarm-etcd2-photon/docker.service
similarity index 100%
rename from swarm-etcd2-photon/docker.service
rename to docker/swarm-etcd2-photon/docker.service
diff --git a/photon-ansible/docker.socket b/docker/swarm-etcd2-photon/docker.socket
similarity index 100%
rename from photon-ansible/docker.socket
rename to docker/swarm-etcd2-photon/docker.socket
diff --git a/etcd-2.0/etcd.conf b/docker/swarm-etcd2-photon/etcd.conf
similarity index 100%
rename from etcd-2.0/etcd.conf
rename to docker/swarm-etcd2-photon/etcd.conf
diff --git a/swarm-etcd2-photon/etcd.defaults.erb b/docker/swarm-etcd2-photon/etcd.defaults.erb
similarity index 100%
rename from swarm-etcd2-photon/etcd.defaults.erb
rename to docker/swarm-etcd2-photon/etcd.defaults.erb
diff --git a/swarm-etcd2-photon/machines.yml b/docker/swarm-etcd2-photon/machines.yml
similarity index 100%
rename from swarm-etcd2-photon/machines.yml
rename to docker/swarm-etcd2-photon/machines.yml
diff --git a/docker-swarm-ha/README.md b/docker/swarm-ha/README.md
similarity index 100%
rename from docker-swarm-ha/README.md
rename to docker/swarm-ha/README.md
diff --git a/docker-swarm-ha/Vagrantfile b/docker/swarm-ha/Vagrantfile
similarity index 100%
rename from docker-swarm-ha/Vagrantfile
rename to docker/swarm-ha/Vagrantfile
diff --git a/docker-swarm/config.json.erb b/docker/swarm-ha/config.json.erb
similarity index 100%
rename from docker-swarm/config.json.erb
rename to docker/swarm-ha/config.json.erb
diff --git a/docker-swarm/consul.conf b/docker/swarm-ha/consul.conf
similarity index 100%
rename from docker-swarm/consul.conf
rename to docker/swarm-ha/consul.conf
diff --git a/docker-swarm/consul.sh b/docker/swarm-ha/consul.sh
similarity index 100%
rename from docker-swarm/consul.sh
rename to docker/swarm-ha/consul.sh
diff --git a/docker-swarm-ha/machines.yml b/docker/swarm-ha/machines.yml
similarity index 100%
rename from docker-swarm-ha/machines.yml
rename to docker/swarm-ha/machines.yml
diff --git a/swarm-etcd2-photon/.gitignore b/etcd/etcd-2.0/.gitignore
similarity index 100%
rename from swarm-etcd2-photon/.gitignore
rename to etcd/etcd-2.0/.gitignore
diff --git a/etcd-2.0/README.md b/etcd/etcd-2.0/README.md
similarity index 100%
rename from etcd-2.0/README.md
rename to etcd/etcd-2.0/README.md
diff --git a/etcd-2.0/Vagrantfile b/etcd/etcd-2.0/Vagrantfile
similarity index 100%
rename from etcd-2.0/Vagrantfile
rename to etcd/etcd-2.0/Vagrantfile
diff --git a/swarm-etcd2-photon/etcd.conf b/etcd/etcd-2.0/etcd.conf
similarity index 100%
rename from swarm-etcd2-photon/etcd.conf
rename to etcd/etcd-2.0/etcd.conf
diff --git a/etcd-2.0/etcd.defaults.erb b/etcd/etcd-2.0/etcd.defaults.erb
similarity index 100%
rename from etcd-2.0/etcd.defaults.erb
rename to etcd/etcd-2.0/etcd.defaults.erb
diff --git a/etcd-2.0/machines.yml b/etcd/etcd-2.0/machines.yml
similarity index 100%
rename from etcd-2.0/machines.yml
rename to etcd/etcd-2.0/machines.yml
diff --git a/etcd-2.0/provision.sh b/etcd/etcd-2.0/provision.sh
similarity index 100%
rename from etcd-2.0/provision.sh
rename to etcd/etcd-2.0/provision.sh
diff --git a/kvm/README.md b/kvm/kvm-generic/README.md
similarity index 100%
rename from kvm/README.md
rename to kvm/kvm-generic/README.md
diff --git a/kvm/Vagrantfile b/kvm/kvm-generic/Vagrantfile
similarity index 100%
rename from kvm/Vagrantfile
rename to kvm/kvm-generic/Vagrantfile
diff --git a/kvm/ansible.cfg b/kvm/kvm-generic/ansible.cfg
similarity index 100%
rename from kvm/ansible.cfg
rename to kvm/kvm-generic/ansible.cfg
diff --git a/kvm/machines.yml b/kvm/kvm-generic/machines.yml
similarity index 100%
rename from kvm/machines.yml
rename to kvm/kvm-generic/machines.yml
diff --git a/kvm/provision.yml b/kvm/kvm-generic/provision.yml
similarity index 100%
rename from kvm/provision.yml
rename to kvm/kvm-generic/provision.yml
diff --git a/kvm-macvtap/README.md b/kvm/kvm-macvtap/README.md
similarity index 100%
rename from kvm-macvtap/README.md
rename to kvm/kvm-macvtap/README.md
diff --git a/kvm-macvtap/Vagrantfile b/kvm/kvm-macvtap/Vagrantfile
similarity index 100%
rename from kvm-macvtap/Vagrantfile
rename to kvm/kvm-macvtap/Vagrantfile
diff --git a/ovn-kvm/ansible.cfg b/kvm/kvm-macvtap/ansible.cfg
similarity index 100%
rename from ovn-kvm/ansible.cfg
rename to kvm/kvm-macvtap/ansible.cfg
diff --git a/kvm-macvtap/machines.yml b/kvm/kvm-macvtap/machines.yml
similarity index 100%
rename from kvm-macvtap/machines.yml
rename to kvm/kvm-macvtap/machines.yml
diff --git a/kvm-macvtap/macvtap.xml b/kvm/kvm-macvtap/macvtap.xml
similarity index 100%
rename from kvm-macvtap/macvtap.xml
rename to kvm/kvm-macvtap/macvtap.xml
diff --git a/kvm-macvtap/provision.yml b/kvm/kvm-macvtap/provision.yml
similarity index 100%
rename from kvm-macvtap/provision.yml
rename to kvm/kvm-macvtap/provision.yml
diff --git a/lxc/README.md b/lxc-lxd/lxc/README.md
similarity index 100%
rename from lxc/README.md
rename to lxc-lxd/lxc/README.md
diff --git a/lxc/Vagrantfile b/lxc-lxd/lxc/Vagrantfile
similarity index 100%
rename from lxc/Vagrantfile
rename to lxc-lxd/lxc/Vagrantfile
diff --git a/lxc/ansible.cfg b/lxc-lxd/lxc/ansible.cfg
similarity index 100%
rename from lxc/ansible.cfg
rename to lxc-lxd/lxc/ansible.cfg
diff --git a/lxc/machines.yml b/lxc-lxd/lxc/machines.yml
similarity index 100%
rename from lxc/machines.yml
rename to lxc-lxd/lxc/machines.yml
diff --git a/lxc/provision.yml b/lxc-lxd/lxc/provision.yml
similarity index 100%
rename from lxc/provision.yml
rename to lxc-lxd/lxc/provision.yml
diff --git a/lxd-ansible/README.md b/lxc-lxd/lxd-ansible/README.md
similarity index 100%
rename from lxd-ansible/README.md
rename to lxc-lxd/lxd-ansible/README.md
diff --git a/lxd-ansible/Vagrantfile b/lxc-lxd/lxd-ansible/Vagrantfile
similarity index 100%
rename from lxd-ansible/Vagrantfile
rename to lxc-lxd/lxd-ansible/Vagrantfile
diff --git a/lxd-ansible/ansible.cfg b/lxc-lxd/lxd-ansible/ansible.cfg
similarity index 100%
rename from lxd-ansible/ansible.cfg
rename to lxc-lxd/lxd-ansible/ansible.cfg
diff --git a/lxd-ansible/machines.yml b/lxc-lxd/lxd-ansible/machines.yml
similarity index 100%
rename from lxd-ansible/machines.yml
rename to lxc-lxd/lxd-ansible/machines.yml
diff --git a/lxd-ansible/provision.yml b/lxc-lxd/lxd-ansible/provision.yml
similarity index 100%
rename from lxd-ansible/provision.yml
rename to lxc-lxd/lxd-ansible/provision.yml
diff --git a/lxd-ovs/README.md b/lxc-lxd/lxd-ovs/README.md
similarity index 100%
rename from lxd-ovs/README.md
rename to lxc-lxd/lxd-ovs/README.md
diff --git a/lxd-ovs/Vagrantfile b/lxc-lxd/lxd-ovs/Vagrantfile
similarity index 100%
rename from lxd-ovs/Vagrantfile
rename to lxc-lxd/lxd-ovs/Vagrantfile
diff --git a/lxd-ovs/machines.yml b/lxc-lxd/lxd-ovs/machines.yml
similarity index 100%
rename from lxd-ovs/machines.yml
rename to lxc-lxd/lxd-ovs/machines.yml
diff --git a/lxd-ovs/setup.sh b/lxc-lxd/lxd-ovs/setup.sh
similarity index 100%
rename from lxd-ovs/setup.sh
rename to lxc-lxd/lxd-ovs/setup.sh
diff --git a/lxd-shell/README.md b/lxc-lxd/lxd-shell/README.md
similarity index 100%
rename from lxd-shell/README.md
rename to lxc-lxd/lxd-shell/README.md
diff --git a/lxd-shell/Vagrantfile b/lxc-lxd/lxd-shell/Vagrantfile
similarity index 100%
rename from lxd-shell/Vagrantfile
rename to lxc-lxd/lxd-shell/Vagrantfile
diff --git a/lxd-shell/machines.yml b/lxc-lxd/lxd-shell/machines.yml
similarity index 100%
rename from lxd-shell/machines.yml
rename to lxc-lxd/lxd-shell/machines.yml
diff --git a/lxd-shell/setup.sh b/lxc-lxd/lxd-shell/setup.sh
similarity index 100%
rename from lxd-shell/setup.sh
rename to lxc-lxd/lxd-shell/setup.sh
diff --git a/junos/Vagrantfile b/netos/junos/Vagrantfile
similarity index 100%
rename from junos/Vagrantfile
rename to netos/junos/Vagrantfile
diff --git a/junos/Vagrantfile-working b/netos/junos/Vagrantfile-working
similarity index 100%
rename from junos/Vagrantfile-working
rename to netos/junos/Vagrantfile-working
diff --git a/junos/devices.yml b/netos/junos/devices.yml
similarity index 100%
rename from junos/devices.yml
rename to netos/junos/devices.yml
diff --git a/openstack-cli/README.md b/openstack/cli/README.md
similarity index 100%
rename from openstack-cli/README.md
rename to openstack/cli/README.md
diff --git a/openstack-cli/Vagrantfile b/openstack/cli/Vagrantfile
similarity index 100%
rename from openstack-cli/Vagrantfile
rename to openstack/cli/Vagrantfile
diff --git a/openstack-cli/adminrc b/openstack/cli/adminrc
similarity index 100%
rename from openstack-cli/adminrc
rename to openstack/cli/adminrc
diff --git a/openstack-cli/config.sh b/openstack/cli/config.sh
similarity index 100%
rename from openstack-cli/config.sh
rename to openstack/cli/config.sh
diff --git a/openstack-cli/machines.yml b/openstack/cli/machines.yml
similarity index 100%
rename from openstack-cli/machines.yml
rename to openstack/cli/machines.yml
diff --git a/swarm-consul-openstack/README.md b/openstack/swarm-consul/README.md
similarity index 100%
rename from swarm-consul-openstack/README.md
rename to openstack/swarm-consul/README.md
diff --git a/swarm-consul-openstack/consul-cluster.yml b/openstack/swarm-consul/consul-cluster.yml
similarity index 100%
rename from swarm-consul-openstack/consul-cluster.yml
rename to openstack/swarm-consul/consul-cluster.yml
diff --git a/swarm-consul-openstack/consul-software-config.yml b/openstack/swarm-consul/consul-software-config.yml
similarity index 100%
rename from swarm-consul-openstack/consul-software-config.yml
rename to openstack/swarm-consul/consul-software-config.yml
diff --git a/swarm-consul-openstack/coreos-cluster.yml b/openstack/swarm-consul/coreos-cluster.yml
similarity index 100%
rename from swarm-consul-openstack/coreos-cluster.yml
rename to openstack/swarm-consul/coreos-cluster.yml
diff --git a/swarm-consul-openstack/docker-swarm.yml b/openstack/swarm-consul/docker-swarm.yml
similarity index 100%
rename from swarm-consul-openstack/docker-swarm.yml
rename to openstack/swarm-consul/docker-swarm.yml
diff --git a/swarm-consul-openstack/docker-workloads.yml b/openstack/swarm-consul/docker-workloads.yml
similarity index 100%
rename from swarm-consul-openstack/docker-workloads.yml
rename to openstack/swarm-consul/docker-workloads.yml
diff --git a/ovn-docker-ansible/10-exec-options.conf.j2 b/ovs-ovn/ovn-docker-ansible/10-exec-options.conf.j2
similarity index 100%
rename from ovn-docker-ansible/10-exec-options.conf.j2
rename to ovs-ovn/ovn-docker-ansible/10-exec-options.conf.j2
diff --git a/ovn-docker-ansible/README.md b/ovs-ovn/ovn-docker-ansible/README.md
similarity index 100%
rename from ovn-docker-ansible/README.md
rename to ovs-ovn/ovn-docker-ansible/README.md
diff --git a/ovn-docker-ansible/Vagrantfile b/ovs-ovn/ovn-docker-ansible/Vagrantfile
similarity index 100%
rename from ovn-docker-ansible/Vagrantfile
rename to ovs-ovn/ovn-docker-ansible/Vagrantfile
diff --git a/ovn-docker-ansible/ansible.cfg b/ovs-ovn/ovn-docker-ansible/ansible.cfg
similarity index 100%
rename from ovn-docker-ansible/ansible.cfg
rename to ovs-ovn/ovn-docker-ansible/ansible.cfg
diff --git a/ovn-docker-ansible/config.json.j2 b/ovs-ovn/ovn-docker-ansible/config.json.j2
similarity index 100%
rename from ovn-docker-ansible/config.json.j2
rename to ovs-ovn/ovn-docker-ansible/config.json.j2
diff --git a/ovn-docker-ansible/consul-server.service b/ovs-ovn/ovn-docker-ansible/consul-server.service
similarity index 100%
rename from ovn-docker-ansible/consul-server.service
rename to ovs-ovn/ovn-docker-ansible/consul-server.service
diff --git a/ovn-docker-ansible/machines.yml b/ovs-ovn/ovn-docker-ansible/machines.yml
similarity index 100%
rename from ovn-docker-ansible/machines.yml
rename to ovs-ovn/ovn-docker-ansible/machines.yml
diff --git a/ovn-docker-ansible/provision.yml b/ovs-ovn/ovn-docker-ansible/provision.yml
similarity index 100%
rename from ovn-docker-ansible/provision.yml
rename to ovs-ovn/ovn-docker-ansible/provision.yml
diff --git a/ovn-docker-ansible/setup.sh.j2 b/ovs-ovn/ovn-docker-ansible/setup.sh.j2
similarity index 100%
rename from ovn-docker-ansible/setup.sh.j2
rename to ovs-ovn/ovn-docker-ansible/setup.sh.j2
diff --git a/ovn-docker-ansible/update.yml b/ovs-ovn/ovn-docker-ansible/update.yml
similarity index 100%
rename from ovn-docker-ansible/update.yml
rename to ovs-ovn/ovn-docker-ansible/update.yml
diff --git a/ovn-kvm/README.md b/ovs-ovn/ovn-kvm/README.md
similarity index 100%
rename from ovn-kvm/README.md
rename to ovs-ovn/ovn-kvm/README.md
diff --git a/ovn-kvm/Vagrantfile b/ovs-ovn/ovn-kvm/Vagrantfile
similarity index 100%
rename from ovn-kvm/Vagrantfile
rename to ovs-ovn/ovn-kvm/Vagrantfile
diff --git a/ovn/ansible.cfg b/ovs-ovn/ovn-kvm/ansible.cfg
similarity index 100%
rename from ovn/ansible.cfg
rename to ovs-ovn/ovn-kvm/ansible.cfg
diff --git a/ovn-kvm/final-setup.sh b/ovs-ovn/ovn-kvm/final-setup.sh
similarity index 100%
rename from ovn-kvm/final-setup.sh
rename to ovs-ovn/ovn-kvm/final-setup.sh
diff --git a/ovn-kvm/machines.yml b/ovs-ovn/ovn-kvm/machines.yml
similarity index 100%
rename from ovn-kvm/machines.yml
rename to ovs-ovn/ovn-kvm/machines.yml
diff --git a/ovn-kvm/net-setup.sh b/ovs-ovn/ovn-kvm/net-setup.sh
similarity index 100%
rename from ovn-kvm/net-setup.sh
rename to ovs-ovn/ovn-kvm/net-setup.sh
diff --git a/ovn-kvm/ovn-setup.sh.j2 b/ovs-ovn/ovn-kvm/ovn-setup.sh.j2
similarity index 100%
rename from ovn-kvm/ovn-setup.sh.j2
rename to ovs-ovn/ovn-kvm/ovn-setup.sh.j2
diff --git a/ovn-kvm/ovs.xml b/ovs-ovn/ovn-kvm/ovs.xml
similarity index 100%
rename from ovn-kvm/ovs.xml
rename to ovs-ovn/ovn-kvm/ovs.xml
diff --git a/ovn-kvm/provision.yml b/ovs-ovn/ovn-kvm/provision.yml
similarity index 100%
rename from ovn-kvm/provision.yml
rename to ovs-ovn/ovn-kvm/provision.yml
diff --git a/ovn-kvm/vm-setup.sh b/ovs-ovn/ovn-kvm/vm-setup.sh
similarity index 100%
rename from ovn-kvm/vm-setup.sh
rename to ovs-ovn/ovn-kvm/vm-setup.sh
diff --git a/ovn/README.md b/ovs-ovn/ovn/README.md
similarity index 100%
rename from ovn/README.md
rename to ovs-ovn/ovn/README.md
diff --git a/ovn/Vagrantfile b/ovs-ovn/ovn/Vagrantfile
similarity index 100%
rename from ovn/Vagrantfile
rename to ovs-ovn/ovn/Vagrantfile
diff --git a/ovs-geneve/ansible.cfg b/ovs-ovn/ovn/ansible.cfg
similarity index 100%
rename from ovs-geneve/ansible.cfg
rename to ovs-ovn/ovn/ansible.cfg
diff --git a/ovn/machines.yml b/ovs-ovn/ovn/machines.yml
similarity index 100%
rename from ovn/machines.yml
rename to ovs-ovn/ovn/machines.yml
diff --git a/ovn/provision.yml b/ovs-ovn/ovn/provision.yml
similarity index 100%
rename from ovn/provision.yml
rename to ovs-ovn/ovn/provision.yml
diff --git a/ovn/setup.sh.j2 b/ovs-ovn/ovn/setup.sh.j2
similarity index 100%
rename from ovn/setup.sh.j2
rename to ovs-ovn/ovn/setup.sh.j2
diff --git a/ovs-geneve/README.md b/ovs-ovn/ovs-geneve/README.md
similarity index 100%
rename from ovs-geneve/README.md
rename to ovs-ovn/ovs-geneve/README.md
diff --git a/ovs-geneve/Vagrantfile b/ovs-ovn/ovs-geneve/Vagrantfile
similarity index 100%
rename from ovs-geneve/Vagrantfile
rename to ovs-ovn/ovs-geneve/Vagrantfile
diff --git a/ovs-multi-br/ansible.cfg b/ovs-ovn/ovs-geneve/ansible.cfg
similarity index 100%
rename from ovs-multi-br/ansible.cfg
rename to ovs-ovn/ovs-geneve/ansible.cfg
diff --git a/ovs-geneve/machines.yml b/ovs-ovn/ovs-geneve/machines.yml
similarity index 100%
rename from ovs-geneve/machines.yml
rename to ovs-ovn/ovs-geneve/machines.yml
diff --git a/ovs-geneve/provision.yml b/ovs-ovn/ovs-geneve/provision.yml
similarity index 100%
rename from ovs-geneve/provision.yml
rename to ovs-ovn/ovs-geneve/provision.yml
diff --git a/ovs-geneve/setup.sh b/ovs-ovn/ovs-geneve/setup.sh
similarity index 100%
rename from ovs-geneve/setup.sh
rename to ovs-ovn/ovs-geneve/setup.sh
diff --git a/ovs-multi-br/README.md b/ovs-ovn/ovs-multi-br/README.md
similarity index 100%
rename from ovs-multi-br/README.md
rename to ovs-ovn/ovs-multi-br/README.md
diff --git a/ovs-multi-br/Vagrantfile b/ovs-ovn/ovs-multi-br/Vagrantfile
similarity index 100%
rename from ovs-multi-br/Vagrantfile
rename to ovs-ovn/ovs-multi-br/Vagrantfile
diff --git a/swarm-etcd2-photon/ansible.cfg b/ovs-ovn/ovs-multi-br/ansible.cfg
similarity index 100%
rename from swarm-etcd2-photon/ansible.cfg
rename to ovs-ovn/ovs-multi-br/ansible.cfg
diff --git a/ovs-multi-br/br0.xml b/ovs-ovn/ovs-multi-br/br0.xml
similarity index 100%
rename from ovs-multi-br/br0.xml
rename to ovs-ovn/ovs-multi-br/br0.xml
diff --git a/ovs-multi-br/br1.xml b/ovs-ovn/ovs-multi-br/br1.xml
similarity index 100%
rename from ovs-multi-br/br1.xml
rename to ovs-ovn/ovs-multi-br/br1.xml
diff --git a/ovs-multi-br/machines.yml b/ovs-ovn/ovs-multi-br/machines.yml
similarity index 100%
rename from ovs-multi-br/machines.yml
rename to ovs-ovn/ovs-multi-br/machines.yml
diff --git a/ovs-multi-br/provision.yml b/ovs-ovn/ovs-multi-br/provision.yml
similarity index 100%
rename from ovs-multi-br/provision.yml
rename to ovs-ovn/ovs-multi-br/provision.yml
diff --git a/photon-ansible/README.md b/photon/photon-ansible/README.md
similarity index 100%
rename from photon-ansible/README.md
rename to photon/photon-ansible/README.md
diff --git a/photon-ansible/Vagrantfile b/photon/photon-ansible/Vagrantfile
similarity index 100%
rename from photon-ansible/Vagrantfile
rename to photon/photon-ansible/Vagrantfile
diff --git a/photon-ansible/ansible.cfg b/photon/photon-ansible/ansible.cfg
similarity index 100%
rename from photon-ansible/ansible.cfg
rename to photon/photon-ansible/ansible.cfg
diff --git a/swarm-etcd2-photon/docker-tcp.socket b/photon/photon-ansible/docker-tcp.socket
similarity index 100%
rename from swarm-etcd2-photon/docker-tcp.socket
rename to photon/photon-ansible/docker-tcp.socket
diff --git a/photon-ansible/docker.service b/photon/photon-ansible/docker.service
similarity index 100%
rename from photon-ansible/docker.service
rename to photon/photon-ansible/docker.service
diff --git a/swarm-etcd2-photon/docker.socket b/photon/photon-ansible/docker.socket
similarity index 100%
rename from swarm-etcd2-photon/docker.socket
rename to photon/photon-ansible/docker.socket
diff --git a/photon-ansible/machines.yml b/photon/photon-ansible/machines.yml
similarity index 100%
rename from photon-ansible/machines.yml
rename to photon/photon-ansible/machines.yml
diff --git a/photon-ansible/provision.yml b/photon/photon-ansible/provision.yml
similarity index 100%
rename from photon-ansible/provision.yml
rename to photon/photon-ansible/provision.yml
diff --git a/photon-cloudinit/README.md b/photon/photon-cloudinit/README.md
similarity index 100%
rename from photon-cloudinit/README.md
rename to photon/photon-cloudinit/README.md
diff --git a/photon-cloudinit/Vagrantfile b/photon/photon-cloudinit/Vagrantfile
similarity index 100%
rename from photon-cloudinit/Vagrantfile
rename to photon/photon-cloudinit/Vagrantfile
diff --git a/photon-cloudinit/machines.yml b/photon/photon-cloudinit/machines.yml
similarity index 100%
rename from photon-cloudinit/machines.yml
rename to photon/photon-cloudinit/machines.yml
diff --git a/photon-cloudinit/meta-data b/photon/photon-cloudinit/meta-data
similarity index 100%
rename from photon-cloudinit/meta-data
rename to photon/photon-cloudinit/meta-data
diff --git a/photon-cloudinit/setup.sh b/photon/photon-cloudinit/setup.sh
similarity index 100%
rename from photon-cloudinit/setup.sh
rename to photon/photon-cloudinit/setup.sh
diff --git a/photon-cloudinit/user-data b/photon/photon-cloudinit/user-data
similarity index 100%
rename from photon-cloudinit/user-data
rename to photon/photon-cloudinit/user-data
diff --git a/photon/README.md b/photon/photon-generic/README.md
similarity index 100%
rename from photon/README.md
rename to photon/photon-generic/README.md
diff --git a/photon/Vagrantfile b/photon/photon-generic/Vagrantfile
similarity index 100%
rename from photon/Vagrantfile
rename to photon/photon-generic/Vagrantfile
diff --git a/photon/machines.yml b/photon/photon-generic/machines.yml
similarity index 100%
rename from photon/machines.yml
rename to photon/photon-generic/machines.yml
diff --git a/rkt/.gitignore b/rkt/rkt-ubuntu/.gitignore
similarity index 100%
rename from rkt/.gitignore
rename to rkt/rkt-ubuntu/.gitignore
diff --git a/rkt/README.md b/rkt/rkt-ubuntu/README.md
similarity index 100%
rename from rkt/README.md
rename to rkt/rkt-ubuntu/README.md
diff --git a/rkt/Vagrantfile b/rkt/rkt-ubuntu/Vagrantfile
similarity index 100%
rename from rkt/Vagrantfile
rename to rkt/rkt-ubuntu/Vagrantfile
diff --git a/rkt/machines.yml b/rkt/rkt-ubuntu/machines.yml
similarity index 100%
rename from rkt/machines.yml
rename to rkt/rkt-ubuntu/machines.yml
diff --git a/rkt/provision.sh b/rkt/rkt-ubuntu/provision.sh
similarity index 100%
rename from rkt/provision.sh
rename to rkt/rkt-ubuntu/provision.sh
diff --git a/ssh-bastion-ansible/README.md b/ssh/ssh-bastion-ansible/README.md
similarity index 100%
rename from ssh-bastion-ansible/README.md
rename to ssh/ssh-bastion-ansible/README.md
diff --git a/ssh-bastion-ansible/Vagrantfile b/ssh/ssh-bastion-ansible/Vagrantfile
similarity index 100%
rename from ssh-bastion-ansible/Vagrantfile
rename to ssh/ssh-bastion-ansible/Vagrantfile
diff --git a/ssh-bastion-ansible/bastion_rsa b/ssh/ssh-bastion-ansible/bastion_rsa
similarity index 100%
rename from ssh-bastion-ansible/bastion_rsa
rename to ssh/ssh-bastion-ansible/bastion_rsa
diff --git a/ssh-bastion-ansible/bastion_rsa.pub b/ssh/ssh-bastion-ansible/bastion_rsa.pub
similarity index 100%
rename from ssh-bastion-ansible/bastion_rsa.pub
rename to ssh/ssh-bastion-ansible/bastion_rsa.pub
diff --git a/ssh-bastion-ansible/config b/ssh/ssh-bastion-ansible/config
similarity index 100%
rename from ssh-bastion-ansible/config
rename to ssh/ssh-bastion-ansible/config
diff --git a/ssh-bastion-ansible/machines.yml b/ssh/ssh-bastion-ansible/machines.yml
similarity index 100%
rename from ssh-bastion-ansible/machines.yml
rename to ssh/ssh-bastion-ansible/machines.yml
diff --git a/ssh-bastion-ansible/provision.yml b/ssh/ssh-bastion-ansible/provision.yml
similarity index 100%
rename from ssh-bastion-ansible/provision.yml
rename to ssh/ssh-bastion-ansible/provision.yml
diff --git a/ssh-bastion-ansible/remote_rsa b/ssh/ssh-bastion-ansible/remote_rsa
similarity index 100%
rename from ssh-bastion-ansible/remote_rsa
rename to ssh/ssh-bastion-ansible/remote_rsa
diff --git a/ssh-bastion-ansible/remote_rsa.pub b/ssh/ssh-bastion-ansible/remote_rsa.pub
similarity index 100%
rename from ssh-bastion-ansible/remote_rsa.pub
rename to ssh/ssh-bastion-ansible/remote_rsa.pub
diff --git a/ssh-bastion-ansible/ssh-bastion-diagram.png b/ssh/ssh-bastion-ansible/ssh-bastion-diagram.png
similarity index 100%
rename from ssh-bastion-ansible/ssh-bastion-diagram.png
rename to ssh/ssh-bastion-ansible/ssh-bastion-diagram.png
diff --git a/ssh-bastion/README.md b/ssh/ssh-bastion/README.md
similarity index 100%
rename from ssh-bastion/README.md
rename to ssh/ssh-bastion/README.md
diff --git a/ssh-bastion/Vagrantfile b/ssh/ssh-bastion/Vagrantfile
similarity index 100%
rename from ssh-bastion/Vagrantfile
rename to ssh/ssh-bastion/Vagrantfile
diff --git a/ssh-bastion/bastion-hosts b/ssh/ssh-bastion/bastion-hosts
similarity index 100%
rename from ssh-bastion/bastion-hosts
rename to ssh/ssh-bastion/bastion-hosts
diff --git a/ssh-bastion/bastion_rsa b/ssh/ssh-bastion/bastion_rsa
similarity index 100%
rename from ssh-bastion/bastion_rsa
rename to ssh/ssh-bastion/bastion_rsa
diff --git a/ssh-bastion/bastion_rsa.pub b/ssh/ssh-bastion/bastion_rsa.pub
similarity index 100%
rename from ssh-bastion/bastion_rsa.pub
rename to ssh/ssh-bastion/bastion_rsa.pub
diff --git a/ssh-bastion/client-ssh-config b/ssh/ssh-bastion/client-ssh-config
similarity index 100%
rename from ssh-bastion/client-ssh-config
rename to ssh/ssh-bastion/client-ssh-config
diff --git a/ssh-bastion/machines.yml b/ssh/ssh-bastion/machines.yml
similarity index 100%
rename from ssh-bastion/machines.yml
rename to ssh/ssh-bastion/machines.yml
diff --git a/ssh-bastion/remote_rsa b/ssh/ssh-bastion/remote_rsa
similarity index 100%
rename from ssh-bastion/remote_rsa
rename to ssh/ssh-bastion/remote_rsa
diff --git a/ssh-bastion/remote_rsa.pub b/ssh/ssh-bastion/remote_rsa.pub
similarity index 100%
rename from ssh-bastion/remote_rsa.pub
rename to ssh/ssh-bastion/remote_rsa.pub
diff --git a/ssh-bastion/ssh-bastion-diagram.png b/ssh/ssh-bastion/ssh-bastion-diagram.png
similarity index 100%
rename from ssh-bastion/ssh-bastion-diagram.png
rename to ssh/ssh-bastion/ssh-bastion-diagram.png
diff --git a/terraform-aws/.gitignore b/terraform/aws/.gitignore
similarity index 100%
rename from terraform-aws/.gitignore
rename to terraform/aws/.gitignore
diff --git a/terraform-aws/README.md b/terraform/aws/README.md
similarity index 100%
rename from terraform-aws/README.md
rename to terraform/aws/README.md
diff --git a/terraform-aws/new-vpc/data.tf b/terraform/aws/new-vpc/data.tf
similarity index 100%
rename from terraform-aws/new-vpc/data.tf
rename to terraform/aws/new-vpc/data.tf
diff --git a/terraform-aws/new-vpc/main.tf b/terraform/aws/new-vpc/main.tf
similarity index 100%
rename from terraform-aws/new-vpc/main.tf
rename to terraform/aws/new-vpc/main.tf
diff --git a/terraform-aws/new-vpc/provider.tf b/terraform/aws/new-vpc/provider.tf
similarity index 100%
rename from terraform-aws/new-vpc/provider.tf
rename to terraform/aws/new-vpc/provider.tf
diff --git a/terraform-aws/new-vpc/vars.tf b/terraform/aws/new-vpc/vars.tf
similarity index 100%
rename from terraform-aws/new-vpc/vars.tf
rename to terraform/aws/new-vpc/vars.tf
diff --git a/terraform-aws/simple-ec2/data.tf b/terraform/aws/simple-ec2/data.tf
similarity index 100%
rename from terraform-aws/simple-ec2/data.tf
rename to terraform/aws/simple-ec2/data.tf
diff --git a/terraform-aws/simple-ec2/main.tf b/terraform/aws/simple-ec2/main.tf
similarity index 100%
rename from terraform-aws/simple-ec2/main.tf
rename to terraform/aws/simple-ec2/main.tf
diff --git a/terraform-aws/simple-ec2/provider.tf b/terraform/aws/simple-ec2/provider.tf
similarity index 100%
rename from terraform-aws/simple-ec2/provider.tf
rename to terraform/aws/simple-ec2/provider.tf
diff --git a/terraform-aws/simple-ec2/vars.tf b/terraform/aws/simple-ec2/vars.tf
similarity index 100%
rename from terraform-aws/simple-ec2/vars.tf
rename to terraform/aws/simple-ec2/vars.tf
diff --git a/terraform/README.md b/terraform/tf-general/README.md
similarity index 100%
rename from terraform/README.md
rename to terraform/tf-general/README.md
diff --git a/terraform/tf-example/main.tf b/terraform/tf-general/tf-example/main.tf
similarity index 100%
rename from terraform/tf-example/main.tf
rename to terraform/tf-general/tf-example/main.tf
diff --git a/terraform/tf-example/output.tf b/terraform/tf-general/tf-example/output.tf
similarity index 100%
rename from terraform/tf-example/output.tf
rename to terraform/tf-general/tf-example/output.tf
diff --git a/terraform/tf-example/provider.tf b/terraform/tf-general/tf-example/provider.tf
similarity index 100%
rename from terraform/tf-example/provider.tf
rename to terraform/tf-general/tf-example/provider.tf
diff --git a/terraform/tf-example/vars.tf b/terraform/tf-general/tf-example/vars.tf
similarity index 100%
rename from terraform/tf-example/vars.tf
rename to terraform/tf-general/tf-example/vars.tf
diff --git a/terraform/tf-json-example/main.tf.json b/terraform/tf-general/tf-json-example/main.tf.json
similarity index 100%
rename from terraform/tf-json-example/main.tf.json
rename to terraform/tf-general/tf-json-example/main.tf.json
diff --git a/terraform/tf-json-example/output.tf.json b/terraform/tf-general/tf-json-example/output.tf.json
similarity index 100%
rename from terraform/tf-json-example/output.tf.json
rename to terraform/tf-general/tf-json-example/output.tf.json
diff --git a/terraform/tf-json-example/provider.tf.json b/terraform/tf-general/tf-json-example/provider.tf.json
similarity index 100%
rename from terraform/tf-json-example/provider.tf.json
rename to terraform/tf-general/tf-json-example/provider.tf.json
diff --git a/terraform/tf-json-example/vars.tf.json b/terraform/tf-general/tf-json-example/vars.tf.json
similarity index 100%
rename from terraform/tf-json-example/vars.tf.json
rename to terraform/tf-general/tf-json-example/vars.tf.json
diff --git a/ubuntu-generic/README.md b/ubuntu/ubuntu-generic/README.md
similarity index 100%
rename from ubuntu-generic/README.md
rename to ubuntu/ubuntu-generic/README.md
diff --git a/ubuntu-generic/Vagrantfile b/ubuntu/ubuntu-generic/Vagrantfile
similarity index 100%
rename from ubuntu-generic/Vagrantfile
rename to ubuntu/ubuntu-generic/Vagrantfile
diff --git a/ubuntu-generic/machines.yml b/ubuntu/ubuntu-generic/machines.yml
similarity index 100%
rename from ubuntu-generic/machines.yml
rename to ubuntu/ubuntu-generic/machines.yml
diff --git a/vagrant-aws-multi/README.md b/vagrant/aws-multi/README.md
similarity index 100%
rename from vagrant-aws-multi/README.md
rename to vagrant/aws-multi/README.md
diff --git a/vagrant-aws-multi/Vagrantfile b/vagrant/aws-multi/Vagrantfile
similarity index 100%
rename from vagrant-aws-multi/Vagrantfile
rename to vagrant/aws-multi/Vagrantfile
diff --git a/vagrant-aws-multi/instances.yml b/vagrant/aws-multi/instances.yml
similarity index 100%
rename from vagrant-aws-multi/instances.yml
rename to vagrant/aws-multi/instances.yml
diff --git a/vagrant-aws/README.md b/vagrant/aws/README.md
similarity index 100%
rename from vagrant-aws/README.md
rename to vagrant/aws/README.md
diff --git a/vagrant-aws/Vagrantfile b/vagrant/aws/Vagrantfile
similarity index 100%
rename from vagrant-aws/Vagrantfile
rename to vagrant/aws/Vagrantfile
diff --git a/vagrant-aws/instances.yml b/vagrant/aws/instances.yml
similarity index 100%
rename from vagrant-aws/instances.yml
rename to vagrant/aws/instances.yml
diff --git a/complex-json/README.md b/vagrant/complex-json/README.md
similarity index 100%
rename from complex-json/README.md
rename to vagrant/complex-json/README.md
diff --git a/complex-json/Vagrantfile b/vagrant/complex-json/Vagrantfile
similarity index 100%
rename from complex-json/Vagrantfile
rename to vagrant/complex-json/Vagrantfile
diff --git a/complex-json/machines.json b/vagrant/complex-json/machines.json
similarity index 100%
rename from complex-json/machines.json
rename to vagrant/complex-json/machines.json
diff --git a/complex-yaml/README.md b/vagrant/complex-yaml/README.md
similarity index 100%
rename from complex-yaml/README.md
rename to vagrant/complex-yaml/README.md
diff --git a/complex-yaml/Vagrantfile b/vagrant/complex-yaml/Vagrantfile
similarity index 100%
rename from complex-yaml/Vagrantfile
rename to vagrant/complex-yaml/Vagrantfile
diff --git a/complex-yaml/machines.yml b/vagrant/complex-yaml/machines.yml
similarity index 100%
rename from complex-yaml/machines.yml
rename to vagrant/complex-yaml/machines.yml
diff --git a/vagrant-docker-json/README.md b/vagrant/docker-json/README.md
similarity index 100%
rename from vagrant-docker-json/README.md
rename to vagrant/docker-json/README.md
diff --git a/vagrant-docker-json/Vagrantfile b/vagrant/docker-json/Vagrantfile
similarity index 100%
rename from vagrant-docker-json/Vagrantfile
rename to vagrant/docker-json/Vagrantfile
diff --git a/vagrant-docker-json/containers.json b/vagrant/docker-json/containers.json
similarity index 100%
rename from vagrant-docker-json/containers.json
rename to vagrant/docker-json/containers.json
diff --git a/vagrant-docker-json/host/Vagrantfile b/vagrant/docker-json/host/Vagrantfile
similarity index 100%
rename from vagrant-docker-json/host/Vagrantfile
rename to vagrant/docker-json/host/Vagrantfile
diff --git a/vagrant-docker-yaml/README.md b/vagrant/docker-yaml/README.md
similarity index 100%
rename from vagrant-docker-yaml/README.md
rename to vagrant/docker-yaml/README.md
diff --git a/vagrant-docker-yaml/Vagrantfile b/vagrant/docker-yaml/Vagrantfile
similarity index 100%
rename from vagrant-docker-yaml/Vagrantfile
rename to vagrant/docker-yaml/Vagrantfile
diff --git a/vagrant-docker-yaml/VagrantfileHost b/vagrant/docker-yaml/VagrantfileHost
similarity index 100%
rename from vagrant-docker-yaml/VagrantfileHost
rename to vagrant/docker-yaml/VagrantfileHost
diff --git a/vagrant-docker-yaml/containers.yml b/vagrant/docker-yaml/containers.yml
similarity index 100%
rename from vagrant-docker-yaml/containers.yml
rename to vagrant/docker-yaml/containers.yml
diff --git a/vagrant-docker-yaml/hostvms.yml b/vagrant/docker-yaml/hostvms.yml
similarity index 100%
rename from vagrant-docker-yaml/hostvms.yml
rename to vagrant/docker-yaml/hostvms.yml
diff --git a/vagrant-docker/README.md b/vagrant/docker/README.md
similarity index 100%
rename from vagrant-docker/README.md
rename to vagrant/docker/README.md
diff --git a/vagrant-docker/Vagrantfile b/vagrant/docker/Vagrantfile
similarity index 100%
rename from vagrant-docker/Vagrantfile
rename to vagrant/docker/Vagrantfile
diff --git a/vagrant-docker/host/Vagrantfile b/vagrant/docker/host/Vagrantfile
similarity index 100%
rename from vagrant-docker/host/Vagrantfile
rename to vagrant/docker/host/Vagrantfile
diff --git a/vagrant-json/README.md b/vagrant/json/README.md
similarity index 100%
rename from vagrant-json/README.md
rename to vagrant/json/README.md
diff --git a/vagrant-json/Vagrantfile b/vagrant/json/Vagrantfile
similarity index 100%
rename from vagrant-json/Vagrantfile
rename to vagrant/json/Vagrantfile
diff --git a/vagrant-json/machines.json b/vagrant/json/machines.json
similarity index 100%
rename from vagrant-json/machines.json
rename to vagrant/json/machines.json
diff --git a/vagrant-multi-platform/README.md b/vagrant/multi-platform/README.md
similarity index 100%
rename from vagrant-multi-platform/README.md
rename to vagrant/multi-platform/README.md
diff --git a/vagrant-multi-platform/Vagrantfile b/vagrant/multi-platform/Vagrantfile
similarity index 100%
rename from vagrant-multi-platform/Vagrantfile
rename to vagrant/multi-platform/Vagrantfile
diff --git a/vagrant-multi-platform/machines.yml b/vagrant/multi-platform/machines.yml
similarity index 100%
rename from vagrant-multi-platform/machines.yml
rename to vagrant/multi-platform/machines.yml
diff --git a/multi-provider-simple/Vagrantfile b/vagrant/multi-provider/Vagrantfile
similarity index 100%
rename from multi-provider-simple/Vagrantfile
rename to vagrant/multi-provider/Vagrantfile
diff --git a/multi-provider-simple/machines.yml b/vagrant/multi-provider/machines.yml
similarity index 100%
rename from multi-provider-simple/machines.yml
rename to vagrant/multi-provider/machines.yml
diff --git a/vagrant-openstack-multi/README.md b/vagrant/openstack-multi/README.md
similarity index 100%
rename from vagrant-openstack-multi/README.md
rename to vagrant/openstack-multi/README.md
diff --git a/vagrant-openstack-multi/Vagrantfile b/vagrant/openstack-multi/Vagrantfile
similarity index 100%
rename from vagrant-openstack-multi/Vagrantfile
rename to vagrant/openstack-multi/Vagrantfile
diff --git a/vagrant-openstack-multi/credentials.yml b/vagrant/openstack-multi/credentials.yml
similarity index 100%
rename from vagrant-openstack-multi/credentials.yml
rename to vagrant/openstack-multi/credentials.yml
diff --git a/vagrant-openstack-multi/instances.yml b/vagrant/openstack-multi/instances.yml
similarity index 100%
rename from vagrant-openstack-multi/instances.yml
rename to vagrant/openstack-multi/instances.yml
diff --git a/vagrant-openstack/README.md b/vagrant/openstack/README.md
similarity index 100%
rename from vagrant-openstack/README.md
rename to vagrant/openstack/README.md
diff --git a/vagrant-openstack/Vagrantfile b/vagrant/openstack/Vagrantfile
similarity index 100%
rename from vagrant-openstack/Vagrantfile
rename to vagrant/openstack/Vagrantfile
diff --git a/vagrant-openstack/credentials.yml b/vagrant/openstack/credentials.yml
similarity index 100%
rename from vagrant-openstack/credentials.yml
rename to vagrant/openstack/credentials.yml
diff --git a/vagrant-openstack/instances.yml b/vagrant/openstack/instances.yml
similarity index 100%
rename from vagrant-openstack/instances.yml
rename to vagrant/openstack/instances.yml