reorg of the Vagrantfile