diff --git a/reco/detectors/sts/CMakeLists.txt b/reco/detectors/sts/CMakeLists.txt
index 07203f6f8881eef4c6d4fee7e1742a97da414e3d..251273ae4787298061a00814e408a44b0803be98 100644
--- a/reco/detectors/sts/CMakeLists.txt
+++ b/reco/detectors/sts/CMakeLists.txt
@@ -16,7 +16,6 @@ CbmStsAlgoFindHits.cxx
 CbmStsAlgoFindHitsOrtho.cxx
 CbmStsFindTracks.cxx
 CbmStsFindTracksEvents.cxx
-CbmStsFindTracksQa.cxx
 CbmStsRecoModule.cxx
 CbmStsTrackFinderIdeal.cxx
 
@@ -25,6 +24,8 @@ unpack/CbmStsUnpackAlgoBase.cxx
 unpack/CbmStsUnpackAlgoLegacy.cxx
 unpack/CbmStsUnpackConfig.cxx
 unpack/CbmStsUnpackMonitor.cxx
+
+qa/CbmStsFindTracksQa.cxx
 )
 # -----  End of sources   ---------------------------------
 
@@ -36,6 +37,7 @@ set(INCLUDE_DIRECTORIES
 # This directory
 ${CBMROOT_SOURCE_DIR}/reco/detectors/sts
 ${CBMROOT_SOURCE_DIR}/reco/detectors/sts/unpack
+${CBMROOT_SOURCE_DIR}/reco/detectors/sts/qa
 
 # Reco
 ${CBMROOT_SOURCE_DIR}/reco/base
diff --git a/reco/detectors/sts/CbmStsFindTracksQa.cxx b/reco/detectors/sts/qa/CbmStsFindTracksQa.cxx
similarity index 100%
rename from reco/detectors/sts/CbmStsFindTracksQa.cxx
rename to reco/detectors/sts/qa/CbmStsFindTracksQa.cxx
diff --git a/reco/detectors/sts/CbmStsFindTracksQa.h b/reco/detectors/sts/qa/CbmStsFindTracksQa.h
similarity index 100%
rename from reco/detectors/sts/CbmStsFindTracksQa.h
rename to reco/detectors/sts/qa/CbmStsFindTracksQa.h
diff --git a/sim/detectors/sts/CMakeLists.txt b/sim/detectors/sts/CMakeLists.txt
index d573e16743b3dcd6857aa60aa70c8e4266fcae28..11623cd84765989b9471eb531732bc3e22dc0fd9 100644
--- a/sim/detectors/sts/CMakeLists.txt
+++ b/sim/detectors/sts/CMakeLists.txt
@@ -10,8 +10,6 @@ Set(LIBRARY_NAME CbmStsSim)
 # -----  Specify sources for compilation   ----------------
 set(SRCS
 CbmStsDigitize.cxx
-CbmStsDigitizeQa.cxx
-CbmStsDigitizeQaReport.cxx
 CbmStsMC.cxx
 CbmStsSensorPoint.cxx
 CbmStsSignal.cxx
@@ -21,6 +19,9 @@ CbmStsSimSensorDssd.cxx
 CbmStsSimSensorDssdOrtho.cxx
 CbmStsSimSensorDssdStereo.cxx
 CbmStsSimSensorFactory.cxx
+
+qa/CbmStsDigitizeQa.cxx
+qa/CbmStsDigitizeQaReport.cxx
 )
 # -----  End of sources   ---------------------------------
 
@@ -31,6 +32,7 @@ set(INCLUDE_DIRECTORIES
 
 # --- this directory
 ${CBMROOT_SOURCE_DIR}/sim/detectors/sts
+${CBMROOT_SOURCE_DIR}/sim/detectors/sts/qa
 
 # --- sts base
 ${CBMDETECTORBASE_DIR}/sts
diff --git a/sim/detectors/sts/CbmStsDigitizeQa.cxx b/sim/detectors/sts/qa/CbmStsDigitizeQa.cxx
similarity index 100%
rename from sim/detectors/sts/CbmStsDigitizeQa.cxx
rename to sim/detectors/sts/qa/CbmStsDigitizeQa.cxx
diff --git a/sim/detectors/sts/CbmStsDigitizeQa.h b/sim/detectors/sts/qa/CbmStsDigitizeQa.h
similarity index 100%
rename from sim/detectors/sts/CbmStsDigitizeQa.h
rename to sim/detectors/sts/qa/CbmStsDigitizeQa.h
diff --git a/sim/detectors/sts/CbmStsDigitizeQaReport.cxx b/sim/detectors/sts/qa/CbmStsDigitizeQaReport.cxx
similarity index 100%
rename from sim/detectors/sts/CbmStsDigitizeQaReport.cxx
rename to sim/detectors/sts/qa/CbmStsDigitizeQaReport.cxx
diff --git a/sim/detectors/sts/CbmStsDigitizeQaReport.h b/sim/detectors/sts/qa/CbmStsDigitizeQaReport.h
similarity index 100%
rename from sim/detectors/sts/CbmStsDigitizeQaReport.h
rename to sim/detectors/sts/qa/CbmStsDigitizeQaReport.h