Renaming files and cleaning up a couple things.