re-organize game states and monitors