[phpdoc] Update PhpDoc

Update PhpDoc and refactor some code (no code changes).
the ``@package`` annotation does not add any value IMO, especially when it just duplicates the namespace. Please remove it