Small VM structure changes

The code is a bit cleaner now.