Bust up Matchers to detangle the project dependencies.

Also solves some building in IDEA issues.