Various accumulated edits (sorry)

Forgot I was using this repo, now I have a pile of edits. Probably not
worth --patch ing them all separately.
Reorganize file structure