Moved some of the GameState code to GameState.cpp, some minor clean-up.