Moving to PSR-4.