PSR4/Composer migration

Yeah, sure, I don't mind.