move the files around to have more sensible names

also, move the stuff that's not expected to be in the
future into the old/ directory

(and add some parens to insert to fix indentation)