refactor service package to manager