fix some issues with the vm files reorganization