fix dependency on matcher

matcher is now in its own package