reorganize gamestate and game objects