PSR-4 Namespacing

Updated for PSR-4 namespacing.