[Phase 4] - Migrate additional functionality from Project to ProjectNamespace/Namespace