Refactored generator-angular structure