Refactoring out Matchers into submodules