add list of next events in competition
reorganize component classes