cleanup

remove old copies, unnecessary files, and do a few file renames