refactored GameMap and Scene