Merge "init: Refactor service.h/cpp"