Update for use with namespaces
Updates for PSR-0 PSR-2 compliance