Rename a few files to make the initial source tree a little more
consistent. It's the same code, but it looks cleaner now.