Move directory matchers to own class