Another round of rearanging, using lots of folds
removed ;cc mapping in nerdcommneter, it conflicts