diff --git a/source/RobotAPI/components/ObjectPoseObserver/CMakeLists.txt b/source/RobotAPI/components/ObjectPoseObserver/CMakeLists.txt
index 439322b1764eaf4a39ed1b418edfe65796226c27..2dac9b5a5138fe9664c22e03d2ee5015ba3f444d 100644
--- a/source/RobotAPI/components/ObjectPoseObserver/CMakeLists.txt
+++ b/source/RobotAPI/components/ObjectPoseObserver/CMakeLists.txt
@@ -15,6 +15,7 @@ set(SOURCES
 
     plugins/ObjectPoseProviderPlugin.cpp
     plugins/ObjectPoseClientPlugin.cpp
+    plugins/RequestedObjects.cpp
 
     ice_conversions.cpp
     json_conversions.cpp
@@ -25,6 +26,7 @@ set(HEADERS
 
     plugins/ObjectPoseProviderPlugin.h
     plugins/ObjectPoseClientPlugin.h
+    plugins/RequestedObjects.h
 
     ice_conversions.h
     json_conversions.h
diff --git a/source/RobotAPI/components/ObjectPoseProviderExample/RequestedObjects.cpp b/source/RobotAPI/components/ObjectPoseObserver/plugins/RequestedObjects.cpp
similarity index 100%
rename from source/RobotAPI/components/ObjectPoseProviderExample/RequestedObjects.cpp
rename to source/RobotAPI/components/ObjectPoseObserver/plugins/RequestedObjects.cpp
diff --git a/source/RobotAPI/components/ObjectPoseProviderExample/RequestedObjects.h b/source/RobotAPI/components/ObjectPoseObserver/plugins/RequestedObjects.h
similarity index 100%
rename from source/RobotAPI/components/ObjectPoseProviderExample/RequestedObjects.h
rename to source/RobotAPI/components/ObjectPoseObserver/plugins/RequestedObjects.h
diff --git a/source/RobotAPI/components/ObjectPoseProviderExample/CMakeLists.txt b/source/RobotAPI/components/ObjectPoseProviderExample/CMakeLists.txt
index 3179669cdf46534424f60aec0639bbc308c4f967..fae15ee0afc1b1577bf808383a75faaa2d814ec3 100644
--- a/source/RobotAPI/components/ObjectPoseProviderExample/CMakeLists.txt
+++ b/source/RobotAPI/components/ObjectPoseProviderExample/CMakeLists.txt
@@ -10,13 +10,9 @@ set(COMPONENT_LIBS
 
 set(SOURCES
     ObjectPoseProviderExample.cpp
-
-    RequestedObjects.cpp
 )
 set(HEADERS
     ObjectPoseProviderExample.h
-
-    RequestedObjects.h
 )
 
 
diff --git a/source/RobotAPI/components/ObjectPoseProviderExample/ObjectPoseProviderExample.h b/source/RobotAPI/components/ObjectPoseProviderExample/ObjectPoseProviderExample.h
index cd31fa61d06de419cfd0a9624c6918852d33f9e9..aac11a5f1c9fd6d8a920a85166495e29346e6772 100644
--- a/source/RobotAPI/components/ObjectPoseProviderExample/ObjectPoseProviderExample.h
+++ b/source/RobotAPI/components/ObjectPoseProviderExample/ObjectPoseProviderExample.h
@@ -22,22 +22,20 @@
 
 #pragma once
 
+#include <mutex>
 
 #include <ArmarXCore/core/Component.h>
 
 #include <ArmarXCore/interface/observers/ObserverInterface.h>
+#include <ArmarXCore/core/services/tasks/TaskUtil.h>
 // #include <RobotAPI/libraries/RobotAPIComponentPlugins/ArVizComponentPlugin.h>
 
-
 // Include the ProviderPlugin
 #include <RobotAPI/components/ObjectPoseObserver/plugins/ObjectPoseProviderPlugin.h>
+#include <RobotAPI/components/ObjectPoseObserver/plugins/RequestedObjects.h>
 
 #include <RobotAPI/libraries/ArmarXObjects/ObjectFinder.h>
 
-#include <mutex>
-#include <ArmarXCore/core/services/tasks/TaskUtil.h>
-#include "RequestedObjects.h"
-
 
 namespace armarx
 {