diff --git a/source/RobotAPI/libraries/armem/CMakeLists.txt b/source/RobotAPI/libraries/armem/CMakeLists.txt
index a3f2632b20e716d6cbf6a0c0fa78d4814ad3d7e7..e63616934d2e5e5f40ed4a3d864bd87131cfd070 100644
--- a/source/RobotAPI/libraries/armem/CMakeLists.txt
+++ b/source/RobotAPI/libraries/armem/CMakeLists.txt
@@ -50,26 +50,15 @@ set(LIB_FILES
     core/wm/memory_definitions.cpp
     core/wm/ice_conversions.cpp
     core/wm/ice_conversions.cpp
-    core/wm/json_conversions.cpp
     core/wm/aron_conversions.cpp
     core/wm/visitor/Visitor.cpp
     core/wm/visitor/FunctionalVisitor.cpp
 
-    core/longtermmemory/CoreSegment.cpp
-    core/longtermmemory/Entity.cpp
-    core/longtermmemory/EntityInstance.cpp
-    core/longtermmemory/EntitySnapshot.cpp
-    core/longtermmemory/Memory.cpp
-    core/longtermmemory/ProviderSegment.cpp
-    core/longtermmemory/mongodb/MongoDBConnectionManager.cpp
-
-    core/diskmemory/TypeIO.cpp
-    core/diskmemory/CoreSegment.cpp
-    core/diskmemory/Entity.cpp
-    core/diskmemory/EntityInstance.cpp
-    core/diskmemory/EntitySnapshot.cpp
-    core/diskmemory/Memory.cpp
-    core/diskmemory/ProviderSegment.cpp
+    core/ltm/LongtermMemoryBase.cpp
+    core/ltm/disk/Manager.cpp
+    core/ltm/disk/Data.cpp
+    core/ltm/mongodb/MemoryManager.cpp
+    core/ltm/mongodb/ConnectionManager.cpp
 
     core/error/ArMemError.cpp
     core/error/mns.cpp
@@ -138,8 +127,8 @@ set(LIB_HEADERS
     core/SuccessHeader.h
     core/Time.h
     core/aron_conversions.h
-    core/json_conversions.h
     core/ice_conversions.h
+    core/json_conversions.h
     core/ice_conversions_boost_templates.h
     core/ice_conversions_templates.h
 
@@ -166,25 +155,14 @@ set(LIB_HEADERS
     core/wm/memory_definitions.h
     core/wm/aron_conversions.h
     core/wm/ice_conversions.h
-    core/wm/json_conversions.h
     core/wm/visitor/Visitor.h
     core/wm/visitor/FunctionalVisitor.h
 
-    core/longtermmemory/CoreSegment.h
-    core/longtermmemory/Entity.h
-    core/longtermmemory/EntityInstance.h
-    core/longtermmemory/EntitySnapshot.h
-    core/longtermmemory/Memory.h
-    core/longtermmemory/ProviderSegment.h
-    core/longtermmemory/mongodb/MongoDBConnectionManager.h
-
-    core/diskmemory/TypeIO.h
-    core/diskmemory/CoreSegment.h
-    core/diskmemory/Entity.h
-    core/diskmemory/EntityInstance.h
-    core/diskmemory/EntitySnapshot.h
-    core/diskmemory/Memory.h
-    core/diskmemory/ProviderSegment.h
+    core/ltm/LongtermMemoryBase.h
+    core/ltm/disk/Manager.h
+    core/ltm/disk/Data.h
+    core/ltm/mongodb/MemoryManager.h
+    core/ltm/mongodb/ConnectionManager.h
 
     core/ice_conversions_templates.h
     core/ice_conversions.h