splitting services -refactiring