diff --git a/Reconstruction/tauRecTools/Root/LinkDef.h b/Reconstruction/tauRecTools/Root/LinkDef.h
index f5a919a42f3923dada64bc7e879d0e9131594e8f..cd09769f64ad4d688212129f629ff00af739e8a2 100644
--- a/Reconstruction/tauRecTools/Root/LinkDef.h
+++ b/Reconstruction/tauRecTools/Root/LinkDef.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "tauRecTools/TauCalibrateLC.h"
@@ -25,10 +25,6 @@
 #pragma link off all functions;
 #pragma link C++ nestedclass;
 
-#endif
-
-#ifdef __CINT__
-
 #pragma link C++ class TauCalibrateLC+;
 #pragma link C++ class TauCommonCalcVars+;
 #pragma link C++ class TauSubstructureVariables+;
diff --git a/Reconstruction/tauRecTools/Root/TauPi0ClusterScaler.cxx b/Reconstruction/tauRecTools/src/TauPi0ClusterScaler.cxx
similarity index 99%
rename from Reconstruction/tauRecTools/Root/TauPi0ClusterScaler.cxx
rename to Reconstruction/tauRecTools/src/TauPi0ClusterScaler.cxx
index 5568f08bc3044916c947eaee70915bbdca98ccf5..2d9a903a0ac915b636c5e7670e2adef5442da919 100644
--- a/Reconstruction/tauRecTools/Root/TauPi0ClusterScaler.cxx
+++ b/Reconstruction/tauRecTools/src/TauPi0ClusterScaler.cxx
@@ -12,7 +12,7 @@
 
 #include <vector>
 
-#include "tauRecTools/TauPi0ClusterScaler.h"
+#include "TauPi0ClusterScaler.h"
 #include "xAODTau/TauJet.h"
 #include "xAODPFlow/PFO.h"
 #include "tauRecTools/ITauToolBase.h"
diff --git a/Reconstruction/tauRecTools/tauRecTools/TauPi0ClusterScaler.h b/Reconstruction/tauRecTools/src/TauPi0ClusterScaler.h
similarity index 100%
rename from Reconstruction/tauRecTools/tauRecTools/TauPi0ClusterScaler.h
rename to Reconstruction/tauRecTools/src/TauPi0ClusterScaler.h
diff --git a/Reconstruction/tauRecTools/src/components/tauRecTools_entries.cxx b/Reconstruction/tauRecTools/src/components/tauRecTools_entries.cxx
index 83a774a34059c5934f683f8fd5bf67779243cb2d..881c83e2414222a669f3cd842d68ebfd0a85ab68 100644
--- a/Reconstruction/tauRecTools/src/components/tauRecTools_entries.cxx
+++ b/Reconstruction/tauRecTools/src/components/tauRecTools_entries.cxx
@@ -8,8 +8,10 @@
 #include "../TauShotFinder.h"
 #include "../TauPi0ClusterCreator.h"
 #include "../TauPi0CreateROI.h"
+#include "../TauPi0ClusterScaler.h"
 #include "../TauVertexVariables.h"
 #endif
+
 #include "tauRecTools/TauCalibrateLC.h"
 #include "tauRecTools/TauCommonCalcVars.h"
 #include "tauRecTools/TauSubstructureVariables.h"
@@ -18,7 +20,6 @@
 #include "tauRecTools/TauTrackClassifier.h"
 #include "tauRecTools/TauTrackRNNClassifier.h"
 #include "tauRecTools/CombinedP4FromRecoTaus.h"
-#include "tauRecTools/TauPi0ClusterScaler.h"
 #include "tauRecTools/TauPi0ScoreCalculator.h"
 #include "tauRecTools/TauPi0Selector.h"
 #include "tauRecTools/TauWPDecorator.h"
@@ -37,6 +38,7 @@ DECLARE_COMPONENT( TauElectronVetoVariables )
 DECLARE_COMPONENT( TauShotFinder )
 DECLARE_COMPONENT( TauPi0ClusterCreator )
 DECLARE_COMPONENT( TauPi0CreateROI )
+DECLARE_COMPONENT( TauPi0ClusterScaler )
 DECLARE_COMPONENT( TauVertexVariables )
 #endif
 
@@ -50,7 +52,6 @@ DECLARE_COMPONENT( tauRecTools::TrackRNN )
 DECLARE_COMPONENT( CombinedP4FromRecoTaus )
 DECLARE_COMPONENT( TauSubstructureVariables )
 DECLARE_COMPONENT( TauCommonCalcVars )
-DECLARE_COMPONENT( TauPi0ClusterScaler )
 DECLARE_COMPONENT( TauPi0ScoreCalculator )
 DECLARE_COMPONENT( TauPi0Selector )
 DECLARE_COMPONENT( TauWPDecorator )