file_structure: major update