Update to PSR-4