Renaming of files and folders to make more sense.