PSR4/Composer migration