some reshuffling...
Tests pass again
Major refactoring, including moving a bunch of rules into narrower scopes. Most tests pass, but still one test failing in scalatexApi