Updating C4Shape, moving C4Line and C4Polygon to their own classes