Refactored annotations.

Separate annotations for classes and packages.