diff --git a/Circular_kernel_2/demo/Circular_kernel_2/data/circle_grid.cgal b/GraphicsView/demo/Circular_kernel_2/data/circle_grid.cgal
similarity index 100%
rename from Circular_kernel_2/demo/Circular_kernel_2/data/circle_grid.cgal
rename to GraphicsView/demo/Circular_kernel_2/data/circle_grid.cgal
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/data/circles_21.cgal b/GraphicsView/demo/Circular_kernel_2/data/circles_21.cgal
similarity index 100%
rename from Circular_kernel_2/demo/Circular_kernel_2/data/circles_21.cgal
rename to GraphicsView/demo/Circular_kernel_2/data/circles_21.cgal
diff --git a/Triangulation_2/demo/Triangulation_2/data/butterfly b/GraphicsView/demo/Triangulation_2/data/butterfly
similarity index 100%
rename from Triangulation_2/demo/Triangulation_2/data/butterfly
rename to GraphicsView/demo/Triangulation_2/data/butterfly
diff --git a/Triangulation_2/demo/Triangulation_2/data/fish b/GraphicsView/demo/Triangulation_2/data/fish
similarity index 100%
rename from Triangulation_2/demo/Triangulation_2/data/fish
rename to GraphicsView/demo/Triangulation_2/data/fish
diff --git a/Triangulation_2/demo/Triangulation_2/data/norway.edg b/GraphicsView/demo/Triangulation_2/data/norway.edg
similarity index 100%
rename from Triangulation_2/demo/Triangulation_2/data/norway.edg
rename to GraphicsView/demo/Triangulation_2/data/norway.edg
diff --git a/Triangulation_2/demo/Triangulation_2/data/poisson b/GraphicsView/demo/Triangulation_2/data/poisson
similarity index 100%
rename from Triangulation_2/demo/Triangulation_2/data/poisson
rename to GraphicsView/demo/Triangulation_2/data/poisson
diff --git a/Triangulation_2/demo/Triangulation_2/data/tr b/GraphicsView/demo/Triangulation_2/data/tr
similarity index 100%
rename from Triangulation_2/demo/Triangulation_2/data/tr
rename to GraphicsView/demo/Triangulation_2/data/tr
diff --git a/Triangulation_2/demo/Triangulation_2/data/triangulation.cgal b/GraphicsView/demo/Triangulation_2/data/triangulation.cgal
similarity index 100%
rename from Triangulation_2/demo/Triangulation_2/data/triangulation.cgal
rename to GraphicsView/demo/Triangulation_2/data/triangulation.cgal
diff --git a/Scripts/developer_scripts/test_merge_of_branch b/Scripts/developer_scripts/test_merge_of_branch
index 8915bc8b8af..c81c501734b 100755
--- a/Scripts/developer_scripts/test_merge_of_branch
+++ b/Scripts/developer_scripts/test_merge_of_branch
@@ -85,7 +85,7 @@ fi
 
 #check cmake scripts of tests, examples are present
 echo '.. Checking if all CMakeLists.txt are present...'
-for i in `ls -d ^build*/examples/*/ ^build*/test/*/`; do
+for i in `ls -d ^build*/examples/*/ ^build*/test/*/ ^build*/demo/^(icons|resources)/`; do
   if ! [ -f $i/CMakeLists.txt ]; then
     echo "Error: $i/CMakeLists.txt does not exist!"
     exit 1
diff --git a/Three/demo/Three/CMakeLists.txt b/Three/demo/Three/CMakeLists.txt
index 2209285ac71..ef680b5d109 100644
--- a/Three/demo/Three/CMakeLists.txt
+++ b/Three/demo/Three/CMakeLists.txt
@@ -2,7 +2,7 @@
 # This is the CMake script for compiling a CGAL application.
 
 
-project( Three_test )
+project( Three_Demo )
 
 cmake_minimum_required(VERSION 2.8.10)