diff --git a/Alpha_shapes_2/doc_tex/Alpha_shapes_2/PkgDescription.tex b/Alpha_shapes_2/doc_tex/Alpha_shapes_2/PkgDescription.tex
index 48f3c1a9152..2e4156075c2 100644
--- a/Alpha_shapes_2/doc_tex/Alpha_shapes_2/PkgDescription.tex
+++ b/Alpha_shapes_2/doc_tex/Alpha_shapes_2/PkgDescription.tex
@@ -11,6 +11,6 @@ alpha value for which each face is included on the alpha-complex).}
\ccPkgDependsOn{\ccRef[2D Triangulation]{Pkg:Triangulation2}}
\ccPkgIntroducedInCGAL{2.1}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{2D Alpha Shapes}{demo/alpha_shapes_2.zip}
+\ccPkgDemo{2D Alpha Shapes}{alpha_shapes_2.zip}
\ccPkgIllustration{Alpha_shapes_2/alpha-detail.png}{Alpha_shapes_2/alphashape.png}
\end{ccPkgDescription}
diff --git a/Alpha_shapes_3/doc_tex/Alpha_shapes_3/PkgDescription.tex b/Alpha_shapes_3/doc_tex/Alpha_shapes_3/PkgDescription.tex
index 90591ec7cb3..ed07cb64d0e 100644
--- a/Alpha_shapes_3/doc_tex/Alpha_shapes_3/PkgDescription.tex
+++ b/Alpha_shapes_3/doc_tex/Alpha_shapes_3/PkgDescription.tex
@@ -10,6 +10,6 @@ alpha value for which each face is included on the alpha-complex).}
\ccPkgDependsOn{\ccRef[2D Triangulation]{Pkg:Triangulation3}}
\ccPkgIntroducedInCGAL{2.3}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{3D Alpha Shapes}{demo/alpha_shape_3.zip}
+\ccPkgDemo{3D Alpha Shapes}{alpha_shape_3.zip}
\ccPkgIllustration{Alpha_shapes_3/alpha_shapes_3_small.png}{Alpha_shapes_3/alpha_shapes_3_large.png}
\end{ccPkgDescription}
diff --git a/Apollonius_graph_2/doc_tex/Apollonius_graph_2/PkgDescription.tex b/Apollonius_graph_2/doc_tex/Apollonius_graph_2/PkgDescription.tex
index 0722fa682eb..e1bf450f71f 100644
--- a/Apollonius_graph_2/doc_tex/Apollonius_graph_2/PkgDescription.tex
+++ b/Apollonius_graph_2/doc_tex/Apollonius_graph_2/PkgDescription.tex
@@ -13,6 +13,6 @@
\ccPkgDependsOn{\ccRef[2D Triangulation Data Structure]{Pkg:TDS2}}
\ccPkgIntroducedInCGAL{3.0}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{2D Apollonius Graph}{demo/apollonius_graph_2.zip}
+\ccPkgDemo{2D Apollonius Graph}{apollonius_graph_2.zip}
\ccPkgIllustration{Apollonius_graph_2/fig/CircleVoronoi.png}{Apollonius_graph_2/fig/CircleVoronoiLarge.png}
\end{ccPkgDescription}
diff --git a/Boolean_set_operations_2/doc_tex/Boolean_set_operations_2/PkgDescription.tex b/Boolean_set_operations_2/doc_tex/Boolean_set_operations_2/PkgDescription.tex
index d065ceea942..e94fbd2fa42 100644
--- a/Boolean_set_operations_2/doc_tex/Boolean_set_operations_2/PkgDescription.tex
+++ b/Boolean_set_operations_2/doc_tex/Boolean_set_operations_2/PkgDescription.tex
@@ -11,6 +11,6 @@ set-operations, intersection predicates, and point containment predicates.}
\ccPkgDependsOn{\ccRef[2D Arrangements]{Pkg:Arrangement2}}
\ccPkgIntroducedInCGAL{3.2}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{Boolean operations}{demo/boolean_operations_2.zip}
+\ccPkgDemo{Boolean operations}{boolean_operations_2.zip}
\ccPkgIllustration{Boolean_set_operations_2/fig/Boolean_set_operations_2.png}{Boolean_set_operations_2/fig/Boolean_set_operations_2.png}
\end{ccPkgDescription}
diff --git a/Box_intersection_d/doc_tex/Box_intersection_d/PkgDescription.tex b/Box_intersection_d/doc_tex/Box_intersection_d/PkgDescription.tex
index 210d9130532..90ad9a447d5 100644
--- a/Box_intersection_d/doc_tex/Box_intersection_d/PkgDescription.tex
+++ b/Box_intersection_d/doc_tex/Box_intersection_d/PkgDescription.tex
@@ -12,6 +12,6 @@ tests of surfaces etc.
%\ccPkgDependsOn{}
\ccPkgIntroducedInCGAL{3.1}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{Operations on Polyhedra}{demo/polyhedron_3.zip}
+\ccPkgDemo{Operations on Polyhedra}{polyhedron_3.zip}
\ccPkgIllustration{Box_intersection_d/fig/box_inters-small.gif}{Box_intersection_d/fig/box_inters.gif}
\end{ccPkgDescription}
diff --git a/Circular_kernel_2/doc_tex/Circular_kernel_2/PkgDescription.tex b/Circular_kernel_2/doc_tex/Circular_kernel_2/PkgDescription.tex
index eb7905a4777..95c3f80fb5b 100644
--- a/Circular_kernel_2/doc_tex/Circular_kernel_2/PkgDescription.tex
+++ b/Circular_kernel_2/doc_tex/Circular_kernel_2/PkgDescription.tex
@@ -8,6 +8,6 @@ plane.
\ccPkgIntroducedInCGAL{3.2}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{Arrangement of Circular Arcs}{demo/circular_kernel.zip}
+\ccPkgDemo{Arrangement of Circular Arcs}{circular_kernel.zip}
\ccPkgIllustration{Circular_kernel_2/fig/Boolean_operation_detail.png}{Circular_kernel_2/fig/Boolean_operation.png}
\end{ccPkgDescription}
diff --git a/Convex_hull_2/doc_tex/Convex_hull_2/PkgDescription.tex b/Convex_hull_2/doc_tex/Convex_hull_2/PkgDescription.tex
index 2cf94083d57..5784d6f1846 100644
--- a/Convex_hull_2/doc_tex/Convex_hull_2/PkgDescription.tex
+++ b/Convex_hull_2/doc_tex/Convex_hull_2/PkgDescription.tex
@@ -11,6 +11,6 @@ hull of a set of points.}
%\ccPkgDependsOn{\ccRefPkg:Triangulation2}
\ccPkgIntroducedInCGAL{1.0}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{2D Convex Hull}{demo/convex_hull_2.zip}
+\ccPkgDemo{2D Convex Hull}{convex_hull_2.zip}
\ccPkgIllustration{Convex_hull_2/convex_hull.png}{Convex_hull_2/convex_hull.png}
\end{ccPkgDescription}
diff --git a/Convex_hull_3/doc_tex/Convex_hull_3/PkgDescription.tex b/Convex_hull_3/doc_tex/Convex_hull_3/PkgDescription.tex
index 912a5fbdc0b..f6a64508df3 100644
--- a/Convex_hull_3/doc_tex/Convex_hull_3/PkgDescription.tex
+++ b/Convex_hull_3/doc_tex/Convex_hull_3/PkgDescription.tex
@@ -13,6 +13,6 @@ dynamic computation.}
The dynamic algorithms depend on \ccRef[3D Triangulations]{Pkg:Triangulation3}}
\ccPkgIntroducedInCGAL{1.1}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{See Polyhedral Surface}{demo/polyhedron_3.zip}
+\ccPkgDemo{See Polyhedral Surface}{polyhedron_3.zip}
\ccPkgIllustration{Convex_hull_3/bunny.png}{Convex_hull_3/bunny.png}
\end{ccPkgDescription}
diff --git a/Envelope_3/doc_tex/Envelope_3/PkgDescription.tex b/Envelope_3/doc_tex/Envelope_3/PkgDescription.tex
index 20b68ea493a..a0ff73e4a2b 100644
--- a/Envelope_3/doc_tex/Envelope_3/PkgDescription.tex
+++ b/Envelope_3/doc_tex/Envelope_3/PkgDescription.tex
@@ -10,6 +10,6 @@ each diagram cell is unique.}
\ccPkgDependsOn{\ccRef[2D Arrangements]{Pkg:Arrangement2}}
\ccPkgIntroducedInCGAL{3.3}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{3D Envelopes}{demo/envelope_3.zip}
+\ccPkgDemo{3D Envelopes}{envelope_3.zip}
\ccPkgIllustration{Envelope_3/fig/Envelope_3.png}{Envelope_3/fig/Envelope_3.png}
\end{ccPkgDescription}
diff --git a/Jet_fitting_3/doc_tex/Jet_fitting_3/PkgDescription.tex b/Jet_fitting_3/doc_tex/Jet_fitting_3/PkgDescription.tex
index b48f928a00e..7782d904209 100644
--- a/Jet_fitting_3/doc_tex/Jet_fitting_3/PkgDescription.tex
+++ b/Jet_fitting_3/doc_tex/Jet_fitting_3/PkgDescription.tex
@@ -13,7 +13,7 @@
\ccPkgDependsOn{Solvers as \ccThirdPartyLapack\ and \ccThirdPartyBlas.}
\ccPkgIntroducedInCGAL{3.3}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{Operations on Polyhedra}{demo/polyhedron_3.zip}
+\ccPkgDemo{Operations on Polyhedra}{polyhedron_3.zip}
\ccPkgIllustration{Jet_fitting_3/DavidDetail.png}{Jet_fitting_3/david-dirmaxkmin-white-back.jpg}
\end{ccPkgDescription}
diff --git a/Kernel_23/doc_tex/Kernel_23/PkgDescription.tex b/Kernel_23/doc_tex/Kernel_23/PkgDescription.tex
index 6e638e8fec3..569f4ef5bcd 100644
--- a/Kernel_23/doc_tex/Kernel_23/PkgDescription.tex
+++ b/Kernel_23/doc_tex/Kernel_23/PkgDescription.tex
@@ -9,6 +9,6 @@ mainly differ in the way they handle robustness issues.}
%\ccPkgDependsOn{}
\ccPkgIntroducedInCGAL{0.9}
\ccPkgLicense{\ccLicenseLGPL}
-\ccPkgDemo{Robustness}{demo/robustness.zip}
+\ccPkgDemo{Robustness}{robustness.zip}
\ccPkgIllustration{Kernel_23/fig/pointSegmentTriangle.png}{Kernel_23/fig/pointSegmentTriangle.png}
\end{ccPkgDescription}
diff --git a/Manual/doc_tex/Preliminaries/PkgDescription.tex b/Manual/doc_tex/Preliminaries/PkgDescription.tex
index 0d328039c4d..70303cd7fd1 100755
--- a/Manual/doc_tex/Preliminaries/PkgDescription.tex
+++ b/Manual/doc_tex/Preliminaries/PkgDescription.tex
@@ -16,6 +16,6 @@ also need the {\em Microsoft Visual C++ 2005 SP1 Redistributable Package (x86)}.
\ccPkgIntroducedInCGAL{1.0}
-\ccPkgDemo{dlls used by all demos}{demo/CGAL-3.4-demoDLLs.zip}
+\ccPkgDemo{dlls used by all demos}{CGAL-3.4-demoDLLs.zip}
\ccPkgIllustration{Preliminaries/illustration.jpg}{Preliminaries/illustration.jpg}
\end{ccPkgDescription}
diff --git a/Manual_tools/src/latex_converter_config/html/cc_manual.sty b/Manual_tools/src/latex_converter_config/html/cc_manual.sty
index 5393107d1af..c4a60e1bcf3 100644
--- a/Manual_tools/src/latex_converter_config/html/cc_manual.sty
+++ b/Manual_tools/src/latex_converter_config/html/cc_manual.sty
@@ -1,3 +1,4 @@
+
% ___________________________________________________________________________
% |#########################################################################|
% | |
@@ -1071,7 +1072,7 @@
%\newcommand{\ccPkgDemo}[2]{\lciPushGlobalStack{\ccValueofPkgDemo}{#1}}
\newcommand{\ccPkgDemo}[2]{\ccPkgDemoX{#1}{#2}{\ccValueofPkgDemo}}
\newcommand{\ccPkgDemoX}[3]{\gdef\ccValueofPkgDemo{%
-#Y3\lcRawHtml{Demo: }#1\lcRawHtml{
}}%
+#Y3\lcRawHtml{Demo: }#1\lcRawHtml{
}}%
}
\newenvironment{ccPkgDescription}{\ccPkgDescriptionX}{\end{savestream}}
diff --git a/Mesh_2/doc_tex/Mesh_2/PkgDescription.tex b/Mesh_2/doc_tex/Mesh_2/PkgDescription.tex
index cfd251366aa..eabe3f35cbb 100644
--- a/Mesh_2/doc_tex/Mesh_2/PkgDescription.tex
+++ b/Mesh_2/doc_tex/Mesh_2/PkgDescription.tex
@@ -20,6 +20,6 @@ and set no restriction on the angle formed
\ccPkgDependsOn{\ccRef[2D Delaunay Triangulation]{Pkg:Triangulation2}}
\ccPkgIntroducedInCGAL{3.1}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{2D Mesh Generator}{demo/constrained_delaunay_2.zip}
+\ccPkgDemo{2D Mesh Generator}{constrained_delaunay_2.zip}
\ccPkgIllustration{Mesh_2/delaunaymesh-small.png}{Mesh_2/delaunaymesh-teaser.png}
\end{ccPkgDescription}
diff --git a/Nef_2/doc_tex/Nef_2/PkgDescription.tex b/Nef_2/doc_tex/Nef_2/PkgDescription.tex
index 39dfa491b1a..ef8c199647d 100644
--- a/Nef_2/doc_tex/Nef_2/PkgDescription.tex
+++ b/Nef_2/doc_tex/Nef_2/PkgDescription.tex
@@ -14,6 +14,6 @@ domain of Nef polygons interior, boundary, and closure.}
%\ccPkgDependsOn{}
\ccPkgIntroducedInCGAL{2.3}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{2D Nef Polygons}{demo/nef_2.zip}
+\ccPkgDemo{2D Nef Polygons}{nef_2.zip}
\ccPkgIllustration{Nef_2/complex-teaser.png}{Nef_2/complex-teaser.png}
\end{ccPkgDescription}
diff --git a/Nef_3/doc_tex/Nef_3/PkgDescription.tex b/Nef_3/doc_tex/Nef_3/PkgDescription.tex
index df461aa6b05..a7a85739e38 100644
--- a/Nef_3/doc_tex/Nef_3/PkgDescription.tex
+++ b/Nef_3/doc_tex/Nef_3/PkgDescription.tex
@@ -12,6 +12,6 @@ open and closed sets and can represent non-manifold geometry.}
\ccPkgDependsOn{\ccRef[2D Nef Polygons]{Pkg:Nef2}, \ccRef[Nef Polygons on the Sphere]{Pkg:NefS2} }
\ccPkgIntroducedInCGAL{3.1}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{Operations on Polyhedra}{demo/polyhedron_3.zip}
+\ccPkgDemo{Operations on Polyhedra}{polyhedron_3.zip}
\ccPkgIllustration{Nef_3/fig/teaser.png}{Nef_3/fig/teaser.png}
\end{ccPkgDescription}
diff --git a/Optimisation_doc/doc_tex/Bounding_volumes/PkgDescription.tex b/Optimisation_doc/doc_tex/Bounding_volumes/PkgDescription.tex
index ac714ee5451..a6ec0f4eaf2 100644
--- a/Optimisation_doc/doc_tex/Bounding_volumes/PkgDescription.tex
+++ b/Optimisation_doc/doc_tex/Bounding_volumes/PkgDescription.tex
@@ -15,9 +15,9 @@
%\ccPkgDependsOn{}
\ccPkgIntroducedInCGAL{1.1}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{Smallest Enclosing Circle}{demo/min_circle_2.zip}
-\ccPkgDemo{Smallest Enclosing Ellipse}{demo/min_elipse_2.zip}
-\ccPkgDemo{Smallest Enclosing Quadrilateral}{demo/min_quadrilateral_2.zip}
-\ccPkgDemo{2D Rectangular p-center}{demo/rectangular_p_center_2.zip}
+\ccPkgDemo{Smallest Enclosing Circle}{min_circle_2.zip}
+\ccPkgDemo{Smallest Enclosing Ellipse}{min_elipse_2.zip}
+\ccPkgDemo{Smallest Enclosing Quadrilateral}{min_quadrilateral_2.zip}
+\ccPkgDemo{2D Rectangular p-center}{rectangular_p_center_2.zip}
\ccPkgIllustration{Bounding_volumes/minCircle.png}{Bounding_volumes/minCircle.png}
\end{ccPkgDescription}
diff --git a/Optimisation_doc/doc_tex/Inscribed_areas/PkgDescription.tex b/Optimisation_doc/doc_tex/Inscribed_areas/PkgDescription.tex
index 2afb3dd1503..d7127c8a847 100644
--- a/Optimisation_doc/doc_tex/Inscribed_areas/PkgDescription.tex
+++ b/Optimisation_doc/doc_tex/Inscribed_areas/PkgDescription.tex
@@ -10,7 +10,7 @@ iso-rectangle.}
%\ccPkgDependsOn{}
\ccPkgIntroducedInCGAL{1.1}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{2D Inscribed k-gon}{demo/max_k-gon.zip}
-\ccPkgDemo{2D Largest Empty Rectangle}{demo/largest_empty_rect_2.zip}
+\ccPkgDemo{2D Inscribed k-gon}{max_k-gon.zip}
+\ccPkgDemo{2D Largest Empty Rectangle}{largest_empty_rect_2.zip}
\ccPkgIllustration{Inscribed_areas_ref/ler-detail.png}{Inscribed_areas_ref/ler.png}
\end{ccPkgDescription}
diff --git a/Partition_2/doc_tex/Partition_2/PkgDescription.tex b/Partition_2/doc_tex/Partition_2/PkgDescription.tex
index 54de2c678f0..85ed98212ff 100644
--- a/Partition_2/doc_tex/Partition_2/PkgDescription.tex
+++ b/Partition_2/doc_tex/Partition_2/PkgDescription.tex
@@ -11,8 +11,8 @@ their runtime complexities.}
%\ccPkgDependsOn{\ccRefPkg:Triangulation2}
\ccPkgIntroducedInCGAL{2.3}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{2D Polygon Partition}{demo/partition_2.zip}
-\ccPkgDemo{Operations on Polygons}{demo/polygon_2.zip}
+\ccPkgDemo{2D Polygon Partition}{partition_2.zip}
+\ccPkgDemo{Operations on Polygons}{polygon_2.zip}
\ccPkgIllustration{Partition_2/teaser-small.png}{Partition_2/teaser.png}
\end{ccPkgDescription}
diff --git a/Polygon/doc_tex/Polygon/PkgDescription.tex b/Polygon/doc_tex/Polygon/PkgDescription.tex
index bd36b607c1f..e5bd4ade78a 100644
--- a/Polygon/doc_tex/Polygon/PkgDescription.tex
+++ b/Polygon/doc_tex/Polygon/PkgDescription.tex
@@ -13,6 +13,6 @@ partition, and the straight skeleton.}
%\ccPkgDependsOn{}
\ccPkgIntroducedInCGAL{0.9}
\ccPkgLicense{\ccLicenseLGPL}
-\ccPkgDemo{Operations on Polygons}{demo/polygon.zip}
+\ccPkgDemo{Operations on Polygons}{polygon.zip}
\ccPkgIllustration{Polygon/polygon.png}{Polygon/polygon.png}
\end{ccPkgDescription}
diff --git a/Polyhedron/doc_tex/Polyhedron/PkgDescription.tex b/Polyhedron/doc_tex/Polyhedron/PkgDescription.tex
index e3bf3254e0a..e571d7fa2b3 100644
--- a/Polyhedron/doc_tex/Polyhedron/PkgDescription.tex
+++ b/Polyhedron/doc_tex/Polyhedron/PkgDescription.tex
@@ -10,6 +10,6 @@ without boundary. If the surface is closed we call it a polyhedron.}
\ccPkgDependsOn{\ccRef[Halfedge Data Structure]{Pkg:HDS}}
\ccPkgIntroducedInCGAL{1.0}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{Operations on Polyhedra}{demo/polyhedron_3.zip}
+\ccPkgDemo{Operations on Polyhedra}{polyhedron_3.zip}
\ccPkgIllustration{Polyhedron/fig/teaser-small.gif}{Polyhedron/fig/teaser.gif}
\end{ccPkgDescription}
diff --git a/Principal_component_analysis/doc_tex/Principal_component_analysis/PkgDescription.tex b/Principal_component_analysis/doc_tex/Principal_component_analysis/PkgDescription.tex
index 61703e2ffb9..c2d8012608c 100644
--- a/Principal_component_analysis/doc_tex/Principal_component_analysis/PkgDescription.tex
+++ b/Principal_component_analysis/doc_tex/Principal_component_analysis/PkgDescription.tex
@@ -5,7 +5,7 @@
%\ccPkgDependsOn{}
\ccPkgIntroducedInCGAL{3.2}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{Operations on Polygons}{demo/polygon.zip}
-\ccPkgDemo{Operations on Polyhedra}{demo/polyhedron_3.zip}
+\ccPkgDemo{Operations on Polygons}{polygon.zip}
+\ccPkgDemo{Operations on Polyhedra}{polyhedron_3.zip}
\ccPkgIllustration{Principal_component_analysis/teaserLeastSquaresFitting.png}{Principal_component_analysis/teaserLeastSquaresFitting-large.png}
\end{ccPkgDescription}
diff --git a/Segment_Delaunay_graph_2/doc_tex/Segment_Delaunay_graph_2/PkgDescription.tex b/Segment_Delaunay_graph_2/doc_tex/Segment_Delaunay_graph_2/PkgDescription.tex
index 022a7270e49..7636769ecaf 100644
--- a/Segment_Delaunay_graph_2/doc_tex/Segment_Delaunay_graph_2/PkgDescription.tex
+++ b/Segment_Delaunay_graph_2/doc_tex/Segment_Delaunay_graph_2/PkgDescription.tex
@@ -10,6 +10,6 @@
\ccPkgDependsOn{\ccRef[2D Triangulation Data Structure]{Pkg:TDS2}}
\ccPkgIntroducedInCGAL{3.1}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{2D Segment Voronoi Diagram}{demo/segment_voronoi_diagram_2.zip}
+\ccPkgDemo{2D Segment Voronoi Diagram}{segment_voronoi_diagram_2.zip}
\ccPkgIllustration{Segment_Delaunay_graph_2/fig/svd.png}{Segment_Delaunay_graph_2/fig/norway.png}
\end{ccPkgDescription}
diff --git a/Snap_rounding_2/doc_tex/Snap_rounding_2/PkgDescription.tex b/Snap_rounding_2/doc_tex/Snap_rounding_2/PkgDescription.tex
index 2f5341e9598..196ff881d78 100644
--- a/Snap_rounding_2/doc_tex/Snap_rounding_2/PkgDescription.tex
+++ b/Snap_rounding_2/doc_tex/Snap_rounding_2/PkgDescription.tex
@@ -13,6 +13,6 @@ edge. This package supports both methods.}
\ccPkgDependsOn{\ccRef[Arrangements]{Pkg:Arrangement2}}
\ccPkgIntroducedInCGAL{3.1}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{2D Snap Rounding}{demo/snap_rounding_2.zip}
+\ccPkgDemo{2D Snap Rounding}{snap_rounding_2.zip}
\ccPkgIllustration{Snap_rounding_2/snap-detail.png}{Snap_rounding_2/snap.png}
\end{ccPkgDescription}
diff --git a/Spatial_searching/doc_tex/Spatial_searching/PkgDescription.tex b/Spatial_searching/doc_tex/Spatial_searching/PkgDescription.tex
index 97c8fbc5b19..0b432d9f977 100644
--- a/Spatial_searching/doc_tex/Spatial_searching/PkgDescription.tex
+++ b/Spatial_searching/doc_tex/Spatial_searching/PkgDescription.tex
@@ -12,7 +12,7 @@ query items are points in dD Euclidean space.}
%\ccPkgDependsOn{}
\ccPkgIntroducedInCGAL{3.0}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{2D Spatial Searching}{demo/spatial_searching.zip}
+\ccPkgDemo{2D Spatial Searching}{spatial_searching.zip}
\ccPkgIllustration{Spatial_searching/windowQuery.png}{Spatial_searching/windowQuery.png}
\end{ccPkgDescription}
diff --git a/Straight_skeleton_2/doc_tex/Straight_skeleton_2/PkgDescription.tex b/Straight_skeleton_2/doc_tex/Straight_skeleton_2/PkgDescription.tex
index 2e0036bfaa3..8ac1134e578 100644
--- a/Straight_skeleton_2/doc_tex/Straight_skeleton_2/PkgDescription.tex
+++ b/Straight_skeleton_2/doc_tex/Straight_skeleton_2/PkgDescription.tex
@@ -9,7 +9,7 @@ polygons at any offset distance given a straight skeleton.}
\ccPkgDependsOn{ \ccRef[Halfedge Data Structure]{Pkg:HDS}}
\ccPkgIntroducedInCGAL{3.2}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{2D Straight Skeleton}{demo/straight_skeleton_2.zip}
-\ccPkgDemo{Operations on Polygons}{demo/polygon_2.zip}
+\ccPkgDemo{2D Straight Skeleton}{straight_skeleton_2.zip}
+\ccPkgDemo{Operations on Polygons}{polygon_2.zip}
\ccPkgIllustration{Straight_skeleton_2/StraightSkeletonTeaser.png}{Straight_skeleton_2/StraightSkeleton.png}
\end{ccPkgDescription}
diff --git a/Stream_lines_2/doc_tex/Stream_lines_2/PkgDescription.tex b/Stream_lines_2/doc_tex/Stream_lines_2/PkgDescription.tex
index 6d8854495c1..4c68ddbe73f 100644
--- a/Stream_lines_2/doc_tex/Stream_lines_2/PkgDescription.tex
+++ b/Stream_lines_2/doc_tex/Stream_lines_2/PkgDescription.tex
@@ -15,6 +15,6 @@ streamlines.}
\ccPkgDependsOn{\ccRef[2D Delaunay triangulation]{Pkg:Triangulation2}}
\ccPkgIntroducedInCGAL{3.2}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{2D Stream Lines}{demo/streamlines.zip}
+\ccPkgDemo{2D Stream Lines}{streamlines.zip}
\ccPkgIllustration{Stream_lines_2/streamlines-small.jpg}{Stream_lines_2/streamlines-teaser.jpg}
\end{ccPkgDescription}
diff --git a/Subdivision_method_3/doc_tex/Subdivision_method_3/PkgDescription.tex b/Subdivision_method_3/doc_tex/Subdivision_method_3/PkgDescription.tex
index aeca266bd99..7954bede86f 100644
--- a/Subdivision_method_3/doc_tex/Subdivision_method_3/PkgDescription.tex
+++ b/Subdivision_method_3/doc_tex/Subdivision_method_3/PkgDescription.tex
@@ -14,6 +14,6 @@ refinement host.}
%\ccPkgDependsOn{}
\ccPkgIntroducedInCGAL{3.2}
\ccPkgLicense{\ccLicenseLGPL}
-\ccPkgDemo{Operations on Polyhedra}{demo/polyhedron_3.zip}
+\ccPkgDemo{Operations on Polyhedra}{polyhedron_3.zip}
\ccPkgIllustration{Subdivision_method_3/FIG/twoheads-detail.png}{Subdivision_method_3/FIG/twoheads.png}
\end{ccPkgDescription}
diff --git a/Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization/PkgDescription.tex b/Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization/PkgDescription.tex
index b57e9870e89..595b8867b75 100644
--- a/Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization/PkgDescription.tex
+++ b/Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization/PkgDescription.tex
@@ -12,7 +12,7 @@ barycentric mapping.}
\ccPkgDependsOn{Solvers as \ccThirdPartyOpenNL\ or \ccThirdPartyTaucs.}
\ccPkgIntroducedInCGAL{3.2}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{Operations on Polyhedra}{demo/polyhedron_3.zip}
+\ccPkgDemo{Operations on Polyhedra}{polyhedron_3.zip}
\ccPkgIllustration{Surface_mesh_parameterization/fig/bimbaDetail.png}{Surface_mesh_parameterization/fig/bimba.jpg}
\end{ccPkgDescription}
diff --git a/Surface_mesh_simplification/doc_tex/Surface_mesh_simplification/PkgDescription.tex b/Surface_mesh_simplification/doc_tex/Surface_mesh_simplification/PkgDescription.tex
index 164021de15c..f2536714bed 100644
--- a/Surface_mesh_simplification/doc_tex/Surface_mesh_simplification/PkgDescription.tex
+++ b/Surface_mesh_simplification/doc_tex/Surface_mesh_simplification/PkgDescription.tex
@@ -9,6 +9,6 @@ mesh simplification algorithm.}
\ccPkgDependsOn{ \ccRef[Polyhedron]{Pkg:Polyhedron}}
\ccPkgIntroducedInCGAL{3.3}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{Operations on Polyhedra}{demo/polyhedron_3.zip}
+\ccPkgDemo{Operations on Polyhedra}{polyhedron_3.zip}
\ccPkgIllustration{Surface_mesh_simplification/fig/detail.png}{Surface_mesh_simplification/fig/Illustration-Simplification-ALL.jpg}
\end{ccPkgDescription}
diff --git a/Surface_mesher/doc_tex/Surface_mesher/PkgDescription.tex b/Surface_mesher/doc_tex/Surface_mesher/PkgDescription.tex
index 336ee40d5b9..e05f83e7241 100644
--- a/Surface_mesher/doc_tex/Surface_mesher/PkgDescription.tex
+++ b/Surface_mesher/doc_tex/Surface_mesher/PkgDescription.tex
@@ -20,6 +20,6 @@ level set in a three-dimensional image.}
%\ccPkgDependsOn{ }
\ccPkgIntroducedInCGAL{3.2}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{Surface Mesh Generator}{demo/surface_mesher.zip}
+\ccPkgDemo{Surface Mesh Generator}{surface_mesher.zip}
\ccPkgIllustration{Surface_mesher/segmented_head-small.png}{Surface_mesher/segmented_head.png}
\end{ccPkgDescription}
diff --git a/Triangulation_2/doc_tex/Triangulation_2/PkgDescription.tex b/Triangulation_2/doc_tex/Triangulation_2/PkgDescription.tex
index 6bea971d454..4726d2d07c9 100644
--- a/Triangulation_2/doc_tex/Triangulation_2/PkgDescription.tex
+++ b/Triangulation_2/doc_tex/Triangulation_2/PkgDescription.tex
@@ -25,8 +25,8 @@ segment while others do not. }
\ccPkgDependsOn{\ccRef[2D Triangulation Data Structure]{Pkg:TDS2}}
\ccPkgIntroducedInCGAL{0.9}
\ccPkgLicense{\ccLicenseQPL}
-\ccPkgDemo{Delaunay Triangulation}{demo/delaunay_triangulation_2.zip}
-\ccPkgDemo{Regular Triangulation}{demo/regular_triangulation_2.zip}
-\ccPkgDemo{Constrained Delaunay Triangulation}{demo/constrained_delaunay_triangulation_2.zip}
+\ccPkgDemo{Delaunay Triangulation}{delaunay_triangulation_2.zip}
+\ccPkgDemo{Regular Triangulation}{regular_triangulation_2.zip}
+\ccPkgDemo{Constrained Delaunay Triangulation}{constrained_delaunay_triangulation_2.zip}
\ccPkgIllustration{Triangulation_2/cdt2d-small.png}{Triangulation_2/cdt2d-big.png}
\end{ccPkgDescription}