More single service file refactor.