diff --git a/AMDiS/test/CMakeLists.txt b/AMDiS/test/CMakeLists.txt
index 7304e8e852931dbe24ffa31234048dddf2b3c5ad..5f6979a381e943f7c8cd74cfdd7328c364660037 100644
--- a/AMDiS/test/CMakeLists.txt
+++ b/AMDiS/test/CMakeLists.txt
@@ -1,2 +1,3 @@
 project(tests)
+add_subdirectory(demoimpl)
 add_subdirectory(datacreation EXCLUDE_FROM_ALL)
diff --git a/AMDiS/test/datacreation/CMakeLists.txt b/AMDiS/test/datacreation/CMakeLists.txt
index 1f97ab0997ad4681576c81061d8067d9d6a2e8db..7cd35571872d387505ba050523e8489d13b57619 100644
--- a/AMDiS/test/datacreation/CMakeLists.txt
+++ b/AMDiS/test/datacreation/CMakeLists.txt
@@ -12,7 +12,7 @@ project(testdatacreation)
 	set(BASENAME "${creatorsuffix_lower}")
 	configure_file(src/creator_base.cpp src/creator${creatorsuffix}.cpp @ONLY)
   	add_executable(creator${creatorsuffix} src/creator${creatorsuffix}.cpp src/ProjectList.cpp ${projectfile})
-	target_link_libraries(creator${creatorsuffix} ${AMDiS_LIBS} boost_filesystem)
+	target_link_libraries(creator${creatorsuffix} ${AMDiS_LIBS} demoimpl)
 	file(GLOB initfiles RELATIVE ${CMAKE_CURRENT_BINARY_DIR} init/${creatorsuffix_lower}*.dat*)
 	foreach(initfile ${initfiles})
 		get_filename_component(initfile_ext ${initfile} EXT)
diff --git a/AMDiS/test/datacreation/src/BallProject.cpp b/AMDiS/test/demoimpl/src/BallProject.cpp
similarity index 100%
rename from AMDiS/test/datacreation/src/BallProject.cpp
rename to AMDiS/test/demoimpl/src/BallProject.cpp
diff --git a/AMDiS/test/datacreation/src/BallProject.h b/AMDiS/test/demoimpl/src/BallProject.h
similarity index 100%
rename from AMDiS/test/datacreation/src/BallProject.h
rename to AMDiS/test/demoimpl/src/BallProject.h
diff --git a/AMDiS/test/datacreation/src/BunnyProject.cpp b/AMDiS/test/demoimpl/src/BunnyProject.cpp
similarity index 100%
rename from AMDiS/test/datacreation/src/BunnyProject.cpp
rename to AMDiS/test/demoimpl/src/BunnyProject.cpp
diff --git a/AMDiS/test/datacreation/src/BunnyProject.h b/AMDiS/test/demoimpl/src/BunnyProject.h
similarity index 100%
rename from AMDiS/test/datacreation/src/BunnyProject.h
rename to AMDiS/test/demoimpl/src/BunnyProject.h
diff --git a/AMDiS/test/datacreation/src/ElliptProject.cpp b/AMDiS/test/demoimpl/src/ElliptProject.cpp
similarity index 100%
rename from AMDiS/test/datacreation/src/ElliptProject.cpp
rename to AMDiS/test/demoimpl/src/ElliptProject.cpp
diff --git a/AMDiS/test/datacreation/src/ElliptProject.h b/AMDiS/test/demoimpl/src/ElliptProject.h
similarity index 100%
rename from AMDiS/test/datacreation/src/ElliptProject.h
rename to AMDiS/test/demoimpl/src/ElliptProject.h
diff --git a/AMDiS/test/datacreation/src/HeatProject.cpp b/AMDiS/test/demoimpl/src/HeatProject.cpp
similarity index 100%
rename from AMDiS/test/datacreation/src/HeatProject.cpp
rename to AMDiS/test/demoimpl/src/HeatProject.cpp
diff --git a/AMDiS/test/datacreation/src/HeatProject.h b/AMDiS/test/demoimpl/src/HeatProject.h
similarity index 100%
rename from AMDiS/test/datacreation/src/HeatProject.h
rename to AMDiS/test/demoimpl/src/HeatProject.h
diff --git a/AMDiS/test/datacreation/src/HeatProject.hh b/AMDiS/test/demoimpl/src/HeatProject.hh
similarity index 100%
rename from AMDiS/test/datacreation/src/HeatProject.hh
rename to AMDiS/test/demoimpl/src/HeatProject.hh
diff --git a/AMDiS/test/datacreation/src/NeumannProject.cpp b/AMDiS/test/demoimpl/src/NeumannProject.cpp
similarity index 100%
rename from AMDiS/test/datacreation/src/NeumannProject.cpp
rename to AMDiS/test/demoimpl/src/NeumannProject.cpp
diff --git a/AMDiS/test/datacreation/src/NeumannProject.h b/AMDiS/test/demoimpl/src/NeumannProject.h
similarity index 100%
rename from AMDiS/test/datacreation/src/NeumannProject.h
rename to AMDiS/test/demoimpl/src/NeumannProject.h
diff --git a/AMDiS/test/datacreation/src/ParametricProject.cpp b/AMDiS/test/demoimpl/src/ParametricProject.cpp
similarity index 100%
rename from AMDiS/test/datacreation/src/ParametricProject.cpp
rename to AMDiS/test/demoimpl/src/ParametricProject.cpp
diff --git a/AMDiS/test/datacreation/src/ParametricProject.h b/AMDiS/test/demoimpl/src/ParametricProject.h
similarity index 100%
rename from AMDiS/test/datacreation/src/ParametricProject.h
rename to AMDiS/test/demoimpl/src/ParametricProject.h
diff --git a/AMDiS/test/datacreation/src/ParametricProject.hh b/AMDiS/test/demoimpl/src/ParametricProject.hh
similarity index 100%
rename from AMDiS/test/datacreation/src/ParametricProject.hh
rename to AMDiS/test/demoimpl/src/ParametricProject.hh
diff --git a/AMDiS/test/datacreation/src/PeriodicProject.cpp b/AMDiS/test/demoimpl/src/PeriodicProject.cpp
similarity index 100%
rename from AMDiS/test/datacreation/src/PeriodicProject.cpp
rename to AMDiS/test/demoimpl/src/PeriodicProject.cpp
diff --git a/AMDiS/test/datacreation/src/PeriodicProject.h b/AMDiS/test/demoimpl/src/PeriodicProject.h
similarity index 100%
rename from AMDiS/test/datacreation/src/PeriodicProject.h
rename to AMDiS/test/demoimpl/src/PeriodicProject.h
diff --git a/AMDiS/test/datacreation/src/Project.h b/AMDiS/test/demoimpl/src/Project.h
similarity index 100%
rename from AMDiS/test/datacreation/src/Project.h
rename to AMDiS/test/demoimpl/src/Project.h
diff --git a/AMDiS/test/datacreation/src/ProjectList.cpp b/AMDiS/test/demoimpl/src/ProjectList.cpp
similarity index 100%
rename from AMDiS/test/datacreation/src/ProjectList.cpp
rename to AMDiS/test/demoimpl/src/ProjectList.cpp
diff --git a/AMDiS/test/datacreation/src/SphereProject.cpp b/AMDiS/test/demoimpl/src/SphereProject.cpp
similarity index 100%
rename from AMDiS/test/datacreation/src/SphereProject.cpp
rename to AMDiS/test/demoimpl/src/SphereProject.cpp
diff --git a/AMDiS/test/datacreation/src/SphereProject.h b/AMDiS/test/demoimpl/src/SphereProject.h
similarity index 100%
rename from AMDiS/test/datacreation/src/SphereProject.h
rename to AMDiS/test/demoimpl/src/SphereProject.h
diff --git a/AMDiS/test/datacreation/src/TorusProject.h b/AMDiS/test/demoimpl/src/TorusProject.h
similarity index 100%
rename from AMDiS/test/datacreation/src/TorusProject.h
rename to AMDiS/test/demoimpl/src/TorusProject.h
diff --git a/AMDiS/test/datacreation/src/VecelliptProject.cpp b/AMDiS/test/demoimpl/src/VecelliptProject.cpp
similarity index 100%
rename from AMDiS/test/datacreation/src/VecelliptProject.cpp
rename to AMDiS/test/demoimpl/src/VecelliptProject.cpp
diff --git a/AMDiS/test/datacreation/src/VecelliptProject.h b/AMDiS/test/demoimpl/src/VecelliptProject.h
similarity index 100%
rename from AMDiS/test/datacreation/src/VecelliptProject.h
rename to AMDiS/test/demoimpl/src/VecelliptProject.h
diff --git a/AMDiS/test/datacreation/src/creator_base.cpp b/AMDiS/test/demoimpl/src/creator_base.cpp
similarity index 100%
rename from AMDiS/test/datacreation/src/creator_base.cpp
rename to AMDiS/test/demoimpl/src/creator_base.cpp