Switch to PSR4