112 rearrange hierarchy

Minor fixes and improvements to the Vagrantfile