heavy rework of entire structure
heavy rework of entire structure
Merge pull request #30 from jojoo-/master

cleaning up the namespace