Refactoring split classes