Reorganize into a Helpers module and a Matcher class