Also make the machine the singleton and space hang off it Many repercussions, not all fixed in this commit
remove unnecessary Virtual namespace prefix which was a large motivation for the move
and associated changes in code, requires tests etc
