Well, contrib layout is just (documented convention), I have no objection to changes