refactored into generator-calls
refactored top entries into Generator-classes