Refactoring of organizer and abstract base classes.