Renaming of folder structure and adding more entry fields