Moved matchers to separate module