THis commit is a cleanup of the tree before a major refactoring. It does not build
Pushing version 0.3, entirely refactored