diff --git a/.gitattributes b/.gitattributes
index 4093a31302a..acf02f5e522 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -569,17 +569,17 @@ Linear_least_squares_fitting/demo/Linear_least_squares_fitting/windows/3d/res/id
 Linear_least_squares_fitting/demo/Linear_least_squares_fitting/windows/3d/res/idb7.bmp -text svneol=unset#unset
 Linear_least_squares_fitting/demo/Linear_least_squares_fitting/windows/3d/res/idb8.bmp -text svneol=unset#unset
 MacOSX/auxiliary/cgal_app.icns -text svneol=unset#unset
-Packages/Manual/doc_tex/Manual/fig/a-simp.eps -text
-Packages/Manual/doc_tex/Manual/fig/a-simp.pdf -text svneol=unset#unset
-Packages/Manual/doc_tex/Manual/fig/c-simp.eps -text
-Packages/Manual/doc_tex/Manual/fig/c-simp.pdf -text svneol=unset#unset
-Packages/Manual/doc_tex/Manual/fig/cgal_small_FAF8E8.gif -text svneol=unset#unset
-Packages/Manual/doc_tex/Manual/fig/g-simp.eps -text
-Packages/Manual/doc_tex/Manual/fig/g-simp.pdf -text svneol=unset#unset
-Packages/Manual/doc_tex/Manual/fig/l-simp.eps -text
-Packages/Manual/doc_tex/Manual/fig/l-simp.pdf -text svneol=unset#unset
-Packages/Manual/doc_tex/Miscellany/modifier.gif -text svneol=unset#unset
-Packages/Manual/doc_tex/Miscellany/modifier_small.gif -text svneol=unset#unset
+Manual/doc_tex/Manual/fig/a-simp.eps -text
+Manual/doc_tex/Manual/fig/a-simp.pdf -text svneol=unset#unset
+Manual/doc_tex/Manual/fig/c-simp.eps -text
+Manual/doc_tex/Manual/fig/c-simp.pdf -text svneol=unset#unset
+Manual/doc_tex/Manual/fig/cgal_small_FAF8E8.gif -text svneol=unset#unset
+Manual/doc_tex/Manual/fig/g-simp.eps -text
+Manual/doc_tex/Manual/fig/g-simp.pdf -text svneol=unset#unset
+Manual/doc_tex/Manual/fig/l-simp.eps -text
+Manual/doc_tex/Manual/fig/l-simp.pdf -text svneol=unset#unset
+Manual/doc_tex/Miscellany/modifier.gif -text svneol=unset#unset
+Manual/doc_tex/Miscellany/modifier_small.gif -text svneol=unset#unset
 Packages/Manual_tools/doc_tex/Manual_tools/horizontal_struct.eps -text
 Packages/Manual_tools/doc_tex/Manual_tools/horizontal_struct.gif -text svneol=unset#unset
 Packages/Manual_tools/doc_tex/Manual_tools/tools_index.eps -text
diff --git a/Packages/Manual/INSTALL b/Manual/INSTALL
similarity index 100%
rename from Packages/Manual/INSTALL
rename to Manual/INSTALL
diff --git a/Packages/Manual/README b/Manual/README
similarity index 100%
rename from Packages/Manual/README
rename to Manual/README
diff --git a/Packages/Manual/TO_DO b/Manual/TO_DO
similarity index 100%
rename from Packages/Manual/TO_DO
rename to Manual/TO_DO
diff --git a/Packages/Manual/changes.txt b/Manual/changes.txt
similarity index 100%
rename from Packages/Manual/changes.txt
rename to Manual/changes.txt
diff --git a/Packages/Manual/developer_scripts/bibmerge b/Manual/developer_scripts/bibmerge
similarity index 100%
rename from Packages/Manual/developer_scripts/bibmerge
rename to Manual/developer_scripts/bibmerge
diff --git a/Packages/Manual/developer_scripts/cgal_manual b/Manual/developer_scripts/cgal_manual
similarity index 100%
rename from Packages/Manual/developer_scripts/cgal_manual
rename to Manual/developer_scripts/cgal_manual
diff --git a/Packages/Manual/doc_tex/Introduction/advanced.tex b/Manual/doc_tex/Introduction/advanced.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Introduction/advanced.tex
rename to Manual/doc_tex/Introduction/advanced.tex
diff --git a/Packages/Manual/doc_tex/Introduction/checks.tex b/Manual/doc_tex/Introduction/checks.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Introduction/checks.tex
rename to Manual/doc_tex/Introduction/checks.tex
diff --git a/Packages/Manual/doc_tex/Introduction/common_intro.tex b/Manual/doc_tex/Introduction/common_intro.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Introduction/common_intro.tex
rename to Manual/doc_tex/Introduction/common_intro.tex
diff --git a/Packages/Manual/doc_tex/Introduction/main.tex b/Manual/doc_tex/Introduction/main.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Introduction/main.tex
rename to Manual/doc_tex/Introduction/main.tex
diff --git a/Packages/Manual/doc_tex/Introduction/namespace.tex b/Manual/doc_tex/Introduction/namespace.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Introduction/namespace.tex
rename to Manual/doc_tex/Introduction/namespace.tex
diff --git a/Packages/Manual/doc_tex/Introduction_ref/checks.tex b/Manual/doc_tex/Introduction_ref/checks.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Introduction_ref/checks.tex
rename to Manual/doc_tex/Introduction_ref/checks.tex
diff --git a/Packages/Manual/doc_tex/Introduction_ref/inlining.tex b/Manual/doc_tex/Introduction_ref/inlining.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Introduction_ref/inlining.tex
rename to Manual/doc_tex/Introduction_ref/inlining.tex
diff --git a/Packages/Manual/doc_tex/Introduction_ref/main.tex b/Manual/doc_tex/Introduction_ref/main.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Introduction_ref/main.tex
rename to Manual/doc_tex/Introduction_ref/main.tex
diff --git a/Packages/Manual/doc_tex/Introduction_ref/namespace_cgal.tex b/Manual/doc_tex/Introduction_ref/namespace_cgal.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Introduction_ref/namespace_cgal.tex
rename to Manual/doc_tex/Introduction_ref/namespace_cgal.tex
diff --git a/Packages/Manual/doc_tex/Manual/cgal_manual.bib b/Manual/doc_tex/Manual/cgal_manual.bib
similarity index 100%
rename from Packages/Manual/doc_tex/Manual/cgal_manual.bib
rename to Manual/doc_tex/Manual/cgal_manual.bib
diff --git a/Packages/Manual/doc_tex/Manual/cgal_manual.sty b/Manual/doc_tex/Manual/cgal_manual.sty
similarity index 100%
rename from Packages/Manual/doc_tex/Manual/cgal_manual.sty
rename to Manual/doc_tex/Manual/cgal_manual.sty
diff --git a/Packages/Manual/doc_tex/Manual/editors.tex b/Manual/doc_tex/Manual/editors.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Manual/editors.tex
rename to Manual/doc_tex/Manual/editors.tex
diff --git a/Packages/Manual/doc_tex/Manual/fig/a-simp.eps b/Manual/doc_tex/Manual/fig/a-simp.eps
similarity index 100%
rename from Packages/Manual/doc_tex/Manual/fig/a-simp.eps
rename to Manual/doc_tex/Manual/fig/a-simp.eps
diff --git a/Packages/Manual/doc_tex/Manual/fig/a-simp.pdf b/Manual/doc_tex/Manual/fig/a-simp.pdf
similarity index 100%
rename from Packages/Manual/doc_tex/Manual/fig/a-simp.pdf
rename to Manual/doc_tex/Manual/fig/a-simp.pdf
diff --git a/Packages/Manual/doc_tex/Manual/fig/c-simp.eps b/Manual/doc_tex/Manual/fig/c-simp.eps
similarity index 100%
rename from Packages/Manual/doc_tex/Manual/fig/c-simp.eps
rename to Manual/doc_tex/Manual/fig/c-simp.eps
diff --git a/Packages/Manual/doc_tex/Manual/fig/c-simp.pdf b/Manual/doc_tex/Manual/fig/c-simp.pdf
similarity index 100%
rename from Packages/Manual/doc_tex/Manual/fig/c-simp.pdf
rename to Manual/doc_tex/Manual/fig/c-simp.pdf
diff --git a/Packages/Manual/doc_tex/Manual/fig/cgal_small_FAF8E8.gif b/Manual/doc_tex/Manual/fig/cgal_small_FAF8E8.gif
similarity index 100%
rename from Packages/Manual/doc_tex/Manual/fig/cgal_small_FAF8E8.gif
rename to Manual/doc_tex/Manual/fig/cgal_small_FAF8E8.gif
diff --git a/Packages/Manual/doc_tex/Manual/fig/g-simp.eps b/Manual/doc_tex/Manual/fig/g-simp.eps
similarity index 100%
rename from Packages/Manual/doc_tex/Manual/fig/g-simp.eps
rename to Manual/doc_tex/Manual/fig/g-simp.eps
diff --git a/Packages/Manual/doc_tex/Manual/fig/g-simp.pdf b/Manual/doc_tex/Manual/fig/g-simp.pdf
similarity index 100%
rename from Packages/Manual/doc_tex/Manual/fig/g-simp.pdf
rename to Manual/doc_tex/Manual/fig/g-simp.pdf
diff --git a/Packages/Manual/doc_tex/Manual/fig/l-simp.eps b/Manual/doc_tex/Manual/fig/l-simp.eps
similarity index 100%
rename from Packages/Manual/doc_tex/Manual/fig/l-simp.eps
rename to Manual/doc_tex/Manual/fig/l-simp.eps
diff --git a/Packages/Manual/doc_tex/Manual/fig/l-simp.pdf b/Manual/doc_tex/Manual/fig/l-simp.pdf
similarity index 100%
rename from Packages/Manual/doc_tex/Manual/fig/l-simp.pdf
rename to Manual/doc_tex/Manual/fig/l-simp.pdf
diff --git a/Packages/Manual/doc_tex/Manual/geom.bib b/Manual/doc_tex/Manual/geom.bib
similarity index 100%
rename from Packages/Manual/doc_tex/Manual/geom.bib
rename to Manual/doc_tex/Manual/geom.bib
diff --git a/Packages/Manual/doc_tex/Miscellany/main.tex b/Manual/doc_tex/Miscellany/main.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Miscellany/main.tex
rename to Manual/doc_tex/Miscellany/main.tex
diff --git a/Packages/Manual/doc_tex/Miscellany/modifier.gif b/Manual/doc_tex/Miscellany/modifier.gif
similarity index 100%
rename from Packages/Manual/doc_tex/Miscellany/modifier.gif
rename to Manual/doc_tex/Miscellany/modifier.gif
diff --git a/Packages/Manual/doc_tex/Miscellany/modifier_small.gif b/Manual/doc_tex/Miscellany/modifier_small.gif
similarity index 100%
rename from Packages/Manual/doc_tex/Miscellany/modifier_small.gif
rename to Manual/doc_tex/Miscellany/modifier_small.gif
diff --git a/Packages/Manual/doc_tex/Miscellany_ref/intro.tex b/Manual/doc_tex/Miscellany_ref/intro.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Miscellany_ref/intro.tex
rename to Manual/doc_tex/Miscellany_ref/intro.tex
diff --git a/Packages/Manual/doc_tex/Miscellany_ref/main.tex b/Manual/doc_tex/Miscellany_ref/main.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Miscellany_ref/main.tex
rename to Manual/doc_tex/Miscellany_ref/main.tex
diff --git a/Packages/Manual/doc_tex/Use_of_Stl/Algorithm.tex b/Manual/doc_tex/Use_of_Stl/Algorithm.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Use_of_Stl/Algorithm.tex
rename to Manual/doc_tex/Use_of_Stl/Algorithm.tex
diff --git a/Packages/Manual/doc_tex/Use_of_Stl/AssociativeContainer.tex b/Manual/doc_tex/Use_of_Stl/AssociativeContainer.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Use_of_Stl/AssociativeContainer.tex
rename to Manual/doc_tex/Use_of_Stl/AssociativeContainer.tex
diff --git a/Packages/Manual/doc_tex/Use_of_Stl/Circulator_stl.tex b/Manual/doc_tex/Use_of_Stl/Circulator_stl.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Use_of_Stl/Circulator_stl.tex
rename to Manual/doc_tex/Use_of_Stl/Circulator_stl.tex
diff --git a/Packages/Manual/doc_tex/Use_of_Stl/FunctionObject.tex b/Manual/doc_tex/Use_of_Stl/FunctionObject.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Use_of_Stl/FunctionObject.tex
rename to Manual/doc_tex/Use_of_Stl/FunctionObject.tex
diff --git a/Packages/Manual/doc_tex/Use_of_Stl/Iterator.tex b/Manual/doc_tex/Use_of_Stl/Iterator.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Use_of_Stl/Iterator.tex
rename to Manual/doc_tex/Use_of_Stl/Iterator.tex
diff --git a/Packages/Manual/doc_tex/Use_of_Stl/Preliminaries.tex b/Manual/doc_tex/Use_of_Stl/Preliminaries.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Use_of_Stl/Preliminaries.tex
rename to Manual/doc_tex/Use_of_Stl/Preliminaries.tex
diff --git a/Packages/Manual/doc_tex/Use_of_Stl/SequenceContainer.tex b/Manual/doc_tex/Use_of_Stl/SequenceContainer.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Use_of_Stl/SequenceContainer.tex
rename to Manual/doc_tex/Use_of_Stl/SequenceContainer.tex
diff --git a/Packages/Manual/doc_tex/Use_of_Stl/circulator_prog1.C b/Manual/doc_tex/Use_of_Stl/circulator_prog1.C
similarity index 100%
rename from Packages/Manual/doc_tex/Use_of_Stl/circulator_prog1.C
rename to Manual/doc_tex/Use_of_Stl/circulator_prog1.C
diff --git a/Packages/Manual/doc_tex/Use_of_Stl/circulator_prog2.C b/Manual/doc_tex/Use_of_Stl/circulator_prog2.C
similarity index 100%
rename from Packages/Manual/doc_tex/Use_of_Stl/circulator_prog2.C
rename to Manual/doc_tex/Use_of_Stl/circulator_prog2.C
diff --git a/Packages/Manual/doc_tex/Use_of_Stl/deque.tex b/Manual/doc_tex/Use_of_Stl/deque.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Use_of_Stl/deque.tex
rename to Manual/doc_tex/Use_of_Stl/deque.tex
diff --git a/Packages/Manual/doc_tex/Use_of_Stl/introduction.tex b/Manual/doc_tex/Use_of_Stl/introduction.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Use_of_Stl/introduction.tex
rename to Manual/doc_tex/Use_of_Stl/introduction.tex
diff --git a/Packages/Manual/doc_tex/Use_of_Stl/list.tex b/Manual/doc_tex/Use_of_Stl/list.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Use_of_Stl/list.tex
rename to Manual/doc_tex/Use_of_Stl/list.tex
diff --git a/Packages/Manual/doc_tex/Use_of_Stl/main.tex b/Manual/doc_tex/Use_of_Stl/main.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Use_of_Stl/main.tex
rename to Manual/doc_tex/Use_of_Stl/main.tex
diff --git a/Packages/Manual/doc_tex/Use_of_Stl/map.tex b/Manual/doc_tex/Use_of_Stl/map.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Use_of_Stl/map.tex
rename to Manual/doc_tex/Use_of_Stl/map.tex
diff --git a/Packages/Manual/doc_tex/Use_of_Stl/multimap.tex b/Manual/doc_tex/Use_of_Stl/multimap.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Use_of_Stl/multimap.tex
rename to Manual/doc_tex/Use_of_Stl/multimap.tex
diff --git a/Packages/Manual/doc_tex/Use_of_Stl/multiset.tex b/Manual/doc_tex/Use_of_Stl/multiset.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Use_of_Stl/multiset.tex
rename to Manual/doc_tex/Use_of_Stl/multiset.tex
diff --git a/Packages/Manual/doc_tex/Use_of_Stl/preface.tex b/Manual/doc_tex/Use_of_Stl/preface.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Use_of_Stl/preface.tex
rename to Manual/doc_tex/Use_of_Stl/preface.tex
diff --git a/Packages/Manual/doc_tex/Use_of_Stl/set.tex b/Manual/doc_tex/Use_of_Stl/set.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Use_of_Stl/set.tex
rename to Manual/doc_tex/Use_of_Stl/set.tex
diff --git a/Packages/Manual/doc_tex/Use_of_Stl/vector.tex b/Manual/doc_tex/Use_of_Stl/vector.tex
similarity index 100%
rename from Packages/Manual/doc_tex/Use_of_Stl/vector.tex
rename to Manual/doc_tex/Use_of_Stl/vector.tex
diff --git a/Packages/Manual/doc_tex/cgal_manual.tex b/Manual/doc_tex/cgal_manual.tex
similarity index 100%
rename from Packages/Manual/doc_tex/cgal_manual.tex
rename to Manual/doc_tex/cgal_manual.tex
diff --git a/Packages/Manual/doc_tex/cgal_manual__Triangulation.only.tex b/Manual/doc_tex/cgal_manual__Triangulation.only.tex
similarity index 100%
rename from Packages/Manual/doc_tex/cgal_manual__Triangulation.only.tex
rename to Manual/doc_tex/cgal_manual__Triangulation.only.tex
diff --git a/Packages/Manual/doc_tex/core_manual.tex b/Manual/doc_tex/core_manual.tex
similarity index 100%
rename from Packages/Manual/doc_tex/core_manual.tex
rename to Manual/doc_tex/core_manual.tex
diff --git a/Packages/Manual/doc_tex/foundations_manual.tex b/Manual/doc_tex/foundations_manual.tex
similarity index 100%
rename from Packages/Manual/doc_tex/foundations_manual.tex
rename to Manual/doc_tex/foundations_manual.tex
diff --git a/Packages/Manual/doc_tex/ipe.sty b/Manual/doc_tex/ipe.sty
similarity index 100%
rename from Packages/Manual/doc_tex/ipe.sty
rename to Manual/doc_tex/ipe.sty
diff --git a/Packages/Manual/doc_tex/use_of_stl_manual.tex b/Manual/doc_tex/use_of_stl_manual.tex
similarity index 100%
rename from Packages/Manual/doc_tex/use_of_stl_manual.tex
rename to Manual/doc_tex/use_of_stl_manual.tex
diff --git a/Packages/Manual/dont_submit b/Manual/dont_submit
similarity index 100%
rename from Packages/Manual/dont_submit
rename to Manual/dont_submit