Maintaining Cohesion After Split - Refactoring For Srp | OneNoughtOne