Remove extra bits from data struct
experimental un-nesting of structs to try to appease visual studio