GameState reforms; move some packages