merge ColouredPoint to Point (planning to remove ColouredPoint class..)