diff --git a/CMakeLists.txt b/CMakeLists.txt
index 659442e3801c704a4d1bebb1d0aac29873e8df97..02907565de880845d72d1e336be154ac4bf4839a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -240,9 +240,6 @@ add_subdirectory (sim)
 add_subdirectory (reco)
 add_subdirectory (analysis)
 
-### Detector directories
-#add_subdirectory (mvd)
-
 ### Others
 Option(LARGE_TEST_STATISTIC "Run the test suite with large statistic (100 events)" OFF)
 
diff --git a/mvd/ReadMeMvd.pdf b/core/detectors/mvd/ReadMeMvd.pdf
similarity index 100%
rename from mvd/ReadMeMvd.pdf
rename to core/detectors/mvd/ReadMeMvd.pdf
diff --git a/mvd/ReadMeMvdPart2.pdf b/core/detectors/mvd/ReadMeMvdPart2.pdf
similarity index 100%
rename from mvd/ReadMeMvdPart2.pdf
rename to core/detectors/mvd/ReadMeMvdPart2.pdf
diff --git a/mvd/CMakeLists.txt b/mvd/CMakeLists.txt
deleted file mode 100644
index db2f3ece2e83a70ff01813f4a24c82d268905217..0000000000000000000000000000000000000000
--- a/mvd/CMakeLists.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-set(INCLUDE_DIRECTORIES
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/tools
-  ${CMAKE_CURRENT_SOURCE_DIR}/tools/readout
-  ${CMAKE_CURRENT_SOURCE_DIR}/SensorDataSheets
-  ${CMAKE_CURRENT_SOURCE_DIR}/plugins
-  ${CMAKE_CURRENT_SOURCE_DIR}/plugins/tasks
-  ${CMAKE_CURRENT_SOURCE_DIR}/plugins/buffers
-  ${CMAKE_CURRENT_SOURCE_DIR}/qa
-
-  )
-
-set(SRCS
-  plugins/tasks/CbmMvdSensorTask.cxx
-  plugins/tasks/CbmMvdSensorDigitizerTask.cxx
-  #plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx
-  #plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
-  #OLD
-  plugins/tasks/CbmMvdSensorHitfinderTask.cxx
-  plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
-  ####
-  plugins/tasks/CbmMvdSensorReadoutTask.cxx
-  plugins/CbmMvdSensorPlugin.cxx
-  
-  SensorDataSheets/CbmMvdMimosa26AHR.cxx
-  SensorDataSheets/CbmMvdMimosa34.cxx
-  SensorDataSheets/CbmMvdMimosis.cxx
-  SensorDataSheets/CbmMvdSensorDataSheet.cxx
-  
-  tools/CbmMvdGeoHandler.cxx
-  tools/CbmMvdHelper.h
-  tools/readout/CbmMvdReadoutSimple.cxx
-  tools/readout/CbmMvdReadoutCluster.cxx
-  
-  qa/CbmMvdQa.cxx
-  
-  CbmMvd.cxx
-  
-  CbmMvdDigitizer.cxx
-  CbmMvdPileupManager.cxx
-  CbmMvdPixelCharge.cxx
-  CbmMvdHitfinder.cxx  #OLD
-  CbmMvdStationPar.cxx
-  CbmMvdDetector.cxx
-  CbmMvdSensor.cxx
-# CbmMvdDigiToHit.cxx
-# CbmMvdDigiToHit.cxx
-  CbmMvdTrackingInterface.cxx
-  
-  #OLD
-  CbmMvdClusterfinder.cxx
-  #CbmMvdClusterfinderTB.cxx
-  ####
-  CbmMvdReadout.cxx
-  )
-
-
-set(LIBRARY_NAME CbmMvd)
-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
-  FairLogger::FairLogger
-  FairRoot::GeoBase
-  FairRoot::ParBase
-  ROOT::EG
-  ROOT::Graf
-  ROOT::Matrix
-  ROOT::RIO
-  ROOT::Tree
-  )
-
-generate_cbm_library()
-
-
-# Install file 
-install(FILES tools/CbmMvdHelper.h
-              tools/CbmMvdGeoHandler.h
-        DESTINATION include/mvd/tools
-       )
-install(FILES plugins/CbmMvdSensorPlugin.h
-        DESTINATION include/mvd/plugins
-       )
-install(FILES #SensorDataSheets/CbmMvdMimosa26AHR.h
-              SensorDataSheets/CbmMvdSensorDataSheet.h
-              #SensorDataSheets/CbmMvdMimosa34.h
-              SensorDataSheets/CbmMvdMimosis.h
-        DESTINATION include/mvd/SensorDataSheets
-       )
-install(FILES plugins/buffers/CbmMvdSensorBuffer.h
-              plugins/buffers/CbmMvdSensorFrameBuffer.h
-              plugins/buffers/CbmMvdSensorTrackingBuffer.h
-        DESTINATION include/mvd/plugins/buffers
-       )
-install(FILES plugins/tasks/CbmMvdSensorClusterfinderTask.h
-              plugins/tasks/CbmMvdSensorDigitizerTask.h
-              #plugins/tasks/CbmMvdSensorDigitizerTBTask.h
-              #plugins/tasks/CbmMvdSensorDigiToHitTask.h
-              plugins/tasks/CbmMvdSensorFindHitTask.h
-              plugins/tasks/CbmMvdSensorHitfinderTask.h
-              plugins/tasks/CbmMvdSensorTask.h
-        DESTINATION include/mvd/plugins/tasks
-       )
-
-      
diff --git a/mvd/CbmMvdLinkDef.h b/mvd/CbmMvdLinkDef.h
deleted file mode 100644
index a83aaa53745dd63137296c02a86884ebbcc13454..0000000000000000000000000000000000000000
--- a/mvd/CbmMvdLinkDef.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* 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 CbmMvdDigitizerTB+;
-#pragma link C++ class CbmMvdHitfinder + ;
-#pragma link C++ class CbmMvdClusterfinder + ;
-//#pragma link C++ class CbmMvdDigiToHit + ;
-//#pragma link C++ class CbmMvdClusterfinderTB + ;
-//#pragma link C++ class CbmMvdDigiToHitTB + ;
-#pragma link C++ class CbmMvdReadout + ;
-
-#pragma link C++ class CbmMvdPileupManager + ;
-#pragma link C++ class CbmMvdPixelCharge + ;
-
-#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 CbmMvdSensorPlugin + ;
-
-//#pragma link C++ class CbmMvdSensorBuffer+;
-//#pragma link C++ class CbmMvdSensorTrackingBuffer+;
-//#pragma link C++ class CbmMvdSensorFrameBuffer+;
-
-#pragma link C++ class CbmMvdSensorTask + ;
-//#pragma link C++ class CbmMvdSensorFindHitTask+;
-#pragma link C++ class CbmMvdSensorHitfinderTask + ;  //OLD
-#pragma link C++ class CbmMvdSensorDigitizerTask + ;
-#pragma link C++ class CbmMvdSensorReadoutTask + ;
-//#pragma link C++ class CbmMvdSensorDigitizerTBTask + ;
-#pragma link C++ class CbmMvdSensorClusterfinderTask + ;  //OLD
-//KHUN
-//#pragma link C++ class CbmMvdSensorDigiToHitTask + ;
-
-
-#pragma link C++ class CbmMvdGeoHandler + ;
-
-#pragma link C++ class CbmMvdQa + ;
-//#pragma link C++ class CbmMvdClusterAna+;
-
-#pragma link C++ class CbmMvdReadoutSimple + ;
-#pragma link C++ class CbmMvdReadoutCluster + ;
-
-#pragma link C++ class CbmMvdTrackingInterface + ;
-
-//#pragma link C++ class MyG4UniversalFluctuationForSi+;
-//#pragma link C++ class CbmMvdFindHits+;
-//#pragma link C++ class CbmMvdDigitizeL+;
-//#pragma link C++ class CbmMvdHitProducer+;
-//#pragma link C++ class CbmMvdStation+;
-
-#endif