diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42074e06fbd1edc3e4a64445afe0f3cc68ebed47..072b8adbc911a27f95d898cc8af9a08b7439018c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,5 +48,6 @@ add_definitions(-Werror=reorder)
 add_definitions(-Werror=narrowing)
 
 add_subdirectory(source)
+add_subdirectory(examples)
 
 armarx_install_project()
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..4454172b06c209839ceb4d76bd275b16e20e1d20
--- /dev/null
+++ b/examples/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(components/example_client)
diff --git a/source/armarx/navigation/components/example_client/CMakeLists.txt b/examples/components/example_client/CMakeLists.txt
similarity index 100%
rename from source/armarx/navigation/components/example_client/CMakeLists.txt
rename to examples/components/example_client/CMakeLists.txt
diff --git a/source/armarx/navigation/components/example_client/Component.cpp b/examples/components/example_client/Component.cpp
similarity index 100%
rename from source/armarx/navigation/components/example_client/Component.cpp
rename to examples/components/example_client/Component.cpp
diff --git a/source/armarx/navigation/components/example_client/Component.h b/examples/components/example_client/Component.h
similarity index 100%
rename from source/armarx/navigation/components/example_client/Component.h
rename to examples/components/example_client/Component.h
diff --git a/source/armarx/navigation/components/CMakeLists.txt b/source/armarx/navigation/components/CMakeLists.txt
index 34e29e918478e7440e083272c0c28d589bf3fa0f..d0cdc31746d712beccdba07d2fe9b075390d541c 100644
--- a/source/armarx/navigation/components/CMakeLists.txt
+++ b/source/armarx/navigation/components/CMakeLists.txt
@@ -2,7 +2,4 @@ add_subdirectory(GraphImportExport)
 add_subdirectory(NavigationMemory)
 add_subdirectory(Navigator)
 
-# Examples
-add_subdirectory(example_client)
-
-add_subdirectory(dynamic_distance_to_obstacle_costmap_provider)
\ No newline at end of file
+add_subdirectory(dynamic_distance_to_obstacle_costmap_provider)