More work on splitting up systems and classes.