Refactoring: Spreading classes out