Upgrade to PSR-4 to get rid of nesting