diff --git a/source/RobotAPI/libraries/armem/CMakeLists.txt b/source/RobotAPI/libraries/armem/CMakeLists.txt
index ab29a06c1472580c08971fa2e0cccb28177f9514..03ba9e03e497fbd15022c0bf1a430997d3fdcae4 100644
--- a/source/RobotAPI/libraries/armem/CMakeLists.txt
+++ b/source/RobotAPI/libraries/armem/CMakeLists.txt
@@ -12,24 +12,26 @@ set(LIBS
 set(LIB_FILES
     ArMemBase.cpp
 
+    core/MemoryID.cpp
+    core/Time.cpp
+
     segments/CoreSegment.cpp
     segments/Entity.cpp
     segments/EntityData.cpp
-    segments/MemoryID.cpp
     segments/Memory.cpp
     segments/ProviderSegment.cpp
-    segments/Time.cpp
 )
 set(LIB_HEADERS
     ArMemBase.h
 
+    core/MemoryID.h
+    core/Time.h
+
     segments/CoreSegment.h
     segments/Entity.h
     segments/EntityData.h
-    segments/MemoryID.h
     segments/Memory.h
     segments/ProviderSegment.h
-    segments/Time.h
 )
 
 armarx_add_library("${LIB_NAME}" "${LIB_FILES}" "${LIB_HEADERS}" "${LIBS}")
diff --git a/source/RobotAPI/libraries/armem/segments/MemoryID.cpp b/source/RobotAPI/libraries/armem/core/MemoryID.cpp
similarity index 100%
rename from source/RobotAPI/libraries/armem/segments/MemoryID.cpp
rename to source/RobotAPI/libraries/armem/core/MemoryID.cpp
diff --git a/source/RobotAPI/libraries/armem/segments/MemoryID.h b/source/RobotAPI/libraries/armem/core/MemoryID.h
similarity index 100%
rename from source/RobotAPI/libraries/armem/segments/MemoryID.h
rename to source/RobotAPI/libraries/armem/core/MemoryID.h
diff --git a/source/RobotAPI/libraries/armem/segments/Time.cpp b/source/RobotAPI/libraries/armem/core/Time.cpp
similarity index 100%
rename from source/RobotAPI/libraries/armem/segments/Time.cpp
rename to source/RobotAPI/libraries/armem/core/Time.cpp
diff --git a/source/RobotAPI/libraries/armem/segments/Time.h b/source/RobotAPI/libraries/armem/core/Time.h
similarity index 100%
rename from source/RobotAPI/libraries/armem/segments/Time.h
rename to source/RobotAPI/libraries/armem/core/Time.h
diff --git a/source/RobotAPI/libraries/armem/segments/Entity.h b/source/RobotAPI/libraries/armem/segments/Entity.h
index ad34937c9dd01ade2224923e4d56a5d3a8962980..7bf8f61190d0b5865c43ad654e9ad4932af70c86 100644
--- a/source/RobotAPI/libraries/armem/segments/Entity.h
+++ b/source/RobotAPI/libraries/armem/segments/Entity.h
@@ -6,8 +6,8 @@
 
 #include <RobotAPI/interface/aron.h>
 
-#include "Time.h"
-#include "MemoryID.h"
+#include "../core/Time.h"
+#include "../core/MemoryID.h"
 #include "EntityData.h"
 
 
diff --git a/source/RobotAPI/libraries/armem/segments/EntityData.h b/source/RobotAPI/libraries/armem/segments/EntityData.h
index 769b1699e3532b451a86c68fb16addb6b5552b4f..5c46d6e58bfaad35ef72fa2e3eeb415015456b57 100644
--- a/source/RobotAPI/libraries/armem/segments/EntityData.h
+++ b/source/RobotAPI/libraries/armem/segments/EntityData.h
@@ -4,7 +4,7 @@
 
 #include <RobotAPI/interface/aron.h>
 
-#include "Time.h"
+#include "../core/Time.h"
 
 
 namespace armarx::armem