Reworking most classes based on responsibilities.