Added munging for @category, @package and @subpackage