Upgrading Composer configuration to PSR-4
Stylistic updates