Many updates to structure and to the files