Add psr-4 stuff in a few more places.
Validation to make the combination of target-dir with psr-4 illegal.