Migrating to PSR standards