proposed refactoring
improving the Primitive namespace pattern
clean Primitive module, get rid of Base
minor fixeds