Finish tidying up PSR-0 conversion