v0.0.3 Namespace + minor refactoring