SEC-2357: Move *RequestMatcher to .matcher package