delete a bunch of files that didn't get moved in the merge
Delete the rest of the missing stuff