move to PSR4 folder structure