Migrate to PSR4