refactored service classes to common package