ref #6903
Fix service handling and refresh problem for distribution table
refactoring package structure