Rafactoring of NeoOrganizer --> standard Organizer.