Final changes to get the code back to working after the PSR-0 change