PSR4/Composer migration

yes, these can be done in a future PR.