refactor - move service implementations to service package