Changed some class names, added GameContainer for each game type