removed all @package and @subpackage annotations