refactoring services in subpackage; refactoring package filter string