Separated VM from rest of code.
Merge branch 'vmseparation' into develop