Split Organizer into Organizer and ClassOrganizer
Better handling of system announcements and organizers