Updated @package and removed @subpackage from the PHPDocs