Removed Red-Black tree and Set. Added Circle, Ellipse, Solid, Rectangle, and Square.