A little house cleaning.
Some reorganization. Also added a skeletal version of a VuPP VM in Scala.