Some reorganisation of GameConstruction