Moved matcher to own module