Change structure and add first draft of GameSession et al.