Initial Reworking of Vagrant structure