Remove redundant folder and PointD