Update game structure
Merge branch 'game_structure'