diff --git a/source/RobotAPI/components/ArViz/CMakeLists.txt b/source/RobotAPI/components/ArViz/CMakeLists.txt
index b315d13234a3055c32d4d89c2017e033f0bd029a..ff779519162096014fddcc86bbb695bbf6b50b37 100644
--- a/source/RobotAPI/components/ArViz/CMakeLists.txt
+++ b/source/RobotAPI/components/ArViz/CMakeLists.txt
@@ -60,3 +60,5 @@ ArVizStorage.h
 )
 
 armarx_add_component_executable("${SOURCES}" "${HEADERS}")
+
+add_subdirectory(Example)
diff --git a/source/RobotAPI/components/ArVizExample/ArVizExample.cpp b/source/RobotAPI/components/ArViz/Example/ArVizExample.cpp
similarity index 100%
rename from source/RobotAPI/components/ArVizExample/ArVizExample.cpp
rename to source/RobotAPI/components/ArViz/Example/ArVizExample.cpp
diff --git a/source/RobotAPI/components/ArVizExample/ArVizExample.h b/source/RobotAPI/components/ArViz/Example/ArVizExample.h
similarity index 100%
rename from source/RobotAPI/components/ArVizExample/ArVizExample.h
rename to source/RobotAPI/components/ArViz/Example/ArVizExample.h
diff --git a/source/RobotAPI/components/ArVizExample/CMakeLists.txt b/source/RobotAPI/components/ArViz/Example/CMakeLists.txt
similarity index 100%
rename from source/RobotAPI/components/ArVizExample/CMakeLists.txt
rename to source/RobotAPI/components/ArViz/Example/CMakeLists.txt
diff --git a/source/RobotAPI/components/ArVizExample/main.cpp b/source/RobotAPI/components/ArViz/Example/main.cpp
similarity index 100%
rename from source/RobotAPI/components/ArVizExample/main.cpp
rename to source/RobotAPI/components/ArViz/Example/main.cpp
diff --git a/source/RobotAPI/components/CMakeLists.txt b/source/RobotAPI/components/CMakeLists.txt
index f2e3b6b26d730fc3379a8c57adfff48669be4cbd..d227152e9c85ca32a887de7ad4a0ea28438588fc 100644
--- a/source/RobotAPI/components/CMakeLists.txt
+++ b/source/RobotAPI/components/CMakeLists.txt
@@ -17,4 +17,3 @@ add_subdirectory(MultiHandUnit)
 add_subdirectory(TopicTimingTest)
 
 add_subdirectory(ArViz)
-add_subdirectory(ArVizExample)