Virtual Machine refactor

@stijn22