Move matcher definition to a new file