diff --git a/.gitattributes b/.gitattributes
index 60a440c5093..5d96d64e9d5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1074,21 +1074,21 @@ Nef_3/test/Nef_3/data/cube+vertex.off -text
 Nef_3/test/Nef_3/data/cube.off -text
 Nef_3/test/Nef_3/data/octa.off -text
 Nef_3/test/Nef_3/data/star.off -text
-Packages/Nef_S2/doc_tex/Nef_S2/fig/complex.gif -text svneol=unset#unset
-Packages/Nef_S2/doc_tex/Nef_S2/fig/complex.pdf -text svneol=unset#unset
-Packages/Nef_S2/doc_tex/Nef_S2/fig/complex.ps -text
-Packages/Nef_S2/doc_tex/Nef_S2/fig/halfspace.gif -text svneol=unset#unset
-Packages/Nef_S2/doc_tex/Nef_S2/fig/halfspace.pdf -text svneol=unset#unset
-Packages/Nef_S2/doc_tex/Nef_S2/fig/halfspace.ps -text
-Packages/Nef_S2/doc_tex/Nef_S2/fig/shalfloopB.eps -text svneol=unset#unset
-Packages/Nef_S2/doc_tex/Nef_S2/fig/shalfloopB.gif -text svneol=unset#unset
-Packages/Nef_S2/doc_tex/Nef_S2/fig/shalfloopB.pdf -text svneol=unset#unset
-Packages/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfedge.eps -text
-Packages/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfedge.gif -text svneol=unset#unset
-Packages/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfedge.pdf -text svneol=unset#unset
-Packages/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfloopB.eps -text svneol=unset#unset
-Packages/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfloopB.gif -text svneol=unset#unset
-Packages/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfloopB.pdf -text svneol=unset#unset
+Nef_S2/doc_tex/Nef_S2/fig/complex.gif -text svneol=unset#unset
+Nef_S2/doc_tex/Nef_S2/fig/complex.pdf -text svneol=unset#unset
+Nef_S2/doc_tex/Nef_S2/fig/complex.ps -text
+Nef_S2/doc_tex/Nef_S2/fig/halfspace.gif -text svneol=unset#unset
+Nef_S2/doc_tex/Nef_S2/fig/halfspace.pdf -text svneol=unset#unset
+Nef_S2/doc_tex/Nef_S2/fig/halfspace.ps -text
+Nef_S2/doc_tex/Nef_S2/fig/shalfloopB.eps -text svneol=unset#unset
+Nef_S2/doc_tex/Nef_S2/fig/shalfloopB.gif -text svneol=unset#unset
+Nef_S2/doc_tex/Nef_S2/fig/shalfloopB.pdf -text svneol=unset#unset
+Nef_S2/doc_tex/Nef_S2_ref/fig/shalfedge.eps -text
+Nef_S2/doc_tex/Nef_S2_ref/fig/shalfedge.gif -text svneol=unset#unset
+Nef_S2/doc_tex/Nef_S2_ref/fig/shalfedge.pdf -text svneol=unset#unset
+Nef_S2/doc_tex/Nef_S2_ref/fig/shalfloopB.eps -text svneol=unset#unset
+Nef_S2/doc_tex/Nef_S2_ref/fig/shalfloopB.gif -text svneol=unset#unset
+Nef_S2/doc_tex/Nef_S2_ref/fig/shalfloopB.pdf -text svneol=unset#unset
 Packages/Optimisation_doc/doc_tex/Optimisation/annulus.eps -text
 Packages/Optimisation_doc/doc_tex/Optimisation/annulus.gif -text svneol=unset#unset
 Packages/Optimisation_doc/doc_tex/Optimisation/annulus.pdf -text svneol=unset#unset
diff --git a/Packages/Nef_S2/TODO b/Nef_S2/TODO
similarity index 100%
rename from Packages/Nef_S2/TODO
rename to Nef_S2/TODO
diff --git a/Packages/Nef_S2/changes.txt b/Nef_S2/changes.txt
similarity index 100%
rename from Packages/Nef_S2/changes.txt
rename to Nef_S2/changes.txt
diff --git a/Packages/Nef_S2/demo/Nef_S2/Nef_polyhedron_S2-demo.C b/Nef_S2/demo/Nef_S2/Nef_polyhedron_S2-demo.C
similarity index 100%
rename from Packages/Nef_S2/demo/Nef_S2/Nef_polyhedron_S2-demo.C
rename to Nef_S2/demo/Nef_S2/Nef_polyhedron_S2-demo.C
diff --git a/Packages/Nef_S2/demo/Nef_S2/Nef_polyhedron_S2-demo2.C b/Nef_S2/demo/Nef_S2/Nef_polyhedron_S2-demo2.C
similarity index 100%
rename from Packages/Nef_S2/demo/Nef_S2/Nef_polyhedron_S2-demo2.C
rename to Nef_S2/demo/Nef_S2/Nef_polyhedron_S2-demo2.C
diff --git a/Packages/Nef_S2/demo/Nef_S2/SM_overlayer-demo.C b/Nef_S2/demo/Nef_S2/SM_overlayer-demo.C
similarity index 100%
rename from Packages/Nef_S2/demo/Nef_S2/SM_overlayer-demo.C
rename to Nef_S2/demo/Nef_S2/SM_overlayer-demo.C
diff --git a/Packages/Nef_S2/demo/Nef_S2/SM_triangulator-demo.C b/Nef_S2/demo/Nef_S2/SM_triangulator-demo.C
similarity index 100%
rename from Packages/Nef_S2/demo/Nef_S2/SM_triangulator-demo.C
rename to Nef_S2/demo/Nef_S2/SM_triangulator-demo.C
diff --git a/Packages/Nef_S2/demo/Nef_S2/Sphere_geometry-demo.C b/Nef_S2/demo/Nef_S2/Sphere_geometry-demo.C
similarity index 100%
rename from Packages/Nef_S2/demo/Nef_S2/Sphere_geometry-demo.C
rename to Nef_S2/demo/Nef_S2/Sphere_geometry-demo.C
diff --git a/Packages/Nef_S2/demo/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.C b/Nef_S2/demo/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.C
similarity index 100%
rename from Packages/Nef_S2/demo/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.C
rename to Nef_S2/demo/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.C
diff --git a/Packages/Nef_S2/demo/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.h b/Nef_S2/demo/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.h
similarity index 100%
rename from Packages/Nef_S2/demo/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.h
rename to Nef_S2/demo/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.h
diff --git a/Packages/Nef_S2/demo/Nef_S2/makefile b/Nef_S2/demo/Nef_S2/makefile
similarity index 100%
rename from Packages/Nef_S2/demo/Nef_S2/makefile
rename to Nef_S2/demo/Nef_S2/makefile
diff --git a/Packages/Nef_S2/demo/Nef_S2/visualization.C b/Nef_S2/demo/Nef_S2/visualization.C
similarity index 100%
rename from Packages/Nef_S2/demo/Nef_S2/visualization.C
rename to Nef_S2/demo/Nef_S2/visualization.C
diff --git a/Packages/Nef_S2/description.txt b/Nef_S2/description.txt
similarity index 100%
rename from Packages/Nef_S2/description.txt
rename to Nef_S2/description.txt
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2/fig/complex.gif b/Nef_S2/doc_tex/Nef_S2/fig/complex.gif
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2/fig/complex.gif
rename to Nef_S2/doc_tex/Nef_S2/fig/complex.gif
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2/fig/complex.pdf b/Nef_S2/doc_tex/Nef_S2/fig/complex.pdf
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2/fig/complex.pdf
rename to Nef_S2/doc_tex/Nef_S2/fig/complex.pdf
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2/fig/complex.ps b/Nef_S2/doc_tex/Nef_S2/fig/complex.ps
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2/fig/complex.ps
rename to Nef_S2/doc_tex/Nef_S2/fig/complex.ps
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2/fig/halfspace.gif b/Nef_S2/doc_tex/Nef_S2/fig/halfspace.gif
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2/fig/halfspace.gif
rename to Nef_S2/doc_tex/Nef_S2/fig/halfspace.gif
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2/fig/halfspace.pdf b/Nef_S2/doc_tex/Nef_S2/fig/halfspace.pdf
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2/fig/halfspace.pdf
rename to Nef_S2/doc_tex/Nef_S2/fig/halfspace.pdf
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2/fig/halfspace.ps b/Nef_S2/doc_tex/Nef_S2/fig/halfspace.ps
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2/fig/halfspace.ps
rename to Nef_S2/doc_tex/Nef_S2/fig/halfspace.ps
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2/fig/shalfloopB.eps b/Nef_S2/doc_tex/Nef_S2/fig/shalfloopB.eps
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2/fig/shalfloopB.eps
rename to Nef_S2/doc_tex/Nef_S2/fig/shalfloopB.eps
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2/fig/shalfloopB.gif b/Nef_S2/doc_tex/Nef_S2/fig/shalfloopB.gif
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2/fig/shalfloopB.gif
rename to Nef_S2/doc_tex/Nef_S2/fig/shalfloopB.gif
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2/fig/shalfloopB.pdf b/Nef_S2/doc_tex/Nef_S2/fig/shalfloopB.pdf
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2/fig/shalfloopB.pdf
rename to Nef_S2/doc_tex/Nef_S2/fig/shalfloopB.pdf
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2/main.tex b/Nef_S2/doc_tex/Nef_S2/main.tex
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2/main.tex
rename to Nef_S2/doc_tex/Nef_S2/main.tex
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2/user.tex b/Nef_S2/doc_tex/Nef_S2/user.tex
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2/user.tex
rename to Nef_S2/doc_tex/Nef_S2/user.tex
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2_ref/Explorer.tex b/Nef_S2/doc_tex/Nef_S2_ref/Explorer.tex
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2_ref/Explorer.tex
rename to Nef_S2/doc_tex/Nef_S2_ref/Explorer.tex
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2.tex b/Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2.tex
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2.tex
rename to Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2.tex
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2_SFace.tex b/Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2_SFace.tex
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2_SFace.tex
rename to Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2_SFace.tex
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2_SFace_cycle_iterator.tex b/Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2_SFace_cycle_iterator.tex
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2_SFace_cycle_iterator.tex
rename to Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2_SFace_cycle_iterator.tex
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2_SHalfedge.tex b/Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2_SHalfedge.tex
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2_SHalfedge.tex
rename to Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2_SHalfedge.tex
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2_SHalfloop.tex b/Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2_SHalfloop.tex
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2_SHalfloop.tex
rename to Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2_SHalfloop.tex
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2_SVertex.tex b/Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2_SVertex.tex
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2_SVertex.tex
rename to Nef_S2/doc_tex/Nef_S2_ref/Nef_polyhedron_S2_SVertex.tex
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2_ref/Qt_widget_Nef_S2.tex b/Nef_S2/doc_tex/Nef_S2_ref/Qt_widget_Nef_S2.tex
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2_ref/Qt_widget_Nef_S2.tex
rename to Nef_S2/doc_tex/Nef_S2_ref/Qt_widget_Nef_S2.tex
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2_ref/Sphere_circle.tex b/Nef_S2/doc_tex/Nef_S2_ref/Sphere_circle.tex
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2_ref/Sphere_circle.tex
rename to Nef_S2/doc_tex/Nef_S2_ref/Sphere_circle.tex
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2_ref/Sphere_direction.tex b/Nef_S2/doc_tex/Nef_S2_ref/Sphere_direction.tex
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2_ref/Sphere_direction.tex
rename to Nef_S2/doc_tex/Nef_S2_ref/Sphere_direction.tex
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2_ref/Sphere_point.tex b/Nef_S2/doc_tex/Nef_S2_ref/Sphere_point.tex
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2_ref/Sphere_point.tex
rename to Nef_S2/doc_tex/Nef_S2_ref/Sphere_point.tex
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2_ref/Sphere_segment.tex b/Nef_S2/doc_tex/Nef_S2_ref/Sphere_segment.tex
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2_ref/Sphere_segment.tex
rename to Nef_S2/doc_tex/Nef_S2_ref/Sphere_segment.tex
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2_ref/Sphere_triangle.tex b/Nef_S2/doc_tex/Nef_S2_ref/Sphere_triangle.tex
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2_ref/Sphere_triangle.tex
rename to Nef_S2/doc_tex/Nef_S2_ref/Sphere_triangle.tex
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2_ref/Spherical_geometry.tex b/Nef_S2/doc_tex/Nef_S2_ref/Spherical_geometry.tex
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2_ref/Spherical_geometry.tex
rename to Nef_S2/doc_tex/Nef_S2_ref/Spherical_geometry.tex
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfedge.eps b/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfedge.eps
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfedge.eps
rename to Nef_S2/doc_tex/Nef_S2_ref/fig/shalfedge.eps
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfedge.gif b/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfedge.gif
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfedge.gif
rename to Nef_S2/doc_tex/Nef_S2_ref/fig/shalfedge.gif
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfedge.pdf b/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfedge.pdf
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfedge.pdf
rename to Nef_S2/doc_tex/Nef_S2_ref/fig/shalfedge.pdf
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfloopB.eps b/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfloopB.eps
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfloopB.eps
rename to Nef_S2/doc_tex/Nef_S2_ref/fig/shalfloopB.eps
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfloopB.gif b/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfloopB.gif
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfloopB.gif
rename to Nef_S2/doc_tex/Nef_S2_ref/fig/shalfloopB.gif
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfloopB.pdf b/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfloopB.pdf
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2_ref/fig/shalfloopB.pdf
rename to Nef_S2/doc_tex/Nef_S2_ref/fig/shalfloopB.pdf
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2_ref/intro.tex b/Nef_S2/doc_tex/Nef_S2_ref/intro.tex
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2_ref/intro.tex
rename to Nef_S2/doc_tex/Nef_S2_ref/intro.tex
diff --git a/Packages/Nef_S2/doc_tex/Nef_S2_ref/main.tex b/Nef_S2/doc_tex/Nef_S2_ref/main.tex
similarity index 100%
rename from Packages/Nef_S2/doc_tex/Nef_S2_ref/main.tex
rename to Nef_S2/doc_tex/Nef_S2_ref/main.tex
diff --git a/Packages/Nef_S2/dont_submit b/Nef_S2/dont_submit
similarity index 100%
rename from Packages/Nef_S2/dont_submit
rename to Nef_S2/dont_submit
diff --git a/Packages/Nef_S2/examples/Nef_S2/README b/Nef_S2/examples/Nef_S2/README
similarity index 100%
rename from Packages/Nef_S2/examples/Nef_S2/README
rename to Nef_S2/examples/Nef_S2/README
diff --git a/Packages/Nef_S2/examples/Nef_S2/construction.C b/Nef_S2/examples/Nef_S2/construction.C
similarity index 100%
rename from Packages/Nef_S2/examples/Nef_S2/construction.C
rename to Nef_S2/examples/Nef_S2/construction.C
diff --git a/Packages/Nef_S2/examples/Nef_S2/exploration.C b/Nef_S2/examples/Nef_S2/exploration.C
similarity index 100%
rename from Packages/Nef_S2/examples/Nef_S2/exploration.C
rename to Nef_S2/examples/Nef_S2/exploration.C
diff --git a/Packages/Nef_S2/examples/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.C b/Nef_S2/examples/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.C
similarity index 100%
rename from Packages/Nef_S2/examples/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.C
rename to Nef_S2/examples/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.C
diff --git a/Packages/Nef_S2/examples/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.h b/Nef_S2/examples/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.h
similarity index 100%
rename from Packages/Nef_S2/examples/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.h
rename to Nef_S2/examples/Nef_S2/include/CGAL/Nef_S2/create_random_Nef_S2.h
diff --git a/Packages/Nef_S2/examples/Nef_S2/point_location.C b/Nef_S2/examples/Nef_S2/point_location.C
similarity index 100%
rename from Packages/Nef_S2/examples/Nef_S2/point_location.C
rename to Nef_S2/examples/Nef_S2/point_location.C
diff --git a/Packages/Nef_S2/examples/Nef_S2/simple.C b/Nef_S2/examples/Nef_S2/simple.C
similarity index 100%
rename from Packages/Nef_S2/examples/Nef_S2/simple.C
rename to Nef_S2/examples/Nef_S2/simple.C
diff --git a/Packages/Nef_S2/include/CGAL/IO/Nef_polyhedron_S2_OGLUT_stream.h b/Nef_S2/include/CGAL/IO/Nef_polyhedron_S2_OGLUT_stream.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/IO/Nef_polyhedron_S2_OGLUT_stream.h
rename to Nef_S2/include/CGAL/IO/Nef_polyhedron_S2_OGLUT_stream.h
diff --git a/Packages/Nef_S2/include/CGAL/IO/Qt_widget_Nef_S2.h b/Nef_S2/include/CGAL/IO/Qt_widget_Nef_S2.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/IO/Qt_widget_Nef_S2.h
rename to Nef_S2/include/CGAL/IO/Qt_widget_Nef_S2.h
diff --git a/Packages/Nef_S2/include/CGAL/IO/Qt_widget_OpenGL.h b/Nef_S2/include/CGAL/IO/Qt_widget_OpenGL.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/IO/Qt_widget_OpenGL.h
rename to Nef_S2/include/CGAL/IO/Qt_widget_OpenGL.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/Generic_handle_map.h b/Nef_S2/include/CGAL/Nef_S2/Generic_handle_map.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/Generic_handle_map.h
rename to Nef_S2/include/CGAL/Nef_S2/Generic_handle_map.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/Normalizing.h b/Nef_S2/include/CGAL/Nef_S2/Normalizing.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/Normalizing.h
rename to Nef_S2/include/CGAL/Nef_S2/Normalizing.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/OGL_base_object.h b/Nef_S2/include/CGAL/Nef_S2/OGL_base_object.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/OGL_base_object.h
rename to Nef_S2/include/CGAL/Nef_S2/OGL_base_object.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/SM_checker.h b/Nef_S2/include/CGAL/Nef_S2/SM_checker.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/SM_checker.h
rename to Nef_S2/include/CGAL/Nef_S2/SM_checker.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/SM_const_decorator.h b/Nef_S2/include/CGAL/Nef_S2/SM_const_decorator.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/SM_const_decorator.h
rename to Nef_S2/include/CGAL/Nef_S2/SM_const_decorator.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/SM_constrained_triang_traits.h b/Nef_S2/include/CGAL/Nef_S2/SM_constrained_triang_traits.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/SM_constrained_triang_traits.h
rename to Nef_S2/include/CGAL/Nef_S2/SM_constrained_triang_traits.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/SM_decorator.h b/Nef_S2/include/CGAL/Nef_S2/SM_decorator.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/SM_decorator.h
rename to Nef_S2/include/CGAL/Nef_S2/SM_decorator.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/SM_decorator_traits.h b/Nef_S2/include/CGAL/Nef_S2/SM_decorator_traits.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/SM_decorator_traits.h
rename to Nef_S2/include/CGAL/Nef_S2/SM_decorator_traits.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h b/Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h
rename to Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/SM_items.h b/Nef_S2/include/CGAL/Nef_S2/SM_items.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/SM_items.h
rename to Nef_S2/include/CGAL/Nef_S2/SM_items.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/SM_iteration.h b/Nef_S2/include/CGAL/Nef_S2/SM_iteration.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/SM_iteration.h
rename to Nef_S2/include/CGAL/Nef_S2/SM_iteration.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/SM_list.h b/Nef_S2/include/CGAL/Nef_S2/SM_list.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/SM_list.h
rename to Nef_S2/include/CGAL/Nef_S2/SM_list.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h b/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h
rename to Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/SM_point_locator.h b/Nef_S2/include/CGAL/Nef_S2/SM_point_locator.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/SM_point_locator.h
rename to Nef_S2/include/CGAL/Nef_S2/SM_point_locator.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/SM_triangulator.h b/Nef_S2/include/CGAL/Nef_S2/SM_triangulator.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/SM_triangulator.h
rename to Nef_S2/include/CGAL/Nef_S2/SM_triangulator.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/SM_visualizor.h b/Nef_S2/include/CGAL/Nef_S2/SM_visualizor.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/SM_visualizor.h
rename to Nef_S2/include/CGAL/Nef_S2/SM_visualizor.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/Sphere_circle.h b/Nef_S2/include/CGAL/Nef_S2/Sphere_circle.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/Sphere_circle.h
rename to Nef_S2/include/CGAL/Nef_S2/Sphere_circle.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/Sphere_direction.h b/Nef_S2/include/CGAL/Nef_S2/Sphere_direction.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/Sphere_direction.h
rename to Nef_S2/include/CGAL/Nef_S2/Sphere_direction.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/Sphere_geometry.h b/Nef_S2/include/CGAL/Nef_S2/Sphere_geometry.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/Sphere_geometry.h
rename to Nef_S2/include/CGAL/Nef_S2/Sphere_geometry.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/Sphere_geometry_OGL.h b/Nef_S2/include/CGAL/Nef_S2/Sphere_geometry_OGL.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/Sphere_geometry_OGL.h
rename to Nef_S2/include/CGAL/Nef_S2/Sphere_geometry_OGL.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/Sphere_map.h b/Nef_S2/include/CGAL/Nef_S2/Sphere_map.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/Sphere_map.h
rename to Nef_S2/include/CGAL/Nef_S2/Sphere_map.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/Sphere_point.h b/Nef_S2/include/CGAL/Nef_S2/Sphere_point.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/Sphere_point.h
rename to Nef_S2/include/CGAL/Nef_S2/Sphere_point.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/Sphere_segment.h b/Nef_S2/include/CGAL/Nef_S2/Sphere_segment.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/Sphere_segment.h
rename to Nef_S2/include/CGAL/Nef_S2/Sphere_segment.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/Sphere_triangle.h b/Nef_S2/include/CGAL/Nef_S2/Sphere_triangle.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/Sphere_triangle.h
rename to Nef_S2/include/CGAL/Nef_S2/Sphere_triangle.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/Tuple.h b/Nef_S2/include/CGAL/Nef_S2/Tuple.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/Tuple.h
rename to Nef_S2/include/CGAL/Nef_S2/Tuple.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/leda_sphere_map.h b/Nef_S2/include/CGAL/Nef_S2/leda_sphere_map.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/leda_sphere_map.h
rename to Nef_S2/include/CGAL/Nef_S2/leda_sphere_map.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_S2/sphere_predicates.h b/Nef_S2/include/CGAL/Nef_S2/sphere_predicates.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_S2/sphere_predicates.h
rename to Nef_S2/include/CGAL/Nef_S2/sphere_predicates.h
diff --git a/Packages/Nef_S2/include/CGAL/Nef_polyhedron_S2.h b/Nef_S2/include/CGAL/Nef_polyhedron_S2.h
similarity index 100%
rename from Packages/Nef_S2/include/CGAL/Nef_polyhedron_S2.h
rename to Nef_S2/include/CGAL/Nef_polyhedron_S2.h
diff --git a/Packages/Nef_S2/maintainer b/Nef_S2/maintainer
similarity index 100%
rename from Packages/Nef_S2/maintainer
rename to Nef_S2/maintainer
diff --git a/Packages/Nef_S2/noweb/Makefile b/Nef_S2/noweb/Makefile
similarity index 100%
rename from Packages/Nef_S2/noweb/Makefile
rename to Nef_S2/noweb/Makefile
diff --git a/Packages/Nef_S2/noweb/README b/Nef_S2/noweb/README
similarity index 100%
rename from Packages/Nef_S2/noweb/README
rename to Nef_S2/noweb/README
diff --git a/Packages/Nef_S2/noweb/SM_overlayer.lw b/Nef_S2/noweb/SM_overlayer.lw
similarity index 100%
rename from Packages/Nef_S2/noweb/SM_overlayer.lw
rename to Nef_S2/noweb/SM_overlayer.lw
diff --git a/Packages/Nef_S2/src/CGALQt/Qt_widget_OpenGL.C b/Nef_S2/src/CGALQt/Qt_widget_OpenGL.C
similarity index 100%
rename from Packages/Nef_S2/src/CGALQt/Qt_widget_OpenGL.C
rename to Nef_S2/src/CGALQt/Qt_widget_OpenGL.C
diff --git a/Packages/Nef_S2/test/Nef_S2/Nef_polyhedron_S2-test.C b/Nef_S2/test/Nef_S2/Nef_polyhedron_S2-test.C
similarity index 100%
rename from Packages/Nef_S2/test/Nef_S2/Nef_polyhedron_S2-test.C
rename to Nef_S2/test/Nef_S2/Nef_polyhedron_S2-test.C
diff --git a/Packages/Nef_S2/test/Nef_S2/Sphere_geometry-test.C b/Nef_S2/test/Nef_S2/Sphere_geometry-test.C
similarity index 100%
rename from Packages/Nef_S2/test/Nef_S2/Sphere_geometry-test.C
rename to Nef_S2/test/Nef_S2/Sphere_geometry-test.C
diff --git a/Packages/Nef_S2/test/Nef_S2/cgal_test b/Nef_S2/test/Nef_S2/cgal_test
similarity index 100%
rename from Packages/Nef_S2/test/Nef_S2/cgal_test
rename to Nef_S2/test/Nef_S2/cgal_test
diff --git a/Packages/Nef_S2/test/Nef_S2/include/CGAL/test_macros.h b/Nef_S2/test/Nef_S2/include/CGAL/test_macros.h
similarity index 100%
rename from Packages/Nef_S2/test/Nef_S2/include/CGAL/test_macros.h
rename to Nef_S2/test/Nef_S2/include/CGAL/test_macros.h