added namespaces and removed @package and @subpackage tags