diff --git a/StRoot/KFParticlePerformance/.includes_for_export.flg b/StRoot/KFParticlePerformance/.includes_for_export.flg
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/StRoot/KFParticlePerformance/KFPHistogram/KFPHistogram.h b/StRoot/KFParticlePerformance/KFPHistogram/KFPHistogram.h
index d36ea25d3ba..af0834806dd 100644
--- a/StRoot/KFParticlePerformance/KFPHistogram/KFPHistogram.h
+++ b/StRoot/KFParticlePerformance/KFPHistogram/KFPHistogram.h
@@ -25,7 +25,7 @@
 
 #include "KFPHistogramSet.h"
 #include "KFPartEfficiencies.h"
-#include "KFParticleTopoReconstructor.h"
+#include "KFParticle/KFParticleTopoReconstructor.h"
 #include <map>
 #include <iostream>
 #include <fstream>
diff --git a/StRoot/KFParticlePerformance/KFPHistogram/KFPHistogramSet.h b/StRoot/KFParticlePerformance/KFPHistogram/KFPHistogramSet.h
index c30c3491d46..3bd371a170a 100644
--- a/StRoot/KFParticlePerformance/KFPHistogram/KFPHistogramSet.h
+++ b/StRoot/KFParticlePerformance/KFPHistogram/KFPHistogramSet.h
@@ -23,7 +23,7 @@
 #define KFPHISTOGRAMSET
 
 #include "KFPHistogram1D.h"
-#include "KFParticle.h"
+#include "KFParticle/KFParticle.h"
 
 /** @class KFPHistogramSet
  ** @brief A set of histograms collected at the external devise.
diff --git a/StRoot/KFParticlePerformance/KFTopoPerformance.cxx b/StRoot/KFParticlePerformance/KFTopoPerformance.cxx
index 5d9e2f2b8fa..c141ec45456 100644
--- a/StRoot/KFParticlePerformance/KFTopoPerformance.cxx
+++ b/StRoot/KFParticlePerformance/KFTopoPerformance.cxx
@@ -29,8 +29,8 @@
 #include "AliHLTTPCCAPerformance.h"
 #endif
 
-#include "KFParticleTopoReconstructor.h"
-#include "KFParticleSIMD.h"
+#include "KFParticle/KFParticleTopoReconstructor.h"
+#include "KFParticle/KFParticleSIMD.h"
 #include "KFPHistogram/KFPHistogram.h"
 
 #include "TParticlePDG.h"
diff --git a/StRoot/KFParticleTest/KFParticleTest.cxx b/StRoot/KFParticleTest/KFParticleTest.cxx
index c81d4dfb97d..59b67a143b7 100644
--- a/StRoot/KFParticleTest/KFParticleTest.cxx
+++ b/StRoot/KFParticleTest/KFParticleTest.cxx
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "KFParticle.h"
-#include "KFPTrack.h"
-#include "KFPVertex.h"
-#include "KFParticleSIMD.h"
+#include "KFParticle/KFParticle.h"
+#include "KFParticle/KFPTrack.h"
+#include "KFParticle/KFPVertex.h"
+#include "KFParticle/KFParticleSIMD.h"
 #include "KFParticleTest.h"
 
 #include <iostream>
diff --git a/StRoot/StKFParticleAnalysisMaker/StKFParticleAnalysisMaker.cxx b/StRoot/StKFParticleAnalysisMaker/StKFParticleAnalysisMaker.cxx
index 49034f98828..23d1b198016 100644
--- a/StRoot/StKFParticleAnalysisMaker/StKFParticleAnalysisMaker.cxx
+++ b/StRoot/StKFParticleAnalysisMaker/StKFParticleAnalysisMaker.cxx
@@ -8,12 +8,12 @@
 #include "TTree.h"
 #include "TSystem.h"
 //--- KF particle classes ---
-#include "KFVertex.h"
-#include "KFParticle.h"
-#include "KFParticleSIMD.h"
-#include "KFPTrack.h"
-#include "KFParticleTopoReconstructor.h"
-#include "KFPartEfficiencies.h"
+#include "KFParticle/KFVertex.h"
+#include "KFParticle/KFParticle.h"
+#include "KFParticle/KFParticleSIMD.h"
+#include "KFParticle/KFPTrack.h"
+#include "KFParticle/KFParticleTopoReconstructor.h"
+#include "KFParticlePerformance/KFPartEfficiencies.h"
 #include "StKFParticleInterface.h"
 #include "StKFParticlePerformanceInterface.h"
 //--- Pico classes ---
diff --git a/StRoot/StKFParticleAnalysisMaker/StKFParticleAnalysisMaker.h b/StRoot/StKFParticleAnalysisMaker/StKFParticleAnalysisMaker.h
index 48e4c3658b2..84751563ba5 100644
--- a/StRoot/StKFParticleAnalysisMaker/StKFParticleAnalysisMaker.h
+++ b/StRoot/StKFParticleAnalysisMaker/StKFParticleAnalysisMaker.h
@@ -13,7 +13,7 @@
 #endif
 #include "TMVA/Reader.h"
 
-#include "KFParticle.h"
+#include "KFParticle/KFParticle.h"
 
 class StKFParticleInterface;
 class StKFParticlePerformanceInterface;
diff --git a/StRoot/StKFParticleAnalysisMaker/StKFParticleCandidateAnalysis.cxx b/StRoot/StKFParticleAnalysisMaker/StKFParticleCandidateAnalysis.cxx
index 20e67241509..7f192ea4c2c 100644
--- a/StRoot/StKFParticleAnalysisMaker/StKFParticleCandidateAnalysis.cxx
+++ b/StRoot/StKFParticleAnalysisMaker/StKFParticleCandidateAnalysis.cxx
@@ -14,7 +14,7 @@
 #include <iostream>
 #include <iomanip>
 
-#include "KFParticleSIMD.h"
+#include "KFParticle/KFParticleSIMD.h"
 
 ClassImp(StKFParticleCandidateAnalysis)
 
diff --git a/StRoot/StKFParticleAnalysisMaker/StKFParticleCandidateAnalysis.h b/StRoot/StKFParticleAnalysisMaker/StKFParticleCandidateAnalysis.h
index 191798360fb..2bce89e00a3 100644
--- a/StRoot/StKFParticleAnalysisMaker/StKFParticleCandidateAnalysis.h
+++ b/StRoot/StKFParticleAnalysisMaker/StKFParticleCandidateAnalysis.h
@@ -1,7 +1,7 @@
 #ifndef STAR_StKFParticleCandidateAnalysisMaker
 #define STAR_StKFParticleCandidateAnalysisMaker
 
-#include "KFParticle.h"
+#include "KFParticle/KFParticle.h"
 
 #include "TString.h"
 #include "TObject.h"
diff --git a/StRoot/StKFParticleAnalysisMaker/StKFParticleInterface.cxx b/StRoot/StKFParticleAnalysisMaker/StKFParticleInterface.cxx
index ef5f9d76f64..206b7c1f06b 100644
--- a/StRoot/StKFParticleAnalysisMaker/StKFParticleInterface.cxx
+++ b/StRoot/StKFParticleAnalysisMaker/StKFParticleInterface.cxx
@@ -1,7 +1,7 @@
 #include "StKFParticleInterface.h"
 
-#include "KFParticleTopoReconstructor.h"
-#include "KFMCTrack.h"
+#include "KFParticle/KFParticleTopoReconstructor.h"
+#include "KFParticlePerformance/KFMCTrack.h"
 
 #include "TMath.h"
 #include "TArrayD.h"
diff --git a/StRoot/StKFParticleAnalysisMaker/StKFParticleInterface.h b/StRoot/StKFParticleAnalysisMaker/StKFParticleInterface.h
index 128261d4d21..07c626835d3 100644
--- a/StRoot/StKFParticleAnalysisMaker/StKFParticleInterface.h
+++ b/StRoot/StKFParticleAnalysisMaker/StKFParticleInterface.h
@@ -3,7 +3,7 @@
 #include <vector>
 #include <map>
 
-#include "KFParticle.h"
+#include "KFParticle/KFParticle.h"
 #include "TObject.h"
 #include "StMuDSTMaker/COMMON/StMuTrack.h"
 
diff --git a/StRoot/StKFParticleAnalysisMaker/StKFParticlePerformanceInterface.cxx b/StRoot/StKFParticleAnalysisMaker/StKFParticlePerformanceInterface.cxx
index c7a21094494..7ea4189a7bf 100644
--- a/StRoot/StKFParticleAnalysisMaker/StKFParticlePerformanceInterface.cxx
+++ b/StRoot/StKFParticleAnalysisMaker/StKFParticlePerformanceInterface.cxx
@@ -1,7 +1,7 @@
 #include "StKFParticlePerformanceInterface.h"
 
-#include "KFParticleTopoReconstructor.h"
-#include "KFTopoPerformance.h"
+#include "KFParticle/KFParticleTopoReconstructor.h"
+#include "KFParticlePerformance/KFTopoPerformance.h"
 
 #include "TFile.h"
 #include "TDirectory.h"
diff --git a/StRoot/StKFParticleAnalysisMaker/StKFParticlePerformanceInterface.h b/StRoot/StKFParticleAnalysisMaker/StKFParticlePerformanceInterface.h
index cdeaea1afe8..5cf9f29f841 100644
--- a/StRoot/StKFParticleAnalysisMaker/StKFParticlePerformanceInterface.h
+++ b/StRoot/StKFParticleAnalysisMaker/StKFParticlePerformanceInterface.h
@@ -1,7 +1,7 @@
 #ifndef StKFParticlePerformanceInterface_H
 #define StKFParticlePerformanceInterface_H
 
-#include "KFMCTrack.h"
+#include "KFParticlePerformance/KFMCTrack.h"
 
 #include "TObject.h"
 #include "TString.h"