Big refactoring: joining services