Fixed @package annotations and use statements