Refactored file formats to not have any inline structs