Combined VectorPoint and Point into single class.