rearranged/renamed structs in model.h