diff --git a/.gitignore b/.gitignore
index bd5ba0a536b..c6ff87fc841 100644
--- a/.gitignore
+++ b/.gitignore
@@ -190,22 +190,6 @@ Optimisation_doc/.tmp
 Optimisation_doc/Makefile
 Optimisation_doc/bin
 Optimisation_doc/doc_ps
-Packages/Polytope_distance_d/*.aux
-Packages/Polytope_distance_d/*.bbl
-Packages/Polytope_distance_d/*.blg
-Packages/Polytope_distance_d/*.dvi
-Packages/Polytope_distance_d/*.idx
-Packages/Polytope_distance_d/*.ilg
-Packages/Polytope_distance_d/*.ind
-Packages/Polytope_distance_d/*.log
-Packages/Polytope_distance_d/*.mxp
-Packages/Polytope_distance_d/*.toc
-Packages/Polytope_distance_d/.dep
-Packages/Polytope_distance_d/.obj
-Packages/Polytope_distance_d/.tmp
-Packages/Polytope_distance_d/Makefile
-Packages/Polytope_distance_d/bin
-Packages/Polytope_distance_d/doc_ps
 Packages/Qt_widget/.env
 Packages/Qt_widget/demo/Qt_widget/Examples/*.moc
 Packages/Qt_widget/demo/Qt_widget/Examples/hellosegment
@@ -357,3 +341,19 @@ Parameterization/test/Parameterization/ProgramOutput.*
 Parameterization/test/Parameterization/Release
 Parameterization/test/Parameterization/error.txt
 Parameterization/test/Parameterization/extensive_parameterization_test
+Polytope_distance_d/*.aux
+Polytope_distance_d/*.bbl
+Polytope_distance_d/*.blg
+Polytope_distance_d/*.dvi
+Polytope_distance_d/*.idx
+Polytope_distance_d/*.ilg
+Polytope_distance_d/*.ind
+Polytope_distance_d/*.log
+Polytope_distance_d/*.mxp
+Polytope_distance_d/*.toc
+Polytope_distance_d/.dep
+Polytope_distance_d/.obj
+Polytope_distance_d/.tmp
+Polytope_distance_d/Makefile
+Polytope_distance_d/bin
+Polytope_distance_d/doc_ps
diff --git a/Packages/Polytope_distance_d/.cvsignore b/Polytope_distance_d/.cvsignore
similarity index 100%
rename from Packages/Polytope_distance_d/.cvsignore
rename to Polytope_distance_d/.cvsignore
diff --git a/Packages/Polytope_distance_d/Makefile.settings b/Polytope_distance_d/Makefile.settings
similarity index 100%
rename from Packages/Polytope_distance_d/Makefile.settings
rename to Polytope_distance_d/Makefile.settings
diff --git a/Packages/Polytope_distance_d/changes.txt b/Polytope_distance_d/changes.txt
similarity index 100%
rename from Packages/Polytope_distance_d/changes.txt
rename to Polytope_distance_d/changes.txt
diff --git a/Packages/Polytope_distance_d/description.txt b/Polytope_distance_d/description.txt
similarity index 100%
rename from Packages/Polytope_distance_d/description.txt
rename to Polytope_distance_d/description.txt
diff --git a/Packages/Polytope_distance_d/doc_tex/Optimisation_ref/Polytope_distance_d.tex b/Polytope_distance_d/doc_tex/Optimisation_ref/Polytope_distance_d.tex
similarity index 100%
rename from Packages/Polytope_distance_d/doc_tex/Optimisation_ref/Polytope_distance_d.tex
rename to Polytope_distance_d/doc_tex/Optimisation_ref/Polytope_distance_d.tex
diff --git a/Packages/Polytope_distance_d/doc_tex/Optimisation_ref/main_Polytope_distance_d.tex b/Polytope_distance_d/doc_tex/Optimisation_ref/main_Polytope_distance_d.tex
similarity index 100%
rename from Packages/Polytope_distance_d/doc_tex/Optimisation_ref/main_Polytope_distance_d.tex
rename to Polytope_distance_d/doc_tex/Optimisation_ref/main_Polytope_distance_d.tex
diff --git a/Packages/Polytope_distance_d/dont_submit b/Polytope_distance_d/dont_submit
similarity index 100%
rename from Packages/Polytope_distance_d/dont_submit
rename to Polytope_distance_d/dont_submit
diff --git a/Packages/Polytope_distance_d/include/CGAL/Polytope_distance_d.h b/Polytope_distance_d/include/CGAL/Polytope_distance_d.h
similarity index 100%
rename from Packages/Polytope_distance_d/include/CGAL/Polytope_distance_d.h
rename to Polytope_distance_d/include/CGAL/Polytope_distance_d.h
diff --git a/Packages/Polytope_distance_d/maintainer b/Polytope_distance_d/maintainer
similarity index 100%
rename from Packages/Polytope_distance_d/maintainer
rename to Polytope_distance_d/maintainer
diff --git a/Packages/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d.h b/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d.h
similarity index 100%
rename from Packages/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d.h
rename to Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d.h
diff --git a/Packages/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_2.C b/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_2.C
similarity index 100%
rename from Packages/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_2.C
rename to Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_2.C
diff --git a/Packages/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_2.cmd b/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_2.cmd
similarity index 100%
rename from Packages/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_2.cmd
rename to Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_2.cmd
diff --git a/Packages/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_3.C b/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_3.C
similarity index 100%
rename from Packages/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_3.C
rename to Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_3.C
diff --git a/Packages/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_3.cmd b/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_3.cmd
similarity index 100%
rename from Packages/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_3.cmd
rename to Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_3.cmd
diff --git a/Packages/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_d.C b/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_d.C
similarity index 100%
rename from Packages/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_d.C
rename to Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_d.C
diff --git a/Packages/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_d.cmd b/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_d.cmd
similarity index 100%
rename from Packages/Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_d.cmd
rename to Polytope_distance_d/test/Polytope_distance_d/test_Polytope_distance_d_d.cmd
diff --git a/Packages/Polytope_distance_d/web/Polytope_distance_d.aw b/Polytope_distance_d/web/Polytope_distance_d.aw
similarity index 100%
rename from Packages/Polytope_distance_d/web/Polytope_distance_d.aw
rename to Polytope_distance_d/web/Polytope_distance_d.aw