diff --git a/.gitignore b/.gitignore
index 7c4e4c457d3..81b636931e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -157,23 +157,23 @@ Min_sphere_d_new/.tmp
 Min_sphere_d_new/Makefile
 Min_sphere_d_new/bin
 Min_sphere_d_new/doc_ps
-Packages/Optimisation_basic/*.aux
-Packages/Optimisation_basic/*.bbl
-Packages/Optimisation_basic/*.blg
-Packages/Optimisation_basic/*.dvi
-Packages/Optimisation_basic/*.idx
-Packages/Optimisation_basic/*.ilg
-Packages/Optimisation_basic/*.ind
-Packages/Optimisation_basic/*.log
-Packages/Optimisation_basic/*.mxp
-Packages/Optimisation_basic/*.toc
-Packages/Optimisation_basic/.dep
-Packages/Optimisation_basic/.obj
-Packages/Optimisation_basic/.tmp
-Packages/Optimisation_basic/Makefile
-Packages/Optimisation_basic/bin
-Packages/Optimisation_basic/doc_ps
-Packages/Optimisation_basic/src/Optimisation
+Optimisation_basic/*.aux
+Optimisation_basic/*.bbl
+Optimisation_basic/*.blg
+Optimisation_basic/*.dvi
+Optimisation_basic/*.idx
+Optimisation_basic/*.ilg
+Optimisation_basic/*.ind
+Optimisation_basic/*.log
+Optimisation_basic/*.mxp
+Optimisation_basic/*.toc
+Optimisation_basic/.dep
+Optimisation_basic/.obj
+Optimisation_basic/.tmp
+Optimisation_basic/Makefile
+Optimisation_basic/bin
+Optimisation_basic/doc_ps
+Optimisation_basic/src/Optimisation
 Packages/Optimisation_doc/*.aux
 Packages/Optimisation_doc/*.bbl
 Packages/Optimisation_doc/*.blg
diff --git a/Packages/Optimisation_basic/.cvsignore b/Optimisation_basic/.cvsignore
similarity index 100%
rename from Packages/Optimisation_basic/.cvsignore
rename to Optimisation_basic/.cvsignore
diff --git a/Packages/Optimisation_basic/Makefile.settings b/Optimisation_basic/Makefile.settings
similarity index 100%
rename from Packages/Optimisation_basic/Makefile.settings
rename to Optimisation_basic/Makefile.settings
diff --git a/Packages/Optimisation_basic/changes.txt b/Optimisation_basic/changes.txt
similarity index 100%
rename from Packages/Optimisation_basic/changes.txt
rename to Optimisation_basic/changes.txt
diff --git a/Packages/Optimisation_basic/description.txt b/Optimisation_basic/description.txt
similarity index 100%
rename from Packages/Optimisation_basic/description.txt
rename to Optimisation_basic/description.txt
diff --git a/Packages/Optimisation_basic/doc_tex/Optimisation_ref/OptimisationDTraits.tex b/Optimisation_basic/doc_tex/Optimisation_ref/OptimisationDTraits.tex
similarity index 100%
rename from Packages/Optimisation_basic/doc_tex/Optimisation_ref/OptimisationDTraits.tex
rename to Optimisation_basic/doc_tex/Optimisation_ref/OptimisationDTraits.tex
diff --git a/Packages/Optimisation_basic/doc_tex/Optimisation_ref/Optimisation_d_traits_2.tex b/Optimisation_basic/doc_tex/Optimisation_ref/Optimisation_d_traits_2.tex
similarity index 100%
rename from Packages/Optimisation_basic/doc_tex/Optimisation_ref/Optimisation_d_traits_2.tex
rename to Optimisation_basic/doc_tex/Optimisation_ref/Optimisation_d_traits_2.tex
diff --git a/Packages/Optimisation_basic/doc_tex/Optimisation_ref/Optimisation_d_traits_3.tex b/Optimisation_basic/doc_tex/Optimisation_ref/Optimisation_d_traits_3.tex
similarity index 100%
rename from Packages/Optimisation_basic/doc_tex/Optimisation_ref/Optimisation_d_traits_3.tex
rename to Optimisation_basic/doc_tex/Optimisation_ref/Optimisation_d_traits_3.tex
diff --git a/Packages/Optimisation_basic/doc_tex/Optimisation_ref/Optimisation_d_traits_d.tex b/Optimisation_basic/doc_tex/Optimisation_ref/Optimisation_d_traits_d.tex
similarity index 100%
rename from Packages/Optimisation_basic/doc_tex/Optimisation_ref/Optimisation_d_traits_d.tex
rename to Optimisation_basic/doc_tex/Optimisation_ref/Optimisation_d_traits_d.tex
diff --git a/Packages/Optimisation_basic/doc_tex/Optimisation_ref/main_Optimisation_d_traits.tex b/Optimisation_basic/doc_tex/Optimisation_ref/main_Optimisation_d_traits.tex
similarity index 100%
rename from Packages/Optimisation_basic/doc_tex/Optimisation_ref/main_Optimisation_d_traits.tex
rename to Optimisation_basic/doc_tex/Optimisation_ref/main_Optimisation_d_traits.tex
diff --git a/Packages/Optimisation_basic/dont_submit b/Optimisation_basic/dont_submit
similarity index 100%
rename from Packages/Optimisation_basic/dont_submit
rename to Optimisation_basic/dont_submit
diff --git a/Packages/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_2.h b/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_2.h
similarity index 100%
rename from Packages/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_2.h
rename to Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_2.h
diff --git a/Packages/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_3.h b/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_3.h
similarity index 100%
rename from Packages/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_3.h
rename to Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_3.h
diff --git a/Packages/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_d.h b/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_d.h
similarity index 100%
rename from Packages/Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_d.h
rename to Optimisation_basic/include/CGAL/Optimisation/Access_coordinates_begin_d.h
diff --git a/Packages/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_2.h b/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_2.h
similarity index 100%
rename from Packages/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_2.h
rename to Optimisation_basic/include/CGAL/Optimisation/Access_dimension_2.h
diff --git a/Packages/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_3.h b/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_3.h
similarity index 100%
rename from Packages/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_3.h
rename to Optimisation_basic/include/CGAL/Optimisation/Access_dimension_3.h
diff --git a/Packages/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_d.h b/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_d.h
similarity index 100%
rename from Packages/Optimisation_basic/include/CGAL/Optimisation/Access_dimension_d.h
rename to Optimisation_basic/include/CGAL/Optimisation/Access_dimension_d.h
diff --git a/Packages/Optimisation_basic/include/CGAL/Optimisation/Construct_point_2.h b/Optimisation_basic/include/CGAL/Optimisation/Construct_point_2.h
similarity index 100%
rename from Packages/Optimisation_basic/include/CGAL/Optimisation/Construct_point_2.h
rename to Optimisation_basic/include/CGAL/Optimisation/Construct_point_2.h
diff --git a/Packages/Optimisation_basic/include/CGAL/Optimisation/Construct_point_3.h b/Optimisation_basic/include/CGAL/Optimisation/Construct_point_3.h
similarity index 100%
rename from Packages/Optimisation_basic/include/CGAL/Optimisation/Construct_point_3.h
rename to Optimisation_basic/include/CGAL/Optimisation/Construct_point_3.h
diff --git a/Packages/Optimisation_basic/include/CGAL/Optimisation/Construct_point_d.h b/Optimisation_basic/include/CGAL/Optimisation/Construct_point_d.h
similarity index 100%
rename from Packages/Optimisation_basic/include/CGAL/Optimisation/Construct_point_d.h
rename to Optimisation_basic/include/CGAL/Optimisation/Construct_point_d.h
diff --git a/Packages/Optimisation_basic/include/CGAL/Optimisation/assertions.h b/Optimisation_basic/include/CGAL/Optimisation/assertions.h
similarity index 100%
rename from Packages/Optimisation_basic/include/CGAL/Optimisation/assertions.h
rename to Optimisation_basic/include/CGAL/Optimisation/assertions.h
diff --git a/Packages/Optimisation_basic/include/CGAL/Optimisation/basic.h b/Optimisation_basic/include/CGAL/Optimisation/basic.h
similarity index 100%
rename from Packages/Optimisation_basic/include/CGAL/Optimisation/basic.h
rename to Optimisation_basic/include/CGAL/Optimisation/basic.h
diff --git a/Packages/Optimisation_basic/include/CGAL/Optimisation/debug.h b/Optimisation_basic/include/CGAL/Optimisation/debug.h
similarity index 100%
rename from Packages/Optimisation_basic/include/CGAL/Optimisation/debug.h
rename to Optimisation_basic/include/CGAL/Optimisation/debug.h
diff --git a/Packages/Optimisation_basic/include/CGAL/Optimisation_d_traits_2.h b/Optimisation_basic/include/CGAL/Optimisation_d_traits_2.h
similarity index 100%
rename from Packages/Optimisation_basic/include/CGAL/Optimisation_d_traits_2.h
rename to Optimisation_basic/include/CGAL/Optimisation_d_traits_2.h
diff --git a/Packages/Optimisation_basic/include/CGAL/Optimisation_d_traits_3.h b/Optimisation_basic/include/CGAL/Optimisation_d_traits_3.h
similarity index 100%
rename from Packages/Optimisation_basic/include/CGAL/Optimisation_d_traits_3.h
rename to Optimisation_basic/include/CGAL/Optimisation_d_traits_3.h
diff --git a/Packages/Optimisation_basic/include/CGAL/Optimisation_d_traits_d.h b/Optimisation_basic/include/CGAL/Optimisation_d_traits_d.h
similarity index 100%
rename from Packages/Optimisation_basic/include/CGAL/Optimisation_d_traits_d.h
rename to Optimisation_basic/include/CGAL/Optimisation_d_traits_d.h
diff --git a/Packages/Optimisation_basic/maintainer b/Optimisation_basic/maintainer
similarity index 100%
rename from Packages/Optimisation_basic/maintainer
rename to Optimisation_basic/maintainer
diff --git a/Packages/Optimisation_basic/package/additional_commands b/Optimisation_basic/package/additional_commands
similarity index 100%
rename from Packages/Optimisation_basic/package/additional_commands
rename to Optimisation_basic/package/additional_commands
diff --git a/Packages/Optimisation_basic/src/.cvsignore b/Optimisation_basic/src/.cvsignore
similarity index 100%
rename from Packages/Optimisation_basic/src/.cvsignore
rename to Optimisation_basic/src/.cvsignore
diff --git a/Packages/Optimisation_basic/web/Optimisation_basic.aw b/Optimisation_basic/web/Optimisation_basic.aw
similarity index 100%
rename from Packages/Optimisation_basic/web/Optimisation_basic.aw
rename to Optimisation_basic/web/Optimisation_basic.aw
diff --git a/Packages/Optimisation_basic/web/Optimisation_d_traits.aw b/Optimisation_basic/web/Optimisation_d_traits.aw
similarity index 100%
rename from Packages/Optimisation_basic/web/Optimisation_d_traits.aw
rename to Optimisation_basic/web/Optimisation_d_traits.aw
diff --git a/Packages/Optimisation_basic/web/share/file_header.awi b/Optimisation_basic/web/share/file_header.awi
similarity index 100%
rename from Packages/Optimisation_basic/web/share/file_header.awi
rename to Optimisation_basic/web/share/file_header.awi
diff --git a/Packages/Optimisation_basic/web/share/namespace.awi b/Optimisation_basic/web/share/namespace.awi
similarity index 100%
rename from Packages/Optimisation_basic/web/share/namespace.awi
rename to Optimisation_basic/web/share/namespace.awi