Highlight type names and package names separately

[tobil4sk]

Package names are now highlighted with @module, and type names are highlighted with @type.

This also removes the need for nested highlighting queries for package and import statements, so longer type paths will still highlight properly.

Before:

After: