WIP - refactoring of the Organizer GWT code