Refactored services to separate files