The `@package` annotations are no longer necessary throughout.