Move Matcher classes into their own sub-directory.

Just to add some order to things.