restructured the way VMs are built