diff --git a/source/armarx/navigation/components/GraphImportExport/GraphImportExport.cpp b/source/armarx/navigation/components/GraphImportExport/GraphImportExport.cpp
index 27ea3f1572b693bd58464a59c05b76939a357f18..e10c6e3ff2c1bab4565e3db237d49d598ccaadbe 100644
--- a/source/armarx/navigation/components/GraphImportExport/GraphImportExport.cpp
+++ b/source/armarx/navigation/components/GraphImportExport/GraphImportExport.cpp
@@ -39,7 +39,7 @@
 #include <armarx/navigation/core/aron/Graph.aron.generated.h>
 #include <armarx/navigation/graph/Visu.h>
 #include <armarx/navigation/graph/constants.h>
-#include <armarx/navigation/location/aron/Location.aron.generated.h>
+#include <armarx/navigation/core/aron/Location.aron.generated.h>
 #include <armarx/navigation/location/constants.h>
 
 
diff --git a/source/armarx/navigation/components/NavigationMemory/NavigationMemory.cpp b/source/armarx/navigation/components/NavigationMemory/NavigationMemory.cpp
index 11b8271d64fe3fec26ed19c0720400c9aed325c3..292b497c9cfcea15a21c6cc0b8ce158d3849cb04 100644
--- a/source/armarx/navigation/components/NavigationMemory/NavigationMemory.cpp
+++ b/source/armarx/navigation/components/NavigationMemory/NavigationMemory.cpp
@@ -39,7 +39,7 @@
 #include <armarx/navigation/core/aron/Trajectory.aron.generated.h>
 #include <armarx/navigation/core/aron/Twist.aron.generated.h>
 #include <armarx/navigation/graph/constants.h>
-#include <armarx/navigation/location/aron/Location.aron.generated.h>
+#include <armarx/navigation/core/aron/Location.aron.generated.h>
 #include <armarx/navigation/location/constants.h>
 
 
diff --git a/source/armarx/navigation/components/NavigationMemory/Visu.cpp b/source/armarx/navigation/components/NavigationMemory/Visu.cpp
index 63307c109a3e213026a25e958e0ced4db92b46c2..328e21cee7ad6e63ce00ee998ccaaadf2b67f42b 100644
--- a/source/armarx/navigation/components/NavigationMemory/Visu.cpp
+++ b/source/armarx/navigation/components/NavigationMemory/Visu.cpp
@@ -27,7 +27,7 @@
 #include <armarx/navigation/core/Graph.h>
 #include <armarx/navigation/core/aron/Graph.aron.generated.h>
 #include <armarx/navigation/graph/Visu.h>
-#include <armarx/navigation/location/aron/Location.aron.generated.h>
+#include <armarx/navigation/core/aron/Location.aron.generated.h>
 
 
 namespace armarx::navigation::memory
diff --git a/source/armarx/navigation/core/CMakeLists.txt b/source/armarx/navigation/core/CMakeLists.txt
index d4eb48836d6d48e3635a3a2e376e2057fd6fc708..ec1598c68ac4a430c0663a76421f6e9a9e00a855 100644
--- a/source/armarx/navigation/core/CMakeLists.txt
+++ b/source/armarx/navigation/core/CMakeLists.txt
@@ -6,6 +6,7 @@ armarx_add_aron_library(core_aron
         aron/Trajectory.xml
         aron/Events.xml
         aron/Graph.xml
+        aron/Location.xml
 )
 
 armarx_add_library(core
diff --git a/source/armarx/navigation/core/Graph.cpp b/source/armarx/navigation/core/Graph.cpp
index 7bdd89bab7bb09d29f2fda394d66ea4bb7f5b76a..f1bc378109fa48f6ed104e728467866474426dec 100644
--- a/source/armarx/navigation/core/Graph.cpp
+++ b/source/armarx/navigation/core/Graph.cpp
@@ -30,7 +30,7 @@
 
 #include <RobotAPI/libraries/armem/core/wm/memory_definitions.h>
 
-#include <armarx/navigation/location/aron/Location.aron.generated.h>
+#include <armarx/navigation/core/aron/Location.aron.generated.h>
 #include <armarx/navigation/core/json_conversions.h>
 
 
diff --git a/source/armarx/navigation/location/aron/Location.xml b/source/armarx/navigation/core/aron/Location.xml
similarity index 100%
rename from source/armarx/navigation/location/aron/Location.xml
rename to source/armarx/navigation/core/aron/Location.xml
diff --git a/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.cpp b/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.cpp
index e29849d82dcfe6576c802d4dc7ba7f063a2e1c0f..b4487009018c118f5d3ed49ba73d65c05aeb7cb7 100644
--- a/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.cpp
+++ b/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.cpp
@@ -43,7 +43,7 @@
 #include <armarx/navigation/core/aron/Graph.aron.generated.h>
 #include <armarx/navigation/graph/constants.h>
 #include <armarx/navigation/gui-plugins/LocationGraphEditor/ui_LocationGraphEditorWidget.h>
-#include <armarx/navigation/location/aron/Location.aron.generated.h>
+#include <armarx/navigation/core/aron/Location.aron.generated.h>
 #include <armarx/navigation/location/constants.h>
 
 // Qt headers
diff --git a/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.h b/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.h
index 8fb16d475fa7832edaef3fe50c03dc6c5cf66bf0..4e06004dd64b61c38bc1aa8c6964ccd512146261 100644
--- a/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.h
+++ b/source/armarx/navigation/gui-plugins/LocationGraphEditor/WidgetController.h
@@ -41,7 +41,7 @@
 #include "widgets/graph_scene.h"
 #include <armarx/navigation/core/Graph.h>
 #include <armarx/navigation/gui-plugins/LocationGraphEditor/ui_LocationGraphEditorWidget.h>
-#include <armarx/navigation/location/aron/Location.aron.generated.h>
+#include <armarx/navigation/core/aron/Location.aron.generated.h>
 
 
 class QDialog;
diff --git a/source/armarx/navigation/location/CMakeLists.txt b/source/armarx/navigation/location/CMakeLists.txt
index 45c89d57565840faccda75b923d16624ac70157b..21db0db7bf30dc1ab5b47d3b0046d4f8d65c1172 100644
--- a/source/armarx/navigation/location/CMakeLists.txt
+++ b/source/armarx/navigation/location/CMakeLists.txt
@@ -1,11 +1,3 @@
-
-
-armarx_add_aron_library(location_aron
-    ARON_FILES
-        aron/Location.xml
-)
-
-
 armarx_add_library(location
     DEPENDENCIES
         ArmarXCoreInterfaces
diff --git a/source/armarx/navigation/memory/client/graph/Reader.cpp b/source/armarx/navigation/memory/client/graph/Reader.cpp
index 284bf74ca764324459dacc21a88fcd5a4b5ba8e3..7d3513a1ce38a4d579fcc32753d598fcb8c03bf6 100644
--- a/source/armarx/navigation/memory/client/graph/Reader.cpp
+++ b/source/armarx/navigation/memory/client/graph/Reader.cpp
@@ -15,7 +15,7 @@
 #include <armarx/navigation/core/Graph.h>
 #include <armarx/navigation/core/aron/Graph.aron.generated.h>
 #include <armarx/navigation/graph/constants.h>
-#include <armarx/navigation/location/aron/Location.aron.generated.h>
+#include <armarx/navigation/core/aron/Location.aron.generated.h>
 #include <armarx/navigation/location/constants.h>
 
 namespace armarx::navigation::mem::client::graph
diff --git a/source/armarx/navigation/memory/client/graph/Reader.h b/source/armarx/navigation/memory/client/graph/Reader.h
index d9181e26092eef244f00489bf00bfb2179ec1790..9a65ed9f03657248c62af5b81577adfd3328e564 100644
--- a/source/armarx/navigation/memory/client/graph/Reader.h
+++ b/source/armarx/navigation/memory/client/graph/Reader.h
@@ -25,7 +25,7 @@
 
 #include <armarx/navigation/core/Graph.h>
 #include <armarx/navigation/core/types.h>
-#include <armarx/navigation/location/aron/Location.aron.generated.h>
+#include <armarx/navigation/core/aron/Location.aron.generated.h>
 
 namespace armarx::navigation::mem::client::graph
 {