Refactor CalendarGen, CalendarLeagueGen
Minnor changes CompetitionLeague, CalendarCupGen