Upgrade to PSR-4