Re-org. Now we make distinction between base-vm and factory-vm.