Update for namespaces and PSR2 compliance.
Update to use namespaces and PSR2 compliance.