diff --git a/source/RobotAPI/libraries/armem/CMakeLists.txt b/source/RobotAPI/libraries/armem/CMakeLists.txt
index 0f4a137d17a127b55f3e0255b01e0be837d94ead..784cb0460f83e5d188e345aa3f68a63fe2c36863 100644
--- a/source/RobotAPI/libraries/armem/CMakeLists.txt
+++ b/source/RobotAPI/libraries/armem/CMakeLists.txt
@@ -83,14 +83,27 @@ set(LIB_FILES
server/MemoryRemoteGui.cpp
server/RemoteGuiAronDataVisitor.cpp
- server/ltm/detail/MemoryItem.cpp
- server/ltm/detail/MemoryBase.cpp
- server/ltm/detail/BufferedMemoryBase.cpp
- server/ltm/detail/LUTMemoryBase.cpp
- server/ltm/detail/CoreSegmentBase.cpp
- server/ltm/detail/ProviderSegmentBase.cpp
- server/ltm/detail/EntityBase.cpp
- server/ltm/detail/EntitySnapshotBase.cpp
+ server/ltm/base/detail/MemoryItem.cpp
+ server/ltm/base/detail/MemoryBase.cpp
+ server/ltm/base/detail/BufferedMemoryBase.cpp
+ server/ltm/base/detail/LUTMemoryBase.cpp
+ server/ltm/base/detail/CoreSegmentBase.cpp
+ server/ltm/base/detail/ProviderSegmentBase.cpp
+ server/ltm/base/detail/EntityBase.cpp
+ server/ltm/base/detail/EntitySnapshotBase.cpp
+
+ server/ltm/base/filter/Filter.cpp
+ server/ltm/base/filter/noFilter/NoFilter.cpp
+
+ server/ltm/base/encoder/Encoder.cpp
+ server/ltm/base/encoder/noEncoder/NoEncoder.cpp
+
+ server/ltm/base/converter/Converter.cpp
+ server/ltm/base/converter/json/JsonConverter.cpp
+ server/ltm/base/converter/bson/BsonConverter.cpp
+
+ server/ltm/base/forgetter/Forgetter.cpp
+ server/ltm/base/forgetter/noForgetter/NoForgetter.cpp
server/ltm/disk/detail/Data.cpp
server/ltm/disk/detail/DiskStorage.cpp
@@ -121,7 +134,7 @@ set(LIB_FILES
server/query_proc/ltm/detail/ProviderSegmentQueryProcessorBase.cpp
server/query_proc/ltm/detail/CoreSegmentQueryProcessorBase.cpp
server/query_proc/ltm/detail/MemoryQueryProcessorBase.cpp
- server/query_proc/ltm/ltm.cpp
+ server/query_proc/ltm/disk/ltm.cpp
server/query_proc/wm/detail/EntityQueryProcessorBase.cpp
server/query_proc/wm/detail/ProviderSegmentQueryProcessorBase.cpp
@@ -216,14 +229,27 @@ set(LIB_HEADERS
server/MemoryRemoteGui.h
server/RemoteGuiAronDataVisitor.h
- server/ltm/detail/MemoryItem.h
- server/ltm/detail/MemoryBase.h
- server/ltm/detail/BufferedMemoryBase.h
- server/ltm/detail/LUTMemoryBase.h
- server/ltm/detail/CoreSegmentBase.h
- server/ltm/detail/ProviderSegmentBase.h
- server/ltm/detail/EntityBase.h
- server/ltm/detail/EntitySnapshotBase.h
+ server/ltm/base/detail/MemoryItem.h
+ server/ltm/base/detail/MemoryBase.h
+ server/ltm/base/detail/BufferedMemoryBase.h
+ server/ltm/base/detail/LUTMemoryBase.h
+ server/ltm/base/detail/CoreSegmentBase.h
+ server/ltm/base/detail/ProviderSegmentBase.h
+ server/ltm/base/detail/EntityBase.h
+ server/ltm/base/detail/EntitySnapshotBase.h
+
+ server/ltm/base/filter/Filter.h
+ server/ltm/base/filter/noFilter/NoFilter.h
+
+ server/ltm/base/encoder/Encoder.h
+ server/ltm/base/encoder/noEncoder/NoEncoder.h
+
+ server/ltm/base/converter/Converter.h
+ server/ltm/base/converter/json/JsonConverter.h
+ server/ltm/base/converter/bson/BsonConverter.h
+
+ server/ltm/base/forgetter/Forgetter.h
+ server/ltm/base/forgetter/noForgetter/NoForgetter.h
server/ltm/disk/detail/Data.h
server/ltm/disk/detail/DiskStorage.h
@@ -258,7 +284,7 @@ set(LIB_HEADERS
server/query_proc/ltm/detail/ProviderSegmentQueryProcessorBase.h
server/query_proc/ltm/detail/CoreSegmentQueryProcessorBase.h
server/query_proc/ltm/detail/MemoryQueryProcessorBase.h
- server/query_proc/ltm/ltm.h
+ server/query_proc/ltm/disk/ltm.h
server/query_proc/wm/detail/EntityQueryProcessorBase.h
server/query_proc/wm/detail/ProviderSegmentQueryProcessorBase.h
diff --git a/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp b/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp
index eb79ed3bf5c60ca4d3b1cfdefc8a0fba1b9e1f54..32c8f9672977d96acad2cad24a6806065632989a 100644
--- a/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp
+++ b/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp
@@ -1,7 +1,7 @@
#include "MemoryToIceAdapter.h"
#include "query_proc/wm/wm.h"
-#include "query_proc/ltm/ltm.h"
+#include "query_proc/ltm/disk/ltm.h"
#include <RobotAPI/libraries/armem/server/wm/ice_conversions.h>
@@ -243,7 +243,7 @@ namespace armarx::armem::server
input.withData ? armem::DataMode::WithData : armem::DataMode::NoData);
armem::wm::Memory wmResult = wmServerProcessor.process(input.memoryQueries, *workingMemory);
- query_proc::ltm_server::MemoryQueryProcessor ltmProcessor;
+ query_proc::ltm_server::disk::MemoryQueryProcessor ltmProcessor;
armem::wm::Memory ltmResult = ltmProcessor.process(input, *longtermMemory);
armem::query::data::Result result;
@@ -251,7 +251,7 @@ namespace armarx::armem::server
{
ARMARX_INFO << "The LTM returned data after query";
- longtermMemory->convert(ltmResult); // convert memory ==> meaning resolving lut references to e.g. mongodb
+ longtermMemory->convert(ltmResult); // convert memory ==> meaning resolving references
wmResult.append(ltmResult);
if (wmResult.empty())
diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/converter/Converter.cpp b/source/RobotAPI/libraries/armem/server/ltm/base/converter/Converter.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/converter/Converter.h b/source/RobotAPI/libraries/armem/server/ltm/base/converter/Converter.h
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/converter/bson/BsonConverter.cpp b/source/RobotAPI/libraries/armem/server/ltm/base/converter/bson/BsonConverter.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/converter/bson/BsonConverter.h b/source/RobotAPI/libraries/armem/server/ltm/base/converter/bson/BsonConverter.h
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/converter/json/JsonConverter.cpp b/source/RobotAPI/libraries/armem/server/ltm/base/converter/json/JsonConverter.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/converter/json/JsonConverter.h b/source/RobotAPI/libraries/armem/server/ltm/base/converter/json/JsonConverter.h
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/source/RobotAPI/libraries/armem/server/ltm/detail/BufferedMemoryBase.cpp b/source/RobotAPI/libraries/armem/server/ltm/base/detail/BufferedMemoryBase.cpp
similarity index 100%
rename from source/RobotAPI/libraries/armem/server/ltm/detail/BufferedMemoryBase.cpp
rename to source/RobotAPI/libraries/armem/server/ltm/base/detail/BufferedMemoryBase.cpp
diff --git a/source/RobotAPI/libraries/armem/server/ltm/detail/BufferedMemoryBase.h b/source/RobotAPI/libraries/armem/server/ltm/base/detail/BufferedMemoryBase.h
similarity index 100%
rename from source/RobotAPI/libraries/armem/server/ltm/detail/BufferedMemoryBase.h
rename to source/RobotAPI/libraries/armem/server/ltm/base/detail/BufferedMemoryBase.h
diff --git a/source/RobotAPI/libraries/armem/server/ltm/detail/CoreSegmentBase.cpp b/source/RobotAPI/libraries/armem/server/ltm/base/detail/CoreSegmentBase.cpp
similarity index 100%
rename from source/RobotAPI/libraries/armem/server/ltm/detail/CoreSegmentBase.cpp
rename to source/RobotAPI/libraries/armem/server/ltm/base/detail/CoreSegmentBase.cpp
diff --git a/source/RobotAPI/libraries/armem/server/ltm/detail/CoreSegmentBase.h b/source/RobotAPI/libraries/armem/server/ltm/base/detail/CoreSegmentBase.h
similarity index 100%
rename from source/RobotAPI/libraries/armem/server/ltm/detail/CoreSegmentBase.h
rename to source/RobotAPI/libraries/armem/server/ltm/base/detail/CoreSegmentBase.h
diff --git a/source/RobotAPI/libraries/armem/server/ltm/detail/EntityBase.cpp b/source/RobotAPI/libraries/armem/server/ltm/base/detail/EntityBase.cpp
similarity index 100%
rename from source/RobotAPI/libraries/armem/server/ltm/detail/EntityBase.cpp
rename to source/RobotAPI/libraries/armem/server/ltm/base/detail/EntityBase.cpp
diff --git a/source/RobotAPI/libraries/armem/server/ltm/detail/EntityBase.h b/source/RobotAPI/libraries/armem/server/ltm/base/detail/EntityBase.h
similarity index 100%
rename from source/RobotAPI/libraries/armem/server/ltm/detail/EntityBase.h
rename to source/RobotAPI/libraries/armem/server/ltm/base/detail/EntityBase.h
diff --git a/source/RobotAPI/libraries/armem/server/ltm/detail/EntitySnapshotBase.cpp b/source/RobotAPI/libraries/armem/server/ltm/base/detail/EntitySnapshotBase.cpp
similarity index 100%
rename from source/RobotAPI/libraries/armem/server/ltm/detail/EntitySnapshotBase.cpp
rename to source/RobotAPI/libraries/armem/server/ltm/base/detail/EntitySnapshotBase.cpp
diff --git a/source/RobotAPI/libraries/armem/server/ltm/detail/EntitySnapshotBase.h b/source/RobotAPI/libraries/armem/server/ltm/base/detail/EntitySnapshotBase.h
similarity index 100%
rename from source/RobotAPI/libraries/armem/server/ltm/detail/EntitySnapshotBase.h
rename to source/RobotAPI/libraries/armem/server/ltm/base/detail/EntitySnapshotBase.h
diff --git a/source/RobotAPI/libraries/armem/server/ltm/detail/LUTMemoryBase.cpp b/source/RobotAPI/libraries/armem/server/ltm/base/detail/LUTMemoryBase.cpp
similarity index 100%
rename from source/RobotAPI/libraries/armem/server/ltm/detail/LUTMemoryBase.cpp
rename to source/RobotAPI/libraries/armem/server/ltm/base/detail/LUTMemoryBase.cpp
diff --git a/source/RobotAPI/libraries/armem/server/ltm/detail/LUTMemoryBase.h b/source/RobotAPI/libraries/armem/server/ltm/base/detail/LUTMemoryBase.h
similarity index 100%
rename from source/RobotAPI/libraries/armem/server/ltm/detail/LUTMemoryBase.h
rename to source/RobotAPI/libraries/armem/server/ltm/base/detail/LUTMemoryBase.h
diff --git a/source/RobotAPI/libraries/armem/server/ltm/detail/MemoryBase.cpp b/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryBase.cpp
similarity index 100%
rename from source/RobotAPI/libraries/armem/server/ltm/detail/MemoryBase.cpp
rename to source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryBase.cpp
diff --git a/source/RobotAPI/libraries/armem/server/ltm/detail/MemoryBase.h b/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryBase.h
similarity index 100%
rename from source/RobotAPI/libraries/armem/server/ltm/detail/MemoryBase.h
rename to source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryBase.h
diff --git a/source/RobotAPI/libraries/armem/server/ltm/detail/MemoryItem.cpp b/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryItem.cpp
similarity index 100%
rename from source/RobotAPI/libraries/armem/server/ltm/detail/MemoryItem.cpp
rename to source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryItem.cpp
diff --git a/source/RobotAPI/libraries/armem/server/ltm/detail/MemoryItem.h b/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryItem.h
similarity index 100%
rename from source/RobotAPI/libraries/armem/server/ltm/detail/MemoryItem.h
rename to source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryItem.h
diff --git a/source/RobotAPI/libraries/armem/server/ltm/detail/ProviderSegmentBase.cpp b/source/RobotAPI/libraries/armem/server/ltm/base/detail/ProviderSegmentBase.cpp
similarity index 100%
rename from source/RobotAPI/libraries/armem/server/ltm/detail/ProviderSegmentBase.cpp
rename to source/RobotAPI/libraries/armem/server/ltm/base/detail/ProviderSegmentBase.cpp
diff --git a/source/RobotAPI/libraries/armem/server/ltm/detail/ProviderSegmentBase.h b/source/RobotAPI/libraries/armem/server/ltm/base/detail/ProviderSegmentBase.h
similarity index 100%
rename from source/RobotAPI/libraries/armem/server/ltm/detail/ProviderSegmentBase.h
rename to source/RobotAPI/libraries/armem/server/ltm/base/detail/ProviderSegmentBase.h
diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/encoder/Encoder.cpp b/source/RobotAPI/libraries/armem/server/ltm/base/encoder/Encoder.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/encoder/Encoder.h b/source/RobotAPI/libraries/armem/server/ltm/base/encoder/Encoder.h
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/encoder/noEncoder/NoEncoder.cpp b/source/RobotAPI/libraries/armem/server/ltm/base/encoder/noEncoder/NoEncoder.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/encoder/noEncoder/NoEncoder.h b/source/RobotAPI/libraries/armem/server/ltm/base/encoder/noEncoder/NoEncoder.h
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/filter/Filter.cpp b/source/RobotAPI/libraries/armem/server/ltm/base/filter/Filter.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/filter/Filter.h b/source/RobotAPI/libraries/armem/server/ltm/base/filter/Filter.h
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/filter/noFilter/NoFilter.cpp b/source/RobotAPI/libraries/armem/server/ltm/base/filter/noFilter/NoFilter.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/filter/noFilter/NoFilter.h b/source/RobotAPI/libraries/armem/server/ltm/base/filter/noFilter/NoFilter.h
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/forgetter/Forgetter.cpp b/source/RobotAPI/libraries/armem/server/ltm/base/forgetter/Forgetter.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/forgetter/Forgetter.h b/source/RobotAPI/libraries/armem/server/ltm/base/forgetter/Forgetter.h
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/forgetter/noForgetter/NoForgetter.cpp b/source/RobotAPI/libraries/armem/server/ltm/base/forgetter/noForgetter/NoForgetter.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/forgetter/noForgetter/NoForgetter.h b/source/RobotAPI/libraries/armem/server/ltm/base/forgetter/noForgetter/NoForgetter.h
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/source/RobotAPI/libraries/armem/server/ltm/disk/CoreSegment.h b/source/RobotAPI/libraries/armem/server/ltm/disk/CoreSegment.h
index 1ec95bd792c3d20c8448c3fd956075aedce3e736..a0d3872ce5fca928cf1669f1526bb519def7e4ea 100644
--- a/source/RobotAPI/libraries/armem/server/ltm/disk/CoreSegment.h
+++ b/source/RobotAPI/libraries/armem/server/ltm/disk/CoreSegment.h
@@ -3,7 +3,7 @@
#include <filesystem>
// Base Class
-#include "../detail/CoreSegmentBase.h"
+#include "../base/detail/CoreSegmentBase.h"
#include "detail/DiskStorage.h"
#include "ProviderSegment.h"
diff --git a/source/RobotAPI/libraries/armem/server/ltm/disk/Entity.h b/source/RobotAPI/libraries/armem/server/ltm/disk/Entity.h
index 3d0aacfb3f8c69f96e924b1eeb1764fa1d44b943..48b46c34e6591f9b61bea581d419d38e8bb6b628 100644
--- a/source/RobotAPI/libraries/armem/server/ltm/disk/Entity.h
+++ b/source/RobotAPI/libraries/armem/server/ltm/disk/Entity.h
@@ -3,7 +3,7 @@
#include <filesystem>
// Base Class
-#include "../detail/EntityBase.h"
+#include "../base/detail/EntityBase.h"
#include "detail/DiskStorage.h"
#include "EntitySnapshot.h"
diff --git a/source/RobotAPI/libraries/armem/server/ltm/disk/EntitySnapshot.h b/source/RobotAPI/libraries/armem/server/ltm/disk/EntitySnapshot.h
index 50d01d25461559712d74df3947e3741df306cb72..d93a62c9c7dba00d8aaa1a236b1dbb71cbabc647 100644
--- a/source/RobotAPI/libraries/armem/server/ltm/disk/EntitySnapshot.h
+++ b/source/RobotAPI/libraries/armem/server/ltm/disk/EntitySnapshot.h
@@ -3,7 +3,7 @@
#include <filesystem>
// Base Class
-#include "../detail/EntitySnapshotBase.h"
+#include "../base/detail/EntitySnapshotBase.h"
#include "detail/DiskStorage.h"
namespace armarx::armem::server::ltm::disk
diff --git a/source/RobotAPI/libraries/armem/server/ltm/disk/Memory.h b/source/RobotAPI/libraries/armem/server/ltm/disk/Memory.h
index a32719de2ffa4ff8259de6c989a981c4d6d54d65..e9e4225779b972672e70d693f10f50f863088804 100644
--- a/source/RobotAPI/libraries/armem/server/ltm/disk/Memory.h
+++ b/source/RobotAPI/libraries/armem/server/ltm/disk/Memory.h
@@ -3,7 +3,7 @@
#include <filesystem>
// Base Class
-#include "../detail/BufferedMemoryBase.h"
+#include "../base/detail/BufferedMemoryBase.h"
#include "detail/DiskStorage.h"
#include "CoreSegment.h"
diff --git a/source/RobotAPI/libraries/armem/server/ltm/disk/ProviderSegment.h b/source/RobotAPI/libraries/armem/server/ltm/disk/ProviderSegment.h
index 265902756260196cef11895d79c07052ceb24ce2..45ed5c8acf388d93a24cbb64149b6c59871cca42 100644
--- a/source/RobotAPI/libraries/armem/server/ltm/disk/ProviderSegment.h
+++ b/source/RobotAPI/libraries/armem/server/ltm/disk/ProviderSegment.h
@@ -3,7 +3,7 @@
#include <filesystem>
// Base Class
-#include "../detail/ProviderSegmentBase.h"
+#include "../base/detail/ProviderSegmentBase.h"
#include "detail/DiskStorage.h"
#include "Entity.h"
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/ltm/disk/ltm.cpp b/source/RobotAPI/libraries/armem/server/query_proc/ltm/disk/ltm.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..cf48f8897c8b04b35a14086ae6cc93aed2f1b5cb
--- /dev/null
+++ b/source/RobotAPI/libraries/armem/server/query_proc/ltm/disk/ltm.cpp
@@ -0,0 +1,7 @@
+#include "ltm.h"
+
+
+namespace armarx::armem::server::query_proc::ltm_server::disk
+{
+}
+
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/ltm/ltm.h b/source/RobotAPI/libraries/armem/server/query_proc/ltm/disk/ltm.h
similarity index 87%
rename from source/RobotAPI/libraries/armem/server/query_proc/ltm/ltm.h
rename to source/RobotAPI/libraries/armem/server/query_proc/ltm/disk/ltm.h
index eb8a13122eba76191ab2608db446aea94e716614..80d83a15c4f537916c61049efc27016f48f7eb31 100644
--- a/source/RobotAPI/libraries/armem/server/query_proc/ltm/ltm.h
+++ b/source/RobotAPI/libraries/armem/server/query_proc/ltm/disk/ltm.h
@@ -3,12 +3,12 @@
#include <RobotAPI/libraries/armem/server/ltm/disk/Memory.h>
#include <RobotAPI/libraries/armem/server/query_proc/base.h>
-#include "detail/MemoryQueryProcessorBase.h"
-#include "detail/CoreSegmentQueryProcessorBase.h"
-#include "detail/ProviderSegmentQueryProcessorBase.h"
-#include "detail/EntityQueryProcessorBase.h"
+#include "../detail/MemoryQueryProcessorBase.h"
+#include "../detail/CoreSegmentQueryProcessorBase.h"
+#include "../detail/ProviderSegmentQueryProcessorBase.h"
+#include "../detail/EntityQueryProcessorBase.h"
-namespace armarx::armem::server::query_proc::ltm_server
+namespace armarx::armem::server::query_proc::ltm_server::disk
{
static const base::QueryTarget queryTarget = query::data::QueryTarget::LTM;
diff --git a/source/RobotAPI/libraries/armem/server/query_proc/ltm/ltm.cpp b/source/RobotAPI/libraries/armem/server/query_proc/ltm/ltm.cpp
deleted file mode 100644
index 238cc4b8d1601bf1ffae131caabbf8ca8435899a..0000000000000000000000000000000000000000
--- a/source/RobotAPI/libraries/armem/server/query_proc/ltm/ltm.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "ltm.h"
-
-
-namespace armarx::armem::server::query_proc::ltm
-{
-}
-
diff --git a/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp b/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
index 9ce928459f53b379b40279c033ef7b7a7c709fa3..b7aa4b68ccbcca14dab48f014da975a3f089e3df 100644
--- a/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
+++ b/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
@@ -4,7 +4,7 @@
#include <RobotAPI/libraries/armem_gui/gui_utils.h>
#include <RobotAPI/libraries/armem/server/query_proc/wm/wm.h>
-#include <RobotAPI/libraries/armem/server/query_proc/ltm/ltm.h>
+#include <RobotAPI/libraries/armem/server/query_proc/ltm/disk/ltm.h>
#include <ArmarXGui/libraries/SimpleConfigDialog/SimpleConfigDialog.h>
diff --git a/source/RobotAPI/libraries/armem_gui/disk/ControlWidget.cpp b/source/RobotAPI/libraries/armem_gui/disk/ControlWidget.cpp
index 0e0f620d2140cd6a8102572e125828026831b003..2306f3c6020cddb0a57b60735ca17f085affe7c6 100644
--- a/source/RobotAPI/libraries/armem_gui/disk/ControlWidget.cpp
+++ b/source/RobotAPI/libraries/armem_gui/disk/ControlWidget.cpp
@@ -1,7 +1,7 @@
#include "ControlWidget.h"
#include <RobotAPI/libraries/armem/server/ltm/disk/Memory.h>
-#include <RobotAPI/libraries/armem/server/query_proc/ltm/ltm.h>
+#include <RobotAPI/libraries/armem/server/query_proc/ltm/disk/ltm.h>
#include <ArmarXCore/core/exceptions/local/ExpressionException.h>