[TASK] Migrate Menu sub scope to Namespaces