packages refactoring, filtering service