Revert "composer: psr4 again"

This reverts commit 9963e602a40fdd311013a0feb1336fc9bbdebebb.
Revert "composer: psr4"

This reverts commit 6c22fa3fd097bcdf38dcd153f8bd5ac1e74c8bfe.