* Namespace and Class name re-factor