Moved SimpleTeamGenerator specific code to right place