Back to a proper project pattern, precedent commit wasn't a good idea...