Moved structs into include file