Changed a few more filenames, deleted files that are no longer relevant.