switch to PSR-4
Merge branch 'psr-4'