Go to PSR4
Fix class name
Add new trait