Service structure refactoring