Fixing issues related to PSR-0 rearch