This is an easy fix.
Doesn't make sense for them to be in the VM module when they have a more general purpose now.
Changed folder names for sake of clarity (will be introducing a new build target soon), and Makefile can now easily support more targets.