Count “scores” when a metric covers the whole grammar
Properly treat subpackages
Re-extract some of the grammars