Added a stub class to manage game state, and merged some duplicated classes.