Renamed Rectangle to CMRectangle

Added CMCircle, CMConvex