Maintaining Cohesion After Split - Refactoring for Single Responsibility Principle | OneNoughtOne