added namespaces and class @package