re-org of files, convert to PSR4