[TASK] Migrate leftovers to namespaces