[Proposal] [4.2] PSR-4 Refactor