Conversion to PSR-4.