Made grep a package. Moved matchers to separate module