* PSR-0 compability improvements.
* PSR-0 compability improvements.