Move to psr-0 again as psr-4 does not seem to be working