Switched to PSR-4 to get out of the russian doll syndrome.