Improve file structure/Add anonymous structs