diff --git a/.gitattributes b/.gitattributes
index 34f1cb958f4..6f71cd5b0e4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -990,39 +990,39 @@ Modifier/doc_tex/Modifier/idraw/modifier.eps -text
 Modifier/doc_tex/Modifier/idraw/modifier.pdf -text svneol=unset#unset
 Modifier/doc_tex/Modifier/modifier.gif -text svneol=unset#unset
 Modifier/doc_tex/Modifier/modifier_small.gif -text svneol=unset#unset
-Packages/Nef_2/demo/Nef_2/nef_2.vcproj -text
-Packages/Nef_2/demo/Nef_2/xpms/basic.gif -text svneol=unset#unset
-Packages/Nef_2/demo/Nef_2/xpms/basic.pcx -text svneol=unset#unset
-Packages/Nef_2/demo/Nef_2/xpms/basic2.pcx -text svneol=unset#unset
-Packages/Nef_2/demo/Nef_2/xpms/boundary.pcx -text svneol=unset#unset
-Packages/Nef_2/demo/Nef_2/xpms/boundary.xpm -text svneol=unset#unset
-Packages/Nef_2/demo/Nef_2/xpms/closure.pcx -text svneol=unset#unset
-Packages/Nef_2/demo/Nef_2/xpms/closure.xpm -text svneol=unset#unset
-Packages/Nef_2/demo/Nef_2/xpms/complement.pcx -text svneol=unset#unset
-Packages/Nef_2/demo/Nef_2/xpms/complement.xpm -text svneol=unset#unset
-Packages/Nef_2/demo/Nef_2/xpms/diff.pcx -text svneol=unset#unset
-Packages/Nef_2/demo/Nef_2/xpms/diff.xpm -text svneol=unset#unset
-Packages/Nef_2/demo/Nef_2/xpms/exor.pcx -text svneol=unset#unset
-Packages/Nef_2/demo/Nef_2/xpms/exor.xpm -text svneol=unset#unset
-Packages/Nef_2/demo/Nef_2/xpms/interior.pcx -text svneol=unset#unset
-Packages/Nef_2/demo/Nef_2/xpms/interior.xpm -text svneol=unset#unset
-Packages/Nef_2/demo/Nef_2/xpms/intersection.pcx -text svneol=unset#unset
-Packages/Nef_2/demo/Nef_2/xpms/intersection.xpm -text
-Packages/Nef_2/demo/Nef_2/xpms/nef.xpm -text
-Packages/Nef_2/demo/Nef_2/xpms/newclosed.pcx -text svneol=unset#unset
-Packages/Nef_2/demo/Nef_2/xpms/newopen.pcx -text svneol=unset#unset
-Packages/Nef_2/demo/Nef_2/xpms/newpoly.pcx -text svneol=unset#unset
-Packages/Nef_2/demo/Nef_2/xpms/union.pcx -text svneol=unset#unset
-Packages/Nef_2/demo/Nef_2/xpms/union.xpm -text svneol=unset#unset
-Packages/Nef_2/doc_tex/Nef_2/complex.gif -text svneol=unset#unset
-Packages/Nef_2/doc_tex/Nef_2/complex.pdf -text svneol=unset#unset
-Packages/Nef_2/doc_tex/Nef_2/complex.ps -text
-Packages/Nef_2/doc_tex/Nef_2/halfplane.gif -text svneol=unset#unset
-Packages/Nef_2/doc_tex/Nef_2/halfplane.pdf -text svneol=unset#unset
-Packages/Nef_2/doc_tex/Nef_2/halfplane.ps -text
-Packages/Nef_2/doc_tex/Nef_2_ref/extsegs.eps -text
-Packages/Nef_2/doc_tex/Nef_2_ref/extsegs.gif -text svneol=unset#unset
-Packages/Nef_2/doc_tex/Nef_2_ref/extsegs.pdf -text svneol=unset#unset
+Nef_2/demo/Nef_2/nef_2.vcproj -text
+Nef_2/demo/Nef_2/xpms/basic.gif -text svneol=unset#unset
+Nef_2/demo/Nef_2/xpms/basic.pcx -text svneol=unset#unset
+Nef_2/demo/Nef_2/xpms/basic2.pcx -text svneol=unset#unset
+Nef_2/demo/Nef_2/xpms/boundary.pcx -text svneol=unset#unset
+Nef_2/demo/Nef_2/xpms/boundary.xpm -text svneol=unset#unset
+Nef_2/demo/Nef_2/xpms/closure.pcx -text svneol=unset#unset
+Nef_2/demo/Nef_2/xpms/closure.xpm -text svneol=unset#unset
+Nef_2/demo/Nef_2/xpms/complement.pcx -text svneol=unset#unset
+Nef_2/demo/Nef_2/xpms/complement.xpm -text svneol=unset#unset
+Nef_2/demo/Nef_2/xpms/diff.pcx -text svneol=unset#unset
+Nef_2/demo/Nef_2/xpms/diff.xpm -text svneol=unset#unset
+Nef_2/demo/Nef_2/xpms/exor.pcx -text svneol=unset#unset
+Nef_2/demo/Nef_2/xpms/exor.xpm -text svneol=unset#unset
+Nef_2/demo/Nef_2/xpms/interior.pcx -text svneol=unset#unset
+Nef_2/demo/Nef_2/xpms/interior.xpm -text svneol=unset#unset
+Nef_2/demo/Nef_2/xpms/intersection.pcx -text svneol=unset#unset
+Nef_2/demo/Nef_2/xpms/intersection.xpm -text
+Nef_2/demo/Nef_2/xpms/nef.xpm -text
+Nef_2/demo/Nef_2/xpms/newclosed.pcx -text svneol=unset#unset
+Nef_2/demo/Nef_2/xpms/newopen.pcx -text svneol=unset#unset
+Nef_2/demo/Nef_2/xpms/newpoly.pcx -text svneol=unset#unset
+Nef_2/demo/Nef_2/xpms/union.pcx -text svneol=unset#unset
+Nef_2/demo/Nef_2/xpms/union.xpm -text svneol=unset#unset
+Nef_2/doc_tex/Nef_2/complex.gif -text svneol=unset#unset
+Nef_2/doc_tex/Nef_2/complex.pdf -text svneol=unset#unset
+Nef_2/doc_tex/Nef_2/complex.ps -text
+Nef_2/doc_tex/Nef_2/halfplane.gif -text svneol=unset#unset
+Nef_2/doc_tex/Nef_2/halfplane.pdf -text svneol=unset#unset
+Nef_2/doc_tex/Nef_2/halfplane.ps -text
+Nef_2/doc_tex/Nef_2_ref/extsegs.eps -text
+Nef_2/doc_tex/Nef_2_ref/extsegs.gif -text svneol=unset#unset
+Nef_2/doc_tex/Nef_2_ref/extsegs.pdf -text svneol=unset#unset
 Packages/Nef_3/Visual_hull/Nef_3/corner.off -text
 Packages/Nef_3/Visual_hull/Nef_3/hole.off -text
 Packages/Nef_3/Visual_hull/Nef_3/mpi.off -text
diff --git a/Packages/Nef_2/TODO b/Nef_2/TODO
similarity index 100%
rename from Packages/Nef_2/TODO
rename to Nef_2/TODO
diff --git a/Packages/Nef_2/changes.txt b/Nef_2/changes.txt
similarity index 100%
rename from Packages/Nef_2/changes.txt
rename to Nef_2/changes.txt
diff --git a/Packages/Nef_2/demo/Nef_2/Qt_widget_toolbar.C b/Nef_2/demo/Nef_2/Qt_widget_toolbar.C
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/Qt_widget_toolbar.C
rename to Nef_2/demo/Nef_2/Qt_widget_toolbar.C
diff --git a/Packages/Nef_2/demo/Nef_2/Qt_widget_toolbar.h b/Nef_2/demo/Nef_2/Qt_widget_toolbar.h
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/Qt_widget_toolbar.h
rename to Nef_2/demo/Nef_2/Qt_widget_toolbar.h
diff --git a/Packages/Nef_2/demo/Nef_2/cgal_types.h b/Nef_2/demo/Nef_2/cgal_types.h
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/cgal_types.h
rename to Nef_2/demo/Nef_2/cgal_types.h
diff --git a/Packages/Nef_2/demo/Nef_2/filtered_homogeneous_data/complex.nef b/Nef_2/demo/Nef_2/filtered_homogeneous_data/complex.nef
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/filtered_homogeneous_data/complex.nef
rename to Nef_2/demo/Nef_2/filtered_homogeneous_data/complex.nef
diff --git a/Packages/Nef_2/demo/Nef_2/filtered_homogeneous_data/symmdif.nef b/Nef_2/demo/Nef_2/filtered_homogeneous_data/symmdif.nef
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/filtered_homogeneous_data/symmdif.nef
rename to Nef_2/demo/Nef_2/filtered_homogeneous_data/symmdif.nef
diff --git a/Packages/Nef_2/demo/Nef_2/help/index.html b/Nef_2/demo/Nef_2/help/index.html
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/help/index.html
rename to Nef_2/demo/Nef_2/help/index.html
diff --git a/Packages/Nef_2/demo/Nef_2/homogeneous_data/box_and_line.nef b/Nef_2/demo/Nef_2/homogeneous_data/box_and_line.nef
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/homogeneous_data/box_and_line.nef
rename to Nef_2/demo/Nef_2/homogeneous_data/box_and_line.nef
diff --git a/Packages/Nef_2/demo/Nef_2/homogeneous_data/cake.nef b/Nef_2/demo/Nef_2/homogeneous_data/cake.nef
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/homogeneous_data/cake.nef
rename to Nef_2/demo/Nef_2/homogeneous_data/cake.nef
diff --git a/Packages/Nef_2/demo/Nef_2/homogeneous_data/dangling.nef b/Nef_2/demo/Nef_2/homogeneous_data/dangling.nef
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/homogeneous_data/dangling.nef
rename to Nef_2/demo/Nef_2/homogeneous_data/dangling.nef
diff --git a/Packages/Nef_2/demo/Nef_2/homogeneous_data/disk.nef b/Nef_2/demo/Nef_2/homogeneous_data/disk.nef
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/homogeneous_data/disk.nef
rename to Nef_2/demo/Nef_2/homogeneous_data/disk.nef
diff --git a/Packages/Nef_2/demo/Nef_2/homogeneous_data/line_cross.nef b/Nef_2/demo/Nef_2/homogeneous_data/line_cross.nef
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/homogeneous_data/line_cross.nef
rename to Nef_2/demo/Nef_2/homogeneous_data/line_cross.nef
diff --git a/Packages/Nef_2/demo/Nef_2/homogeneous_data/mpii.nef b/Nef_2/demo/Nef_2/homogeneous_data/mpii.nef
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/homogeneous_data/mpii.nef
rename to Nef_2/demo/Nef_2/homogeneous_data/mpii.nef
diff --git a/Packages/Nef_2/demo/Nef_2/homogeneous_data/star.nef b/Nef_2/demo/Nef_2/homogeneous_data/star.nef
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/homogeneous_data/star.nef
rename to Nef_2/demo/Nef_2/homogeneous_data/star.nef
diff --git a/Packages/Nef_2/demo/Nef_2/homogeneous_data/symmdiff.nef b/Nef_2/demo/Nef_2/homogeneous_data/symmdiff.nef
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/homogeneous_data/symmdiff.nef
rename to Nef_2/demo/Nef_2/homogeneous_data/symmdiff.nef
diff --git a/Packages/Nef_2/demo/Nef_2/homogeneous_data/triangle.nef b/Nef_2/demo/Nef_2/homogeneous_data/triangle.nef
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/homogeneous_data/triangle.nef
rename to Nef_2/demo/Nef_2/homogeneous_data/triangle.nef
diff --git a/Packages/Nef_2/demo/Nef_2/makefile b/Nef_2/demo/Nef_2/makefile
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/makefile
rename to Nef_2/demo/Nef_2/makefile
diff --git a/Packages/Nef_2/demo/Nef_2/nef_2.C b/Nef_2/demo/Nef_2/nef_2.C
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/nef_2.C
rename to Nef_2/demo/Nef_2/nef_2.C
diff --git a/Packages/Nef_2/demo/Nef_2/nef_2.h b/Nef_2/demo/Nef_2/nef_2.h
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/nef_2.h
rename to Nef_2/demo/Nef_2/nef_2.h
diff --git a/Packages/Nef_2/demo/Nef_2/nef_2.vcproj b/Nef_2/demo/Nef_2/nef_2.vcproj
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/nef_2.vcproj
rename to Nef_2/demo/Nef_2/nef_2.vcproj
diff --git a/Packages/Nef_2/demo/Nef_2/nef_2_layers.h b/Nef_2/demo/Nef_2/nef_2_layers.h
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/nef_2_layers.h
rename to Nef_2/demo/Nef_2/nef_2_layers.h
diff --git a/Packages/Nef_2/demo/Nef_2/xpms/basic.gif b/Nef_2/demo/Nef_2/xpms/basic.gif
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/xpms/basic.gif
rename to Nef_2/demo/Nef_2/xpms/basic.gif
diff --git a/Packages/Nef_2/demo/Nef_2/xpms/basic.pcx b/Nef_2/demo/Nef_2/xpms/basic.pcx
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/xpms/basic.pcx
rename to Nef_2/demo/Nef_2/xpms/basic.pcx
diff --git a/Packages/Nef_2/demo/Nef_2/xpms/basic2.pcx b/Nef_2/demo/Nef_2/xpms/basic2.pcx
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/xpms/basic2.pcx
rename to Nef_2/demo/Nef_2/xpms/basic2.pcx
diff --git a/Packages/Nef_2/demo/Nef_2/xpms/boundary.pcx b/Nef_2/demo/Nef_2/xpms/boundary.pcx
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/xpms/boundary.pcx
rename to Nef_2/demo/Nef_2/xpms/boundary.pcx
diff --git a/Packages/Nef_2/demo/Nef_2/xpms/boundary.xpm b/Nef_2/demo/Nef_2/xpms/boundary.xpm
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/xpms/boundary.xpm
rename to Nef_2/demo/Nef_2/xpms/boundary.xpm
diff --git a/Packages/Nef_2/demo/Nef_2/xpms/closure.pcx b/Nef_2/demo/Nef_2/xpms/closure.pcx
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/xpms/closure.pcx
rename to Nef_2/demo/Nef_2/xpms/closure.pcx
diff --git a/Packages/Nef_2/demo/Nef_2/xpms/closure.xpm b/Nef_2/demo/Nef_2/xpms/closure.xpm
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/xpms/closure.xpm
rename to Nef_2/demo/Nef_2/xpms/closure.xpm
diff --git a/Packages/Nef_2/demo/Nef_2/xpms/complement.pcx b/Nef_2/demo/Nef_2/xpms/complement.pcx
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/xpms/complement.pcx
rename to Nef_2/demo/Nef_2/xpms/complement.pcx
diff --git a/Packages/Nef_2/demo/Nef_2/xpms/complement.xpm b/Nef_2/demo/Nef_2/xpms/complement.xpm
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/xpms/complement.xpm
rename to Nef_2/demo/Nef_2/xpms/complement.xpm
diff --git a/Packages/Nef_2/demo/Nef_2/xpms/diff.pcx b/Nef_2/demo/Nef_2/xpms/diff.pcx
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/xpms/diff.pcx
rename to Nef_2/demo/Nef_2/xpms/diff.pcx
diff --git a/Packages/Nef_2/demo/Nef_2/xpms/diff.xpm b/Nef_2/demo/Nef_2/xpms/diff.xpm
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/xpms/diff.xpm
rename to Nef_2/demo/Nef_2/xpms/diff.xpm
diff --git a/Packages/Nef_2/demo/Nef_2/xpms/exor.pcx b/Nef_2/demo/Nef_2/xpms/exor.pcx
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/xpms/exor.pcx
rename to Nef_2/demo/Nef_2/xpms/exor.pcx
diff --git a/Packages/Nef_2/demo/Nef_2/xpms/exor.xpm b/Nef_2/demo/Nef_2/xpms/exor.xpm
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/xpms/exor.xpm
rename to Nef_2/demo/Nef_2/xpms/exor.xpm
diff --git a/Packages/Nef_2/demo/Nef_2/xpms/interior.pcx b/Nef_2/demo/Nef_2/xpms/interior.pcx
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/xpms/interior.pcx
rename to Nef_2/demo/Nef_2/xpms/interior.pcx
diff --git a/Packages/Nef_2/demo/Nef_2/xpms/interior.xpm b/Nef_2/demo/Nef_2/xpms/interior.xpm
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/xpms/interior.xpm
rename to Nef_2/demo/Nef_2/xpms/interior.xpm
diff --git a/Packages/Nef_2/demo/Nef_2/xpms/intersection.pcx b/Nef_2/demo/Nef_2/xpms/intersection.pcx
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/xpms/intersection.pcx
rename to Nef_2/demo/Nef_2/xpms/intersection.pcx
diff --git a/Packages/Nef_2/demo/Nef_2/xpms/intersection.xpm b/Nef_2/demo/Nef_2/xpms/intersection.xpm
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/xpms/intersection.xpm
rename to Nef_2/demo/Nef_2/xpms/intersection.xpm
diff --git a/Packages/Nef_2/demo/Nef_2/xpms/nef.xpm b/Nef_2/demo/Nef_2/xpms/nef.xpm
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/xpms/nef.xpm
rename to Nef_2/demo/Nef_2/xpms/nef.xpm
diff --git a/Packages/Nef_2/demo/Nef_2/xpms/newclosed.pcx b/Nef_2/demo/Nef_2/xpms/newclosed.pcx
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/xpms/newclosed.pcx
rename to Nef_2/demo/Nef_2/xpms/newclosed.pcx
diff --git a/Packages/Nef_2/demo/Nef_2/xpms/newopen.pcx b/Nef_2/demo/Nef_2/xpms/newopen.pcx
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/xpms/newopen.pcx
rename to Nef_2/demo/Nef_2/xpms/newopen.pcx
diff --git a/Packages/Nef_2/demo/Nef_2/xpms/newpoly.pcx b/Nef_2/demo/Nef_2/xpms/newpoly.pcx
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/xpms/newpoly.pcx
rename to Nef_2/demo/Nef_2/xpms/newpoly.pcx
diff --git a/Packages/Nef_2/demo/Nef_2/xpms/union.pcx b/Nef_2/demo/Nef_2/xpms/union.pcx
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/xpms/union.pcx
rename to Nef_2/demo/Nef_2/xpms/union.pcx
diff --git a/Packages/Nef_2/demo/Nef_2/xpms/union.xpm b/Nef_2/demo/Nef_2/xpms/union.xpm
similarity index 100%
rename from Packages/Nef_2/demo/Nef_2/xpms/union.xpm
rename to Nef_2/demo/Nef_2/xpms/union.xpm
diff --git a/Packages/Nef_2/description.txt b/Nef_2/description.txt
similarity index 100%
rename from Packages/Nef_2/description.txt
rename to Nef_2/description.txt
diff --git a/Packages/Nef_2/doc_tex/Nef_2/complex.gif b/Nef_2/doc_tex/Nef_2/complex.gif
similarity index 100%
rename from Packages/Nef_2/doc_tex/Nef_2/complex.gif
rename to Nef_2/doc_tex/Nef_2/complex.gif
diff --git a/Packages/Nef_2/doc_tex/Nef_2/complex.pdf b/Nef_2/doc_tex/Nef_2/complex.pdf
similarity index 100%
rename from Packages/Nef_2/doc_tex/Nef_2/complex.pdf
rename to Nef_2/doc_tex/Nef_2/complex.pdf
diff --git a/Packages/Nef_2/doc_tex/Nef_2/complex.ps b/Nef_2/doc_tex/Nef_2/complex.ps
similarity index 100%
rename from Packages/Nef_2/doc_tex/Nef_2/complex.ps
rename to Nef_2/doc_tex/Nef_2/complex.ps
diff --git a/Packages/Nef_2/doc_tex/Nef_2/halfplane.gif b/Nef_2/doc_tex/Nef_2/halfplane.gif
similarity index 100%
rename from Packages/Nef_2/doc_tex/Nef_2/halfplane.gif
rename to Nef_2/doc_tex/Nef_2/halfplane.gif
diff --git a/Packages/Nef_2/doc_tex/Nef_2/halfplane.pdf b/Nef_2/doc_tex/Nef_2/halfplane.pdf
similarity index 100%
rename from Packages/Nef_2/doc_tex/Nef_2/halfplane.pdf
rename to Nef_2/doc_tex/Nef_2/halfplane.pdf
diff --git a/Packages/Nef_2/doc_tex/Nef_2/halfplane.ps b/Nef_2/doc_tex/Nef_2/halfplane.ps
similarity index 100%
rename from Packages/Nef_2/doc_tex/Nef_2/halfplane.ps
rename to Nef_2/doc_tex/Nef_2/halfplane.ps
diff --git a/Packages/Nef_2/doc_tex/Nef_2/main.tex b/Nef_2/doc_tex/Nef_2/main.tex
similarity index 100%
rename from Packages/Nef_2/doc_tex/Nef_2/main.tex
rename to Nef_2/doc_tex/Nef_2/main.tex
diff --git a/Packages/Nef_2/doc_tex/Nef_2/user.tex b/Nef_2/doc_tex/Nef_2/user.tex
similarity index 100%
rename from Packages/Nef_2/doc_tex/Nef_2/user.tex
rename to Nef_2/doc_tex/Nef_2/user.tex
diff --git a/Packages/Nef_2/doc_tex/Nef_2_ref/Explorer.tex b/Nef_2/doc_tex/Nef_2_ref/Explorer.tex
similarity index 100%
rename from Packages/Nef_2/doc_tex/Nef_2_ref/Explorer.tex
rename to Nef_2/doc_tex/Nef_2_ref/Explorer.tex
diff --git a/Packages/Nef_2/doc_tex/Nef_2_ref/ExtendedKernelTraits_2.tex b/Nef_2/doc_tex/Nef_2_ref/ExtendedKernelTraits_2.tex
similarity index 100%
rename from Packages/Nef_2/doc_tex/Nef_2_ref/ExtendedKernelTraits_2.tex
rename to Nef_2/doc_tex/Nef_2_ref/ExtendedKernelTraits_2.tex
diff --git a/Packages/Nef_2/doc_tex/Nef_2_ref/Extended_cartesian.tex b/Nef_2/doc_tex/Nef_2_ref/Extended_cartesian.tex
similarity index 100%
rename from Packages/Nef_2/doc_tex/Nef_2_ref/Extended_cartesian.tex
rename to Nef_2/doc_tex/Nef_2_ref/Extended_cartesian.tex
diff --git a/Packages/Nef_2/doc_tex/Nef_2_ref/Extended_homogeneous.tex b/Nef_2/doc_tex/Nef_2_ref/Extended_homogeneous.tex
similarity index 100%
rename from Packages/Nef_2/doc_tex/Nef_2_ref/Extended_homogeneous.tex
rename to Nef_2/doc_tex/Nef_2_ref/Extended_homogeneous.tex
diff --git a/Packages/Nef_2/doc_tex/Nef_2_ref/Filtered_extended_homogeneous.tex b/Nef_2/doc_tex/Nef_2_ref/Filtered_extended_homogeneous.tex
similarity index 100%
rename from Packages/Nef_2/doc_tex/Nef_2_ref/Filtered_extended_homogeneous.tex
rename to Nef_2/doc_tex/Nef_2_ref/Filtered_extended_homogeneous.tex
diff --git a/Packages/Nef_2/doc_tex/Nef_2_ref/Nef_polyhedron_2.tex b/Nef_2/doc_tex/Nef_2_ref/Nef_polyhedron_2.tex
similarity index 100%
rename from Packages/Nef_2/doc_tex/Nef_2_ref/Nef_polyhedron_2.tex
rename to Nef_2/doc_tex/Nef_2_ref/Nef_polyhedron_2.tex
diff --git a/Packages/Nef_2/doc_tex/Nef_2_ref/Topological_explorer.tex b/Nef_2/doc_tex/Nef_2_ref/Topological_explorer.tex
similarity index 100%
rename from Packages/Nef_2/doc_tex/Nef_2_ref/Topological_explorer.tex
rename to Nef_2/doc_tex/Nef_2_ref/Topological_explorer.tex
diff --git a/Packages/Nef_2/doc_tex/Nef_2_ref/extsegs.eps b/Nef_2/doc_tex/Nef_2_ref/extsegs.eps
similarity index 100%
rename from Packages/Nef_2/doc_tex/Nef_2_ref/extsegs.eps
rename to Nef_2/doc_tex/Nef_2_ref/extsegs.eps
diff --git a/Packages/Nef_2/doc_tex/Nef_2_ref/extsegs.gif b/Nef_2/doc_tex/Nef_2_ref/extsegs.gif
similarity index 100%
rename from Packages/Nef_2/doc_tex/Nef_2_ref/extsegs.gif
rename to Nef_2/doc_tex/Nef_2_ref/extsegs.gif
diff --git a/Packages/Nef_2/doc_tex/Nef_2_ref/extsegs.pdf b/Nef_2/doc_tex/Nef_2_ref/extsegs.pdf
similarity index 100%
rename from Packages/Nef_2/doc_tex/Nef_2_ref/extsegs.pdf
rename to Nef_2/doc_tex/Nef_2_ref/extsegs.pdf
diff --git a/Packages/Nef_2/doc_tex/Nef_2_ref/intro.tex b/Nef_2/doc_tex/Nef_2_ref/intro.tex
similarity index 100%
rename from Packages/Nef_2/doc_tex/Nef_2_ref/intro.tex
rename to Nef_2/doc_tex/Nef_2_ref/intro.tex
diff --git a/Packages/Nef_2/doc_tex/Nef_2_ref/main.tex b/Nef_2/doc_tex/Nef_2_ref/main.tex
similarity index 100%
rename from Packages/Nef_2/doc_tex/Nef_2_ref/main.tex
rename to Nef_2/doc_tex/Nef_2_ref/main.tex
diff --git a/Packages/Nef_2/dont_submit b/Nef_2/dont_submit
similarity index 100%
rename from Packages/Nef_2/dont_submit
rename to Nef_2/dont_submit
diff --git a/Packages/Nef_2/examples/Nef_2/README b/Nef_2/examples/Nef_2/README
similarity index 100%
rename from Packages/Nef_2/examples/Nef_2/README
rename to Nef_2/examples/Nef_2/README
diff --git a/Packages/Nef_2/examples/Nef_2/construction.C b/Nef_2/examples/Nef_2/construction.C
similarity index 100%
rename from Packages/Nef_2/examples/Nef_2/construction.C
rename to Nef_2/examples/Nef_2/construction.C
diff --git a/Packages/Nef_2/examples/Nef_2/makefile b/Nef_2/examples/Nef_2/makefile
similarity index 100%
rename from Packages/Nef_2/examples/Nef_2/makefile
rename to Nef_2/examples/Nef_2/makefile
diff --git a/Packages/Nef_2/examples/Nef_2/polylines.C b/Nef_2/examples/Nef_2/polylines.C
similarity index 100%
rename from Packages/Nef_2/examples/Nef_2/polylines.C
rename to Nef_2/examples/Nef_2/polylines.C
diff --git a/Packages/Nef_2/examples/Nef_2/simple_intersection.C b/Nef_2/examples/Nef_2/simple_intersection.C
similarity index 100%
rename from Packages/Nef_2/examples/Nef_2/simple_intersection.C
rename to Nef_2/examples/Nef_2/simple_intersection.C
diff --git a/Packages/Nef_2/include/CGAL/Bounded_kernel.h b/Nef_2/include/CGAL/Bounded_kernel.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Bounded_kernel.h
rename to Nef_2/include/CGAL/Bounded_kernel.h
diff --git a/Packages/Nef_2/include/CGAL/Extended_cartesian.h b/Nef_2/include/CGAL/Extended_cartesian.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Extended_cartesian.h
rename to Nef_2/include/CGAL/Extended_cartesian.h
diff --git a/Packages/Nef_2/include/CGAL/Extended_homogeneous.h b/Nef_2/include/CGAL/Extended_homogeneous.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Extended_homogeneous.h
rename to Nef_2/include/CGAL/Extended_homogeneous.h
diff --git a/Packages/Nef_2/include/CGAL/Filtered_extended_homogeneous.h b/Nef_2/include/CGAL/Filtered_extended_homogeneous.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Filtered_extended_homogeneous.h
rename to Nef_2/include/CGAL/Filtered_extended_homogeneous.h
diff --git a/Packages/Nef_2/include/CGAL/IO/Filtered_extended_homogeneous_Window_stream.h b/Nef_2/include/CGAL/IO/Filtered_extended_homogeneous_Window_stream.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/IO/Filtered_extended_homogeneous_Window_stream.h
rename to Nef_2/include/CGAL/IO/Filtered_extended_homogeneous_Window_stream.h
diff --git a/Packages/Nef_2/include/CGAL/IO/Nef_polyhedron_2_PS_stream.h b/Nef_2/include/CGAL/IO/Nef_polyhedron_2_PS_stream.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/IO/Nef_polyhedron_2_PS_stream.h
rename to Nef_2/include/CGAL/IO/Nef_polyhedron_2_PS_stream.h
diff --git a/Packages/Nef_2/include/CGAL/IO/Nef_polyhedron_2_Window_stream.h b/Nef_2/include/CGAL/IO/Nef_polyhedron_2_Window_stream.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/IO/Nef_polyhedron_2_Window_stream.h
rename to Nef_2/include/CGAL/IO/Nef_polyhedron_2_Window_stream.h
diff --git a/Packages/Nef_2/include/CGAL/Is_extended_kernel.h b/Nef_2/include/CGAL/Is_extended_kernel.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Is_extended_kernel.h
rename to Nef_2/include/CGAL/Is_extended_kernel.h
diff --git a/Packages/Nef_2/include/CGAL/Nef_2/Constrained_triang_anim.h b/Nef_2/include/CGAL/Nef_2/Constrained_triang_anim.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Nef_2/Constrained_triang_anim.h
rename to Nef_2/include/CGAL/Nef_2/Constrained_triang_anim.h
diff --git a/Packages/Nef_2/include/CGAL/Nef_2/Constrained_triang_traits.h b/Nef_2/include/CGAL/Nef_2/Constrained_triang_traits.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Nef_2/Constrained_triang_traits.h
rename to Nef_2/include/CGAL/Nef_2/Constrained_triang_traits.h
diff --git a/Packages/Nef_2/include/CGAL/Nef_2/HDS_items.h b/Nef_2/include/CGAL/Nef_2/HDS_items.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Nef_2/HDS_items.h
rename to Nef_2/include/CGAL/Nef_2/HDS_items.h
diff --git a/Packages/Nef_2/include/CGAL/Nef_2/HalfedgeDS_items_decorator.h b/Nef_2/include/CGAL/Nef_2/HalfedgeDS_items_decorator.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Nef_2/HalfedgeDS_items_decorator.h
rename to Nef_2/include/CGAL/Nef_2/HalfedgeDS_items_decorator.h
diff --git a/Packages/Nef_2/include/CGAL/Nef_2/Line_to_epoint.h b/Nef_2/include/CGAL/Nef_2/Line_to_epoint.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Nef_2/Line_to_epoint.h
rename to Nef_2/include/CGAL/Nef_2/Line_to_epoint.h
diff --git a/Packages/Nef_2/include/CGAL/Nef_2/Nef_polynomial.h b/Nef_2/include/CGAL/Nef_2/Nef_polynomial.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Nef_2/Nef_polynomial.h
rename to Nef_2/include/CGAL/Nef_2/Nef_polynomial.h
diff --git a/Packages/Nef_2/include/CGAL/Nef_2/Object_handle.h b/Nef_2/include/CGAL/Nef_2/Object_handle.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Nef_2/Object_handle.h
rename to Nef_2/include/CGAL/Nef_2/Object_handle.h
diff --git a/Packages/Nef_2/include/CGAL/Nef_2/Object_index.h b/Nef_2/include/CGAL/Nef_2/Object_index.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Nef_2/Object_index.h
rename to Nef_2/include/CGAL/Nef_2/Object_index.h
diff --git a/Packages/Nef_2/include/CGAL/Nef_2/PM_checker.h b/Nef_2/include/CGAL/Nef_2/PM_checker.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Nef_2/PM_checker.h
rename to Nef_2/include/CGAL/Nef_2/PM_checker.h
diff --git a/Packages/Nef_2/include/CGAL/Nef_2/PM_const_decorator.h b/Nef_2/include/CGAL/Nef_2/PM_const_decorator.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Nef_2/PM_const_decorator.h
rename to Nef_2/include/CGAL/Nef_2/PM_const_decorator.h
diff --git a/Packages/Nef_2/include/CGAL/Nef_2/PM_decorator.h b/Nef_2/include/CGAL/Nef_2/PM_decorator.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Nef_2/PM_decorator.h
rename to Nef_2/include/CGAL/Nef_2/PM_decorator.h
diff --git a/Packages/Nef_2/include/CGAL/Nef_2/PM_explorer.h b/Nef_2/include/CGAL/Nef_2/PM_explorer.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Nef_2/PM_explorer.h
rename to Nef_2/include/CGAL/Nef_2/PM_explorer.h
diff --git a/Packages/Nef_2/include/CGAL/Nef_2/PM_io_parser.h b/Nef_2/include/CGAL/Nef_2/PM_io_parser.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Nef_2/PM_io_parser.h
rename to Nef_2/include/CGAL/Nef_2/PM_io_parser.h
diff --git a/Packages/Nef_2/include/CGAL/Nef_2/PM_overlayer.h b/Nef_2/include/CGAL/Nef_2/PM_overlayer.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Nef_2/PM_overlayer.h
rename to Nef_2/include/CGAL/Nef_2/PM_overlayer.h
diff --git a/Packages/Nef_2/include/CGAL/Nef_2/PM_persistent_PL.h b/Nef_2/include/CGAL/Nef_2/PM_persistent_PL.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Nef_2/PM_persistent_PL.h
rename to Nef_2/include/CGAL/Nef_2/PM_persistent_PL.h
diff --git a/Packages/Nef_2/include/CGAL/Nef_2/PM_point_locator.h b/Nef_2/include/CGAL/Nef_2/PM_point_locator.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Nef_2/PM_point_locator.h
rename to Nef_2/include/CGAL/Nef_2/PM_point_locator.h
diff --git a/Packages/Nef_2/include/CGAL/Nef_2/PM_visualizor.h b/Nef_2/include/CGAL/Nef_2/PM_visualizor.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Nef_2/PM_visualizor.h
rename to Nef_2/include/CGAL/Nef_2/PM_visualizor.h
diff --git a/Packages/Nef_2/include/CGAL/Nef_2/Segment_overlay_traits.h b/Nef_2/include/CGAL/Nef_2/Segment_overlay_traits.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Nef_2/Segment_overlay_traits.h
rename to Nef_2/include/CGAL/Nef_2/Segment_overlay_traits.h
diff --git a/Packages/Nef_2/include/CGAL/Nef_2/debug.h b/Nef_2/include/CGAL/Nef_2/debug.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Nef_2/debug.h
rename to Nef_2/include/CGAL/Nef_2/debug.h
diff --git a/Packages/Nef_2/include/CGAL/Nef_2/gen_point_location.h b/Nef_2/include/CGAL/Nef_2/gen_point_location.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Nef_2/gen_point_location.h
rename to Nef_2/include/CGAL/Nef_2/gen_point_location.h
diff --git a/Packages/Nef_2/include/CGAL/Nef_2/geninfo.h b/Nef_2/include/CGAL/Nef_2/geninfo.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Nef_2/geninfo.h
rename to Nef_2/include/CGAL/Nef_2/geninfo.h
diff --git a/Packages/Nef_2/include/CGAL/Nef_2/iterator_tools.h b/Nef_2/include/CGAL/Nef_2/iterator_tools.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Nef_2/iterator_tools.h
rename to Nef_2/include/CGAL/Nef_2/iterator_tools.h
diff --git a/Packages/Nef_2/include/CGAL/Nef_polyhedron_2.h b/Nef_2/include/CGAL/Nef_polyhedron_2.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/Nef_polyhedron_2.h
rename to Nef_2/include/CGAL/Nef_polyhedron_2.h
diff --git a/Packages/Nef_2/include/CGAL/generic_sweep.h b/Nef_2/include/CGAL/generic_sweep.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/generic_sweep.h
rename to Nef_2/include/CGAL/generic_sweep.h
diff --git a/Packages/Nef_2/include/CGAL/sweep_observer.h b/Nef_2/include/CGAL/sweep_observer.h
similarity index 100%
rename from Packages/Nef_2/include/CGAL/sweep_observer.h
rename to Nef_2/include/CGAL/sweep_observer.h
diff --git a/Packages/Nef_2/maintainer b/Nef_2/maintainer
similarity index 100%
rename from Packages/Nef_2/maintainer
rename to Nef_2/maintainer
diff --git a/Packages/Nef_2/noweb/Constrained_triang.lw b/Nef_2/noweb/Constrained_triang.lw
similarity index 100%
rename from Packages/Nef_2/noweb/Constrained_triang.lw
rename to Nef_2/noweb/Constrained_triang.lw
diff --git a/Packages/Nef_2/noweb/Filtered_extended_kernel.lw b/Nef_2/noweb/Filtered_extended_kernel.lw
similarity index 100%
rename from Packages/Nef_2/noweb/Filtered_extended_kernel.lw
rename to Nef_2/noweb/Filtered_extended_kernel.lw
diff --git a/Packages/Nef_2/noweb/Makefile b/Nef_2/noweb/Makefile
similarity index 100%
rename from Packages/Nef_2/noweb/Makefile
rename to Nef_2/noweb/Makefile
diff --git a/Packages/Nef_2/noweb/Nef_polyhedron_2.lw b/Nef_2/noweb/Nef_polyhedron_2.lw
similarity index 100%
rename from Packages/Nef_2/noweb/Nef_polyhedron_2.lw
rename to Nef_2/noweb/Nef_polyhedron_2.lw
diff --git a/Packages/Nef_2/noweb/PM_decorator.lw b/Nef_2/noweb/PM_decorator.lw
similarity index 100%
rename from Packages/Nef_2/noweb/PM_decorator.lw
rename to Nef_2/noweb/PM_decorator.lw
diff --git a/Packages/Nef_2/noweb/PM_decorator_simple.lw b/Nef_2/noweb/PM_decorator_simple.lw
similarity index 100%
rename from Packages/Nef_2/noweb/PM_decorator_simple.lw
rename to Nef_2/noweb/PM_decorator_simple.lw
diff --git a/Packages/Nef_2/noweb/PM_overlayer.lw b/Nef_2/noweb/PM_overlayer.lw
similarity index 100%
rename from Packages/Nef_2/noweb/PM_overlayer.lw
rename to Nef_2/noweb/PM_overlayer.lw
diff --git a/Packages/Nef_2/noweb/PM_point_locator.lw b/Nef_2/noweb/PM_point_locator.lw
similarity index 100%
rename from Packages/Nef_2/noweb/PM_point_locator.lw
rename to Nef_2/noweb/PM_point_locator.lw
diff --git a/Packages/Nef_2/noweb/PM_transformer.lw b/Nef_2/noweb/PM_transformer.lw
similarity index 100%
rename from Packages/Nef_2/noweb/PM_transformer.lw
rename to Nef_2/noweb/PM_transformer.lw
diff --git a/Packages/Nef_2/noweb/Polynomial.lw b/Nef_2/noweb/Polynomial.lw
similarity index 100%
rename from Packages/Nef_2/noweb/Polynomial.lw
rename to Nef_2/noweb/Polynomial.lw
diff --git a/Packages/Nef_2/noweb/Segment_overlay.lw b/Nef_2/noweb/Segment_overlay.lw
similarity index 100%
rename from Packages/Nef_2/noweb/Segment_overlay.lw
rename to Nef_2/noweb/Segment_overlay.lw
diff --git a/Packages/Nef_2/noweb/Simple_extended_kernel.lw b/Nef_2/noweb/Simple_extended_kernel.lw
similarity index 100%
rename from Packages/Nef_2/noweb/Simple_extended_kernel.lw
rename to Nef_2/noweb/Simple_extended_kernel.lw
diff --git a/Packages/Nef_2/noweb/Svens_point_location.lw b/Nef_2/noweb/Svens_point_location.lw
similarity index 100%
rename from Packages/Nef_2/noweb/Svens_point_location.lw
rename to Nef_2/noweb/Svens_point_location.lw
diff --git a/Packages/Nef_2/noweb/specialize b/Nef_2/noweb/specialize
similarity index 100%
rename from Packages/Nef_2/noweb/specialize
rename to Nef_2/noweb/specialize
diff --git a/Packages/Nef_2/test/Nef_2/EPoint-test.C b/Nef_2/test/Nef_2/EPoint-test.C
similarity index 100%
rename from Packages/Nef_2/test/Nef_2/EPoint-test.C
rename to Nef_2/test/Nef_2/EPoint-test.C
diff --git a/Packages/Nef_2/test/Nef_2/Nef_polyhedron_2-test.C b/Nef_2/test/Nef_2/Nef_polyhedron_2-test.C
similarity index 100%
rename from Packages/Nef_2/test/Nef_2/Nef_polyhedron_2-test.C
rename to Nef_2/test/Nef_2/Nef_polyhedron_2-test.C
diff --git a/Packages/Nef_2/test/Nef_2/PM_decorator-test.C b/Nef_2/test/Nef_2/PM_decorator-test.C
similarity index 100%
rename from Packages/Nef_2/test/Nef_2/PM_decorator-test.C
rename to Nef_2/test/Nef_2/PM_decorator-test.C
diff --git a/Packages/Nef_2/test/Nef_2/cgal_test b/Nef_2/test/Nef_2/cgal_test
similarity index 100%
rename from Packages/Nef_2/test/Nef_2/cgal_test
rename to Nef_2/test/Nef_2/cgal_test
diff --git a/Packages/Nef_2/test/Nef_2/include/CGAL/test_macros.h b/Nef_2/test/Nef_2/include/CGAL/test_macros.h
similarity index 100%
rename from Packages/Nef_2/test/Nef_2/include/CGAL/test_macros.h
rename to Nef_2/test/Nef_2/include/CGAL/test_macros.h
diff --git a/Packages/Nef_2/test/Nef_2/makefile b/Nef_2/test/Nef_2/makefile
similarity index 100%
rename from Packages/Nef_2/test/Nef_2/makefile
rename to Nef_2/test/Nef_2/makefile