Converting to PSR-4