big change ---> all new struct
update
Merge branch 'new_file_struct'