holomaze: rearrange the state struct to make a little more sense.