mostly restructure data/. And add a CGAL option