Jarv/vagrant reorganization