PSR4/Composer migration

Fixed