[TASK] Switch to namespaces

Ready for review.