diff --git a/.gitattributes b/.gitattributes
index 04bc4c5bcf9..e3a66729b85 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -466,11 +466,11 @@ HalfedgeDS/doc_tex/HalfedgeDS_ref/fig/hds_optional.eps -text
 HalfedgeDS/doc_tex/HalfedgeDS_ref/fig/hds_optional.gif -text svneol=unset#unset
 HalfedgeDS/doc_tex/HalfedgeDS_ref/fig/hds_optional.pdf -text svneol=unset#unset
 HalfedgeDS/doc_tex/HalfedgeDS_ref/fig/hds_optional_small.gif -text svneol=unset#unset
-Packages/Interpolation/doc_tex/Interpolation/nn_coords.eps -text
-Packages/Interpolation/doc_tex/Interpolation/nn_coords.gif -text svneol=unset#unset
-Packages/Interpolation/doc_tex/Interpolation/nn_coords.ipe -text
-Packages/Interpolation/doc_tex/Interpolation/nn_coords.pdf -text svneol=unset#unset
-Packages/Interpolation/doc_tex/Interpolation/nn_coords.xml -text
+Interpolation/doc_tex/Interpolation/nn_coords.eps -text
+Interpolation/doc_tex/Interpolation/nn_coords.gif -text svneol=unset#unset
+Interpolation/doc_tex/Interpolation/nn_coords.ipe -text
+Interpolation/doc_tex/Interpolation/nn_coords.pdf -text svneol=unset#unset
+Interpolation/doc_tex/Interpolation/nn_coords.xml -text
 Packages/Jet_fitting_3/demo/Jet_fitting_3/data/ellipe0.003.off -text
 Packages/Jet_fitting_3/demo/Jet_fitting_3/data/venus.off -text
 Packages/Jet_fitting_3/doc_tex/Jet_fitting_3/jet_fitting_basis.eps -text
diff --git a/Packages/Interpolation/TODO b/Interpolation/TODO
similarity index 100%
rename from Packages/Interpolation/TODO
rename to Interpolation/TODO
diff --git a/Packages/Interpolation/changes.txt b/Interpolation/changes.txt
similarity index 100%
rename from Packages/Interpolation/changes.txt
rename to Interpolation/changes.txt
diff --git a/Packages/Interpolation/demo/Interpolation/README b/Interpolation/demo/Interpolation/README
similarity index 100%
rename from Packages/Interpolation/demo/Interpolation/README
rename to Interpolation/demo/Interpolation/README
diff --git a/Packages/Interpolation/demo/Interpolation/demo_interpolation_2.C b/Interpolation/demo/Interpolation/demo_interpolation_2.C
similarity index 100%
rename from Packages/Interpolation/demo/Interpolation/demo_interpolation_2.C
rename to Interpolation/demo/Interpolation/demo_interpolation_2.C
diff --git a/Packages/Interpolation/demo/Interpolation/demo_surface_voronoi.C b/Interpolation/demo/Interpolation/demo_surface_voronoi.C
similarity index 100%
rename from Packages/Interpolation/demo/Interpolation/demo_surface_voronoi.C
rename to Interpolation/demo/Interpolation/demo_surface_voronoi.C
diff --git a/Packages/Interpolation/demo/Interpolation/makefile b/Interpolation/demo/Interpolation/makefile
similarity index 100%
rename from Packages/Interpolation/demo/Interpolation/makefile
rename to Interpolation/demo/Interpolation/makefile
diff --git a/Packages/Interpolation/description.txt b/Interpolation/description.txt
similarity index 100%
rename from Packages/Interpolation/description.txt
rename to Interpolation/description.txt
diff --git a/Packages/Interpolation/doc_tex/Interpolation/coordinates.tex b/Interpolation/doc_tex/Interpolation/coordinates.tex
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation/coordinates.tex
rename to Interpolation/doc_tex/Interpolation/coordinates.tex
diff --git a/Packages/Interpolation/doc_tex/Interpolation/design_implementation_history.tex b/Interpolation/doc_tex/Interpolation/design_implementation_history.tex
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation/design_implementation_history.tex
rename to Interpolation/doc_tex/Interpolation/design_implementation_history.tex
diff --git a/Packages/Interpolation/doc_tex/Interpolation/interpolation.tex b/Interpolation/doc_tex/Interpolation/interpolation.tex
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation/interpolation.tex
rename to Interpolation/doc_tex/Interpolation/interpolation.tex
diff --git a/Packages/Interpolation/doc_tex/Interpolation/introduction.tex b/Interpolation/doc_tex/Interpolation/introduction.tex
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation/introduction.tex
rename to Interpolation/doc_tex/Interpolation/introduction.tex
diff --git a/Packages/Interpolation/doc_tex/Interpolation/main.tex b/Interpolation/doc_tex/Interpolation/main.tex
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation/main.tex
rename to Interpolation/doc_tex/Interpolation/main.tex
diff --git a/Packages/Interpolation/doc_tex/Interpolation/nn_coords.eps b/Interpolation/doc_tex/Interpolation/nn_coords.eps
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation/nn_coords.eps
rename to Interpolation/doc_tex/Interpolation/nn_coords.eps
diff --git a/Packages/Interpolation/doc_tex/Interpolation/nn_coords.gif b/Interpolation/doc_tex/Interpolation/nn_coords.gif
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation/nn_coords.gif
rename to Interpolation/doc_tex/Interpolation/nn_coords.gif
diff --git a/Packages/Interpolation/doc_tex/Interpolation/nn_coords.ipe b/Interpolation/doc_tex/Interpolation/nn_coords.ipe
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation/nn_coords.ipe
rename to Interpolation/doc_tex/Interpolation/nn_coords.ipe
diff --git a/Packages/Interpolation/doc_tex/Interpolation/nn_coords.pdf b/Interpolation/doc_tex/Interpolation/nn_coords.pdf
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation/nn_coords.pdf
rename to Interpolation/doc_tex/Interpolation/nn_coords.pdf
diff --git a/Packages/Interpolation/doc_tex/Interpolation/nn_coords.xml b/Interpolation/doc_tex/Interpolation/nn_coords.xml
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation/nn_coords.xml
rename to Interpolation/doc_tex/Interpolation/nn_coords.xml
diff --git a/Packages/Interpolation/doc_tex/Interpolation/surface_coords.tex b/Interpolation/doc_tex/Interpolation/surface_coords.tex
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation/surface_coords.tex
rename to Interpolation/doc_tex/Interpolation/surface_coords.tex
diff --git a/Packages/Interpolation/doc_tex/Interpolation_ref/Data_access.tex b/Interpolation/doc_tex/Interpolation_ref/Data_access.tex
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation_ref/Data_access.tex
rename to Interpolation/doc_tex/Interpolation_ref/Data_access.tex
diff --git a/Packages/Interpolation/doc_tex/Interpolation_ref/GradientFittingTraits.tex b/Interpolation/doc_tex/Interpolation_ref/GradientFittingTraits.tex
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation_ref/GradientFittingTraits.tex
rename to Interpolation/doc_tex/Interpolation_ref/GradientFittingTraits.tex
diff --git a/Packages/Interpolation/doc_tex/Interpolation_ref/InterpolationTraits.tex b/Interpolation/doc_tex/Interpolation_ref/InterpolationTraits.tex
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation_ref/InterpolationTraits.tex
rename to Interpolation/doc_tex/Interpolation_ref/InterpolationTraits.tex
diff --git a/Packages/Interpolation/doc_tex/Interpolation_ref/Interpolation_gradient_fitting_traits_2.tex b/Interpolation/doc_tex/Interpolation_ref/Interpolation_gradient_fitting_traits_2.tex
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation_ref/Interpolation_gradient_fitting_traits_2.tex
rename to Interpolation/doc_tex/Interpolation_ref/Interpolation_gradient_fitting_traits_2.tex
diff --git a/Packages/Interpolation/doc_tex/Interpolation_ref/Interpolation_traits_2.tex b/Interpolation/doc_tex/Interpolation_ref/Interpolation_traits_2.tex
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation_ref/Interpolation_traits_2.tex
rename to Interpolation/doc_tex/Interpolation_ref/Interpolation_traits_2.tex
diff --git a/Packages/Interpolation/doc_tex/Interpolation_ref/Voronoi_intersection_2_traits_3.tex b/Interpolation/doc_tex/Interpolation_ref/Voronoi_intersection_2_traits_3.tex
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation_ref/Voronoi_intersection_2_traits_3.tex
rename to Interpolation/doc_tex/Interpolation_ref/Voronoi_intersection_2_traits_3.tex
diff --git a/Packages/Interpolation/doc_tex/Interpolation_ref/farin_c1_interpolation.tex b/Interpolation/doc_tex/Interpolation_ref/farin_c1_interpolation.tex
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation_ref/farin_c1_interpolation.tex
rename to Interpolation/doc_tex/Interpolation_ref/farin_c1_interpolation.tex
diff --git a/Packages/Interpolation/doc_tex/Interpolation_ref/intro.tex b/Interpolation/doc_tex/Interpolation_ref/intro.tex
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation_ref/intro.tex
rename to Interpolation/doc_tex/Interpolation_ref/intro.tex
diff --git a/Packages/Interpolation/doc_tex/Interpolation_ref/linear_interpolation.tex b/Interpolation/doc_tex/Interpolation_ref/linear_interpolation.tex
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation_ref/linear_interpolation.tex
rename to Interpolation/doc_tex/Interpolation_ref/linear_interpolation.tex
diff --git a/Packages/Interpolation/doc_tex/Interpolation_ref/main.tex b/Interpolation/doc_tex/Interpolation_ref/main.tex
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation_ref/main.tex
rename to Interpolation/doc_tex/Interpolation_ref/main.tex
diff --git a/Packages/Interpolation/doc_tex/Interpolation_ref/natural_neighbor_coordinates_2.tex b/Interpolation/doc_tex/Interpolation_ref/natural_neighbor_coordinates_2.tex
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation_ref/natural_neighbor_coordinates_2.tex
rename to Interpolation/doc_tex/Interpolation_ref/natural_neighbor_coordinates_2.tex
diff --git a/Packages/Interpolation/doc_tex/Interpolation_ref/quadratic_interpolation.tex b/Interpolation/doc_tex/Interpolation_ref/quadratic_interpolation.tex
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation_ref/quadratic_interpolation.tex
rename to Interpolation/doc_tex/Interpolation_ref/quadratic_interpolation.tex
diff --git a/Packages/Interpolation/doc_tex/Interpolation_ref/regular_neighbor_coordinates_2.tex b/Interpolation/doc_tex/Interpolation_ref/regular_neighbor_coordinates_2.tex
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation_ref/regular_neighbor_coordinates_2.tex
rename to Interpolation/doc_tex/Interpolation_ref/regular_neighbor_coordinates_2.tex
diff --git a/Packages/Interpolation/doc_tex/Interpolation_ref/sibson_c1_interpolation.tex b/Interpolation/doc_tex/Interpolation_ref/sibson_c1_interpolation.tex
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation_ref/sibson_c1_interpolation.tex
rename to Interpolation/doc_tex/Interpolation_ref/sibson_c1_interpolation.tex
diff --git a/Packages/Interpolation/doc_tex/Interpolation_ref/sibson_gradient_fitting.tex b/Interpolation/doc_tex/Interpolation_ref/sibson_gradient_fitting.tex
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation_ref/sibson_gradient_fitting.tex
rename to Interpolation/doc_tex/Interpolation_ref/sibson_gradient_fitting.tex
diff --git a/Packages/Interpolation/doc_tex/Interpolation_ref/surface_neighbor_coordinates_3.tex b/Interpolation/doc_tex/Interpolation_ref/surface_neighbor_coordinates_3.tex
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation_ref/surface_neighbor_coordinates_3.tex
rename to Interpolation/doc_tex/Interpolation_ref/surface_neighbor_coordinates_3.tex
diff --git a/Packages/Interpolation/doc_tex/Interpolation_ref/surface_neighbors_3.tex b/Interpolation/doc_tex/Interpolation_ref/surface_neighbors_3.tex
similarity index 100%
rename from Packages/Interpolation/doc_tex/Interpolation_ref/surface_neighbors_3.tex
rename to Interpolation/doc_tex/Interpolation_ref/surface_neighbors_3.tex
diff --git a/Packages/Interpolation/examples/Interpolation/README b/Interpolation/examples/Interpolation/README
similarity index 100%
rename from Packages/Interpolation/examples/Interpolation/README
rename to Interpolation/examples/Interpolation/README
diff --git a/Packages/Interpolation/examples/Interpolation/data/points3 b/Interpolation/examples/Interpolation/data/points3
similarity index 100%
rename from Packages/Interpolation/examples/Interpolation/data/points3
rename to Interpolation/examples/Interpolation/data/points3
diff --git a/Packages/Interpolation/examples/Interpolation/interpolation_2.C b/Interpolation/examples/Interpolation/interpolation_2.C
similarity index 100%
rename from Packages/Interpolation/examples/Interpolation/interpolation_2.C
rename to Interpolation/examples/Interpolation/interpolation_2.C
diff --git a/Packages/Interpolation/examples/Interpolation/linear_interpolation_2.C b/Interpolation/examples/Interpolation/linear_interpolation_2.C
similarity index 100%
rename from Packages/Interpolation/examples/Interpolation/linear_interpolation_2.C
rename to Interpolation/examples/Interpolation/linear_interpolation_2.C
diff --git a/Packages/Interpolation/examples/Interpolation/makefile b/Interpolation/examples/Interpolation/makefile
similarity index 100%
rename from Packages/Interpolation/examples/Interpolation/makefile
rename to Interpolation/examples/Interpolation/makefile
diff --git a/Packages/Interpolation/examples/Interpolation/nn_coordinates_2.C b/Interpolation/examples/Interpolation/nn_coordinates_2.C
similarity index 100%
rename from Packages/Interpolation/examples/Interpolation/nn_coordinates_2.C
rename to Interpolation/examples/Interpolation/nn_coordinates_2.C
diff --git a/Packages/Interpolation/examples/Interpolation/nn_coordinates_3.C b/Interpolation/examples/Interpolation/nn_coordinates_3.C
similarity index 100%
rename from Packages/Interpolation/examples/Interpolation/nn_coordinates_3.C
rename to Interpolation/examples/Interpolation/nn_coordinates_3.C
diff --git a/Packages/Interpolation/examples/Interpolation/rn_coordinates_2.C b/Interpolation/examples/Interpolation/rn_coordinates_2.C
similarity index 100%
rename from Packages/Interpolation/examples/Interpolation/rn_coordinates_2.C
rename to Interpolation/examples/Interpolation/rn_coordinates_2.C
diff --git a/Packages/Interpolation/examples/Interpolation/sibson_interpolation_2.C b/Interpolation/examples/Interpolation/sibson_interpolation_2.C
similarity index 100%
rename from Packages/Interpolation/examples/Interpolation/sibson_interpolation_2.C
rename to Interpolation/examples/Interpolation/sibson_interpolation_2.C
diff --git a/Packages/Interpolation/examples/Interpolation/surface_neighbor_coordinates_3.C b/Interpolation/examples/Interpolation/surface_neighbor_coordinates_3.C
similarity index 100%
rename from Packages/Interpolation/examples/Interpolation/surface_neighbor_coordinates_3.C
rename to Interpolation/examples/Interpolation/surface_neighbor_coordinates_3.C
diff --git a/Packages/Interpolation/include/CGAL/Interpolation_gradient_fitting_traits_2.h b/Interpolation/include/CGAL/Interpolation_gradient_fitting_traits_2.h
similarity index 100%
rename from Packages/Interpolation/include/CGAL/Interpolation_gradient_fitting_traits_2.h
rename to Interpolation/include/CGAL/Interpolation_gradient_fitting_traits_2.h
diff --git a/Packages/Interpolation/include/CGAL/Interpolation_traits_2.h b/Interpolation/include/CGAL/Interpolation_traits_2.h
similarity index 100%
rename from Packages/Interpolation/include/CGAL/Interpolation_traits_2.h
rename to Interpolation/include/CGAL/Interpolation_traits_2.h
diff --git a/Packages/Interpolation/include/CGAL/Voronoi_intersection_2_traits_3.h b/Interpolation/include/CGAL/Voronoi_intersection_2_traits_3.h
similarity index 100%
rename from Packages/Interpolation/include/CGAL/Voronoi_intersection_2_traits_3.h
rename to Interpolation/include/CGAL/Voronoi_intersection_2_traits_3.h
diff --git a/Packages/Interpolation/include/CGAL/constructions/constructions_for_voronoi_intersection_cartesian_2_3.h b/Interpolation/include/CGAL/constructions/constructions_for_voronoi_intersection_cartesian_2_3.h
similarity index 100%
rename from Packages/Interpolation/include/CGAL/constructions/constructions_for_voronoi_intersection_cartesian_2_3.h
rename to Interpolation/include/CGAL/constructions/constructions_for_voronoi_intersection_cartesian_2_3.h
diff --git a/Packages/Interpolation/include/CGAL/interpolation_functions.h b/Interpolation/include/CGAL/interpolation_functions.h
similarity index 100%
rename from Packages/Interpolation/include/CGAL/interpolation_functions.h
rename to Interpolation/include/CGAL/interpolation_functions.h
diff --git a/Packages/Interpolation/include/CGAL/natural_neighbor_coordinates_2.h b/Interpolation/include/CGAL/natural_neighbor_coordinates_2.h
similarity index 100%
rename from Packages/Interpolation/include/CGAL/natural_neighbor_coordinates_2.h
rename to Interpolation/include/CGAL/natural_neighbor_coordinates_2.h
diff --git a/Packages/Interpolation/include/CGAL/natural_neighbor_coordinates_3.h b/Interpolation/include/CGAL/natural_neighbor_coordinates_3.h
similarity index 100%
rename from Packages/Interpolation/include/CGAL/natural_neighbor_coordinates_3.h
rename to Interpolation/include/CGAL/natural_neighbor_coordinates_3.h
diff --git a/Packages/Interpolation/include/CGAL/predicates/predicates_for_voronoi_intersection_cartesian_2_3.h b/Interpolation/include/CGAL/predicates/predicates_for_voronoi_intersection_cartesian_2_3.h
similarity index 100%
rename from Packages/Interpolation/include/CGAL/predicates/predicates_for_voronoi_intersection_cartesian_2_3.h
rename to Interpolation/include/CGAL/predicates/predicates_for_voronoi_intersection_cartesian_2_3.h
diff --git a/Packages/Interpolation/include/CGAL/regular_neighbor_coordinates_2.h b/Interpolation/include/CGAL/regular_neighbor_coordinates_2.h
similarity index 100%
rename from Packages/Interpolation/include/CGAL/regular_neighbor_coordinates_2.h
rename to Interpolation/include/CGAL/regular_neighbor_coordinates_2.h
diff --git a/Packages/Interpolation/include/CGAL/sibson_gradient_fitting.h b/Interpolation/include/CGAL/sibson_gradient_fitting.h
similarity index 100%
rename from Packages/Interpolation/include/CGAL/sibson_gradient_fitting.h
rename to Interpolation/include/CGAL/sibson_gradient_fitting.h
diff --git a/Packages/Interpolation/include/CGAL/surface_neighbor_coordinates_3.h b/Interpolation/include/CGAL/surface_neighbor_coordinates_3.h
similarity index 100%
rename from Packages/Interpolation/include/CGAL/surface_neighbor_coordinates_3.h
rename to Interpolation/include/CGAL/surface_neighbor_coordinates_3.h
diff --git a/Packages/Interpolation/include/CGAL/surface_neighbors_3.h b/Interpolation/include/CGAL/surface_neighbors_3.h
similarity index 100%
rename from Packages/Interpolation/include/CGAL/surface_neighbors_3.h
rename to Interpolation/include/CGAL/surface_neighbors_3.h
diff --git a/Packages/Interpolation/maintainer b/Interpolation/maintainer
similarity index 100%
rename from Packages/Interpolation/maintainer
rename to Interpolation/maintainer
diff --git a/Packages/Interpolation/test/Interpolation/include/CGAL/_test_interpolation_functions_2.C b/Interpolation/test/Interpolation/include/CGAL/_test_interpolation_functions_2.C
similarity index 100%
rename from Packages/Interpolation/test/Interpolation/include/CGAL/_test_interpolation_functions_2.C
rename to Interpolation/test/Interpolation/include/CGAL/_test_interpolation_functions_2.C
diff --git a/Packages/Interpolation/test/Interpolation/include/CGAL/_test_regular_neighbors_2.C b/Interpolation/test/Interpolation/include/CGAL/_test_regular_neighbors_2.C
similarity index 100%
rename from Packages/Interpolation/test/Interpolation/include/CGAL/_test_regular_neighbors_2.C
rename to Interpolation/test/Interpolation/include/CGAL/_test_regular_neighbors_2.C
diff --git a/Packages/Interpolation/test/Interpolation/include/CGAL/_test_surface_neighbors_3.C b/Interpolation/test/Interpolation/include/CGAL/_test_surface_neighbors_3.C
similarity index 100%
rename from Packages/Interpolation/test/Interpolation/include/CGAL/_test_surface_neighbors_3.C
rename to Interpolation/test/Interpolation/include/CGAL/_test_surface_neighbors_3.C
diff --git a/Packages/Interpolation/test/Interpolation/makefile b/Interpolation/test/Interpolation/makefile
similarity index 100%
rename from Packages/Interpolation/test/Interpolation/makefile
rename to Interpolation/test/Interpolation/makefile
diff --git a/Packages/Interpolation/test/Interpolation/test_interpolation_functions_2.C b/Interpolation/test/Interpolation/test_interpolation_functions_2.C
similarity index 100%
rename from Packages/Interpolation/test/Interpolation/test_interpolation_functions_2.C
rename to Interpolation/test/Interpolation/test_interpolation_functions_2.C
diff --git a/Packages/Interpolation/test/Interpolation/test_regular_neighbors_2.C b/Interpolation/test/Interpolation/test_regular_neighbors_2.C
similarity index 100%
rename from Packages/Interpolation/test/Interpolation/test_regular_neighbors_2.C
rename to Interpolation/test/Interpolation/test_regular_neighbors_2.C
diff --git a/Packages/Interpolation/test/Interpolation/test_surface_neighbor_3.C b/Interpolation/test/Interpolation/test_surface_neighbor_3.C
similarity index 100%
rename from Packages/Interpolation/test/Interpolation/test_surface_neighbor_3.C
rename to Interpolation/test/Interpolation/test_surface_neighbor_3.C