Move rest matchers under matchers/