Matchers moved to separate namespace
Completely rewritten mathers