refactored services structure
cosmetic refactoring