Adopted PSR-0 namespacing