+ redesign GameWithShapes class. Now GameWithShapes based only on shapes.