diff --git a/source/RobotAPI/libraries/armem/CMakeLists.txt b/source/RobotAPI/libraries/armem/CMakeLists.txt
index 9537a470eabcb07d446a6a6fdf243accd489963c..1a35e79542e52f57227ec6665e7bbd8f9eb5960a 100644
--- a/source/RobotAPI/libraries/armem/CMakeLists.txt
+++ b/source/RobotAPI/libraries/armem/CMakeLists.txt
@@ -16,14 +16,14 @@ set(LIB_FILES
     core/MemoryID.cpp
     core/Time.cpp
 
-    segments/CoreSegment.cpp
-    segments/Entity.cpp
-    segments/EntityData.cpp
-    segments/EntitySnapshot.cpp
-    segments/EntityStorage.cpp
-    segments/InternalCommit.cpp
-    segments/Memory.cpp
-    segments/ProviderSegment.cpp
+    memory/CoreSegment.cpp
+    memory/Entity.cpp
+    memory/EntityData.cpp
+    memory/EntitySnapshot.cpp
+    memory/EntityStorage.cpp
+    memory/InternalCommit.cpp
+    memory/Memory.cpp
+    memory/ProviderSegment.cpp
 )
 set(LIB_HEADERS
     ArMemBase.h
@@ -32,14 +32,14 @@ set(LIB_HEADERS
     core/MemoryID.h
     core/Time.h
 
-    segments/CoreSegment.h
-    segments/Entity.h
-    segments/EntityData.h
-    segments/EntitySnapshot.h
-    segments/EntityStorage.h
-    segments/InternalCommit.h
-    segments/Memory.h
-    segments/ProviderSegment.h
+    memory/CoreSegment.h
+    memory/Entity.h
+    memory/EntityData.h
+    memory/EntitySnapshot.h
+    memory/EntityStorage.h
+    memory/InternalCommit.h
+    memory/Memory.h
+    memory/ProviderSegment.h
 )
 
 armarx_add_library("${LIB_NAME}" "${LIB_FILES}" "${LIB_HEADERS}" "${LIBS}")
diff --git a/source/RobotAPI/libraries/armem/segments/CoreSegment.cpp b/source/RobotAPI/libraries/armem/memory/CoreSegment.cpp
similarity index 100%
rename from source/RobotAPI/libraries/armem/segments/CoreSegment.cpp
rename to source/RobotAPI/libraries/armem/memory/CoreSegment.cpp
diff --git a/source/RobotAPI/libraries/armem/segments/CoreSegment.h b/source/RobotAPI/libraries/armem/memory/CoreSegment.h
similarity index 100%
rename from source/RobotAPI/libraries/armem/segments/CoreSegment.h
rename to source/RobotAPI/libraries/armem/memory/CoreSegment.h
diff --git a/source/RobotAPI/libraries/armem/segments/Entity.cpp b/source/RobotAPI/libraries/armem/memory/Entity.cpp
similarity index 100%
rename from source/RobotAPI/libraries/armem/segments/Entity.cpp
rename to source/RobotAPI/libraries/armem/memory/Entity.cpp
diff --git a/source/RobotAPI/libraries/armem/segments/Entity.h b/source/RobotAPI/libraries/armem/memory/Entity.h
similarity index 100%
rename from source/RobotAPI/libraries/armem/segments/Entity.h
rename to source/RobotAPI/libraries/armem/memory/Entity.h
diff --git a/source/RobotAPI/libraries/armem/segments/EntityData.cpp b/source/RobotAPI/libraries/armem/memory/EntityData.cpp
similarity index 100%
rename from source/RobotAPI/libraries/armem/segments/EntityData.cpp
rename to source/RobotAPI/libraries/armem/memory/EntityData.cpp
diff --git a/source/RobotAPI/libraries/armem/segments/EntityData.h b/source/RobotAPI/libraries/armem/memory/EntityData.h
similarity index 100%
rename from source/RobotAPI/libraries/armem/segments/EntityData.h
rename to source/RobotAPI/libraries/armem/memory/EntityData.h
diff --git a/source/RobotAPI/libraries/armem/segments/EntitySnapshot.cpp b/source/RobotAPI/libraries/armem/memory/EntitySnapshot.cpp
similarity index 100%
rename from source/RobotAPI/libraries/armem/segments/EntitySnapshot.cpp
rename to source/RobotAPI/libraries/armem/memory/EntitySnapshot.cpp
diff --git a/source/RobotAPI/libraries/armem/segments/EntitySnapshot.h b/source/RobotAPI/libraries/armem/memory/EntitySnapshot.h
similarity index 100%
rename from source/RobotAPI/libraries/armem/segments/EntitySnapshot.h
rename to source/RobotAPI/libraries/armem/memory/EntitySnapshot.h
diff --git a/source/RobotAPI/libraries/armem/segments/EntityStorage.cpp b/source/RobotAPI/libraries/armem/memory/EntityStorage.cpp
similarity index 100%
rename from source/RobotAPI/libraries/armem/segments/EntityStorage.cpp
rename to source/RobotAPI/libraries/armem/memory/EntityStorage.cpp
diff --git a/source/RobotAPI/libraries/armem/segments/EntityStorage.h b/source/RobotAPI/libraries/armem/memory/EntityStorage.h
similarity index 100%
rename from source/RobotAPI/libraries/armem/segments/EntityStorage.h
rename to source/RobotAPI/libraries/armem/memory/EntityStorage.h
diff --git a/source/RobotAPI/libraries/armem/segments/InternalCommit.cpp b/source/RobotAPI/libraries/armem/memory/InternalCommit.cpp
similarity index 100%
rename from source/RobotAPI/libraries/armem/segments/InternalCommit.cpp
rename to source/RobotAPI/libraries/armem/memory/InternalCommit.cpp
diff --git a/source/RobotAPI/libraries/armem/segments/InternalCommit.h b/source/RobotAPI/libraries/armem/memory/InternalCommit.h
similarity index 100%
rename from source/RobotAPI/libraries/armem/segments/InternalCommit.h
rename to source/RobotAPI/libraries/armem/memory/InternalCommit.h
diff --git a/source/RobotAPI/libraries/armem/segments/Memory.cpp b/source/RobotAPI/libraries/armem/memory/Memory.cpp
similarity index 100%
rename from source/RobotAPI/libraries/armem/segments/Memory.cpp
rename to source/RobotAPI/libraries/armem/memory/Memory.cpp
diff --git a/source/RobotAPI/libraries/armem/segments/Memory.h b/source/RobotAPI/libraries/armem/memory/Memory.h
similarity index 100%
rename from source/RobotAPI/libraries/armem/segments/Memory.h
rename to source/RobotAPI/libraries/armem/memory/Memory.h
diff --git a/source/RobotAPI/libraries/armem/segments/ProviderSegment.cpp b/source/RobotAPI/libraries/armem/memory/ProviderSegment.cpp
similarity index 100%
rename from source/RobotAPI/libraries/armem/segments/ProviderSegment.cpp
rename to source/RobotAPI/libraries/armem/memory/ProviderSegment.cpp
diff --git a/source/RobotAPI/libraries/armem/segments/ProviderSegment.h b/source/RobotAPI/libraries/armem/memory/ProviderSegment.h
similarity index 100%
rename from source/RobotAPI/libraries/armem/segments/ProviderSegment.h
rename to source/RobotAPI/libraries/armem/memory/ProviderSegment.h