Renamed classes and refactored service methods.