Upgrade from PSR-0 to PSR-4