Fix #15
Organizers section reffactoring