Refactored services to separate module