Move things to new directories, add two new script files, get rid of cruft.