Added Vagrantfile/reorg layout