diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec2507de4404f1c8eac0fa517d5eb3879de1447c..659442e3801c704a4d1bebb1d0aac29873e8df97 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -241,7 +241,7 @@ add_subdirectory (reco)
 add_subdirectory (analysis)
 
 ### Detector directories
-add_subdirectory (mvd)
+#add_subdirectory (mvd)
 
 ### Others
 Option(LARGE_TEST_STATISTIC "Run the test suite with large statistic (100 events)" OFF)
diff --git a/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt b/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
index 2ce62a4824fa7641c6ea43919832d92866201d46..a072fe0253503bda0b05492f9e9af908e9f5c553 100644
--- a/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
+++ b/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
@@ -96,7 +96,7 @@ set(PUBLIC_DEPENDENCIES
   )
 
 set(PRIVATE_DEPENDENCIES
-  CbmMvd
+  CbmMvdBase
   CbmSimBase
   KFParticleInterface
   Littrack
diff --git a/analysis/detectors/CMakeLists.txt b/analysis/detectors/CMakeLists.txt
index a0b7cad75e9f2b7f357e76862ae2df05e9d103e7..07170a4be57b9d2d25bd198013550dfba0a4a136 100644
--- a/analysis/detectors/CMakeLists.txt
+++ b/analysis/detectors/CMakeLists.txt
@@ -1,6 +1,7 @@
 # CMakeList file for directory analysis/detectors
 # V. Friese, 20 April 2020
 
+add_subdirectory(mvd)
 add_subdirectory(psd)
 add_subdirectory(sts)
 add_subdirectory(tof)
diff --git a/analysis/detectors/mvd/CMakeLists.txt b/analysis/detectors/mvd/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d4ef76f8d4ae573b31456d4e48f79f8ee7b687ab
--- /dev/null
+++ b/analysis/detectors/mvd/CMakeLists.txt
@@ -0,0 +1,46 @@
+set(INCLUDE_DIRECTORIES
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/qa
+  ${CMAKE_CURRENT_SOURCE_DIR}/plugins/tasks
+  )
+
+set(SRCS
+  CbmMvdReadoutSimple.cxx
+  CbmMvdReadoutCluster.cxx
+
+  CbmMvdReadout.cxx
+  plugins/tasks/CbmMvdSensorReadoutTask.cxx
+
+  qa/CbmMvdQa.cxx
+#  qa/CbmMvdClusterAna.cxx
+  )
+
+
+set(LIBRARY_NAME CbmMvdAna)
+set(LINKDEF ${LIBRARY_NAME}LinkDef.h)
+set(PUBLIC_DEPENDENCIES
+  CbmBase
+  CbmData
+  FairRoot::Base
+  ROOT::Core
+  ROOT::Geom
+  ROOT::Gpad
+  ROOT::Hist
+  ROOT::MathCore
+  ROOT::Physics
+  )
+
+set(PRIVATE_DEPENDENCIES
+  CbmSimBase
+  CbmMvdBase
+  FairLogger::FairLogger
+  FairRoot::GeoBase
+  FairRoot::ParBase
+  ROOT::EG
+  ROOT::Graf
+  ROOT::Matrix
+  ROOT::RIO
+  ROOT::Tree
+  )
+
+generate_cbm_library()
diff --git a/analysis/detectors/mvd/CbmMvdAnaLinkDef.h b/analysis/detectors/mvd/CbmMvdAnaLinkDef.h
new file mode 100644
index 0000000000000000000000000000000000000000..d399f14dcb6f6278dc55147bf98100afe7a14f64
--- /dev/null
+++ b/analysis/detectors/mvd/CbmMvdAnaLinkDef.h
@@ -0,0 +1,15 @@
+/* Copyright (C) 2023 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+   SPDX-License-Identifier: GPL-3.0-only
+   Authors: Florian Uhlig [committer] */
+
+#ifdef __CINT__
+
+#pragma link C++ class CbmMvdQa+;
+//#pragma link C++ class CbmMvdClusterAna+;
+
+#pragma link C++ class CbmMvdReadoutSimple+;
+#pragma link C++ class CbmMvdReadoutCluster+;
+
+#pragma link C++ class CbmMvdReadout+;
+#pragma link C++ class CbmMvdSensorReadoutTask+;
+#endif
diff --git a/mvd/CbmMvdReadout.cxx b/analysis/detectors/mvd/CbmMvdReadout.cxx
similarity index 100%
rename from mvd/CbmMvdReadout.cxx
rename to analysis/detectors/mvd/CbmMvdReadout.cxx
diff --git a/mvd/CbmMvdReadout.h b/analysis/detectors/mvd/CbmMvdReadout.h
similarity index 100%
rename from mvd/CbmMvdReadout.h
rename to analysis/detectors/mvd/CbmMvdReadout.h
diff --git a/mvd/tools/readout/CbmMvdReadoutCluster.cxx b/analysis/detectors/mvd/CbmMvdReadoutCluster.cxx
similarity index 100%
rename from mvd/tools/readout/CbmMvdReadoutCluster.cxx
rename to analysis/detectors/mvd/CbmMvdReadoutCluster.cxx
diff --git a/mvd/tools/readout/CbmMvdReadoutCluster.h b/analysis/detectors/mvd/CbmMvdReadoutCluster.h
similarity index 100%
rename from mvd/tools/readout/CbmMvdReadoutCluster.h
rename to analysis/detectors/mvd/CbmMvdReadoutCluster.h
diff --git a/mvd/tools/readout/CbmMvdReadoutSimple.cxx b/analysis/detectors/mvd/CbmMvdReadoutSimple.cxx
similarity index 100%
rename from mvd/tools/readout/CbmMvdReadoutSimple.cxx
rename to analysis/detectors/mvd/CbmMvdReadoutSimple.cxx
diff --git a/mvd/tools/readout/CbmMvdReadoutSimple.h b/analysis/detectors/mvd/CbmMvdReadoutSimple.h
similarity index 100%
rename from mvd/tools/readout/CbmMvdReadoutSimple.h
rename to analysis/detectors/mvd/CbmMvdReadoutSimple.h
diff --git a/mvd/plugins/tasks/CbmMvdSensorReadoutTask.cxx b/analysis/detectors/mvd/plugins/tasks/CbmMvdSensorReadoutTask.cxx
similarity index 100%
rename from mvd/plugins/tasks/CbmMvdSensorReadoutTask.cxx
rename to analysis/detectors/mvd/plugins/tasks/CbmMvdSensorReadoutTask.cxx
diff --git a/mvd/plugins/tasks/CbmMvdSensorReadoutTask.h b/analysis/detectors/mvd/plugins/tasks/CbmMvdSensorReadoutTask.h
similarity index 100%
rename from mvd/plugins/tasks/CbmMvdSensorReadoutTask.h
rename to analysis/detectors/mvd/plugins/tasks/CbmMvdSensorReadoutTask.h
diff --git a/mvd/qa/CbmMvdClusterAna.cxx b/analysis/detectors/mvd/qa/CbmMvdClusterAna.cxx
similarity index 100%
rename from mvd/qa/CbmMvdClusterAna.cxx
rename to analysis/detectors/mvd/qa/CbmMvdClusterAna.cxx
diff --git a/mvd/qa/CbmMvdClusterAna.h b/analysis/detectors/mvd/qa/CbmMvdClusterAna.h
similarity index 100%
rename from mvd/qa/CbmMvdClusterAna.h
rename to analysis/detectors/mvd/qa/CbmMvdClusterAna.h
diff --git a/mvd/qa/CbmMvdQa.cxx b/analysis/detectors/mvd/qa/CbmMvdQa.cxx
similarity index 100%
rename from mvd/qa/CbmMvdQa.cxx
rename to analysis/detectors/mvd/qa/CbmMvdQa.cxx
diff --git a/mvd/qa/CbmMvdQa.h b/analysis/detectors/mvd/qa/CbmMvdQa.h
similarity index 100%
rename from mvd/qa/CbmMvdQa.h
rename to analysis/detectors/mvd/qa/CbmMvdQa.h
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index ab46e91eb57a61a7a85cdabc1a82bf19387ac598..f83c7f001975f915de4c119c4227621758eb382e 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -10,6 +10,7 @@ add_subdirectory(qa)
 add_subdirectory(detectors/trd)
 add_subdirectory(detectors/rich)
 add_subdirectory(detectors/much)
+add_subdirectory(detectors/mvd)
 add_subdirectory(detectors/tof)
 add_subdirectory(detectors/sts)
 add_subdirectory(detectors/psd)
diff --git a/core/detectors/mvd/CMakeLists.txt b/core/detectors/mvd/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1f52958ef25e2b297f5fc85efb929bfb2d783d6f
--- /dev/null
+++ b/core/detectors/mvd/CMakeLists.txt
@@ -0,0 +1,61 @@
+set(INCLUDE_DIRECTORIES
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/tools
+  ${CMAKE_CURRENT_SOURCE_DIR}/SensorDataSheets
+  ${CMAKE_CURRENT_SOURCE_DIR}/plugins
+  ${CMAKE_CURRENT_SOURCE_DIR}/plugins/tasks
+  ${CMAKE_CURRENT_SOURCE_DIR}/plugins/buffers
+  )
+
+set(SRCS
+  plugins/CbmMvdSensorPlugin.cxx
+
+  plugins/tasks/CbmMvdSensorTask.cxx
+
+  plugins/buffers/CbmMvdSensorBuffer.cxx
+  plugins/buffers/CbmMvdSensorFrameBuffer.cxx
+#  plugins/buffers/CbmMvdSensorTrackingBuffer.cxx
+
+  SensorDataSheets/CbmMvdMimosa26AHR.cxx
+  SensorDataSheets/CbmMvdMimosa34.cxx
+  SensorDataSheets/CbmMvdMimosis.cxx
+  SensorDataSheets/CbmMvdSensorDataSheet.cxx
+  
+  tools/CbmMvdGeoHandler.cxx
+  tools/CbmMvdHelper.h
+
+  CbmMvdStationPar.cxx
+  CbmMvdDetector.cxx
+  CbmMvdSensor.cxx
+
+  CbmMvdPileupManager.cxx
+  CbmMvdTrackingInterface.cxx
+  )
+
+
+set(LIBRARY_NAME CbmMvdBase)
+set(LINKDEF ${LIBRARY_NAME}LinkDef.h)
+set(PUBLIC_DEPENDENCIES
+  CbmBase
+  CbmData
+  FairRoot::Base
+  ROOT::Core
+  ROOT::Geom
+  ROOT::Gpad
+  ROOT::Hist
+  ROOT::MathCore
+  ROOT::Physics
+  )
+
+set(PRIVATE_DEPENDENCIES
+  FairLogger::FairLogger
+  FairRoot::GeoBase
+  FairRoot::ParBase
+  ROOT::EG
+  ROOT::Graf
+  ROOT::Matrix
+  ROOT::RIO
+  ROOT::Tree
+  )
+
+generate_cbm_library()
diff --git a/core/detectors/mvd/CbmMvdBaseLinkDef.h b/core/detectors/mvd/CbmMvdBaseLinkDef.h
new file mode 100644
index 0000000000000000000000000000000000000000..bb7bc0804e9acd3d95017ba8204aa54dc4108ffa
--- /dev/null
+++ b/core/detectors/mvd/CbmMvdBaseLinkDef.h
@@ -0,0 +1,30 @@
+/* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+   SPDX-License-Identifier: GPL-3.0-only
+   Authors: Philipp Sitzmann, Volker Friese [committer] */
+
+#ifdef __CINT__
+
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+
+#pragma link C++ class CbmMvdStationPar + ;
+
+#pragma link C++ class CbmMvdSensorDataSheet + ;
+#pragma link C++ class CbmMvdMimosa26AHR + ;
+#pragma link C++ class CbmMvdMimosa34 + ;
+#pragma link C++ class CbmMvdMimosis + ;
+
+#pragma link C++ class CbmMvdSensor + ;
+#pragma link C++ class CbmMvdDetector + ;
+
+#pragma link C++ class CbmMvdSensorBuffer + ;
+#pragma link C++ class CbmMvdSensorFrameBuffer + ;
+//#pragma link C++ class CbmMvdSensorTrackingBuffer + ;
+#pragma link C++ class CbmMvdSensorPlugin + ;
+#pragma link C++ class CbmMvdSensorTask + ;
+
+#pragma link C++ class CbmMvdGeoHandler + ;
+#pragma link C++ class CbmMvdTrackingInterface+;
+#pragma link C++ class CbmMvdPileupManager+;
+#endif
diff --git a/mvd/CbmMvdDetector.cxx b/core/detectors/mvd/CbmMvdDetector.cxx
similarity index 100%
rename from mvd/CbmMvdDetector.cxx
rename to core/detectors/mvd/CbmMvdDetector.cxx
diff --git a/mvd/CbmMvdDetector.h b/core/detectors/mvd/CbmMvdDetector.h
similarity index 100%
rename from mvd/CbmMvdDetector.h
rename to core/detectors/mvd/CbmMvdDetector.h
diff --git a/mvd/CbmMvdPileupManager.cxx b/core/detectors/mvd/CbmMvdPileupManager.cxx
similarity index 100%
rename from mvd/CbmMvdPileupManager.cxx
rename to core/detectors/mvd/CbmMvdPileupManager.cxx
diff --git a/mvd/CbmMvdPileupManager.h b/core/detectors/mvd/CbmMvdPileupManager.h
similarity index 100%
rename from mvd/CbmMvdPileupManager.h
rename to core/detectors/mvd/CbmMvdPileupManager.h
diff --git a/mvd/CbmMvdSensor.cxx b/core/detectors/mvd/CbmMvdSensor.cxx
similarity index 100%
rename from mvd/CbmMvdSensor.cxx
rename to core/detectors/mvd/CbmMvdSensor.cxx
diff --git a/mvd/CbmMvdSensor.h b/core/detectors/mvd/CbmMvdSensor.h
similarity index 100%
rename from mvd/CbmMvdSensor.h
rename to core/detectors/mvd/CbmMvdSensor.h
diff --git a/mvd/CbmMvdStationPar.cxx b/core/detectors/mvd/CbmMvdStationPar.cxx
similarity index 100%
rename from mvd/CbmMvdStationPar.cxx
rename to core/detectors/mvd/CbmMvdStationPar.cxx
diff --git a/mvd/CbmMvdStationPar.h b/core/detectors/mvd/CbmMvdStationPar.h
similarity index 100%
rename from mvd/CbmMvdStationPar.h
rename to core/detectors/mvd/CbmMvdStationPar.h
diff --git a/mvd/CbmMvdTrackingInterface.cxx b/core/detectors/mvd/CbmMvdTrackingInterface.cxx
similarity index 100%
rename from mvd/CbmMvdTrackingInterface.cxx
rename to core/detectors/mvd/CbmMvdTrackingInterface.cxx
diff --git a/mvd/CbmMvdTrackingInterface.h b/core/detectors/mvd/CbmMvdTrackingInterface.h
similarity index 100%
rename from mvd/CbmMvdTrackingInterface.h
rename to core/detectors/mvd/CbmMvdTrackingInterface.h
diff --git a/mvd/SensorDataSheets/CbmMvdMimosa26AHR.cxx b/core/detectors/mvd/SensorDataSheets/CbmMvdMimosa26AHR.cxx
similarity index 100%
rename from mvd/SensorDataSheets/CbmMvdMimosa26AHR.cxx
rename to core/detectors/mvd/SensorDataSheets/CbmMvdMimosa26AHR.cxx
diff --git a/mvd/SensorDataSheets/CbmMvdMimosa26AHR.h b/core/detectors/mvd/SensorDataSheets/CbmMvdMimosa26AHR.h
similarity index 100%
rename from mvd/SensorDataSheets/CbmMvdMimosa26AHR.h
rename to core/detectors/mvd/SensorDataSheets/CbmMvdMimosa26AHR.h
diff --git a/mvd/SensorDataSheets/CbmMvdMimosa34.cxx b/core/detectors/mvd/SensorDataSheets/CbmMvdMimosa34.cxx
similarity index 100%
rename from mvd/SensorDataSheets/CbmMvdMimosa34.cxx
rename to core/detectors/mvd/SensorDataSheets/CbmMvdMimosa34.cxx
diff --git a/mvd/SensorDataSheets/CbmMvdMimosa34.h b/core/detectors/mvd/SensorDataSheets/CbmMvdMimosa34.h
similarity index 100%
rename from mvd/SensorDataSheets/CbmMvdMimosa34.h
rename to core/detectors/mvd/SensorDataSheets/CbmMvdMimosa34.h
diff --git a/mvd/SensorDataSheets/CbmMvdMimosis.cxx b/core/detectors/mvd/SensorDataSheets/CbmMvdMimosis.cxx
similarity index 100%
rename from mvd/SensorDataSheets/CbmMvdMimosis.cxx
rename to core/detectors/mvd/SensorDataSheets/CbmMvdMimosis.cxx
diff --git a/mvd/SensorDataSheets/CbmMvdMimosis.h b/core/detectors/mvd/SensorDataSheets/CbmMvdMimosis.h
similarity index 100%
rename from mvd/SensorDataSheets/CbmMvdMimosis.h
rename to core/detectors/mvd/SensorDataSheets/CbmMvdMimosis.h
diff --git a/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx b/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx
similarity index 100%
rename from mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx
rename to core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx
diff --git a/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h b/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
similarity index 100%
rename from mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
rename to core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
diff --git a/mvd/plugins/CbmMvdSensorPlugin.cxx b/core/detectors/mvd/plugins/CbmMvdSensorPlugin.cxx
similarity index 100%
rename from mvd/plugins/CbmMvdSensorPlugin.cxx
rename to core/detectors/mvd/plugins/CbmMvdSensorPlugin.cxx
diff --git a/mvd/plugins/CbmMvdSensorPlugin.h b/core/detectors/mvd/plugins/CbmMvdSensorPlugin.h
similarity index 100%
rename from mvd/plugins/CbmMvdSensorPlugin.h
rename to core/detectors/mvd/plugins/CbmMvdSensorPlugin.h
diff --git a/mvd/plugins/PluginNamingConvention.txt b/core/detectors/mvd/plugins/PluginNamingConvention.txt
similarity index 100%
rename from mvd/plugins/PluginNamingConvention.txt
rename to core/detectors/mvd/plugins/PluginNamingConvention.txt
diff --git a/mvd/plugins/buffers/CbmMvdSensorBuffer.cxx b/core/detectors/mvd/plugins/buffers/CbmMvdSensorBuffer.cxx
similarity index 100%
rename from mvd/plugins/buffers/CbmMvdSensorBuffer.cxx
rename to core/detectors/mvd/plugins/buffers/CbmMvdSensorBuffer.cxx
diff --git a/mvd/plugins/buffers/CbmMvdSensorBuffer.h b/core/detectors/mvd/plugins/buffers/CbmMvdSensorBuffer.h
similarity index 100%
rename from mvd/plugins/buffers/CbmMvdSensorBuffer.h
rename to core/detectors/mvd/plugins/buffers/CbmMvdSensorBuffer.h
diff --git a/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.cxx b/core/detectors/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.cxx
similarity index 100%
rename from mvd/plugins/buffers/CbmMvdSensorFrameBuffer.cxx
rename to core/detectors/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.cxx
diff --git a/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.h b/core/detectors/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.h
similarity index 100%
rename from mvd/plugins/buffers/CbmMvdSensorFrameBuffer.h
rename to core/detectors/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.h
diff --git a/mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.cxx b/core/detectors/mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.cxx
similarity index 100%
rename from mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.cxx
rename to core/detectors/mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.cxx
diff --git a/mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.h b/core/detectors/mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.h
similarity index 100%
rename from mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.h
rename to core/detectors/mvd/plugins/buffers/CbmMvdSensorTrackingBuffer.h
diff --git a/mvd/plugins/tasks/CbmMvdSensorTask.cxx b/core/detectors/mvd/plugins/tasks/CbmMvdSensorTask.cxx
similarity index 100%
rename from mvd/plugins/tasks/CbmMvdSensorTask.cxx
rename to core/detectors/mvd/plugins/tasks/CbmMvdSensorTask.cxx
diff --git a/mvd/plugins/tasks/CbmMvdSensorTask.h b/core/detectors/mvd/plugins/tasks/CbmMvdSensorTask.h
similarity index 100%
rename from mvd/plugins/tasks/CbmMvdSensorTask.h
rename to core/detectors/mvd/plugins/tasks/CbmMvdSensorTask.h
diff --git a/mvd/tools/CbmMvdGeoHandler.cxx b/core/detectors/mvd/tools/CbmMvdGeoHandler.cxx
similarity index 100%
rename from mvd/tools/CbmMvdGeoHandler.cxx
rename to core/detectors/mvd/tools/CbmMvdGeoHandler.cxx
diff --git a/mvd/tools/CbmMvdGeoHandler.h b/core/detectors/mvd/tools/CbmMvdGeoHandler.h
similarity index 100%
rename from mvd/tools/CbmMvdGeoHandler.h
rename to core/detectors/mvd/tools/CbmMvdGeoHandler.h
diff --git a/mvd/tools/CbmMvdHelper.h b/core/detectors/mvd/tools/CbmMvdHelper.h
similarity index 100%
rename from mvd/tools/CbmMvdHelper.h
rename to core/detectors/mvd/tools/CbmMvdHelper.h
diff --git a/reco/KF/KF.cmake b/reco/KF/KF.cmake
index a5fe0231cb507261ab45701bcd263534a2444edb..701804792973c7801c60ea2f9dade0f8f1d244a8 100644
--- a/reco/KF/KF.cmake
+++ b/reco/KF/KF.cmake
@@ -86,7 +86,7 @@ set(LINKDEF ${LIBRARY_NAME}LinkDef.h)
 set(PUBLIC_DEPENDENCIES
   CbmBase
   CbmData
-  CbmMvd
+  CbmMvdBase
   CbmRecoBase
   FairRoot::Base
   ROOT::Core
diff --git a/reco/L1/CMakeLists.txt b/reco/L1/CMakeLists.txt
index 60ed071a1c6cd882b817c64b142ccbe1acf2ef51..36e1375d6dadf7af60ac9f5c6d0bd70b2fffd94e 100644
--- a/reco/L1/CMakeLists.txt
+++ b/reco/L1/CMakeLists.txt
@@ -175,7 +175,7 @@ endif()
 
 set(PRIVATE_DEPENDENCIES
   CbmMuchBase
-  CbmMvd
+  CbmMvdBase
   CbmRecoSts
   CbmSimSteer
   CbmStsBase
diff --git a/reco/detectors/CMakeLists.txt b/reco/detectors/CMakeLists.txt
index a45aa1a279038f024ed3b02c7ec031598c700c6d..a7b2f7391d93ae7bdc6a56b738898e16e7f8bf31 100644
--- a/reco/detectors/CMakeLists.txt
+++ b/reco/detectors/CMakeLists.txt
@@ -3,6 +3,7 @@
 
 add_subdirectory(bmon)
 add_subdirectory(much)
+add_subdirectory(mvd)
 add_subdirectory(psd)
 add_subdirectory(rich)
 add_subdirectory(sts)
diff --git a/reco/detectors/mvd/CMakeLists.txt b/reco/detectors/mvd/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5fde4b285cdeb9876b1ef7833fcaad243e6e3012
--- /dev/null
+++ b/reco/detectors/mvd/CMakeLists.txt
@@ -0,0 +1,47 @@
+set(INCLUDE_DIRECTORIES
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/qa
+  ${CMAKE_CURRENT_SOURCE_DIR}/plugins/tasks
+  )
+
+set(SRCS
+  #plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
+  plugins/tasks/CbmMvdSensorHitfinderTask.cxx
+  plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
+  
+  CbmMvdHitfinder.cxx  #OLD
+# CbmMvdDigiToHit.cxx
+  
+  CbmMvdClusterfinder.cxx
+  #CbmMvdClusterfinderTB.cxx
+  )
+
+
+set(LIBRARY_NAME CbmMvdReco)
+set(LINKDEF ${LIBRARY_NAME}LinkDef.h)
+set(PUBLIC_DEPENDENCIES
+  CbmBase
+  CbmData
+  FairRoot::Base
+  ROOT::Core
+  ROOT::Geom
+  ROOT::Gpad
+  ROOT::Hist
+  ROOT::MathCore
+  ROOT::Physics
+  )
+
+set(PRIVATE_DEPENDENCIES
+  CbmSimBase
+  CbmMvdBase
+  FairLogger::FairLogger
+  FairRoot::GeoBase
+  FairRoot::ParBase
+  ROOT::EG
+  ROOT::Graf
+  ROOT::Matrix
+  ROOT::RIO
+  ROOT::Tree
+  )
+
+generate_cbm_library()
diff --git a/mvd/CbmMvdClusterfinder.cxx b/reco/detectors/mvd/CbmMvdClusterfinder.cxx
similarity index 100%
rename from mvd/CbmMvdClusterfinder.cxx
rename to reco/detectors/mvd/CbmMvdClusterfinder.cxx
diff --git a/mvd/CbmMvdClusterfinder.h b/reco/detectors/mvd/CbmMvdClusterfinder.h
similarity index 100%
rename from mvd/CbmMvdClusterfinder.h
rename to reco/detectors/mvd/CbmMvdClusterfinder.h
diff --git a/mvd/CbmMvdClusterfinderTB.cxx b/reco/detectors/mvd/CbmMvdClusterfinderTB.cxx
similarity index 100%
rename from mvd/CbmMvdClusterfinderTB.cxx
rename to reco/detectors/mvd/CbmMvdClusterfinderTB.cxx
diff --git a/mvd/CbmMvdClusterfinderTB.h b/reco/detectors/mvd/CbmMvdClusterfinderTB.h
similarity index 100%
rename from mvd/CbmMvdClusterfinderTB.h
rename to reco/detectors/mvd/CbmMvdClusterfinderTB.h
diff --git a/mvd/CbmMvdDigiToHit.cxx b/reco/detectors/mvd/CbmMvdDigiToHit.cxx
similarity index 100%
rename from mvd/CbmMvdDigiToHit.cxx
rename to reco/detectors/mvd/CbmMvdDigiToHit.cxx
diff --git a/mvd/CbmMvdDigiToHit.h b/reco/detectors/mvd/CbmMvdDigiToHit.h
similarity index 100%
rename from mvd/CbmMvdDigiToHit.h
rename to reco/detectors/mvd/CbmMvdDigiToHit.h
diff --git a/mvd/CbmMvdDigiToHitTB.cxx b/reco/detectors/mvd/CbmMvdDigiToHitTB.cxx
similarity index 100%
rename from mvd/CbmMvdDigiToHitTB.cxx
rename to reco/detectors/mvd/CbmMvdDigiToHitTB.cxx
diff --git a/mvd/CbmMvdDigiToHitTB.h b/reco/detectors/mvd/CbmMvdDigiToHitTB.h
similarity index 100%
rename from mvd/CbmMvdDigiToHitTB.h
rename to reco/detectors/mvd/CbmMvdDigiToHitTB.h
diff --git a/mvd/CbmMvdHitfinder.cxx b/reco/detectors/mvd/CbmMvdHitfinder.cxx
similarity index 100%
rename from mvd/CbmMvdHitfinder.cxx
rename to reco/detectors/mvd/CbmMvdHitfinder.cxx
diff --git a/mvd/CbmMvdHitfinder.h b/reco/detectors/mvd/CbmMvdHitfinder.h
similarity index 100%
rename from mvd/CbmMvdHitfinder.h
rename to reco/detectors/mvd/CbmMvdHitfinder.h
diff --git a/mvd/CbmMvdHitfinderTB.cxx b/reco/detectors/mvd/CbmMvdHitfinderTB.cxx
similarity index 100%
rename from mvd/CbmMvdHitfinderTB.cxx
rename to reco/detectors/mvd/CbmMvdHitfinderTB.cxx
diff --git a/mvd/CbmMvdHitfinderTB.h b/reco/detectors/mvd/CbmMvdHitfinderTB.h
similarity index 100%
rename from mvd/CbmMvdHitfinderTB.h
rename to reco/detectors/mvd/CbmMvdHitfinderTB.h
diff --git a/reco/detectors/mvd/CbmMvdRecoLinkDef.h b/reco/detectors/mvd/CbmMvdRecoLinkDef.h
new file mode 100644
index 0000000000000000000000000000000000000000..b764523df4c869b48d8427499657ceebf2219b48
--- /dev/null
+++ b/reco/detectors/mvd/CbmMvdRecoLinkDef.h
@@ -0,0 +1,21 @@
+/* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+   SPDX-License-Identifier: GPL-3.0-only
+   Authors: Philipp Sitzmann, Volker Friese [committer] */
+
+#ifdef __CINT__
+
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+
+#pragma link C++ class CbmMvdHitfinder + ;
+#pragma link C++ class CbmMvdClusterfinder + ;
+
+#pragma link C++ class CbmMvdSensorHitfinderTask + ;  //OLD
+#pragma link C++ class CbmMvdSensorClusterfinderTask + ;  //OLD
+#pragma link C++ class CbmMvdTrackingInterface + ;
+
+#pragma link C++ class CbmMvdQa+;
+//#pragma link C++ class CbmMvdClusterAna+;
+
+#endif
diff --git a/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
similarity index 100%
rename from mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
rename to reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
diff --git a/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h
similarity index 100%
rename from mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h
rename to reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h
diff --git a/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
similarity index 100%
rename from mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
rename to reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
diff --git a/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.h b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.h
similarity index 100%
rename from mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.h
rename to reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.h
diff --git a/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx
similarity index 100%
rename from mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx
rename to reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx
diff --git a/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h
similarity index 100%
rename from mvd/plugins/tasks/CbmMvdSensorFindHitTask.h
rename to reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h
diff --git a/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx
similarity index 100%
rename from mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx
rename to reco/detectors/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx
diff --git a/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.h b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.h
similarity index 100%
rename from mvd/plugins/tasks/CbmMvdSensorHitfinderTask.h
rename to reco/detectors/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.h
diff --git a/reco/detectors/sts/CMakeLists.txt b/reco/detectors/sts/CMakeLists.txt
index e9cca0d6262f074328b2604f194ab6110a7b271c..284386c655f212ed4755f9d5ad263c1dc069be42 100644
--- a/reco/detectors/sts/CMakeLists.txt
+++ b/reco/detectors/sts/CMakeLists.txt
@@ -58,7 +58,7 @@ set(PRIVATE_DEPENDENCIES
   CbmBase
   CbmRecoBase
   CbmFlibFlesTools
-  CbmMvd
+  CbmMvdBase
   FairRoot::ParBase
   ROOT::Geom
   ROOT::Gpad
diff --git a/sim/detectors/CMakeLists.txt b/sim/detectors/CMakeLists.txt
index f9d1edb8ba435463e15a6406623a5221baaa0fe2..8c50987d7d5119cb35aeef563eb8bdd04417e547 100644
--- a/sim/detectors/CMakeLists.txt
+++ b/sim/detectors/CMakeLists.txt
@@ -3,6 +3,7 @@
 
 add_subdirectory(bmon)
 add_subdirectory(much)
+add_subdirectory(mvd)
 add_subdirectory(psd)
 add_subdirectory(rich)
 add_subdirectory(sts)
diff --git a/sim/detectors/mvd/CMakeLists.txt b/sim/detectors/mvd/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..bba9a280a8007132d0e5622766fabd95fa3a7e51
--- /dev/null
+++ b/sim/detectors/mvd/CMakeLists.txt
@@ -0,0 +1,44 @@
+set(INCLUDE_DIRECTORIES
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/plugins/tasks
+  )
+
+set(SRCS
+  plugins/tasks/CbmMvdSensorDigitizerTask.cxx
+  #plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx
+  
+  CbmMvd.cxx
+
+  CbmMvdDigitizer.cxx
+  CbmMvdPixelCharge.cxx
+  )
+
+
+set(LIBRARY_NAME CbmMvdSim)
+set(LINKDEF ${LIBRARY_NAME}LinkDef.h)
+set(PUBLIC_DEPENDENCIES
+  CbmBase
+  CbmData
+  CbmMvdBase
+  FairRoot::Base
+  ROOT::Core
+  ROOT::Geom
+  ROOT::Gpad
+  ROOT::Hist
+  ROOT::MathCore
+  ROOT::Physics
+  )
+
+set(PRIVATE_DEPENDENCIES
+  CbmSimBase
+  FairLogger::FairLogger
+  FairRoot::GeoBase
+  FairRoot::ParBase
+  ROOT::EG
+  ROOT::Graf
+  ROOT::Matrix
+  ROOT::RIO
+  ROOT::Tree
+  )
+
+generate_cbm_library()
diff --git a/mvd/CbmMvd.cxx b/sim/detectors/mvd/CbmMvd.cxx
similarity index 100%
rename from mvd/CbmMvd.cxx
rename to sim/detectors/mvd/CbmMvd.cxx
diff --git a/mvd/CbmMvd.h b/sim/detectors/mvd/CbmMvd.h
similarity index 100%
rename from mvd/CbmMvd.h
rename to sim/detectors/mvd/CbmMvd.h
diff --git a/mvd/CbmMvdDigitizer.cxx b/sim/detectors/mvd/CbmMvdDigitizer.cxx
similarity index 100%
rename from mvd/CbmMvdDigitizer.cxx
rename to sim/detectors/mvd/CbmMvdDigitizer.cxx
diff --git a/mvd/CbmMvdDigitizer.h b/sim/detectors/mvd/CbmMvdDigitizer.h
similarity index 100%
rename from mvd/CbmMvdDigitizer.h
rename to sim/detectors/mvd/CbmMvdDigitizer.h
diff --git a/mvd/CbmMvdDigitizerTB.cxx b/sim/detectors/mvd/CbmMvdDigitizerTB.cxx
similarity index 100%
rename from mvd/CbmMvdDigitizerTB.cxx
rename to sim/detectors/mvd/CbmMvdDigitizerTB.cxx
diff --git a/mvd/CbmMvdDigitizerTB.h b/sim/detectors/mvd/CbmMvdDigitizerTB.h
similarity index 100%
rename from mvd/CbmMvdDigitizerTB.h
rename to sim/detectors/mvd/CbmMvdDigitizerTB.h
diff --git a/mvd/CbmMvdPixelCharge.cxx b/sim/detectors/mvd/CbmMvdPixelCharge.cxx
similarity index 100%
rename from mvd/CbmMvdPixelCharge.cxx
rename to sim/detectors/mvd/CbmMvdPixelCharge.cxx
diff --git a/mvd/CbmMvdPixelCharge.h b/sim/detectors/mvd/CbmMvdPixelCharge.h
similarity index 100%
rename from mvd/CbmMvdPixelCharge.h
rename to sim/detectors/mvd/CbmMvdPixelCharge.h
diff --git a/sim/detectors/mvd/CbmMvdSimLinkDef.h b/sim/detectors/mvd/CbmMvdSimLinkDef.h
new file mode 100644
index 0000000000000000000000000000000000000000..2fe7bdbd42c9fefc6d15b4e23fb9e211109d25bc
--- /dev/null
+++ b/sim/detectors/mvd/CbmMvdSimLinkDef.h
@@ -0,0 +1,19 @@
+/* Copyright (C) 2006-2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt
+   SPDX-License-Identifier: GPL-3.0-only
+   Authors: Philipp Sitzmann, Volker Friese [committer] */
+
+#ifdef __CINT__
+
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+
+#pragma link C++ class CbmMvd + ;
+
+#pragma link C++ class CbmDigitize < CbmMvdDigi> + ;
+#pragma link C++ class CbmMvdDigitizer + ;
+#pragma link C++ class CbmMvdPixelCharge + ;
+
+#pragma link C++ class CbmMvdSensorDigitizerTask + ;
+
+#endif
diff --git a/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx b/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx
similarity index 100%
rename from mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx
rename to sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx
diff --git a/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.h b/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.h
similarity index 100%
rename from mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.h
rename to sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.h
diff --git a/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx b/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx
similarity index 100%
rename from mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx
rename to sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx
diff --git a/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.h b/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.h
similarity index 100%
rename from mvd/plugins/tasks/CbmMvdSensorDigitizerTask.h
rename to sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.h
diff --git a/sim/detectors/mvd/test.txt b/sim/detectors/mvd/test.txt
deleted file mode 100644
index 90bfcb510602aa11ae53a42dcec18ea39fbd8cec..0000000000000000000000000000000000000000
--- a/sim/detectors/mvd/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-this is a test
diff --git a/sim/response/CMakeLists.txt b/sim/response/CMakeLists.txt
index 9b2b9f2482789390625cf3433f97e25132bd959a..dde4f0799b0863782d462edbd99385768a36136d 100644
--- a/sim/response/CMakeLists.txt
+++ b/sim/response/CMakeLists.txt
@@ -22,7 +22,7 @@ set(PUBLIC_DEPENDENCIES
 
 set(PRIVATE_DEPENDENCIES
   CbmMuchSim
-  CbmMvd
+  CbmMvdSim
   CbmPsdSim
   CbmRichSim
   CbmSimSteer
diff --git a/sim/transport/geosetup/CMakeLists.txt b/sim/transport/geosetup/CMakeLists.txt
index ff9e26a359dd23224e77991370c8a71be83d4cbf..b85021167384398733cdedcd68f818ee1c846557 100644
--- a/sim/transport/geosetup/CMakeLists.txt
+++ b/sim/transport/geosetup/CMakeLists.txt
@@ -31,7 +31,7 @@ set(PUBLIC_DEPENDENCIES
 
 set(PRIVATE_DEPENDENCIES
   CbmMuchSim
-  CbmMvd
+  CbmMvdSim
   CbmPassive
   CbmPsdSim
   CbmRichSim