cleanup, fixing psr-4 again