Fixes for PSR-4 directory structure