More single service file refactoring.