[Proposal] [4.2] PSR-4 Refactor

All tests pass. :P