update files and modify the structure