refactoring: merge *New and *ViewModel types for all entities