Moved command matchers into their own files. Added a partial matcher.