Matcher class moved to matchers module