package refactoring for matcher change