diff --git a/src/opt/memory/CMakeLists.txt b/src/core/memory/CMakeLists.txt
similarity index 100%
rename from src/opt/memory/CMakeLists.txt
rename to src/core/memory/CMakeLists.txt
diff --git a/src/opt/memory/GenericFileSystemMessage.cpp b/src/core/memory/GenericFileSystemMessage.cpp
similarity index 100%
rename from src/opt/memory/GenericFileSystemMessage.cpp
rename to src/core/memory/GenericFileSystemMessage.cpp
diff --git a/src/opt/memory/MemoryHelper.cpp b/src/core/memory/MemoryHelper.cpp
similarity index 100%
rename from src/opt/memory/MemoryHelper.cpp
rename to src/core/memory/MemoryHelper.cpp
diff --git a/src/opt/memory/MemoryMessage.cpp b/src/core/memory/MemoryMessage.cpp
similarity index 100%
rename from src/opt/memory/MemoryMessage.cpp
rename to src/core/memory/MemoryMessage.cpp