Refactored WCFR code - reordered fields in files data structs