[TASK] Switch to namespaces
Merge pull request #114 from bjo3rnf/namespaces

[TASK] Switch to namespaces