Separated the ShapeModel class from the MoveShapeHub.