Fix directory structure for PSR-4