diff --git a/algo/ca/core/CMakeLists.txt b/algo/ca/core/CMakeLists.txt
index f11c8847c9d7eee072b2e6faa80939ddde9a4515..755fcaa22227efee64b9d565c9d460bde39574b5 100644
--- a/algo/ca/core/CMakeLists.txt
+++ b/algo/ca/core/CMakeLists.txt
@@ -6,6 +6,8 @@ set(INCLUDE_DIRECTORIES
 )
 
 set(SRCS
+  ${CMAKE_CURRENT_SOURCE_DIR}/data/CaDataManager.cxx
+  ${CMAKE_CURRENT_SOURCE_DIR}/data/CaInputData.cxx
   ${CMAKE_CURRENT_SOURCE_DIR}/data/CaTrack.cxx
   ${CMAKE_CURRENT_SOURCE_DIR}/data/CaTrackParam.cxx
   ${CMAKE_CURRENT_SOURCE_DIR}/pars/CaConfigReader.cxx
@@ -45,11 +47,13 @@ install(DIRECTORY pars TYPE INCLUDE FILES_MATCHING PATTERN "*.h")
 
 install(
   FILES
+    data/CaDataManager.h
+    data/CaGridEntry.h
+    data/CaHit.h
+    data/CaInputData.h
     data/CaTrackParam.h
     data/CaTrack.h
-    data/CaHit.h
     pars/CaConfigReader.h
-    data/CaGridEntry.h
     pars/CaConstants.h
     pars/CaField.h
     pars/CaInitManager.h
@@ -61,12 +65,12 @@ install(
     pars/CaStationInitializer.h
     utils/CaEnumArray.h
     utils/CaMonitor.h
+    utils/CaObjectInitController.h
     utils/CaSimd.h
     utils/CaSimdVc.h
     utils/CaSimdPseudo.h
     utils/CaVector.h
     utils/CaUtils.h
-    utils/CaObjectInitController.h
   DESTINATION
     include/
 )
diff --git a/reco/L1/L1Algo/L1IODataManager.cxx b/algo/ca/core/data/CaDataManager.cxx
similarity index 99%
rename from reco/L1/L1Algo/L1IODataManager.cxx
rename to algo/ca/core/data/CaDataManager.cxx
index 66bffd2d4f9a1000357e07547f2004bda76d3e04..0e9174594c38c84a462b0ac1471716505401b26d 100644
--- a/reco/L1/L1Algo/L1IODataManager.cxx
+++ b/algo/ca/core/data/CaDataManager.cxx
@@ -7,7 +7,7 @@
 /// \since 08.08.2022
 /// \author S.Zharko <s.zharko@gsi.de>
 
-#include "L1IODataManager.h"
+#include "CaDataManager.h"
 
 #include <boost/archive/binary_iarchive.hpp>
 #include <boost/archive/binary_oarchive.hpp>
diff --git a/reco/L1/L1Algo/L1IODataManager.h b/algo/ca/core/data/CaDataManager.h
similarity index 99%
rename from reco/L1/L1Algo/L1IODataManager.h
rename to algo/ca/core/data/CaDataManager.h
index 2c80b3c86c4b06fe14a84a20d9ee5b0f4164fb92..3cba54fde4e9a028dfd7456f7bcf9d983c287e63 100644
--- a/reco/L1/L1Algo/L1IODataManager.h
+++ b/algo/ca/core/data/CaDataManager.h
@@ -11,7 +11,7 @@
 #define L1IODataManager_h 1
 
 #include "CaConstants.h"
-#include "L1InputData.h"
+#include "CaInputData.h"
 
 using namespace cbm::algo::ca;  //TODO: remove
 
diff --git a/reco/L1/L1Algo/L1InputData.cxx b/algo/ca/core/data/CaInputData.cxx
similarity index 98%
rename from reco/L1/L1Algo/L1InputData.cxx
rename to algo/ca/core/data/CaInputData.cxx
index d9087691f0d47f57064dcb66bc6a325d406f1287..bafa1c1ba24ad940c6eacb895940de9dfec38309 100644
--- a/reco/L1/L1Algo/L1InputData.cxx
+++ b/algo/ca/core/data/CaInputData.cxx
@@ -7,7 +7,7 @@
 /// \since  08.08.2022
 /// \author Sergei Zharko <s.zharko@gsi.de>
 
-#include "L1InputData.h"
+#include "CaInputData.h"
 
 
 // ---------------------------------------------------------------------------------------------------------------------
diff --git a/reco/L1/L1Algo/L1InputData.h b/algo/ca/core/data/CaInputData.h
similarity index 99%
rename from reco/L1/L1Algo/L1InputData.h
rename to algo/ca/core/data/CaInputData.h
index 3badad4eb8f8b35b8e1e69f6c856b3fe19fdc276..093e07816e400061d99251ecda9a2d8f56123bb0 100644
--- a/reco/L1/L1Algo/L1InputData.h
+++ b/algo/ca/core/data/CaInputData.h
@@ -22,7 +22,7 @@ namespace
   using cbm::algo::ca::Vector;
   using namespace cbm::algo;
   using namespace cbm::algo::ca;
-}
+}  // namespace
 
 /// Class L1InputData represents a block of the input data to the L1 tracking algorithm per event or time slice.
 /// Filling of the L1InputData is carried out with L1IODataManager class
diff --git a/reco/L1/CMakeLists.txt b/reco/L1/CMakeLists.txt
index 50e819eac6758507e173bb1ab4d1bd50d6896b78..75c05e0b1edfcb40158df62cda0083770c2c1b7f 100644
--- a/reco/L1/CMakeLists.txt
+++ b/reco/L1/CMakeLists.txt
@@ -49,8 +49,6 @@ set(SRCS
   L1Algo/L1MaterialMonitor.cxx
   L1Algo/L1UMeasurementInfo.cxx
   L1Algo/L1XYMeasurementInfo.cxx
-  L1Algo/L1InputData.cxx
-  L1Algo/L1IODataManager.cxx
   L1Algo/L1CloneMerger.cxx
   L1Algo/utils/L1AlgoDraw.cxx
   L1Algo/utils/L1AlgoEfficiencyPerformance.cxx
diff --git a/reco/L1/CbmCaMCModule.h b/reco/L1/CbmCaMCModule.h
index 7885be82cfaf20d64330d863ca4def52b9ae9669..8a289b8b7594f6bb13ce34893d2ce0d482f79d40 100644
--- a/reco/L1/CbmCaMCModule.h
+++ b/reco/L1/CbmCaMCModule.h
@@ -44,7 +44,6 @@
 #include "CaToolsMCData.h"
 #include "CaToolsMCPoint.h"
 #include "CaVector.h"
-#include "L1InputData.h"
 
 class CbmEvent;
 class CbmMCDataObject;
diff --git a/reco/L1/CbmCaTimeSliceReader.cxx b/reco/L1/CbmCaTimeSliceReader.cxx
index 1dc4b5cbde2c33fffed46c9160221ad783380571..ecdaf8af27017525b863acac6f3732009d2fc8df 100644
--- a/reco/L1/CbmCaTimeSliceReader.cxx
+++ b/reco/L1/CbmCaTimeSliceReader.cxx
@@ -23,8 +23,8 @@
 #include <numeric>
 
 #include "CaConstants.h"
+#include "CaInputData.h"
 #include "CaParameters.h"
-#include "L1InputData.h"
 
 using cbm::ca::tools::HitRecord;
 
diff --git a/reco/L1/CbmL1.h b/reco/L1/CbmL1.h
index 447a8ebaf8cb88b18a1301a3e77d7c3d885a7346..e4f861c73d941c2c8df3008a6fdef40d49e957eb 100644
--- a/reco/L1/CbmL1.h
+++ b/reco/L1/CbmL1.h
@@ -53,12 +53,12 @@
 #include <utility>
 
 #include "AlgoFairloggerCompat.h"
+#include "CaDataManager.h"
 #include "CaInitManager.h"
 #include "CaMonitor.h"
 #include "CaVector.h"
 #include "L1Algo/L1Algo.h"
 #include "L1EventEfficiencies.h"
-#include "L1IODataManager.h"
 #include "L1MaterialMonitor.h"
 
 class L1Algo;
diff --git a/reco/L1/L1Algo/L1Algo.h b/reco/L1/L1Algo/L1Algo.h
index e239a822ddd4f14dff94383c130a35923374a19f..8718507e869b01913ab8ac78e1ab0fc2e5891478 100644
--- a/reco/L1/L1Algo/L1Algo.h
+++ b/reco/L1/L1Algo/L1Algo.h
@@ -32,6 +32,7 @@ class L1AlgoDraw;
 #include "CaField.h"
 #include "CaGridEntry.h"
 #include "CaHit.h"
+#include "CaInputData.h"
 #include "CaParameters.h"
 #include "CaStation.h"
 #include "CaTrack.h"
@@ -41,7 +42,6 @@ class L1AlgoDraw;
 #include "L1CloneMerger.h"
 #include "L1Fit.h"
 #include "L1Grid.h"
-#include "L1InputData.h"
 #include "L1Triplet.h"
 #include "L1Utils.h"  // ? DEPRECATED ?