PSR-4 more of the things