Updated to PSR-0 standard