Refactor structs for more OO