[TASK] Migration to namespaces