diff --git a/vagrant-ansible_local/README.md b/vagrant/ansible_local/README.md
similarity index 100%
rename from vagrant-ansible_local/README.md
rename to vagrant/ansible_local/README.md
diff --git a/vagrant-ansible_local/create_workarea.sh b/vagrant/ansible_local/create_workarea.sh
similarity index 100%
rename from vagrant-ansible_local/create_workarea.sh
rename to vagrant/ansible_local/create_workarea.sh
diff --git a/vagrant-ansible_local/part1_ubuntu/Vagrantfile b/vagrant/ansible_local/part1_ubuntu/Vagrantfile
similarity index 100%
rename from vagrant-ansible_local/part1_ubuntu/Vagrantfile
rename to vagrant/ansible_local/part1_ubuntu/Vagrantfile
diff --git a/vagrant-ansible_local/part1_ubuntu/provision/playbook.yml b/vagrant/ansible_local/part1_ubuntu/provision/playbook.yml
similarity index 100%
rename from vagrant-ansible_local/part1_ubuntu/provision/playbook.yml
rename to vagrant/ansible_local/part1_ubuntu/provision/playbook.yml
diff --git a/vagrant-ansible_local/part1_ubuntu/provision/roles/hello_web/defaults/main.yml b/vagrant/ansible_local/part1_ubuntu/provision/roles/hello_web/defaults/main.yml
similarity index 100%
rename from vagrant-ansible_local/part1_ubuntu/provision/roles/hello_web/defaults/main.yml
rename to vagrant/ansible_local/part1_ubuntu/provision/roles/hello_web/defaults/main.yml
diff --git a/vagrant-ansible_local/part1_ubuntu/provision/roles/hello_web/files/index.html b/vagrant/ansible_local/part1_ubuntu/provision/roles/hello_web/files/index.html
similarity index 100%
rename from vagrant-ansible_local/part1_ubuntu/provision/roles/hello_web/files/index.html
rename to vagrant/ansible_local/part1_ubuntu/provision/roles/hello_web/files/index.html
diff --git a/vagrant-ansible_local/part1_ubuntu/provision/roles/hello_web/tasks/main.yml b/vagrant/ansible_local/part1_ubuntu/provision/roles/hello_web/tasks/main.yml
similarity index 100%
rename from vagrant-ansible_local/part1_ubuntu/provision/roles/hello_web/tasks/main.yml
rename to vagrant/ansible_local/part1_ubuntu/provision/roles/hello_web/tasks/main.yml
diff --git a/vagrant-ansible_local/part2_centos/Vagrantfile b/vagrant/ansible_local/part2_centos/Vagrantfile
similarity index 100%
rename from vagrant-ansible_local/part2_centos/Vagrantfile
rename to vagrant/ansible_local/part2_centos/Vagrantfile
diff --git a/vagrant-ansible_local/part2_centos/provision/playbook.yml b/vagrant/ansible_local/part2_centos/provision/playbook.yml
similarity index 100%
rename from vagrant-ansible_local/part2_centos/provision/playbook.yml
rename to vagrant/ansible_local/part2_centos/provision/playbook.yml
diff --git a/vagrant-ansible_local/part2_centos/provision/roles/hello_web/defaults/main.yml b/vagrant/ansible_local/part2_centos/provision/roles/hello_web/defaults/main.yml
similarity index 100%
rename from vagrant-ansible_local/part2_centos/provision/roles/hello_web/defaults/main.yml
rename to vagrant/ansible_local/part2_centos/provision/roles/hello_web/defaults/main.yml
diff --git a/vagrant-ansible_local/part2_centos/provision/roles/hello_web/files/index.html b/vagrant/ansible_local/part2_centos/provision/roles/hello_web/files/index.html
similarity index 100%
rename from vagrant-ansible_local/part2_centos/provision/roles/hello_web/files/index.html
rename to vagrant/ansible_local/part2_centos/provision/roles/hello_web/files/index.html
diff --git a/vagrant-ansible_local/part2_centos/provision/roles/hello_web/tasks/main.yml b/vagrant/ansible_local/part2_centos/provision/roles/hello_web/tasks/main.yml
similarity index 100%
rename from vagrant-ansible_local/part2_centos/provision/roles/hello_web/tasks/main.yml
rename to vagrant/ansible_local/part2_centos/provision/roles/hello_web/tasks/main.yml
diff --git a/vagrant-chef_zero/README.md b/vagrant/chef_zero/README.md
similarity index 100%
rename from vagrant-chef_zero/README.md
rename to vagrant/chef_zero/README.md
diff --git a/vagrant-chef_zero/create_workarea.sh b/vagrant/chef_zero/create_workarea.sh
similarity index 100%
rename from vagrant-chef_zero/create_workarea.sh
rename to vagrant/chef_zero/create_workarea.sh
diff --git a/vagrant-chef_zero/part1_ubuntu/Vagrantfile b/vagrant/chef_zero/part1_ubuntu/Vagrantfile
similarity index 100%
rename from vagrant-chef_zero/part1_ubuntu/Vagrantfile
rename to vagrant/chef_zero/part1_ubuntu/Vagrantfile
diff --git a/vagrant-chef_zero/part1_ubuntu/cookbooks/hello_web/attributes/default.rb b/vagrant/chef_zero/part1_ubuntu/cookbooks/hello_web/attributes/default.rb
similarity index 100%
rename from vagrant-chef_zero/part1_ubuntu/cookbooks/hello_web/attributes/default.rb
rename to vagrant/chef_zero/part1_ubuntu/cookbooks/hello_web/attributes/default.rb
diff --git a/vagrant-chef_zero/part1_ubuntu/cookbooks/hello_web/files/default/index.html b/vagrant/chef_zero/part1_ubuntu/cookbooks/hello_web/files/default/index.html
similarity index 100%
rename from vagrant-chef_zero/part1_ubuntu/cookbooks/hello_web/files/default/index.html
rename to vagrant/chef_zero/part1_ubuntu/cookbooks/hello_web/files/default/index.html
diff --git a/vagrant-chef_zero/part1_ubuntu/cookbooks/hello_web/metadata.rb b/vagrant/chef_zero/part1_ubuntu/cookbooks/hello_web/metadata.rb
similarity index 100%
rename from vagrant-chef_zero/part1_ubuntu/cookbooks/hello_web/metadata.rb
rename to vagrant/chef_zero/part1_ubuntu/cookbooks/hello_web/metadata.rb
diff --git a/vagrant-chef_zero/part1_ubuntu/cookbooks/hello_web/recipes/default.rb b/vagrant/chef_zero/part1_ubuntu/cookbooks/hello_web/recipes/default.rb
similarity index 100%
rename from vagrant-chef_zero/part1_ubuntu/cookbooks/hello_web/recipes/default.rb
rename to vagrant/chef_zero/part1_ubuntu/cookbooks/hello_web/recipes/default.rb
diff --git a/vagrant-chef_zero/part1_ubuntu/nodes/.gitkeep b/vagrant/chef_zero/part1_ubuntu/nodes/.gitkeep
similarity index 100%
rename from vagrant-chef_zero/part1_ubuntu/nodes/.gitkeep
rename to vagrant/chef_zero/part1_ubuntu/nodes/.gitkeep
diff --git a/vagrant-chef_zero/part2_centos/Vagrantfile b/vagrant/chef_zero/part2_centos/Vagrantfile
similarity index 100%
rename from vagrant-chef_zero/part2_centos/Vagrantfile
rename to vagrant/chef_zero/part2_centos/Vagrantfile
diff --git a/vagrant-chef_zero/part2_centos/cookbooks/hello_web/attributes/default.rb b/vagrant/chef_zero/part2_centos/cookbooks/hello_web/attributes/default.rb
similarity index 100%
rename from vagrant-chef_zero/part2_centos/cookbooks/hello_web/attributes/default.rb
rename to vagrant/chef_zero/part2_centos/cookbooks/hello_web/attributes/default.rb
diff --git a/vagrant-chef_zero/part2_centos/cookbooks/hello_web/files/default/index.html b/vagrant/chef_zero/part2_centos/cookbooks/hello_web/files/default/index.html
similarity index 100%
rename from vagrant-chef_zero/part2_centos/cookbooks/hello_web/files/default/index.html
rename to vagrant/chef_zero/part2_centos/cookbooks/hello_web/files/default/index.html
diff --git a/vagrant-chef_zero/part2_centos/cookbooks/hello_web/metadata.rb b/vagrant/chef_zero/part2_centos/cookbooks/hello_web/metadata.rb
similarity index 100%
rename from vagrant-chef_zero/part2_centos/cookbooks/hello_web/metadata.rb
rename to vagrant/chef_zero/part2_centos/cookbooks/hello_web/metadata.rb
diff --git a/vagrant-chef_zero/part2_centos/cookbooks/hello_web/recipes/default.rb b/vagrant/chef_zero/part2_centos/cookbooks/hello_web/recipes/default.rb
similarity index 100%
rename from vagrant-chef_zero/part2_centos/cookbooks/hello_web/recipes/default.rb
rename to vagrant/chef_zero/part2_centos/cookbooks/hello_web/recipes/default.rb
diff --git a/vagrant-chef_zero/part2_centos/nodes/.gitkeep b/vagrant/chef_zero/part2_centos/nodes/.gitkeep
similarity index 100%
rename from vagrant-chef_zero/part2_centos/nodes/.gitkeep
rename to vagrant/chef_zero/part2_centos/nodes/.gitkeep
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/create_workarea.sh b/vagrant/docker/create_workarea.sh
similarity index 100%
rename from vagrant-docker/create_workarea.sh
rename to vagrant/docker/create_workarea.sh
diff --git a/vagrant-docker/part1_build/Dockerfile b/vagrant/docker/part1_build/Dockerfile
similarity index 100%
rename from vagrant-docker/part1_build/Dockerfile
rename to vagrant/docker/part1_build/Dockerfile
diff --git a/vagrant-docker/part1_build/README.md b/vagrant/docker/part1_build/README.md
similarity index 100%
rename from vagrant-docker/part1_build/README.md
rename to vagrant/docker/part1_build/README.md
diff --git a/vagrant-docker/part1_build/Vagrantfile b/vagrant/docker/part1_build/Vagrantfile
similarity index 100%
rename from vagrant-docker/part1_build/Vagrantfile
rename to vagrant/docker/part1_build/Vagrantfile
diff --git a/vagrant-docker/part1_build/public-html/index.html b/vagrant/docker/part1_build/public-html/index.html
similarity index 100%
rename from vagrant-docker/part1_build/public-html/index.html
rename to vagrant/docker/part1_build/public-html/index.html
diff --git a/vagrant-docker/part2_image/README.md b/vagrant/docker/part2_image/README.md
similarity index 100%
rename from vagrant-docker/part2_image/README.md
rename to vagrant/docker/part2_image/README.md
diff --git a/vagrant-docker/part2_image/Vagrantfile b/vagrant/docker/part2_image/Vagrantfile
similarity index 100%
rename from vagrant-docker/part2_image/Vagrantfile
rename to vagrant/docker/part2_image/Vagrantfile
diff --git a/vagrant-docker/part2_image/public-html/index.html b/vagrant/docker/part2_image/public-html/index.html
similarity index 100%
rename from vagrant-docker/part2_image/public-html/index.html
rename to vagrant/docker/part2_image/public-html/index.html
diff --git a/vagrant-puppet/README.md b/vagrant/puppet/README.md
similarity index 100%
rename from vagrant-puppet/README.md
rename to vagrant/puppet/README.md
diff --git a/vagrant-puppet/create_workarea.sh b/vagrant/puppet/create_workarea.sh
similarity index 100%
rename from vagrant-puppet/create_workarea.sh
rename to vagrant/puppet/create_workarea.sh
diff --git a/vagrant-puppet/part1_ubuntu/README.md b/vagrant/puppet/part1_ubuntu/README.md
similarity index 100%
rename from vagrant-puppet/part1_ubuntu/README.md
rename to vagrant/puppet/part1_ubuntu/README.md
diff --git a/vagrant-puppet/part1_ubuntu/Vagrantfile b/vagrant/puppet/part1_ubuntu/Vagrantfile
similarity index 100%
rename from vagrant-puppet/part1_ubuntu/Vagrantfile
rename to vagrant/puppet/part1_ubuntu/Vagrantfile
diff --git a/vagrant-puppet/part1_ubuntu/bootstrap.sh b/vagrant/puppet/part1_ubuntu/bootstrap.sh
similarity index 100%
rename from vagrant-puppet/part1_ubuntu/bootstrap.sh
rename to vagrant/puppet/part1_ubuntu/bootstrap.sh
diff --git a/vagrant-puppet/part1_ubuntu/manifests/default.pp b/vagrant/puppet/part1_ubuntu/manifests/default.pp
similarity index 100%
rename from vagrant-puppet/part1_ubuntu/manifests/default.pp
rename to vagrant/puppet/part1_ubuntu/manifests/default.pp
diff --git a/vagrant-puppet/part1_ubuntu/site/hello_web/files/index.html b/vagrant/puppet/part1_ubuntu/site/hello_web/files/index.html
similarity index 100%
rename from vagrant-puppet/part1_ubuntu/site/hello_web/files/index.html
rename to vagrant/puppet/part1_ubuntu/site/hello_web/files/index.html
diff --git a/vagrant-puppet/part1_ubuntu/site/hello_web/manifests/init.pp b/vagrant/puppet/part1_ubuntu/site/hello_web/manifests/init.pp
similarity index 100%
rename from vagrant-puppet/part1_ubuntu/site/hello_web/manifests/init.pp
rename to vagrant/puppet/part1_ubuntu/site/hello_web/manifests/init.pp
diff --git a/vagrant-puppet/part2_centos/README.md b/vagrant/puppet/part2_centos/README.md
similarity index 100%
rename from vagrant-puppet/part2_centos/README.md
rename to vagrant/puppet/part2_centos/README.md
diff --git a/vagrant-puppet/part2_centos/Vagrantfile b/vagrant/puppet/part2_centos/Vagrantfile
similarity index 100%
rename from vagrant-puppet/part2_centos/Vagrantfile
rename to vagrant/puppet/part2_centos/Vagrantfile
diff --git a/vagrant-puppet/part2_centos/bootstrap.sh b/vagrant/puppet/part2_centos/bootstrap.sh
similarity index 100%
rename from vagrant-puppet/part2_centos/bootstrap.sh
rename to vagrant/puppet/part2_centos/bootstrap.sh
diff --git a/vagrant-puppet/part2_centos/manifests/default.pp b/vagrant/puppet/part2_centos/manifests/default.pp
similarity index 100%
rename from vagrant-puppet/part2_centos/manifests/default.pp
rename to vagrant/puppet/part2_centos/manifests/default.pp
diff --git a/vagrant-puppet/part2_centos/site/hello_web/files/index.html b/vagrant/puppet/part2_centos/site/hello_web/files/index.html
similarity index 100%
rename from vagrant-puppet/part2_centos/site/hello_web/files/index.html
rename to vagrant/puppet/part2_centos/site/hello_web/files/index.html
diff --git a/vagrant-puppet/part2_centos/site/hello_web/manifests/init.pp b/vagrant/puppet/part2_centos/site/hello_web/manifests/init.pp
similarity index 100%
rename from vagrant-puppet/part2_centos/site/hello_web/manifests/init.pp
rename to vagrant/puppet/part2_centos/site/hello_web/manifests/init.pp
diff --git a/vagrant-salt/README.md b/vagrant/salt/README.md
similarity index 100%
rename from vagrant-salt/README.md
rename to vagrant/salt/README.md
diff --git a/vagrant-salt/create_workarea.sh b/vagrant/salt/create_workarea.sh
similarity index 100%
rename from vagrant-salt/create_workarea.sh
rename to vagrant/salt/create_workarea.sh
diff --git a/vagrant-salt/part1_ubuntu/Vagrantfile b/vagrant/salt/part1_ubuntu/Vagrantfile
similarity index 100%
rename from vagrant-salt/part1_ubuntu/Vagrantfile
rename to vagrant/salt/part1_ubuntu/Vagrantfile
diff --git a/vagrant-salt/part1_ubuntu/roots/pillar/hello_web.sls b/vagrant/salt/part1_ubuntu/roots/pillar/hello_web.sls
similarity index 100%
rename from vagrant-salt/part1_ubuntu/roots/pillar/hello_web.sls
rename to vagrant/salt/part1_ubuntu/roots/pillar/hello_web.sls
diff --git a/vagrant-salt/part1_ubuntu/roots/pillar/top.sls b/vagrant/salt/part1_ubuntu/roots/pillar/top.sls
similarity index 100%
rename from vagrant-salt/part1_ubuntu/roots/pillar/top.sls
rename to vagrant/salt/part1_ubuntu/roots/pillar/top.sls
diff --git a/vagrant-salt/part1_ubuntu/roots/salt/hello_web/defaults.yaml b/vagrant/salt/part1_ubuntu/roots/salt/hello_web/defaults.yaml
similarity index 100%
rename from vagrant-salt/part1_ubuntu/roots/salt/hello_web/defaults.yaml
rename to vagrant/salt/part1_ubuntu/roots/salt/hello_web/defaults.yaml
diff --git a/vagrant-salt/part1_ubuntu/roots/salt/hello_web/files/index.html b/vagrant/salt/part1_ubuntu/roots/salt/hello_web/files/index.html
similarity index 100%
rename from vagrant-salt/part1_ubuntu/roots/salt/hello_web/files/index.html
rename to vagrant/salt/part1_ubuntu/roots/salt/hello_web/files/index.html
diff --git a/vagrant-salt/part1_ubuntu/roots/salt/hello_web/init.sls b/vagrant/salt/part1_ubuntu/roots/salt/hello_web/init.sls
similarity index 100%
rename from vagrant-salt/part1_ubuntu/roots/salt/hello_web/init.sls
rename to vagrant/salt/part1_ubuntu/roots/salt/hello_web/init.sls
diff --git a/vagrant-salt/part1_ubuntu/roots/salt/hello_web/map.jinja b/vagrant/salt/part1_ubuntu/roots/salt/hello_web/map.jinja
similarity index 100%
rename from vagrant-salt/part1_ubuntu/roots/salt/hello_web/map.jinja
rename to vagrant/salt/part1_ubuntu/roots/salt/hello_web/map.jinja
diff --git a/vagrant-salt/part1_ubuntu/roots/salt/top.sls b/vagrant/salt/part1_ubuntu/roots/salt/top.sls
similarity index 100%
rename from vagrant-salt/part1_ubuntu/roots/salt/top.sls
rename to vagrant/salt/part1_ubuntu/roots/salt/top.sls
diff --git a/vagrant-salt/part2_centos/Vagrantfile b/vagrant/salt/part2_centos/Vagrantfile
similarity index 100%
rename from vagrant-salt/part2_centos/Vagrantfile
rename to vagrant/salt/part2_centos/Vagrantfile
diff --git a/vagrant-salt/part2_centos/roots/pillar/hello_web.sls b/vagrant/salt/part2_centos/roots/pillar/hello_web.sls
similarity index 100%
rename from vagrant-salt/part2_centos/roots/pillar/hello_web.sls
rename to vagrant/salt/part2_centos/roots/pillar/hello_web.sls
diff --git a/vagrant-salt/part2_centos/roots/pillar/top.sls b/vagrant/salt/part2_centos/roots/pillar/top.sls
similarity index 100%
rename from vagrant-salt/part2_centos/roots/pillar/top.sls
rename to vagrant/salt/part2_centos/roots/pillar/top.sls
diff --git a/vagrant-salt/part2_centos/roots/salt/hello_web/defaults.yaml b/vagrant/salt/part2_centos/roots/salt/hello_web/defaults.yaml
similarity index 100%
rename from vagrant-salt/part2_centos/roots/salt/hello_web/defaults.yaml
rename to vagrant/salt/part2_centos/roots/salt/hello_web/defaults.yaml
diff --git a/vagrant-salt/part2_centos/roots/salt/hello_web/files/index.html b/vagrant/salt/part2_centos/roots/salt/hello_web/files/index.html
similarity index 100%
rename from vagrant-salt/part2_centos/roots/salt/hello_web/files/index.html
rename to vagrant/salt/part2_centos/roots/salt/hello_web/files/index.html
diff --git a/vagrant-salt/part2_centos/roots/salt/hello_web/init.sls b/vagrant/salt/part2_centos/roots/salt/hello_web/init.sls
similarity index 100%
rename from vagrant-salt/part2_centos/roots/salt/hello_web/init.sls
rename to vagrant/salt/part2_centos/roots/salt/hello_web/init.sls
diff --git a/vagrant-salt/part2_centos/roots/salt/hello_web/map.jinja b/vagrant/salt/part2_centos/roots/salt/hello_web/map.jinja
similarity index 100%
rename from vagrant-salt/part2_centos/roots/salt/hello_web/map.jinja
rename to vagrant/salt/part2_centos/roots/salt/hello_web/map.jinja
diff --git a/vagrant-salt/part2_centos/roots/salt/top.sls b/vagrant/salt/part2_centos/roots/salt/top.sls
similarity index 100%
rename from vagrant-salt/part2_centos/roots/salt/top.sls
rename to vagrant/salt/part2_centos/roots/salt/top.sls
diff --git a/vagrant-shell/README.md b/vagrant/shell/README.md
similarity index 100%
rename from vagrant-shell/README.md
rename to vagrant/shell/README.md
diff --git a/vagrant-shell/create_workarea.sh b/vagrant/shell/create_workarea.sh
similarity index 100%
rename from vagrant-shell/create_workarea.sh
rename to vagrant/shell/create_workarea.sh
diff --git a/vagrant-shell/part1_ubuntu/README.md b/vagrant/shell/part1_ubuntu/README.md
similarity index 100%
rename from vagrant-shell/part1_ubuntu/README.md
rename to vagrant/shell/part1_ubuntu/README.md
diff --git a/vagrant-shell/part1_ubuntu/Vagrantfile b/vagrant/shell/part1_ubuntu/Vagrantfile
similarity index 100%
rename from vagrant-shell/part1_ubuntu/Vagrantfile
rename to vagrant/shell/part1_ubuntu/Vagrantfile
diff --git a/vagrant-shell/part1_ubuntu/scripts/hello_web.sh b/vagrant/shell/part1_ubuntu/scripts/hello_web.sh
similarity index 100%
rename from vagrant-shell/part1_ubuntu/scripts/hello_web.sh
rename to vagrant/shell/part1_ubuntu/scripts/hello_web.sh
diff --git a/vagrant-shell/part2a_centos/README.md b/vagrant/shell/part2a_centos/README.md
similarity index 100%
rename from vagrant-shell/part2a_centos/README.md
rename to vagrant/shell/part2a_centos/README.md
diff --git a/vagrant-shell/part2a_centos/Vagrantfile b/vagrant/shell/part2a_centos/Vagrantfile
similarity index 100%
rename from vagrant-shell/part2a_centos/Vagrantfile
rename to vagrant/shell/part2a_centos/Vagrantfile
diff --git a/vagrant-shell/part2a_centos/scripts/hello_web.sh b/vagrant/shell/part2a_centos/scripts/hello_web.sh
similarity index 100%
rename from vagrant-shell/part2a_centos/scripts/hello_web.sh
rename to vagrant/shell/part2a_centos/scripts/hello_web.sh
diff --git a/vagrant-shell/part2b_gentoo/README.md b/vagrant/shell/part2b_gentoo/README.md
similarity index 100%
rename from vagrant-shell/part2b_gentoo/README.md
rename to vagrant/shell/part2b_gentoo/README.md
diff --git a/vagrant-shell/part2b_gentoo/Vagrantfile b/vagrant/shell/part2b_gentoo/Vagrantfile
similarity index 100%
rename from vagrant-shell/part2b_gentoo/Vagrantfile
rename to vagrant/shell/part2b_gentoo/Vagrantfile
diff --git a/vagrant-shell/part2b_gentoo/scripts/hello_web.sh b/vagrant/shell/part2b_gentoo/scripts/hello_web.sh
similarity index 100%
rename from vagrant-shell/part2b_gentoo/scripts/hello_web.sh
rename to vagrant/shell/part2b_gentoo/scripts/hello_web.sh
diff --git a/vbox_macos/00.all_install.sh b/vbox/macos/00.all_install.sh
similarity index 100%
rename from vbox_macos/00.all_install.sh
rename to vbox/macos/00.all_install.sh
diff --git a/vbox_macos/01.homebrew_install.sh b/vbox/macos/01.homebrew_install.sh
similarity index 100%
rename from vbox_macos/01.homebrew_install.sh
rename to vbox/macos/01.homebrew_install.sh
diff --git a/vbox_macos/02.vbox_install.sh b/vbox/macos/02.vbox_install.sh
similarity index 100%
rename from vbox_macos/02.vbox_install.sh
rename to vbox/macos/02.vbox_install.sh
diff --git a/vbox_macos/03.vagrant_install.sh b/vbox/macos/03.vagrant_install.sh
similarity index 100%
rename from vbox_macos/03.vagrant_install.sh
rename to vbox/macos/03.vagrant_install.sh
diff --git a/vbox_macos/04.vagrant_demo_macos.sh b/vbox/macos/04.vagrant_demo_macos.sh
similarity index 100%
rename from vbox_macos/04.vagrant_demo_macos.sh
rename to vbox/macos/04.vagrant_demo_macos.sh
diff --git a/vbox_macos/05.vagrant_demo_windows_01.sh b/vbox/macos/05.vagrant_demo_windows_01.sh
similarity index 100%
rename from vbox_macos/05.vagrant_demo_windows_01.sh
rename to vbox/macos/05.vagrant_demo_windows_01.sh
diff --git a/vbox_macos/05.vagrant_demo_windows_02.cmd b/vbox/macos/05.vagrant_demo_windows_02.cmd
similarity index 100%
rename from vbox_macos/05.vagrant_demo_windows_02.cmd
rename to vbox/macos/05.vagrant_demo_windows_02.cmd
diff --git a/vbox_macos/05.vagrant_demo_windows_03.sh b/vbox/macos/05.vagrant_demo_windows_03.sh
similarity index 100%
rename from vbox_macos/05.vagrant_demo_windows_03.sh
rename to vbox/macos/05.vagrant_demo_windows_03.sh
diff --git a/vbox_macos/06.kitchen_chefdk_install.sh b/vbox/macos/06.kitchen_chefdk_install.sh
similarity index 100%
rename from vbox_macos/06.kitchen_chefdk_install.sh
rename to vbox/macos/06.kitchen_chefdk_install.sh
diff --git a/vbox_fedora/07.kitchen_chef_generate.sh b/vbox/macos/07.kitchen_chef_generate.sh
similarity index 100%
rename from vbox_fedora/07.kitchen_chef_generate.sh
rename to vbox/macos/07.kitchen_chef_generate.sh
diff --git a/vbox_fedora/08.kitchen_screeenfetch.sh b/vbox/macos/08.kitchen_screeenfetch.sh
similarity index 100%
rename from vbox_fedora/08.kitchen_screeenfetch.sh
rename to vbox/macos/08.kitchen_screeenfetch.sh
diff --git a/vbox_fedora/09.kitchen_demo.sh b/vbox/macos/09.kitchen_demo.sh
similarity index 100%
rename from vbox_fedora/09.kitchen_demo.sh
rename to vbox/macos/09.kitchen_demo.sh
diff --git a/vbox_macos/10.docker_toolbox_install.sh b/vbox/macos/10.docker_toolbox_install.sh
similarity index 100%
rename from vbox_macos/10.docker_toolbox_install.sh
rename to vbox/macos/10.docker_toolbox_install.sh
diff --git a/vbox_fedora/12.docker_machine_demo.sh b/vbox/macos/12.docker_machine_demo.sh
similarity index 100%
rename from vbox_fedora/12.docker_machine_demo.sh
rename to vbox/macos/12.docker_machine_demo.sh
diff --git a/vbox_macos/13.minikube_install.sh b/vbox/macos/13.minikube_install.sh
similarity index 100%
rename from vbox_macos/13.minikube_install.sh
rename to vbox/macos/13.minikube_install.sh
diff --git a/vbox_macos/14.kubectl_client_install.sh b/vbox/macos/14.kubectl_client_install.sh
similarity index 100%
rename from vbox_macos/14.kubectl_client_install.sh
rename to vbox/macos/14.kubectl_client_install.sh
diff --git a/vbox_fedora/15.minikube_demo.sh b/vbox/macos/15.minikube_demo.sh
similarity index 100%
rename from vbox_fedora/15.minikube_demo.sh
rename to vbox/macos/15.minikube_demo.sh
diff --git a/vbox_fedora/16.print_info.sh b/vbox/macos/16.print_info.sh
similarity index 100%
rename from vbox_fedora/16.print_info.sh
rename to vbox/macos/16.print_info.sh
diff --git a/vbox_fedora/17.cleanup.sh b/vbox/macos/17.cleanup.sh
similarity index 100%
rename from vbox_fedora/17.cleanup.sh
rename to vbox/macos/17.cleanup.sh
diff --git a/vbox_macos/Brewfile b/vbox/macos/Brewfile
similarity index 100%
rename from vbox_macos/Brewfile
rename to vbox/macos/Brewfile
diff --git a/vbox_macos/README.md b/vbox/macos/README.md
similarity index 100%
rename from vbox_macos/README.md
rename to vbox/macos/README.md
diff --git a/vbox_fedora/01.vbox_install.sh b/vbox/vbox_fedora/01.vbox_install.sh
similarity index 100%
rename from vbox_fedora/01.vbox_install.sh
rename to vbox/vbox_fedora/01.vbox_install.sh
diff --git a/vbox_fedora/02.vbox_post_install.sh b/vbox/vbox_fedora/02.vbox_post_install.sh
similarity index 100%
rename from vbox_fedora/02.vbox_post_install.sh
rename to vbox/vbox_fedora/02.vbox_post_install.sh
diff --git a/vbox_fedora/03.vagrant_install.sh b/vbox/vbox_fedora/03.vagrant_install.sh
similarity index 100%
rename from vbox_fedora/03.vagrant_install.sh
rename to vbox/vbox_fedora/03.vagrant_install.sh
diff --git a/vbox_fedora/04.vagrant_demo_gentoo.sh b/vbox/vbox_fedora/04.vagrant_demo_gentoo.sh
similarity index 100%
rename from vbox_fedora/04.vagrant_demo_gentoo.sh
rename to vbox/vbox_fedora/04.vagrant_demo_gentoo.sh
diff --git a/vbox_fedora/05.vagrant_demo_arch.sh b/vbox/vbox_fedora/05.vagrant_demo_arch.sh
similarity index 100%
rename from vbox_fedora/05.vagrant_demo_arch.sh
rename to vbox/vbox_fedora/05.vagrant_demo_arch.sh
diff --git a/vbox_fedora/06.kitchen_chefdk_install.sh b/vbox/vbox_fedora/06.kitchen_chefdk_install.sh
similarity index 100%
rename from vbox_fedora/06.kitchen_chefdk_install.sh
rename to vbox/vbox_fedora/06.kitchen_chefdk_install.sh
diff --git a/vbox_macos/07.kitchen_chef_generate.sh b/vbox/vbox_fedora/07.kitchen_chef_generate.sh
similarity index 100%
rename from vbox_macos/07.kitchen_chef_generate.sh
rename to vbox/vbox_fedora/07.kitchen_chef_generate.sh
diff --git a/vbox_macos/08.kitchen_screeenfetch.sh b/vbox/vbox_fedora/08.kitchen_screeenfetch.sh
similarity index 100%
rename from vbox_macos/08.kitchen_screeenfetch.sh
rename to vbox/vbox_fedora/08.kitchen_screeenfetch.sh
diff --git a/vbox_macos/09.kitchen_demo.sh b/vbox/vbox_fedora/09.kitchen_demo.sh
similarity index 100%
rename from vbox_macos/09.kitchen_demo.sh
rename to vbox/vbox_fedora/09.kitchen_demo.sh
diff --git a/vbox_fedora/10.docker_machine_install.sh b/vbox/vbox_fedora/10.docker_machine_install.sh
similarity index 100%
rename from vbox_fedora/10.docker_machine_install.sh
rename to vbox/vbox_fedora/10.docker_machine_install.sh
diff --git a/vbox_fedora/11.docker_client_install.sh b/vbox/vbox_fedora/11.docker_client_install.sh
similarity index 100%
rename from vbox_fedora/11.docker_client_install.sh
rename to vbox/vbox_fedora/11.docker_client_install.sh
diff --git a/vbox_macos/12.docker_machine_demo.sh b/vbox/vbox_fedora/12.docker_machine_demo.sh
similarity index 100%
rename from vbox_macos/12.docker_machine_demo.sh
rename to vbox/vbox_fedora/12.docker_machine_demo.sh
diff --git a/vbox_fedora/13.minikube_install.sh b/vbox/vbox_fedora/13.minikube_install.sh
similarity index 100%
rename from vbox_fedora/13.minikube_install.sh
rename to vbox/vbox_fedora/13.minikube_install.sh
diff --git a/vbox_fedora/14.kubectl_client_install.sh b/vbox/vbox_fedora/14.kubectl_client_install.sh
similarity index 100%
rename from vbox_fedora/14.kubectl_client_install.sh
rename to vbox/vbox_fedora/14.kubectl_client_install.sh
diff --git a/vbox_macos/15.minikube_demo.sh b/vbox/vbox_fedora/15.minikube_demo.sh
similarity index 100%
rename from vbox_macos/15.minikube_demo.sh
rename to vbox/vbox_fedora/15.minikube_demo.sh
diff --git a/vbox_macos/16.print_info.sh b/vbox/vbox_fedora/16.print_info.sh
similarity index 100%
rename from vbox_macos/16.print_info.sh
rename to vbox/vbox_fedora/16.print_info.sh
diff --git a/vbox_macos/17.cleanup.sh b/vbox/vbox_fedora/17.cleanup.sh
similarity index 100%
rename from vbox_macos/17.cleanup.sh
rename to vbox/vbox_fedora/17.cleanup.sh
diff --git a/vbox_fedora/README.md b/vbox/vbox_fedora/README.md
similarity index 100%
rename from vbox_fedora/README.md
rename to vbox/vbox_fedora/README.md
diff --git a/vbox_windows/00.all_install.ps1 b/vbox/windows/00.all_install.ps1
similarity index 100%
rename from vbox_windows/00.all_install.ps1
rename to vbox/windows/00.all_install.ps1
diff --git a/vbox_windows/01.chocolatey_install.ps1 b/vbox/windows/01.chocolatey_install.ps1
similarity index 100%
rename from vbox_windows/01.chocolatey_install.ps1
rename to vbox/windows/01.chocolatey_install.ps1
diff --git a/vbox_windows/02.vbox_install.ps1 b/vbox/windows/02.vbox_install.ps1
similarity index 100%
rename from vbox_windows/02.vbox_install.ps1
rename to vbox/windows/02.vbox_install.ps1
diff --git a/vbox_windows/03.vagrant_install.ps1 b/vbox/windows/03.vagrant_install.ps1
similarity index 100%
rename from vbox_windows/03.vagrant_install.ps1
rename to vbox/windows/03.vagrant_install.ps1
diff --git a/vbox_windows/04.vagrant_demo_manjaro.ps1 b/vbox/windows/04.vagrant_demo_manjaro.ps1
similarity index 100%
rename from vbox_windows/04.vagrant_demo_manjaro.ps1
rename to vbox/windows/04.vagrant_demo_manjaro.ps1
diff --git a/vbox_windows/05.vagrant_demo_win2016_01.ps1 b/vbox/windows/05.vagrant_demo_win2016_01.ps1
similarity index 100%
rename from vbox_windows/05.vagrant_demo_win2016_01.ps1
rename to vbox/windows/05.vagrant_demo_win2016_01.ps1
diff --git a/vbox_windows/06.vagrant_demo_win2016_02.ps1 b/vbox/windows/06.vagrant_demo_win2016_02.ps1
similarity index 100%
rename from vbox_windows/06.vagrant_demo_win2016_02.ps1
rename to vbox/windows/06.vagrant_demo_win2016_02.ps1
diff --git a/vbox_windows/07.vagrant_demo_win2016_03.sh b/vbox/windows/07.vagrant_demo_win2016_03.sh
similarity index 100%
rename from vbox_windows/07.vagrant_demo_win2016_03.sh
rename to vbox/windows/07.vagrant_demo_win2016_03.sh
diff --git a/vbox_windows/08.kitchen_chefdk_install.ps1 b/vbox/windows/08.kitchen_chefdk_install.ps1
similarity index 100%
rename from vbox_windows/08.kitchen_chefdk_install.ps1
rename to vbox/windows/08.kitchen_chefdk_install.ps1
diff --git a/vbox_windows/09.kitchen_chef_generate.ps1 b/vbox/windows/09.kitchen_chef_generate.ps1
similarity index 100%
rename from vbox_windows/09.kitchen_chef_generate.ps1
rename to vbox/windows/09.kitchen_chef_generate.ps1
diff --git a/vbox_windows/10.kitchen_screeenfetch.ps1 b/vbox/windows/10.kitchen_screeenfetch.ps1
similarity index 100%
rename from vbox_windows/10.kitchen_screeenfetch.ps1
rename to vbox/windows/10.kitchen_screeenfetch.ps1
diff --git a/vbox_windows/11.kitchen_demo.ps1 b/vbox/windows/11.kitchen_demo.ps1
similarity index 100%
rename from vbox_windows/11.kitchen_demo.ps1
rename to vbox/windows/11.kitchen_demo.ps1
diff --git a/vbox_windows/12.docker_toolbox_install.ps1 b/vbox/windows/12.docker_toolbox_install.ps1
similarity index 100%
rename from vbox_windows/12.docker_toolbox_install.ps1
rename to vbox/windows/12.docker_toolbox_install.ps1
diff --git a/vbox_windows/13.docker_machine_demo.ps1 b/vbox/windows/13.docker_machine_demo.ps1
similarity index 100%
rename from vbox_windows/13.docker_machine_demo.ps1
rename to vbox/windows/13.docker_machine_demo.ps1
diff --git a/vbox_windows/14.minikube_install.ps1 b/vbox/windows/14.minikube_install.ps1
similarity index 100%
rename from vbox_windows/14.minikube_install.ps1
rename to vbox/windows/14.minikube_install.ps1
diff --git a/vbox_windows/15.minikube_demo.ps1 b/vbox/windows/15.minikube_demo.ps1
similarity index 100%
rename from vbox_windows/15.minikube_demo.ps1
rename to vbox/windows/15.minikube_demo.ps1
diff --git a/vbox_windows/16.print_info.ps1 b/vbox/windows/16.print_info.ps1
similarity index 100%
rename from vbox_windows/16.print_info.ps1
rename to vbox/windows/16.print_info.ps1
diff --git a/vbox_windows/17.cleanup.ps1 b/vbox/windows/17.cleanup.ps1
similarity index 100%
rename from vbox_windows/17.cleanup.ps1
rename to vbox/windows/17.cleanup.ps1
diff --git a/vbox_windows/README.md b/vbox/windows/README.md
similarity index 100%
rename from vbox_windows/README.md
rename to vbox/windows/README.md
diff --git a/vbox_windows/choco.config b/vbox/windows/choco.config
similarity index 100%
rename from vbox_windows/choco.config
rename to vbox/windows/choco.config