All reset
Merge branch 'fix_structure'