diff --git a/.gitattributes b/.gitattributes
index e9c67449a1f..e5b9c00b3b4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1109,14 +1109,6 @@ Optimisation_doc/doc_tex/Optimisation/polydist.gif -text svneol=unset#unset
 Optimisation_doc/doc_tex/Optimisation/polydist.pdf -text svneol=unset#unset
 PS_Stream/doc_tex/PS_Stream/exemple.ps -text
 PS_Stream/doc_tex/PS_Stream/style.ps -text
-Packages/Snap_rounding_2/demo/Snap_rounding_2/grid.xpm -text
-Packages/Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2.vcproj -text
-Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/isr_vs_sr.gif -text svneol=unset#unset
-Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/isr_vs_sr.pdf -text svneol=unset#unset
-Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/isr_vs_sr.ps -text
-Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/sr1.gif -text svneol=unset#unset
-Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/sr1.pdf -text svneol=unset#unset
-Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/sr1.ps -text
 Packages/Spatial_searching/demo/Spatial_searching/spatial_searching.vcproj -text
 Packages/Spatial_searching/doc_tex/Spatial_searching/Fig1.gif -text svneol=unset#unset
 Packages/Spatial_searching/doc_tex/Spatial_searching/Fig1.ps -text
@@ -1997,3 +1989,11 @@ Segment_Delaunay_graph_2/doc_tex/Segment_Delaunay_graph_2_ref/sdg-join_split.eps
 Segment_Delaunay_graph_2/doc_tex/Segment_Delaunay_graph_2_ref/sdg-join_split.fig -text
 Segment_Delaunay_graph_2/doc_tex/Segment_Delaunay_graph_2_ref/sdg-join_split.gif -text svneol=unset#unset
 Segment_Delaunay_graph_2/doc_tex/Segment_Delaunay_graph_2_ref/sdg-join_split.pdf -text svneol=unset#unset
+Snap_rounding_2/demo/Snap_rounding_2/grid.xpm -text
+Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2.vcproj -text
+Snap_rounding_2/doc_tex/Snap_rounding_2/isr_vs_sr.gif -text svneol=unset#unset
+Snap_rounding_2/doc_tex/Snap_rounding_2/isr_vs_sr.pdf -text svneol=unset#unset
+Snap_rounding_2/doc_tex/Snap_rounding_2/isr_vs_sr.ps -text
+Snap_rounding_2/doc_tex/Snap_rounding_2/sr1.gif -text svneol=unset#unset
+Snap_rounding_2/doc_tex/Snap_rounding_2/sr1.pdf -text svneol=unset#unset
+Snap_rounding_2/doc_tex/Snap_rounding_2/sr1.ps -text
diff --git a/Packages/Snap_rounding_2/Snap_rounding_2.dxy b/Snap_rounding_2/Snap_rounding_2.dxy
similarity index 100%
rename from Packages/Snap_rounding_2/Snap_rounding_2.dxy
rename to Snap_rounding_2/Snap_rounding_2.dxy
diff --git a/Packages/Snap_rounding_2/changes.txt b/Snap_rounding_2/changes.txt
similarity index 100%
rename from Packages/Snap_rounding_2/changes.txt
rename to Snap_rounding_2/changes.txt
diff --git a/Packages/Snap_rounding_2/demo/Snap_rounding_2/README b/Snap_rounding_2/demo/Snap_rounding_2/README
similarity index 100%
rename from Packages/Snap_rounding_2/demo/Snap_rounding_2/README
rename to Snap_rounding_2/demo/Snap_rounding_2/README
diff --git a/Packages/Snap_rounding_2/demo/Snap_rounding_2/cgal_types.h b/Snap_rounding_2/demo/Snap_rounding_2/cgal_types.h
similarity index 100%
rename from Packages/Snap_rounding_2/demo/Snap_rounding_2/cgal_types.h
rename to Snap_rounding_2/demo/Snap_rounding_2/cgal_types.h
diff --git a/Packages/Snap_rounding_2/demo/Snap_rounding_2/data/USA b/Snap_rounding_2/demo/Snap_rounding_2/data/USA
similarity index 100%
rename from Packages/Snap_rounding_2/demo/Snap_rounding_2/data/USA
rename to Snap_rounding_2/demo/Snap_rounding_2/data/USA
diff --git a/Packages/Snap_rounding_2/demo/Snap_rounding_2/data/density b/Snap_rounding_2/demo/Snap_rounding_2/data/density
similarity index 100%
rename from Packages/Snap_rounding_2/demo/Snap_rounding_2/data/density
rename to Snap_rounding_2/demo/Snap_rounding_2/data/density
diff --git a/Packages/Snap_rounding_2/demo/Snap_rounding_2/data/inp1 b/Snap_rounding_2/demo/Snap_rounding_2/data/inp1
similarity index 100%
rename from Packages/Snap_rounding_2/demo/Snap_rounding_2/data/inp1
rename to Snap_rounding_2/demo/Snap_rounding_2/data/inp1
diff --git a/Packages/Snap_rounding_2/demo/Snap_rounding_2/data/inp2 b/Snap_rounding_2/demo/Snap_rounding_2/data/inp2
similarity index 100%
rename from Packages/Snap_rounding_2/demo/Snap_rounding_2/data/inp2
rename to Snap_rounding_2/demo/Snap_rounding_2/data/inp2
diff --git a/Packages/Snap_rounding_2/demo/Snap_rounding_2/data/inp3 b/Snap_rounding_2/demo/Snap_rounding_2/data/inp3
similarity index 100%
rename from Packages/Snap_rounding_2/demo/Snap_rounding_2/data/inp3
rename to Snap_rounding_2/demo/Snap_rounding_2/data/inp3
diff --git a/Packages/Snap_rounding_2/demo/Snap_rounding_2/data/inp4 b/Snap_rounding_2/demo/Snap_rounding_2/data/inp4
similarity index 100%
rename from Packages/Snap_rounding_2/demo/Snap_rounding_2/data/inp4
rename to Snap_rounding_2/demo/Snap_rounding_2/data/inp4
diff --git a/Packages/Snap_rounding_2/demo/Snap_rounding_2/data/triangulation b/Snap_rounding_2/demo/Snap_rounding_2/data/triangulation
similarity index 100%
rename from Packages/Snap_rounding_2/demo/Snap_rounding_2/data/triangulation
rename to Snap_rounding_2/demo/Snap_rounding_2/data/triangulation
diff --git a/Packages/Snap_rounding_2/demo/Snap_rounding_2/grid.xpm b/Snap_rounding_2/demo/Snap_rounding_2/grid.xpm
similarity index 100%
rename from Packages/Snap_rounding_2/demo/Snap_rounding_2/grid.xpm
rename to Snap_rounding_2/demo/Snap_rounding_2/grid.xpm
diff --git a/Packages/Snap_rounding_2/demo/Snap_rounding_2/help/index.html b/Snap_rounding_2/demo/Snap_rounding_2/help/index.html
similarity index 100%
rename from Packages/Snap_rounding_2/demo/Snap_rounding_2/help/index.html
rename to Snap_rounding_2/demo/Snap_rounding_2/help/index.html
diff --git a/Packages/Snap_rounding_2/demo/Snap_rounding_2/makefile b/Snap_rounding_2/demo/Snap_rounding_2/makefile
similarity index 100%
rename from Packages/Snap_rounding_2/demo/Snap_rounding_2/makefile
rename to Snap_rounding_2/demo/Snap_rounding_2/makefile
diff --git a/Packages/Snap_rounding_2/demo/Snap_rounding_2/segment_input_layer_with_snapping.h b/Snap_rounding_2/demo/Snap_rounding_2/segment_input_layer_with_snapping.h
similarity index 100%
rename from Packages/Snap_rounding_2/demo/Snap_rounding_2/segment_input_layer_with_snapping.h
rename to Snap_rounding_2/demo/Snap_rounding_2/segment_input_layer_with_snapping.h
diff --git a/Packages/Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2.C b/Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2.C
similarity index 100%
rename from Packages/Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2.C
rename to Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2.C
diff --git a/Packages/Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2.vcproj b/Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2.vcproj
similarity index 100%
rename from Packages/Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2.vcproj
rename to Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2.vcproj
diff --git a/Packages/Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2_layers.h b/Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2_layers.h
similarity index 100%
rename from Packages/Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2_layers.h
rename to Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2_layers.h
diff --git a/Packages/Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2_toolbar.C b/Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2_toolbar.C
similarity index 100%
rename from Packages/Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2_toolbar.C
rename to Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2_toolbar.C
diff --git a/Packages/Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2_toolbar.h b/Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2_toolbar.h
similarity index 100%
rename from Packages/Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2_toolbar.h
rename to Snap_rounding_2/demo/Snap_rounding_2/snap_rounding_2_toolbar.h
diff --git a/Packages/Snap_rounding_2/description.txt b/Snap_rounding_2/description.txt
similarity index 100%
rename from Packages/Snap_rounding_2/description.txt
rename to Snap_rounding_2/description.txt
diff --git a/Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/Snap_rounding_2.bib b/Snap_rounding_2/doc_tex/Snap_rounding_2/Snap_rounding_2.bib
similarity index 100%
rename from Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/Snap_rounding_2.bib
rename to Snap_rounding_2/doc_tex/Snap_rounding_2/Snap_rounding_2.bib
diff --git a/Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/isr_vs_sr.gif b/Snap_rounding_2/doc_tex/Snap_rounding_2/isr_vs_sr.gif
similarity index 100%
rename from Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/isr_vs_sr.gif
rename to Snap_rounding_2/doc_tex/Snap_rounding_2/isr_vs_sr.gif
diff --git a/Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/isr_vs_sr.pdf b/Snap_rounding_2/doc_tex/Snap_rounding_2/isr_vs_sr.pdf
similarity index 100%
rename from Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/isr_vs_sr.pdf
rename to Snap_rounding_2/doc_tex/Snap_rounding_2/isr_vs_sr.pdf
diff --git a/Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/isr_vs_sr.ps b/Snap_rounding_2/doc_tex/Snap_rounding_2/isr_vs_sr.ps
similarity index 100%
rename from Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/isr_vs_sr.ps
rename to Snap_rounding_2/doc_tex/Snap_rounding_2/isr_vs_sr.ps
diff --git a/Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/main.tex b/Snap_rounding_2/doc_tex/Snap_rounding_2/main.tex
similarity index 100%
rename from Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/main.tex
rename to Snap_rounding_2/doc_tex/Snap_rounding_2/main.tex
diff --git a/Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/snap.tex b/Snap_rounding_2/doc_tex/Snap_rounding_2/snap.tex
similarity index 100%
rename from Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/snap.tex
rename to Snap_rounding_2/doc_tex/Snap_rounding_2/snap.tex
diff --git a/Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/sr1.gif b/Snap_rounding_2/doc_tex/Snap_rounding_2/sr1.gif
similarity index 100%
rename from Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/sr1.gif
rename to Snap_rounding_2/doc_tex/Snap_rounding_2/sr1.gif
diff --git a/Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/sr1.pdf b/Snap_rounding_2/doc_tex/Snap_rounding_2/sr1.pdf
similarity index 100%
rename from Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/sr1.pdf
rename to Snap_rounding_2/doc_tex/Snap_rounding_2/sr1.pdf
diff --git a/Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/sr1.ps b/Snap_rounding_2/doc_tex/Snap_rounding_2/sr1.ps
similarity index 100%
rename from Packages/Snap_rounding_2/doc_tex/Snap_rounding_2/sr1.ps
rename to Snap_rounding_2/doc_tex/Snap_rounding_2/sr1.ps
diff --git a/Packages/Snap_rounding_2/doc_tex/Snap_rounding_2_ref/Snap_rounding_traits_2.tex b/Snap_rounding_2/doc_tex/Snap_rounding_2_ref/Snap_rounding_traits_2.tex
similarity index 100%
rename from Packages/Snap_rounding_2/doc_tex/Snap_rounding_2_ref/Snap_rounding_traits_2.tex
rename to Snap_rounding_2/doc_tex/Snap_rounding_2_ref/Snap_rounding_traits_2.tex
diff --git a/Packages/Snap_rounding_2/doc_tex/Snap_rounding_2_ref/main.tex b/Snap_rounding_2/doc_tex/Snap_rounding_2_ref/main.tex
similarity index 100%
rename from Packages/Snap_rounding_2/doc_tex/Snap_rounding_2_ref/main.tex
rename to Snap_rounding_2/doc_tex/Snap_rounding_2_ref/main.tex
diff --git a/Packages/Snap_rounding_2/doc_tex/Snap_rounding_2_ref/snap_concept.tex b/Snap_rounding_2/doc_tex/Snap_rounding_2_ref/snap_concept.tex
similarity index 100%
rename from Packages/Snap_rounding_2/doc_tex/Snap_rounding_2_ref/snap_concept.tex
rename to Snap_rounding_2/doc_tex/Snap_rounding_2_ref/snap_concept.tex
diff --git a/Packages/Snap_rounding_2/doc_tex/Snap_rounding_2_ref/snap_ref.tex b/Snap_rounding_2/doc_tex/Snap_rounding_2_ref/snap_ref.tex
similarity index 100%
rename from Packages/Snap_rounding_2/doc_tex/Snap_rounding_2_ref/snap_ref.tex
rename to Snap_rounding_2/doc_tex/Snap_rounding_2_ref/snap_ref.tex
diff --git a/Packages/Snap_rounding_2/dont_submit b/Snap_rounding_2/dont_submit
similarity index 100%
rename from Packages/Snap_rounding_2/dont_submit
rename to Snap_rounding_2/dont_submit
diff --git a/Packages/Snap_rounding_2/examples/Snap_rounding_2/example1.C b/Snap_rounding_2/examples/Snap_rounding_2/example1.C
similarity index 100%
rename from Packages/Snap_rounding_2/examples/Snap_rounding_2/example1.C
rename to Snap_rounding_2/examples/Snap_rounding_2/example1.C
diff --git a/Packages/Snap_rounding_2/examples/Snap_rounding_2/example2.C b/Snap_rounding_2/examples/Snap_rounding_2/example2.C
similarity index 100%
rename from Packages/Snap_rounding_2/examples/Snap_rounding_2/example2.C
rename to Snap_rounding_2/examples/Snap_rounding_2/example2.C
diff --git a/Packages/Snap_rounding_2/include/CGAL/Snap_rounding_2.h b/Snap_rounding_2/include/CGAL/Snap_rounding_2.h
similarity index 100%
rename from Packages/Snap_rounding_2/include/CGAL/Snap_rounding_2.h
rename to Snap_rounding_2/include/CGAL/Snap_rounding_2.h
diff --git a/Packages/Snap_rounding_2/include/CGAL/Snap_rounding_kd_2.h b/Snap_rounding_2/include/CGAL/Snap_rounding_kd_2.h
similarity index 100%
rename from Packages/Snap_rounding_2/include/CGAL/Snap_rounding_kd_2.h
rename to Snap_rounding_2/include/CGAL/Snap_rounding_kd_2.h
diff --git a/Packages/Snap_rounding_2/include/CGAL/Snap_rounding_traits_2.h b/Snap_rounding_2/include/CGAL/Snap_rounding_traits_2.h
similarity index 100%
rename from Packages/Snap_rounding_2/include/CGAL/Snap_rounding_traits_2.h
rename to Snap_rounding_2/include/CGAL/Snap_rounding_traits_2.h
diff --git a/Packages/Snap_rounding_2/maintainer b/Snap_rounding_2/maintainer
similarity index 100%
rename from Packages/Snap_rounding_2/maintainer
rename to Snap_rounding_2/maintainer
diff --git a/Packages/Snap_rounding_2/test/Snap_rounding_2/cgal_test b/Snap_rounding_2/test/Snap_rounding_2/cgal_test
similarity index 100%
rename from Packages/Snap_rounding_2/test/Snap_rounding_2/cgal_test
rename to Snap_rounding_2/test/Snap_rounding_2/cgal_test
diff --git a/Packages/Snap_rounding_2/test/Snap_rounding_2/data/data1 b/Snap_rounding_2/test/Snap_rounding_2/data/data1
similarity index 100%
rename from Packages/Snap_rounding_2/test/Snap_rounding_2/data/data1
rename to Snap_rounding_2/test/Snap_rounding_2/data/data1
diff --git a/Packages/Snap_rounding_2/test/Snap_rounding_2/data/data2 b/Snap_rounding_2/test/Snap_rounding_2/data/data2
similarity index 100%
rename from Packages/Snap_rounding_2/test/Snap_rounding_2/data/data2
rename to Snap_rounding_2/test/Snap_rounding_2/data/data2
diff --git a/Packages/Snap_rounding_2/test/Snap_rounding_2/data/data3 b/Snap_rounding_2/test/Snap_rounding_2/data/data3
similarity index 100%
rename from Packages/Snap_rounding_2/test/Snap_rounding_2/data/data3
rename to Snap_rounding_2/test/Snap_rounding_2/data/data3
diff --git a/Packages/Snap_rounding_2/test/Snap_rounding_2/data/data4 b/Snap_rounding_2/test/Snap_rounding_2/data/data4
similarity index 100%
rename from Packages/Snap_rounding_2/test/Snap_rounding_2/data/data4
rename to Snap_rounding_2/test/Snap_rounding_2/data/data4
diff --git a/Packages/Snap_rounding_2/test/Snap_rounding_2/data/data5 b/Snap_rounding_2/test/Snap_rounding_2/data/data5
similarity index 100%
rename from Packages/Snap_rounding_2/test/Snap_rounding_2/data/data5
rename to Snap_rounding_2/test/Snap_rounding_2/data/data5
diff --git a/Packages/Snap_rounding_2/test/Snap_rounding_2/data/data6 b/Snap_rounding_2/test/Snap_rounding_2/data/data6
similarity index 100%
rename from Packages/Snap_rounding_2/test/Snap_rounding_2/data/data6
rename to Snap_rounding_2/test/Snap_rounding_2/data/data6
diff --git a/Packages/Snap_rounding_2/test/Snap_rounding_2/data/data7 b/Snap_rounding_2/test/Snap_rounding_2/data/data7
similarity index 100%
rename from Packages/Snap_rounding_2/test/Snap_rounding_2/data/data7
rename to Snap_rounding_2/test/Snap_rounding_2/data/data7
diff --git a/Packages/Snap_rounding_2/test/Snap_rounding_2/data/gold_data1 b/Snap_rounding_2/test/Snap_rounding_2/data/gold_data1
similarity index 100%
rename from Packages/Snap_rounding_2/test/Snap_rounding_2/data/gold_data1
rename to Snap_rounding_2/test/Snap_rounding_2/data/gold_data1
diff --git a/Packages/Snap_rounding_2/test/Snap_rounding_2/data/gold_data2 b/Snap_rounding_2/test/Snap_rounding_2/data/gold_data2
similarity index 100%
rename from Packages/Snap_rounding_2/test/Snap_rounding_2/data/gold_data2
rename to Snap_rounding_2/test/Snap_rounding_2/data/gold_data2
diff --git a/Packages/Snap_rounding_2/test/Snap_rounding_2/data/gold_data3 b/Snap_rounding_2/test/Snap_rounding_2/data/gold_data3
similarity index 100%
rename from Packages/Snap_rounding_2/test/Snap_rounding_2/data/gold_data3
rename to Snap_rounding_2/test/Snap_rounding_2/data/gold_data3
diff --git a/Packages/Snap_rounding_2/test/Snap_rounding_2/data/gold_data4 b/Snap_rounding_2/test/Snap_rounding_2/data/gold_data4
similarity index 100%
rename from Packages/Snap_rounding_2/test/Snap_rounding_2/data/gold_data4
rename to Snap_rounding_2/test/Snap_rounding_2/data/gold_data4
diff --git a/Packages/Snap_rounding_2/test/Snap_rounding_2/data/gold_data5 b/Snap_rounding_2/test/Snap_rounding_2/data/gold_data5
similarity index 100%
rename from Packages/Snap_rounding_2/test/Snap_rounding_2/data/gold_data5
rename to Snap_rounding_2/test/Snap_rounding_2/data/gold_data5
diff --git a/Packages/Snap_rounding_2/test/Snap_rounding_2/data/gold_data6 b/Snap_rounding_2/test/Snap_rounding_2/data/gold_data6
similarity index 100%
rename from Packages/Snap_rounding_2/test/Snap_rounding_2/data/gold_data6
rename to Snap_rounding_2/test/Snap_rounding_2/data/gold_data6
diff --git a/Packages/Snap_rounding_2/test/Snap_rounding_2/data/gold_data7 b/Snap_rounding_2/test/Snap_rounding_2/data/gold_data7
similarity index 100%
rename from Packages/Snap_rounding_2/test/Snap_rounding_2/data/gold_data7
rename to Snap_rounding_2/test/Snap_rounding_2/data/gold_data7
diff --git a/Packages/Snap_rounding_2/test/Snap_rounding_2/test.C b/Snap_rounding_2/test/Snap_rounding_2/test.C
similarity index 100%
rename from Packages/Snap_rounding_2/test/Snap_rounding_2/test.C
rename to Snap_rounding_2/test/Snap_rounding_2/test.C