Moved all Matcher implementations to the new package