Moved vm.d to vm/vm.d and vm_extra.d to vm/vm_extra.d