Add Consort Diagram folder, rearrange other variables