Started working on #2
Resolves #3, everything is now in namespaces