diff --git a/.gitattributes b/.gitattributes
index c0864f743fb..8f88e39287c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1269,12 +1269,12 @@ Circular_kernel_2/Benchmarks/readme.doc -text svneol=unset#application/msword
 Circular_kernel_2/Benchmarks/readme.pdf -text svneol=unset#application/pdf
 Circular_kernel_2/Benchmarks/readme.sxw -text
 Circular_kernel_2/changes -text
-Circular_kernel_2/demo/Circular_kernel_2/README -text
-Circular_kernel_2/demo/Circular_kernel_2/help/get_arc.jpeg -text svneol=unset#image/jpeg
-Circular_kernel_2/demo/Circular_kernel_2/help/index.html svneol=native#text/html
-Circular_kernel_2/demo/Circular_kernel_2/help/planar_map_icon.jpeg -text svneol=unset#image/jpeg
-Circular_kernel_2/demo/Circular_kernel_2/help/sweeper.jpeg -text svneol=unset#image/jpeg
-Circular_kernel_2/demo/Circular_kernel_2/help/trash.jpeg -text svneol=unset#image/jpeg
+Circular_kernel_2/demo/Circular_kernel_2/Qt3/README -text
+Circular_kernel_2/demo/Circular_kernel_2/Qt3/help/get_arc.jpeg -text svneol=unset#image/jpeg
+Circular_kernel_2/demo/Circular_kernel_2/Qt3/help/index.html svneol=native#text/html
+Circular_kernel_2/demo/Circular_kernel_2/Qt3/help/planar_map_icon.jpeg -text svneol=unset#image/jpeg
+Circular_kernel_2/demo/Circular_kernel_2/Qt3/help/sweeper.jpeg -text svneol=unset#image/jpeg
+Circular_kernel_2/demo/Circular_kernel_2/Qt3/help/trash.jpeg -text svneol=unset#image/jpeg
 Circular_kernel_2/doc_tex/Circular_kernel_2/fig/Boolean_operation.png -text
 Circular_kernel_2/doc_tex/Circular_kernel_2/fig/Boolean_operation_detail.png -text
 Circular_kernel_2/doc_tex/Circular_kernel_2_ref/GeomFunctorsCompute.tex -text
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/GNUmakefile b/Circular_kernel_2/demo/Circular_kernel_2/Qt3/GNUmakefile
similarity index 100%
rename from Circular_kernel_2/demo/Circular_kernel_2/GNUmakefile
rename to Circular_kernel_2/demo/Circular_kernel_2/Qt3/GNUmakefile
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_arc.cpp b/Circular_kernel_2/demo/Circular_kernel_2/Qt3/Qt_widget_get_arc.cpp
similarity index 100%
rename from Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_arc.cpp
rename to Circular_kernel_2/demo/Circular_kernel_2/Qt3/Qt_widget_get_arc.cpp
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_arc.h b/Circular_kernel_2/demo/Circular_kernel_2/Qt3/Qt_widget_get_arc.h
similarity index 100%
rename from Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_arc.h
rename to Circular_kernel_2/demo/Circular_kernel_2/Qt3/Qt_widget_get_arc.h
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_segment.cpp b/Circular_kernel_2/demo/Circular_kernel_2/Qt3/Qt_widget_get_segment.cpp
similarity index 100%
rename from Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_segment.cpp
rename to Circular_kernel_2/demo/Circular_kernel_2/Qt3/Qt_widget_get_segment.cpp
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_segment.h b/Circular_kernel_2/demo/Circular_kernel_2/Qt3/Qt_widget_get_segment.h
similarity index 100%
rename from Circular_kernel_2/demo/Circular_kernel_2/Qt_widget_get_segment.h
rename to Circular_kernel_2/demo/Circular_kernel_2/Qt3/Qt_widget_get_segment.h
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/README b/Circular_kernel_2/demo/Circular_kernel_2/Qt3/README
similarity index 100%
rename from Circular_kernel_2/demo/Circular_kernel_2/README
rename to Circular_kernel_2/demo/Circular_kernel_2/Qt3/README
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/demo.cpp b/Circular_kernel_2/demo/Circular_kernel_2/Qt3/demo.cpp
similarity index 100%
rename from Circular_kernel_2/demo/Circular_kernel_2/demo.cpp
rename to Circular_kernel_2/demo/Circular_kernel_2/Qt3/demo.cpp
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/get_arc.xpm b/Circular_kernel_2/demo/Circular_kernel_2/Qt3/get_arc.xpm
similarity index 100%
rename from Circular_kernel_2/demo/Circular_kernel_2/get_arc.xpm
rename to Circular_kernel_2/demo/Circular_kernel_2/Qt3/get_arc.xpm
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/help/get_arc.jpeg b/Circular_kernel_2/demo/Circular_kernel_2/Qt3/help/get_arc.jpeg
similarity index 100%
rename from Circular_kernel_2/demo/Circular_kernel_2/help/get_arc.jpeg
rename to Circular_kernel_2/demo/Circular_kernel_2/Qt3/help/get_arc.jpeg
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/help/index.html b/Circular_kernel_2/demo/Circular_kernel_2/Qt3/help/index.html
similarity index 100%
rename from Circular_kernel_2/demo/Circular_kernel_2/help/index.html
rename to Circular_kernel_2/demo/Circular_kernel_2/Qt3/help/index.html
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/help/planar_map_icon.jpeg b/Circular_kernel_2/demo/Circular_kernel_2/Qt3/help/planar_map_icon.jpeg
similarity index 100%
rename from Circular_kernel_2/demo/Circular_kernel_2/help/planar_map_icon.jpeg
rename to Circular_kernel_2/demo/Circular_kernel_2/Qt3/help/planar_map_icon.jpeg
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/help/sweeper.jpeg b/Circular_kernel_2/demo/Circular_kernel_2/Qt3/help/sweeper.jpeg
similarity index 100%
rename from Circular_kernel_2/demo/Circular_kernel_2/help/sweeper.jpeg
rename to Circular_kernel_2/demo/Circular_kernel_2/Qt3/help/sweeper.jpeg
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/help/trash.jpeg b/Circular_kernel_2/demo/Circular_kernel_2/Qt3/help/trash.jpeg
similarity index 100%
rename from Circular_kernel_2/demo/Circular_kernel_2/help/trash.jpeg
rename to Circular_kernel_2/demo/Circular_kernel_2/Qt3/help/trash.jpeg
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/lines_icon.xpm b/Circular_kernel_2/demo/Circular_kernel_2/Qt3/lines_icon.xpm
similarity index 100%
rename from Circular_kernel_2/demo/Circular_kernel_2/lines_icon.xpm
rename to Circular_kernel_2/demo/Circular_kernel_2/Qt3/lines_icon.xpm
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/makefile b/Circular_kernel_2/demo/Circular_kernel_2/Qt3/makefile
similarity index 100%
rename from Circular_kernel_2/demo/Circular_kernel_2/makefile
rename to Circular_kernel_2/demo/Circular_kernel_2/Qt3/makefile
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/planar_map_icon.xpm b/Circular_kernel_2/demo/Circular_kernel_2/Qt3/planar_map_icon.xpm
similarity index 100%
rename from Circular_kernel_2/demo/Circular_kernel_2/planar_map_icon.xpm
rename to Circular_kernel_2/demo/Circular_kernel_2/Qt3/planar_map_icon.xpm
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/sweeper.xpm b/Circular_kernel_2/demo/Circular_kernel_2/Qt3/sweeper.xpm
similarity index 100%
rename from Circular_kernel_2/demo/Circular_kernel_2/sweeper.xpm
rename to Circular_kernel_2/demo/Circular_kernel_2/Qt3/sweeper.xpm
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/trash.xpm b/Circular_kernel_2/demo/Circular_kernel_2/Qt3/trash.xpm
similarity index 100%
rename from Circular_kernel_2/demo/Circular_kernel_2/trash.xpm
rename to Circular_kernel_2/demo/Circular_kernel_2/Qt3/trash.xpm