[TASK] Switch to namespaces