Move folders around. Merge issue2-editing-and-selection into master.