restructuring with folding for legibility / finding stuff