matchers: clean-up base package, moved classes