Refactoring: Splitting inner classes