[TASK] Switched to namespaces - Closes #110