Restructure into a Game ADT