Revert "Oops, switch back (I didn't want to do this on this branch)"

This reverts commit 2aa2055a1feaea7b7e3deec5b752d5ada839552e.
Revert "Move everything to old directories, to start fresh."

This reverts commit 166683fcf98e1045e595cf3263efa2d34d538c81.