[TASK] Migrate to namespaces