Vagrantfile reorganization