Fix require statements after changing path_matcher to matcher