Introduced ShapeVertex

Introduced the ShapeVertex and discarded the control point approach.
Also reorganized many files