Some renaming and file formatting.