Move to PSR-4