Adding form stuff, renaming files.