More re-structuring; added a game class