diff --git a/.gitattributes b/.gitattributes
index daa0718e77d..2869f3be076 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3229,7 +3229,7 @@ Snap_rounding_2/test/Snap_rounding_2/cgal_test eol=lf
 Snap_rounding_2/test/Snap_rounding_2/cgal_test_base -text
 Snap_rounding_2/test/Snap_rounding_2/cgal_test_with_cmake eol=lf
 Spatial_searching/benchmark/Spatial_searching/Compare_ANN_STANN_CGAL.cpp -text
-Spatial_searching/demo/Spatial_searching/help/index.html svneol=native#text/html
+Spatial_searching/demo/Spatial_searching/Qt3/help/index.html svneol=native#text/html
 Spatial_searching/doc_tex/Spatial_searching/Fig1.gif -text svneol=unset#image/gif
 Spatial_searching/doc_tex/Spatial_searching/windowQuery.png -text
 Spatial_searching/include/CGAL/internal/K_neighbor_search.h -text
diff --git a/Spatial_searching/demo/Spatial_searching/CMakeLists.txt b/Spatial_searching/demo/Spatial_searching/Qt3/CMakeLists.txt
similarity index 100%
rename from Spatial_searching/demo/Spatial_searching/CMakeLists.txt
rename to Spatial_searching/demo/Spatial_searching/Qt3/CMakeLists.txt
diff --git a/Spatial_searching/demo/Spatial_searching/Qt_widget_move_list_point.cpp b/Spatial_searching/demo/Spatial_searching/Qt3/Qt_widget_move_list_point.cpp
similarity index 100%
rename from Spatial_searching/demo/Spatial_searching/Qt_widget_move_list_point.cpp
rename to Spatial_searching/demo/Spatial_searching/Qt3/Qt_widget_move_list_point.cpp
diff --git a/Spatial_searching/demo/Spatial_searching/Qt_widget_move_list_point.h b/Spatial_searching/demo/Spatial_searching/Qt3/Qt_widget_move_list_point.h
similarity index 100%
rename from Spatial_searching/demo/Spatial_searching/Qt_widget_move_list_point.h
rename to Spatial_searching/demo/Spatial_searching/Qt3/Qt_widget_move_list_point.h
diff --git a/Spatial_searching/demo/Spatial_searching/cgal_types.h b/Spatial_searching/demo/Spatial_searching/Qt3/cgal_types.h
similarity index 100%
rename from Spatial_searching/demo/Spatial_searching/cgal_types.h
rename to Spatial_searching/demo/Spatial_searching/Qt3/cgal_types.h
diff --git a/Spatial_searching/demo/Spatial_searching/help/index.html b/Spatial_searching/demo/Spatial_searching/Qt3/help/index.html
similarity index 100%
rename from Spatial_searching/demo/Spatial_searching/help/index.html
rename to Spatial_searching/demo/Spatial_searching/Qt3/help/index.html
diff --git a/Spatial_searching/demo/Spatial_searching/spatial_searching.cpp b/Spatial_searching/demo/Spatial_searching/Qt3/spatial_searching.cpp
similarity index 100%
rename from Spatial_searching/demo/Spatial_searching/spatial_searching.cpp
rename to Spatial_searching/demo/Spatial_searching/Qt3/spatial_searching.cpp
diff --git a/Spatial_searching/demo/Spatial_searching/spatial_searching_toolbar.cpp b/Spatial_searching/demo/Spatial_searching/Qt3/spatial_searching_toolbar.cpp
similarity index 100%
rename from Spatial_searching/demo/Spatial_searching/spatial_searching_toolbar.cpp
rename to Spatial_searching/demo/Spatial_searching/Qt3/spatial_searching_toolbar.cpp
diff --git a/Spatial_searching/demo/Spatial_searching/spatial_searching_toolbar.h b/Spatial_searching/demo/Spatial_searching/Qt3/spatial_searching_toolbar.h
similarity index 100%
rename from Spatial_searching/demo/Spatial_searching/spatial_searching_toolbar.h
rename to Spatial_searching/demo/Spatial_searching/Qt3/spatial_searching_toolbar.h