removed @package and @subpackage annotations