Moved the Matcher interface to a new package