More PSR-4 compliance