Major Fixes to Composer with psr-4, more jefferyway's style than DalyeRees