Refactored class names as per responsibility