Migrating to psr-4