diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index cbce17cccf35bf5d57e561d5a7101baeb5eac39f..5a8d623321eb9153d6acd232fd4ba04e7558db7e 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,3 +1,4 @@
+add_custom_target(examples)
 
 set(projects2d "ellipt" "heat" "vecellipt" "stokes0" "stokes1" "stokes3" "navier_stokes")
 
@@ -7,6 +8,7 @@ foreach(project ${projects2d})
     target_link_dune_default_libraries(${project}.2d)
     target_link_libraries(${project}.2d "amdis")
     target_compile_definitions(${project}.2d PRIVATE AMDIS_DIM=2 AMDIS_DOW=2)
+    add_dependencies(examples ${project}.2d)
 endforeach()
 
 set(projects3d "ellipt" "heat")
@@ -17,4 +19,5 @@ foreach(project ${projects3d})
     target_link_dune_default_libraries(${project}.3d)
     target_link_libraries(${project}.3d "amdis")
     target_compile_definitions(${project}.3d PRIVATE AMDIS_DIM=3 AMDIS_DOW=3)
+    add_dependencies(examples ${project}.3d)
 endforeach()
\ No newline at end of file
diff --git a/init/ellipt.dat.2d b/examples/init/ellipt.dat.2d
similarity index 100%
rename from init/ellipt.dat.2d
rename to examples/init/ellipt.dat.2d
diff --git a/init/ellipt.ini.2d b/examples/init/ellipt.ini.2d
similarity index 100%
rename from init/ellipt.ini.2d
rename to examples/init/ellipt.ini.2d
diff --git a/init/ellipt.json.2d b/examples/init/ellipt.json.2d
similarity index 100%
rename from init/ellipt.json.2d
rename to examples/init/ellipt.json.2d
diff --git a/init/ellipt.json.3d b/examples/init/ellipt.json.3d
similarity index 100%
rename from init/ellipt.json.3d
rename to examples/init/ellipt.json.3d
diff --git a/init/heat.json.2d b/examples/init/heat.json.2d
similarity index 100%
rename from init/heat.json.2d
rename to examples/init/heat.json.2d
diff --git a/init/heat.json.3d b/examples/init/heat.json.3d
similarity index 100%
rename from init/heat.json.3d
rename to examples/init/heat.json.3d
diff --git a/init/navier_stokes.json.2d b/examples/init/navier_stokes.json.2d
similarity index 100%
rename from init/navier_stokes.json.2d
rename to examples/init/navier_stokes.json.2d
diff --git a/init/pfc.json.2d b/examples/init/pfc.json.2d
similarity index 100%
rename from init/pfc.json.2d
rename to examples/init/pfc.json.2d
diff --git a/init/stokes.dat.2d b/examples/init/stokes.dat.2d
similarity index 100%
rename from init/stokes.dat.2d
rename to examples/init/stokes.dat.2d
diff --git a/init/stokes.json.2d b/examples/init/stokes.json.2d
similarity index 100%
rename from init/stokes.json.2d
rename to examples/init/stokes.json.2d
diff --git a/init/test.json.2d b/examples/init/test.json.2d
similarity index 100%
rename from init/test.json.2d
rename to examples/init/test.json.2d
diff --git a/init/vecellipt.json.2d b/examples/init/vecellipt.json.2d
similarity index 100%
rename from init/vecellipt.json.2d
rename to examples/init/vecellipt.json.2d
diff --git a/macro/kanal_square.2d b/examples/macro/kanal_square.2d
similarity index 100%
rename from macro/kanal_square.2d
rename to examples/macro/kanal_square.2d
diff --git a/macro/kanal_square_fin.2d b/examples/macro/kanal_square_fin.2d
similarity index 100%
rename from macro/kanal_square_fin.2d
rename to examples/macro/kanal_square_fin.2d
diff --git a/macro/macro.25.4.2d b/examples/macro/macro.25.4.2d
similarity index 100%
rename from macro/macro.25.4.2d
rename to examples/macro/macro.25.4.2d
diff --git a/macro/macro.ball.2d b/examples/macro/macro.ball.2d
similarity index 100%
rename from macro/macro.ball.2d
rename to examples/macro/macro.ball.2d
diff --git a/macro/macro.ball.3d b/examples/macro/macro.ball.3d
similarity index 100%
rename from macro/macro.ball.3d
rename to examples/macro/macro.ball.3d
diff --git a/macro/macro.drivenCavity.2d b/examples/macro/macro.drivenCavity.2d
similarity index 100%
rename from macro/macro.drivenCavity.2d
rename to examples/macro/macro.drivenCavity.2d
diff --git a/macro/macro.small.2d b/examples/macro/macro.small.2d
similarity index 100%
rename from macro/macro.small.2d
rename to examples/macro/macro.small.2d
diff --git a/macro/macro.small2.2d b/examples/macro/macro.small2.2d
similarity index 100%
rename from macro/macro.small2.2d
rename to examples/macro/macro.small2.2d
diff --git a/macro/macro.square.2d b/examples/macro/macro.square.2d
similarity index 100%
rename from macro/macro.square.2d
rename to examples/macro/macro.square.2d
diff --git a/macro/macro.stand.1d b/examples/macro/macro.stand.1d
similarity index 100%
rename from macro/macro.stand.1d
rename to examples/macro/macro.stand.1d
diff --git a/macro/macro.stand.2d b/examples/macro/macro.stand.2d
similarity index 100%
rename from macro/macro.stand.2d
rename to examples/macro/macro.stand.2d
diff --git a/macro/macro.stand.3d b/examples/macro/macro.stand.3d
similarity index 100%
rename from macro/macro.stand.3d
rename to examples/macro/macro.stand.3d
diff --git a/macro/neumann.macro.2d b/examples/macro/neumann.macro.2d
similarity index 100%
rename from macro/neumann.macro.2d
rename to examples/macro/neumann.macro.2d
diff --git a/macro/parametric.macro.3d b/examples/macro/parametric.macro.3d
similarity index 100%
rename from macro/parametric.macro.3d
rename to examples/macro/parametric.macro.3d
diff --git a/macro/periodic.macro.1d b/examples/macro/periodic.macro.1d
similarity index 100%
rename from macro/periodic.macro.1d
rename to examples/macro/periodic.macro.1d
diff --git a/macro/periodic.macro.2d b/examples/macro/periodic.macro.2d
similarity index 100%
rename from macro/periodic.macro.2d
rename to examples/macro/periodic.macro.2d
diff --git a/macro/periodic.macro.3d b/examples/macro/periodic.macro.3d
similarity index 100%
rename from macro/periodic.macro.3d
rename to examples/macro/periodic.macro.3d
diff --git a/macro/periodic.square.2d b/examples/macro/periodic.square.2d
similarity index 100%
rename from macro/periodic.square.2d
rename to examples/macro/periodic.square.2d
diff --git a/macro/periodic.square.per b/examples/macro/periodic.square.per
similarity index 100%
rename from macro/periodic.square.per
rename to examples/macro/periodic.square.per
diff --git a/macro/sphere_flat.3d b/examples/macro/sphere_flat.3d
similarity index 100%
rename from macro/sphere_flat.3d
rename to examples/macro/sphere_flat.3d
diff --git a/macro/sphere_flat.msh b/examples/macro/sphere_flat.msh
similarity index 100%
rename from macro/sphere_flat.msh
rename to examples/macro/sphere_flat.msh
diff --git a/macro/sphere_macro.3d b/examples/macro/sphere_macro.3d
similarity index 100%
rename from macro/sphere_macro.3d
rename to examples/macro/sphere_macro.3d
diff --git a/macro/torus_macro.3d b/examples/macro/torus_macro.3d
similarity index 100%
rename from macro/torus_macro.3d
rename to examples/macro/torus_macro.3d