[TASK] Namespace clean up
Merge pull request #123 from fudriot/task-clean-up-namespace

[TASK] Namespace clean up