App services refactoring