Fixes to PSR 4
Fixes to PSR 4