diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..7bbe5ba67bc422eef2e0d7017e450fa38fa2cd1b
--- /dev/null
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Trigger/TrigAlgorithms/TrigT2CaloEgamma
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/CMakeLists.txt
index 2f077c4176293ce03a3cda4d5e9d34cf49b0325a..285b26349a613d08bfb42802f938d34257a9be2f 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/CMakeLists.txt
@@ -26,15 +26,10 @@ atlas_depends_on_subdirs( PUBLIC
                           Trigger/TrigTools/TrigTimeAlgs )
 
 # Component(s) in the package:
-atlas_add_library( TrigT2CaloEgammaLib
-                   src/*.cxx
-                   PUBLIC_HEADERS TrigT2CaloEgamma
-                   LINK_LIBRARIES CaloEvent CaloGeoHelpers xAODTrigCalo xAODTrigRinger GaudiKernel TrigSteeringEvent TrigT2CaloCommonLib CaloDetDescrLib TrigT2CaloCalibrationLib TrigTimeAlgsLib
-                   PRIVATE_LINK_LIBRARIES CaloIdentifier AthLinks IRegionSelector TrigT1Interfaces )
-
 atlas_add_component( TrigT2CaloEgamma
+                     src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES CaloEvent CaloGeoHelpers xAODTrigCalo xAODTrigRinger GaudiKernel TrigT2CaloCommonLib TrigSteeringEvent CaloDetDescrLib CaloIdentifier AthLinks IRegionSelector TrigT1Interfaces TrigT2CaloCalibrationLib TrigTimeAlgsLib TrigT2CaloEgammaLib )
+                     LINK_LIBRARIES CaloEvent CaloGeoHelpers xAODTrigCalo xAODTrigRinger GaudiKernel TrigT2CaloCommonLib TrigSteeringEvent CaloDetDescrLib CaloIdentifier AthLinks IRegionSelector TrigT1Interfaces TrigT2CaloCalibrationLib TrigTimeAlgsLib )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaAllFex.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaAllFex.cxx
old mode 100755
new mode 100644
index 5c5b79578b4e13f8bc0423a23c019542cc2182cd..ddc0c273b75168f8a4bd3829259cd9d1b4c5aafb
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaAllFex.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaAllFex.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // ********************************************************************
@@ -18,7 +18,7 @@
 #include "xAODTrigCalo/TrigEMCluster.h"
 #include "CaloGeoHelpers/CaloSampling.h"
 
-#include "TrigT2CaloEgamma/EgammaAllFex.h"
+#include "EgammaAllFex.h"
 #include "TrigT2CaloCommon/Calo_Def.h"
 
 #include "TrigSteeringEvent/TrigRoiDescriptor.h"
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaAllFex.h b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaAllFex.h
similarity index 100%
rename from Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaAllFex.h
rename to Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaAllFex.h
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaEmEnFex.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaEmEnFex.cxx
old mode 100755
new mode 100644
index 529cd5a455994bd293f0368e62cf563d7d03f673..6f3b73f76cf2ebab0b6cc0947972ec5d2a61f4f0
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaEmEnFex.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaEmEnFex.cxx
@@ -15,9 +15,9 @@
 #include "xAODTrigCalo/TrigEMCluster.h"
 #include "CaloGeoHelpers/CaloSampling.h"
 
-#include "TrigT2CaloEgamma/EgammaEmEnFex.h"
+#include "EgammaEmEnFex.h"
 #include "TrigT2CaloCommon/Calo_Def.h"
-#include "TrigT2CaloEgamma/T2CalibrationEgamma.h"
+#include "T2CalibrationEgamma.h"
 
 
 EgammaEmEnFex::EgammaEmEnFex(const std::string & type, const std::string & name, 
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaEmEnFex.h b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaEmEnFex.h
similarity index 100%
rename from Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaEmEnFex.h
rename to Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaEmEnFex.h
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaHadEnFex.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaHadEnFex.cxx
old mode 100755
new mode 100644
index 10d4497bb53a53aaa08881fe1356dee2bab6b402..f8dfd772b97ad3b484d7b83c1a0782f53ff9a40b
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaHadEnFex.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaHadEnFex.cxx
@@ -16,7 +16,7 @@
 //#include "TrigCaloEvent/TrigEMCluster.h"
 #include "CaloGeoHelpers/CaloSampling.h"
 
-#include "TrigT2CaloEgamma/EgammaHadEnFex.h"
+#include "EgammaHadEnFex.h"
 #include "TrigT2CaloCommon/Calo_Def.h"
 #include <math.h>
 
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaHadEnFex.h b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaHadEnFex.h
similarity index 100%
rename from Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaHadEnFex.h
rename to Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaHadEnFex.h
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReEmEnFex.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReEmEnFex.cxx
old mode 100755
new mode 100644
index d4d1f127467b412bc54f7e9ac5a6257abf603444..a121c48f0bbc06e50b873f5f913d0ad45852bb97
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReEmEnFex.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReEmEnFex.cxx
@@ -15,9 +15,9 @@
 #include "xAODTrigCalo/TrigEMCluster.h"
 #include "CaloGeoHelpers/CaloSampling.h"
 
-#include "TrigT2CaloEgamma/EgammaReEmEnFex.h"
+#include "EgammaReEmEnFex.h"
 #include "TrigT2CaloCommon/Calo_Def.h"
-#include "TrigT2CaloEgamma/T2CalibrationEgamma.h"
+#include "T2CalibrationEgamma.h"
 
 
 EgammaReEmEnFex::EgammaReEmEnFex(const std::string & type, const std::string & name, 
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaReEmEnFex.h b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReEmEnFex.h
similarity index 100%
rename from Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaReEmEnFex.h
rename to Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReEmEnFex.h
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReHadEnFex.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReHadEnFex.cxx
old mode 100755
new mode 100644
index 3d96e975670d5732de8ffe756963a9789a7aac3e..8af2ea396e9f7bffc8ae5332a86219007884958a
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReHadEnFex.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReHadEnFex.cxx
@@ -16,7 +16,7 @@
 //#include "TrigCaloEvent/TrigEMCluster.h"
 #include "CaloGeoHelpers/CaloSampling.h"
 
-#include "TrigT2CaloEgamma/EgammaReHadEnFex.h"
+#include "EgammaReHadEnFex.h"
 #include "TrigT2CaloCommon/Calo_Def.h"
 #include <math.h>
 
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaReHadEnFex.h b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReHadEnFex.h
similarity index 100%
rename from Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaReHadEnFex.h
rename to Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReHadEnFex.h
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReSamp1Fex.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReSamp1Fex.cxx
old mode 100755
new mode 100644
index 7bef656bc698371a10fbbab7f5e6929d133cde71..214dc1648365deeabca553a8c6ba9890d51adb46
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReSamp1Fex.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReSamp1Fex.cxx
@@ -17,7 +17,7 @@
 //#include "TrigCaloEvent/TrigEMCluster.h"
 #include "CaloGeoHelpers/CaloSampling.h"
 
-#include "TrigT2CaloEgamma/EgammaReSamp1Fex.h"
+#include "EgammaReSamp1Fex.h"
 #include "TrigT2CaloCommon/Calo_Def.h"
 
 #include "IRegionSelector/IRoiDescriptor.h"
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaReSamp1Fex.h b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReSamp1Fex.h
similarity index 100%
rename from Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaReSamp1Fex.h
rename to Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReSamp1Fex.h
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReSamp2Fex.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReSamp2Fex.cxx
old mode 100755
new mode 100644
index 874bfb4e802eb0b1b4173b98f188cd582a5187d0..ec849ecc783812d8860047235af376b7a29ec6dd
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReSamp2Fex.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReSamp2Fex.cxx
@@ -18,7 +18,7 @@
 #include "xAODTrigCalo/TrigEMCluster.h"
 #include "CaloGeoHelpers/CaloSampling.h"
 
-#include "TrigT2CaloEgamma/EgammaReSamp2Fex.h"
+#include "EgammaReSamp2Fex.h"
 #include "TrigT2CaloCommon/Calo_Def.h"
 
 #include "IRegionSelector/IRoiDescriptor.h"
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaReSamp2Fex.h b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReSamp2Fex.h
similarity index 100%
rename from Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaReSamp2Fex.h
rename to Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaReSamp2Fex.h
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaSamp1Fex.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaSamp1Fex.cxx
old mode 100755
new mode 100644
index 89055547641bc5da2f767013fdc743fe329bbe53..9886a2a03fdc7abf709416612358a5352ae0eeb3
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaSamp1Fex.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaSamp1Fex.cxx
@@ -17,7 +17,7 @@
 //#include "TrigCaloEvent/TrigEMCluster.h"
 #include "CaloGeoHelpers/CaloSampling.h"
 
-#include "TrigT2CaloEgamma/EgammaSamp1Fex.h"
+#include "EgammaSamp1Fex.h"
 #include "TrigT2CaloCommon/Calo_Def.h"
 
 #include "IRegionSelector/IRoiDescriptor.h"
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaSamp1Fex.h b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaSamp1Fex.h
similarity index 100%
rename from Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaSamp1Fex.h
rename to Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaSamp1Fex.h
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaSamp2Fex.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaSamp2Fex.cxx
old mode 100755
new mode 100644
index a8f69cfcfeb9628cd82c59e60e296aec6f3e9d99..bc9be455f6718539d920e18a9d9da2183821cd6c
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaSamp2Fex.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaSamp2Fex.cxx
@@ -18,7 +18,7 @@
 #include "xAODTrigCalo/TrigEMCluster.h"
 #include "CaloGeoHelpers/CaloSampling.h"
 
-#include "TrigT2CaloEgamma/EgammaSamp2Fex.h"
+#include "EgammaSamp2Fex.h"
 #include "TrigT2CaloCommon/Calo_Def.h"
 
 #include "IRegionSelector/IRoiDescriptor.h"
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaSamp2Fex.h b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaSamp2Fex.h
similarity index 100%
rename from Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/EgammaSamp2Fex.h
rename to Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/EgammaSamp2Fex.h
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/RingerFex.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/RingerFex.cxx
old mode 100755
new mode 100644
index 7c1df053203bd04272ab613673549a69572b644b..eb8d0c68b14dd27b7bc56a727637531a922546aa
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/RingerFex.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/RingerFex.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /*******************************************************
@@ -14,7 +14,7 @@
 #include <map>
 #include <cmath>
 #include <numeric>
-#include "TrigT2CaloEgamma/RingerFex.h"
+#include "RingerFex.h"
 #include "TrigTimeAlgs/TrigTimer.h"
 #include "xAODTrigCalo/TrigEMCluster.h"
 #include "xAODTrigRinger/TrigRingerRings.h"
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/RingerFex.h b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/RingerFex.h
similarity index 99%
rename from Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/RingerFex.h
rename to Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/RingerFex.h
index 89150a958a540f114f7e57dc0e5f6e40d437d891..8b4b00ee875b901c4ace52e1fb9c22e3ec3b415a 100755
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/RingerFex.h
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/RingerFex.h
@@ -18,7 +18,7 @@
 #include "CaloGeoHelpers/CaloSampling.h"
 #include "CaloEvent/CaloCell.h"
 #include "TrigT2CaloCommon/IAlgToolCalo.h"
-#include "TrigT2CaloEgamma/T2CaloEgamma.h"
+#include "T2CaloEgamma.h"
 
 class MsgStream;
 class TrigEMCluster; // I dont know if put the xAOD prefix here!
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/T2CalibrationEgamma.h b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CalibrationEgamma.h
similarity index 100%
rename from Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/T2CalibrationEgamma.h
rename to Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CalibrationEgamma.h
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgamma.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgamma.cxx
old mode 100755
new mode 100644
index 68bca35436c62136e418d4b99f720dfea945bb79..41cf461d6c9ae52d3156f922c2a68168d90629f3
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgamma.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgamma.cxx
@@ -28,7 +28,7 @@
 #include "xAODTrigRinger/TrigRingerRings.h"
 #include "xAODTrigRinger/TrigRingerRingsContainer.h"
 
-#include "TrigT2CaloEgamma/T2CaloEgamma.h"
+#include "T2CaloEgamma.h"
 #include "TrigT2CaloCommon/IAlgToolCalo.h"
 #include "TrigT2CaloCalibration/IEgammaCalibration.h"
 
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/T2CaloEgamma.h b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgamma.h
similarity index 100%
rename from Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/T2CaloEgamma.h
rename to Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgamma.h
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx
old mode 100755
new mode 100644
index aea2d56625cc20207836422e2e8d5c46337da861..9099a5013f6ce88250eeca2281c6eb98acc97077
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx
@@ -20,7 +20,7 @@
 #include "xAODTrigCalo/TrigEMClusterContainer.h"
 #include "xAODTrigCalo/TrigEMClusterAuxContainer.h"
 
-#include "TrigT2CaloEgamma/T2CaloEgammaReFastAlgo.h"
+#include "T2CaloEgammaReFastAlgo.h"
 #include "TrigT2CaloCommon/IReAlgToolCalo.h"
 #include "TrigT2CaloCalibration/IEgammaCalibration.h"
 #include "TrigT2CaloCommon/ITrigDataAccess.h"
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/T2CaloEgammaReFastAlgo.h b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.h
similarity index 100%
rename from Trigger/TrigAlgorithms/TrigT2CaloEgamma/TrigT2CaloEgamma/T2CaloEgammaReFastAlgo.h
rename to Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.h
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/components/TrigT2CaloEgamma_entries.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/components/TrigT2CaloEgamma_entries.cxx
index 6a7ba904220514eee379f08953ffd5c69c4d0074..674603a49eccd22cbb9daaafc243a13df200e2d2 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/components/TrigT2CaloEgamma_entries.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/components/TrigT2CaloEgamma_entries.cxx
@@ -1,15 +1,15 @@
-#include "TrigT2CaloEgamma/T2CaloEgamma.h"
-#include "TrigT2CaloEgamma/T2CaloEgammaReFastAlgo.h"
-#include "TrigT2CaloEgamma/EgammaSamp2Fex.h"
-#include "TrigT2CaloEgamma/EgammaSamp1Fex.h"
-#include "TrigT2CaloEgamma/EgammaEmEnFex.h"
-#include "TrigT2CaloEgamma/EgammaHadEnFex.h"
-#include "TrigT2CaloEgamma/EgammaReSamp2Fex.h"
-#include "TrigT2CaloEgamma/EgammaReSamp1Fex.h"
-#include "TrigT2CaloEgamma/EgammaReEmEnFex.h"
-#include "TrigT2CaloEgamma/EgammaReHadEnFex.h"
-#include "TrigT2CaloEgamma/RingerFex.h"
-#include "TrigT2CaloEgamma/EgammaAllFex.h"
+#include "../T2CaloEgamma.h"
+#include "../T2CaloEgammaReFastAlgo.h"
+#include "../EgammaSamp2Fex.h"
+#include "../EgammaSamp1Fex.h"
+#include "../EgammaEmEnFex.h"
+#include "../EgammaHadEnFex.h"
+#include "../EgammaReSamp2Fex.h"
+#include "../EgammaReSamp1Fex.h"
+#include "../EgammaReEmEnFex.h"
+#include "../EgammaReHadEnFex.h"
+#include "../RingerFex.h"
+#include "../EgammaAllFex.h"
 
 DECLARE_COMPONENT( T2CaloEgamma )
 DECLARE_COMPONENT( T2CaloEgammaReFastAlgo )