Refactored services structure;