Renaming some files and add some clone fields.