Moved GameState up a level - didn't need to be in a separate directory.  Found during code review, see #56.