diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamReadV1V2Tool.h b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamReadV1V2Tool.h
index bad5dee644d2baca7765406526459494740f7edd..865e5545bb23cb8d050852d4bcf5073e29dc84e4 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamReadV1V2Tool.h
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcByteStreamReadV1V2Tool.h
@@ -20,7 +20,6 @@
 #include "GaudiKernel/ServiceHandle.h"
 
 #include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
-//#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
 
 #include "xAODTrigL1Calo/TriggerTower.h"
 #include "xAODTrigL1Calo/TriggerTowerContainer.h"
diff --git a/Trigger/TrigAnalysis/TrigBunchCrossingTool/CMakeLists.txt b/Trigger/TrigAnalysis/TrigBunchCrossingTool/CMakeLists.txt
index 4e05b729c533fd69c6bca8b0bb7ad1a845a4e2c6..05ba7baf390283aff64f989f516ee870284099f5 100644
--- a/Trigger/TrigAnalysis/TrigBunchCrossingTool/CMakeLists.txt
+++ b/Trigger/TrigAnalysis/TrigBunchCrossingTool/CMakeLists.txt
@@ -18,14 +18,20 @@ if( XAOD_STANDALONE )
       PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} xAODEventInfo
       xAODTrigger TrigConfL1Data TrigConfInterfaces )
 else()
+   atlas_add_library( TrigBunchCrossingToolLib
+      TrigBunchCrossingTool/*.h
+      INTERFACE
+      PUBLIC_HEADERS TrigBunchCrossingTool
+      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+      LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools TrigAnalysisInterfaces TrigConfInterfaces )
+
    atlas_add_component( TrigBunchCrossingTool
       TrigBunchCrossingTool/*.h src/*.cxx Root/*.h Root/*.cxx
       Root/json/*.h Root/json/*.inl
       src/components/*.cxx
       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
-      LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AsgTools
-      TrigAnalysisInterfaces TrigConfInterfaces GaudiKernel AthenaKernel
-      AthenaPoolUtilities xAODEventInfo xAODTrigger TrigConfL1Data )
+      LINK_LIBRARIES ${CORAL_LIBRARIES} AthenaKernel AthenaPoolUtilities CxxUtils
+      GaudiKernel TrigBunchCrossingToolLib TrigConfL1Data xAODEventInfo xAODTrigger )
 endif()
 
 atlas_add_test( ut_static_bunch_tool_test
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/CMakeLists.txt b/Trigger/TrigT1/TrigT1CaloByteStream/CMakeLists.txt
index 1ecc6474777cd4a937c6044c9758a583916ca522..760ddc40b7766fe96ec8a47e891780908cfb07ed 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/CMakeLists.txt
@@ -21,7 +21,7 @@ atlas_depends_on_subdirs( PUBLIC
                           Event/EventInfo
                           ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream
                           Trigger/TrigT1/TrigT1CaloEvent
-                          Trigger/TrigT1/TrigT1CaloMappingToolInterfaces
+                          Trigger/TrigT1/TrigT1CaloToolInterfaces
                           Trigger/TrigT1/TrigT1CaloUtils
                           Trigger/TrigT1/TrigT1Interfaces )
 
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.cxx
index 206890ac88dc95991a01148cae49fa175aeb6c62..b14ec65ac48cc579b6ddaa166de3de4331758a3a 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamTool.cxx
@@ -19,7 +19,7 @@
 #include "TrigT1CaloEvent/CPBSCollection.h"
 #include "TrigT1CaloUtils/DataError.h"
 #include "TrigT1CaloUtils/TriggerTowerKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 #include "CmmCpSubBlock.h"
 #include "CmmSubBlock.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.cxx
index f0e5e78582629b67bed6b238f5252c03ca575f2f..30e11fd588e54b5eb06aecd0646ed6397a8143d0 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV1Tool.cxx
@@ -19,7 +19,7 @@
 #include "TrigT1CaloEvent/CPBSCollectionV1.h"
 #include "TrigT1CaloUtils/DataError.h"
 #include "TrigT1CaloUtils/TriggerTowerKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 #include "CmmCpSubBlock.h"
 #include "CmmSubBlock.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx
index 7a4330c21e977ba9466ff1353a88f7ae729eb597..9dca2a78374baa360b7b3e764b0440bc8f6f9fb2 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/CpByteStreamV2Tool.cxx
@@ -19,7 +19,7 @@
 #include "TrigT1CaloEvent/CPBSCollectionV2.h"
 #include "TrigT1CaloUtils/DataError.h"
 #include "TrigT1CaloUtils/TriggerTowerKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 #include "CmxCpSubBlock.h"
 #include "CmxSubBlock.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.cxx
index 87a9bd94b0d5400a9e9266e7b57d64b3a19e4a98..90c9f859ed060835c1bc013965f9699603fc2b17 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamTool.cxx
@@ -21,7 +21,7 @@
 #include "TrigT1CaloEvent/JetElement.h"
 #include "TrigT1CaloUtils/DataError.h"
 #include "TrigT1CaloUtils/JetElementKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 #include "CmmEnergySubBlock.h"
 #include "CmmJetSubBlock.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.cxx
index 3c01bc8b1cf4f83a0e9145e5ffe1daf856cc6c2b..50c664bb8453d85c26b4f27b38179a1e5e98ca9d 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV1Tool.cxx
@@ -21,7 +21,7 @@
 #include "TrigT1CaloEvent/JetElement.h"
 #include "TrigT1CaloUtils/DataError.h"
 #include "TrigT1CaloUtils/JetElementKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 #include "CmmEnergySubBlock.h"
 #include "CmmJetSubBlock.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.cxx
index 421ba532a0bab60f7ae49807910b83f360d9cf78..8fc573e0a89d68c70277bef1f62557501c638ba6 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/JepByteStreamV2Tool.cxx
@@ -21,7 +21,7 @@
 #include "TrigT1CaloEvent/JetElement.h"
 #include "TrigT1CaloUtils/DataError.h"
 #include "TrigT1CaloUtils/JetElementKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 #include "CmxEnergySubBlock.h"
 #include "CmxJetSubBlock.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Tool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Tool.cxx
index e2563bd1372a5fc832ca3a9e2e49d509ed1c0d39..5296aa3a451ca6551a16f4758063e252a995bc49 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Tool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/PpmByteStreamV1Tool.cxx
@@ -17,7 +17,7 @@
 #include "TrigT1CaloEvent/TriggerTower.h"
 #include "TrigT1CaloUtils/DataError.h"
 #include "TrigT1CaloUtils/TriggerTowerKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 #include "CmmSubBlock.h"
 #include "L1CaloErrorByteStreamTool.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/TriggerTowerSelectionTool.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/src/TriggerTowerSelectionTool.cxx
index 4ef8fb505b44f1adfb3bf8d670581dca2b96c962..b0d442f9c552afed5ddd65666aa94329b55f033c 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/TriggerTowerSelectionTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/TriggerTowerSelectionTool.cxx
@@ -11,7 +11,7 @@
 #include "GaudiKernel/StatusCode.h"
 
 #include "TrigT1CaloUtils/TriggerTowerKey.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 #include "L1CaloSrcIdMap.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.h b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.h
index 7d97023455576423c8556a1866cd2f04a57688c6..456fc4dcd0f81e631fc7d501b216a40463728194 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.h
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/src/xaod/PpmByteStreamReadV1V2Tool.h
@@ -23,7 +23,7 @@
 #include "GaudiKernel/ServiceHandle.h"
 
 #include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 #include "xAODTrigL1Calo/TriggerTower.h"
 #include "xAODTrigL1Calo/TriggerTowerContainer.h"
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmMappingTester.cxx b/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmMappingTester.cxx
index 83c0f6a17191b4087aa05fca690ea60425cd0d86..af298a66d551fe3879a94d11731e5cf69a4f05aa 100644
--- a/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmMappingTester.cxx
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/test/PpmMappingTester.cxx
@@ -8,7 +8,7 @@
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/StatusCode.h"
 
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 #include "PpmMappingTester.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloMappingToolInterfaces/CMakeLists.txt b/Trigger/TrigT1/TrigT1CaloMappingToolInterfaces/CMakeLists.txt
deleted file mode 100644
index b5a9d38e10d0d3523d7bd60dda4606c5544b9246..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/TrigT1CaloMappingToolInterfaces/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-# Package: TrigT1CaloMappingToolInterfaces
-################################################################################
-
-# Declare the package name:
-atlas_subdir( TrigT1CaloMappingToolInterfaces )
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          GaudiKernel )
-
-# Install files from the package:
-atlas_install_headers( TrigT1CaloMappingToolInterfaces )
-
diff --git a/Trigger/TrigT1/TrigT1CaloMappingTools/CMakeLists.txt b/Trigger/TrigT1/TrigT1CaloMappingTools/CMakeLists.txt
index ab5492693d9064b1a831a22bfa504a73b5d2cb69..b93a3aaa75019078ec894d6c41798ebb94dbc0c1 100644
--- a/Trigger/TrigT1/TrigT1CaloMappingTools/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CaloMappingTools/CMakeLists.txt
@@ -13,7 +13,7 @@ atlas_depends_on_subdirs( PRIVATE
                           Control/StoreGate
                           DetectorDescription/Identifier
                           GaudiKernel
-                          Trigger/TrigT1/TrigT1CaloMappingToolInterfaces )
+                          Trigger/TrigT1/TrigT1CaloToolInterfaces )
 
 # Component(s) in the package:
 atlas_add_component( TrigT1CaloMappingTools
diff --git a/Trigger/TrigT1/TrigT1CaloMappingTools/src/CpmMappingTool.h b/Trigger/TrigT1/TrigT1CaloMappingTools/src/CpmMappingTool.h
index a34894878bd317bfde5589f3169b6435bcc047d2..d6fc878ffc59567dc80a66ff8979f155a6fe61f9 100644
--- a/Trigger/TrigT1/TrigT1CaloMappingTools/src/CpmMappingTool.h
+++ b/Trigger/TrigT1/TrigT1CaloMappingTools/src/CpmMappingTool.h
@@ -11,7 +11,7 @@
 
 #include "AthenaBaseComps/AthAlgTool.h"
 
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 class IInterface;
 class StatusCode;
diff --git a/Trigger/TrigT1/TrigT1CaloMappingTools/src/JemMappingTool.h b/Trigger/TrigT1/TrigT1CaloMappingTools/src/JemMappingTool.h
index c438dfe954fd1ada9473634ccff9929fd175f278..b6466a239c1e1b4d32eb0f481c86c5fd09ab8ea1 100644
--- a/Trigger/TrigT1/TrigT1CaloMappingTools/src/JemMappingTool.h
+++ b/Trigger/TrigT1/TrigT1CaloMappingTools/src/JemMappingTool.h
@@ -11,7 +11,7 @@
 
 #include "AthenaBaseComps/AthAlgTool.h"
 
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 class IInterface;
 class StatusCode;
diff --git a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolMappingTool.h b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolMappingTool.h
index ce47e7a6f0d6706a018e163fd9a501592971ac4e..6afbbfe036d923058e6894fe7ecaf4649671b9e2 100644
--- a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolMappingTool.h
+++ b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolMappingTool.h
@@ -12,7 +12,7 @@
 #include "GaudiKernel/Incident.h"
 #include "GaudiKernel/ToolHandle.h"
 
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 class CaloLVL1_ID;
 class CaloTriggerTowerService;
diff --git a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolOrBuiltinMappingTool.h b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolOrBuiltinMappingTool.h
index ed7bb2d95c20d24ee4414319cb826e459cb03ff9..fc8cb0ba1e27940757f1b6f0e8a50b3c5606b491 100644
--- a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolOrBuiltinMappingTool.h
+++ b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmCoolOrBuiltinMappingTool.h
@@ -10,7 +10,7 @@
 #include "AthenaBaseComps/AthAlgTool.h"
 #include "GaudiKernel/ToolHandle.h"
 
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 class IInterface;
 class StatusCode;
diff --git a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmMappingTool.h b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmMappingTool.h
index 12b099065acd18ed57351adef1848571d133a252..0321ec2e05e25f08d79efa1b569d4b76a50c0acf 100644
--- a/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmMappingTool.h
+++ b/Trigger/TrigT1/TrigT1CaloMappingTools/src/PpmMappingTool.h
@@ -14,7 +14,7 @@
 
 #include "ChannelCoordinate.h"
 
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 
 class IInterface;
 class StatusCode;
diff --git a/Trigger/TrigT1/TrigT1CaloSim/CMakeLists.txt b/Trigger/TrigT1/TrigT1CaloSim/CMakeLists.txt
index 930c647a27cbfc2179752bbee2b5d272d00b7530..79960a5cedcf0f98646c643df9065b0a96730f23 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CaloSim/CMakeLists.txt
@@ -27,7 +27,7 @@ atlas_depends_on_subdirs(
    Trigger/TrigT1/TrigT1CaloCalibConditions
    Trigger/TrigT1/TrigT1CaloCalibToolInterfaces
    Trigger/TrigT1/TrigT1CaloEvent
-   Trigger/TrigT1/TrigT1CaloMappingToolInterfaces
+   Trigger/TrigT1/TrigT1CaloToolInterfaces
    Trigger/TrigT1/TrigT1CaloToolInterfaces
    Trigger/TrigT1/TrigT1CaloUtils
    Trigger/TrigT1/TrigT1Interfaces
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/ReprocessTriggerTowers.h b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/ReprocessTriggerTowers.h
index 1308f46f2ca66139890593c36be81f04bca746e7..5b40ac012fb0eb3c9fe6432907533b5b3954a9e8 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/ReprocessTriggerTowers.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/ReprocessTriggerTowers.h
@@ -32,7 +32,7 @@
 #include "TrigT1CaloEvent/TriggerTowerCollection.h"
 // #include "TrigT1CaloCalibTools/L1CaloTTIdTools.h"
 #include "TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 #include "TrigT1CaloCalibConditions/L1CaloCoolChannelId.h"
 
  namespace LVL1 {
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/TriggerTowerMaker.h b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/TriggerTowerMaker.h
index 0becb50408d457f357466b24ec5c6406fe5aacf3..951b7bac2112e1fd2be863bc6c2ede25993bd1ea 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/TriggerTowerMaker.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/TriggerTowerMaker.h
@@ -67,7 +67,7 @@
 #include "TrigT1CaloCalibToolInterfaces/IL1CaloTTIdTools.h"
 #include "TrigT1CaloCalibToolInterfaces/IL1CaloCells2TriggerTowers.h"
 #include "TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 #include "TrigT1CaloCalibConditions/L1CaloCoolChannelId.h"
 
 // Include for the configuration service:
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx
index 2db59a212b0fbf3d38ee2610fef9de1ebeb9f620..f29d72bed4b2515ffe24fda6b69b5dfb7af7410e 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx
@@ -14,7 +14,7 @@
 #include "TrigT1CaloCalibConditions/L1CaloDisabledTowersContainer.h"
 #include "TrigT1CaloCalibConditions/L1CaloPpmDeadChannelsContainer.h"
 #include "TrigT1CaloCondSvc/L1CaloCondSvc.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 #include "TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
 #include "TrigConfL1Data/ThresholdConfig.h"
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx
index eb0a9f5d4a2c081052e7058c5e3c1b56d5b9dbef..46622cfc4d231af3095f49f2104789209d87984e 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx
@@ -15,7 +15,7 @@
 #include "TrigT1CaloCalibConditions/L1CaloDisabledTowersContainer.h"
 #include "TrigT1CaloCalibConditions/L1CaloPpmDeadChannelsContainer.h"
 #include "TrigT1CaloCondSvc/L1CaloCondSvc.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 #include "TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
 #include "TrigConfL1Data/ThresholdConfig.h"
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.cxx
index 0020eaa33587fd2e4267d30bce7a2bf4bc9ad58c..0f1ea96ee8ed77d53302195d75bd4502802571a9 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.cxx
@@ -24,7 +24,6 @@
 #include <CLHEP/Random/Randomize.h>
 
 #include "TrigConfL1Data/ThresholdConfig.h"
-//#include "TrigT1CaloByteStream/IL1CaloMappingTool.h"
 #include "TrigT1CaloUtils/InternalTriggerTower_ClassDEF.h"
 #include "TrigT1CaloCalibConditions/L1CaloModuleType.h"
 #include "AthContainers/ConstDataVector.h"
diff --git a/Trigger/TrigT1/TrigT1CaloToolInterfaces/CMakeLists.txt b/Trigger/TrigT1/TrigT1CaloToolInterfaces/CMakeLists.txt
index f6e955255deae907001d2f333d26dd7ff7cc0ddf..30d09af36cc972a8beadc180ee1f11625bcad12f 100644
--- a/Trigger/TrigT1/TrigT1CaloToolInterfaces/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CaloToolInterfaces/CMakeLists.txt
@@ -1,22 +1,9 @@
-################################################################################
-# Package: TrigT1CaloToolInterfaces
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrigT1CaloToolInterfaces )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthContainers
-                          DetectorDescription/Identifier
-                          Event/xAOD/xAODTrigL1Calo
-                          GaudiKernel
-                          PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
-                          Trigger/TrigT1/TrigT1CaloCalibConditions
-                          Trigger/TrigT1/TrigT1CaloEvent )
-
 # Component(s) in the package:
 atlas_add_library( TrigT1CaloToolInterfaces
                    PUBLIC_HEADERS TrigT1CaloToolInterfaces
-                   LINK_LIBRARIES AthContainers Identifier xAODTrigL1Calo GaudiKernel AnalysisTriggerEvent TrigT1CaloCalibConditions TrigT1CaloEventLib )
-
+                   LINK_LIBRARIES AnalysisTriggerEvent AthContainers GaudiKernel Identifier TrigT1CaloCalibConditions TrigT1CaloEventLib TrigT1CaloUtilsLib xAODTrigL1Calo )
diff --git a/Trigger/TrigT1/TrigT1CaloMappingToolInterfaces/TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h b/Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CaloMappingTool.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloMappingToolInterfaces/TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h
rename to Trigger/TrigT1/TrigT1CaloToolInterfaces/TrigT1CaloToolInterfaces/IL1CaloMappingTool.h
diff --git a/Trigger/TrigT1/TrigT1CaloTools/CMakeLists.txt b/Trigger/TrigT1/TrigT1CaloTools/CMakeLists.txt
index 4aad8cec16972d20b987cb76431c93d946abb157..c9528cd2bb1556453b461cafd68b1a1f23b0adb0 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CaloTools/CMakeLists.txt
@@ -1,35 +1,8 @@
-################################################################################
-# Package: TrigT1CaloTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrigT1CaloTools )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthContainers
-                          Event/xAOD/xAODTrigL1Calo
-                          GaudiKernel
-                          Trigger/TrigConfiguration/TrigConfInterfaces
-                          Trigger/TrigT1/TrigT1CaloEvent
-                          Trigger/TrigT1/TrigT1CaloToolInterfaces
-                          Trigger/TrigT1/TrigT1CaloUtils
-                          Trigger/TrigT1/TrigT1Interfaces
-                          PRIVATE
-                          Calorimeter/CaloIdentifier
-                          Calorimeter/CaloTriggerTool
-                          Control/CxxUtils
-                          Event/EventInfo
-                          Tools/PathResolver
-                          Trigger/TrigAnalysis/TrigAnalysisInterfaces
-                          Trigger/TrigAnalysis/TrigBunchCrossingTool
-                          Trigger/TrigConfiguration/TrigConfL1Data
-                          Trigger/TrigT1/TrigT1CaloCalibConditions
-                          Trigger/TrigT1/TrigT1CaloCalibToolInterfaces
-                          Trigger/TrigT1/TrigT1CaloCondSvc
-                          Trigger/TrigT1/TrigT1CaloMappingToolInterfaces )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -39,10 +12,9 @@ atlas_add_component( TrigT1CaloTools
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} AthenaBaseComps AthContainers xAODTrigL1Calo GaudiKernel TrigT1CaloEventLib TrigT1CaloToolInterfaces TrigT1CaloUtilsLib TrigT1Interfaces CaloIdentifier CaloTriggerToolLib CxxUtils EventInfo PathResolver TrigConfL1Data TrigT1CaloCalibConditions TrigT1CaloCalibToolInterfaces TrigT1CaloCondSvcLib )
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthContainers AthenaBaseComps CaloIdentifier CaloTriggerToolLib CxxUtils EventInfo GaudiKernel PathResolver StoreGateLib TrigAnalysisInterfaces TrigBunchCrossingToolLib TrigConfInterfaces TrigConfL1Data TrigT1CaloCalibConditions TrigT1CaloCalibToolInterfaces TrigT1CaloCondSvcLib TrigT1CaloEventLib TrigT1CaloToolInterfaces TrigT1CaloUtilsLib TrigT1Interfaces xAODEventInfo xAODTrigL1Calo )
 
 # Install files from the package:
-atlas_install_headers( TrigT1CaloTools )
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( share/*.root share/*.txt )
 
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1RoITools.h.old b/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1RoITools.h.old
deleted file mode 100644
index 38ba98d4fd39dde732ab791a54ae674f5dafe4b7..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1RoITools.h.old
+++ /dev/null
@@ -1,109 +0,0 @@
-///////////////////////////////////////////////////////////////////
-// L1RoITools.h, 
-///////////////////////////////////////////////////////////////////
-
- /***************************************************************************
-  *                                                                         *
-  *                                                                         *
-  ***************************************************************************/
-
-#ifndef LVL1L1ROITOOLS_H
-#define LVL1L1ROITOOLS_H
-
-#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/ToolHandle.h"
-#include "TrigT1CaloToolInterfaces/IL1RoITools.h"
-#include "TrigT1CaloToolInterfaces/IL1JetElementTools.h"
-#include "TrigT1CaloToolInterfaces/IL1EmTauTools.h"
-#include "TrigT1CaloToolInterfaces/IL1JetTools.h"
-#include "TrigT1CaloToolInterfaces/IL1EtTools.h"
-#include "TrigT1CaloToolInterfaces/IL1JetEtTools.h"
-#include "TrigT1CaloToolInterfaces/IL1TriggerTowerTool.h"
-#include "TrigT1CaloEvent/TriggerTower.h"
-#include "TrigT1CaloEvent/JetElement.h"
-#include "xAODTrigL1Calo/JetElementContainer.h"
-#include "xAODTrigL1Calo/JetElementAuxContainer.h"
-#include "TrigT1CaloUtils/CPAlgorithm.h"
-#include "TrigT1CaloUtils/JetAlgorithm.h"
-#include "TrigT1CaloUtils/SystemEnergy.h"
-#include "AnalysisTriggerEvent/LVL1_ROI.h"
-#include "AnalysisTriggerEvent/EmTau_ROI.h"
-#include "AnalysisTriggerEvent/Jet_ROI.h"
-#include "AnalysisTriggerEvent/JetET_ROI.h"
-#include "AnalysisTriggerEvent/EnergySum_ROI.h"
-#include "TrigConfInterfaces/ITrigConfigSvc.h"
-
-class AtlasDetectorID;
-class Identifier;
-
-namespace LVL1 
-{
-
-  /** @class L1RoITools
-
-      This is a tool to reconstruct the L1 EM/tau trigger sums
-      for a particula]
-      r RoI location from the stored TriggerTowers.
-      Used for offline monitoring and trigger reconstruction.
-
-      Useage: L1RoITools->mapTowers() // set up event for analysis
-              L1RoITools->formSums(eta, phi) // for each RoI
-              L1RoITools->EmClus() // etc. Return values
-      
-      @author  Alan Watson <Alan.Watson@cern.ch>
-  */  
-
-  class L1RoITools : virtual public IL1RoITools, public AthAlgTool
-    {
-    public:
-      
-      L1RoITools(const std::string&,const std::string&,const IInterface*);
-
-       /** default destructor */
-      virtual ~L1RoITools ();
-      
-       /** standard Athena-Algorithm method */
-      virtual StatusCode initialize();
-       /** standard Athena-Algorithm method */
-      virtual StatusCode finalize  ();
-      
-      /** Analysis tool: form AnalysisTriggerEvent (AOD) RoI objects from Trigger Towers */
-     virtual void findROIs(const DataVector<TriggerTower>* tts, LVL1_ROI& rois, int slice = -1);
-     /** Form vector of EmTau_ROI */
-     virtual void findEmTauROIs(const DataVector<TriggerTower>* tts, std::vector<EmTau_ROI>& rois, int slice = -1);
-     /** Form vector of Jet_ROI */
-     virtual void findJetROIs(const DataVector<TriggerTower>* tts, std::vector<Jet_ROI>& rois, int slice = -1);
-     virtual void findJetROIs(const DataVector<JetElement>* jes, std::vector<Jet_ROI>& rois, int slice = -1);
-     /** Form vector of EnergySum_ROI */
-     virtual void findEnergySumROI(const DataVector<TriggerTower>* tts, std::vector<EnergySum_ROI>& rois, int slice = -1);
-     virtual void findEnergySumROI(const DataVector<xAOD::JetElement>* jes, std::vector<EnergySum_ROI>& rois, int slice = -1);
-     /** Form JetET_ROI */
-     virtual void findJetETROI(const std::vector<Jet_ROI>& jets, std::vector<JetET_ROI>& rois);
-     
-     /** Find TriggerTower IDs for a given RoI */
-     virtual void findEmTauTTIDs(float roiEta, float roiPhi, std::vector<unsigned int>& coolIDs);
-     virtual void findEmTauTTIDs(const EmTau_ROI& roi, std::vector<unsigned int>& coolIDs);
-     virtual void findJetTTIDs(float roiEta, float roiPhi, std::vector<unsigned int>& coolIDs);
-     virtual void findJetTTIDs(const Jet_ROI& roi, std::vector<unsigned int>& coolIDs);
-            
-    private:
-
-      /** pointer to LVL1ConfigSvc */
-      ServiceHandle<TrigConf::ITrigConfigSvc> m_configSvc;
-
-     /** Pointers to other tools used by this one */
-     ToolHandle<LVL1::IL1JetElementTools>  m_JetElementTool;
-     ToolHandle<LVL1::IL1EmTauTools>       m_EmTauTool;
-     ToolHandle<LVL1::IL1JetTools>         m_JetTool;
-     ToolHandle<LVL1::IL1EtTools>          m_EtTool;
-     ToolHandle<LVL1::IL1JetEtTools>       m_JetEtTool;
-     ToolHandle<LVL1::IL1TriggerTowerTool> m_TriggerTowerTool;
-
-     /** member variables for algorithm properties: */
-
-     static const int m_MeV = 1000;
-
-    };
-} // end of namespace
-
-#endif 
diff --git a/Trigger/TrigT1/TrigT1CaloTools/python/TrigT1CaloToolsConf.py b/Trigger/TrigT1/TrigT1CaloTools/python/TrigT1CaloToolsConf.py
deleted file mode 100755
index cbc8c1e8e7d4fe5dea3d721f2634a3fa68c8a190..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/TrigT1CaloTools/python/TrigT1CaloToolsConf.py
+++ /dev/null
@@ -1,41 +0,0 @@
-from AthenaCommon.Configurable import *
-
-class LVL1__L1EmTauTools( ConfigurableAlgTool ) :
-  __slots__ = { 
-    'OutputLevel' : 7, # int
-    'AuditTools' : False, # bool
-    'AuditInitialize' : False, # bool
-    'AuditFinalize' : False, # bool
-    'TriggerTowerLocation' : 'LVL1TriggerTowers', # str
-  }
-  _propertyDocDct = { 
-  }
-  def __init__(self, name = Configurable.DefaultName, **kwargs):
-      super(LVL1__L1EmTauTools, self).__init__(name)
-      for n,v in kwargs.items():
-         setattr(self, n, v)
-  def getDlls( self ):
-      return 'TrigT1CaloTools'
-  def getType( self ):
-      return 'LVL1::L1EmTauTools'
-  pass # class LVL1__L1EmTauTools
-
-class LVL1__L1JetTools( ConfigurableAlgTool ) :
-  __slots__ = { 
-    'OutputLevel' : 7, # int
-    'AuditTools' : False, # bool
-    'AuditInitialize' : False, # bool
-    'AuditFinalize' : False, # bool
-    'JetElementLocation' : 'LVL1JetElements', # str
-  }
-  _propertyDocDct = { 
-  }
-  def __init__(self, name = Configurable.DefaultName, **kwargs):
-      super(LVL1__L1JetTools, self).__init__(name)
-      for n,v in kwargs.items():
-         setattr(self, n, v)
-  def getDlls( self ):
-      return 'TrigT1CaloTools'
-  def getType( self ):
-      return 'LVL1::L1JetTools'
-  pass # class LVL1__L1JetTools
diff --git a/Trigger/TrigT1/TrigT1CaloTools/share/TrigT1CaloTools_jobOptions.py b/Trigger/TrigT1/TrigT1CaloTools/share/TrigT1CaloTools_jobOptions.py
old mode 100755
new mode 100644
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPCMXTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPCMXTools.cxx
index 93a650c093a3e4b3fa35f516f684222597807b32..a3b90da285bb4f6558921413e9d17b76dd95c195 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPCMXTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPCMXTools.cxx
@@ -15,7 +15,7 @@
 #include "TrigConfL1Data/TriggerThresholdValue.h"
 #include "TrigT1CaloEvent/CPMTobRoI.h"
 #include "TrigT1CaloEvent/EmTauROI.h"
-#include "TrigT1CaloTools/L1CPCMXTools.h"
+#include "L1CPCMXTools.h"
 #include "TrigT1CaloUtils/CPAlgorithm.h"
 #include "TrigT1CaloUtils/ClusterProcessorModuleKey.h"
 #include "TrigT1CaloUtils/DataError.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPCMXTools.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPCMXTools.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPCMXTools.h
rename to Trigger/TrigT1/TrigT1CaloTools/src/L1CPCMXTools.h
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPHitsTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPHitsTools.cxx
index ded963ae1ef09c7c4de34099ec9075bee0dc683e..5ad8e08daa7dbb02760f08b770c6d7ce694f04d4 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPHitsTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPHitsTools.cxx
@@ -17,7 +17,7 @@
 #include "TrigT1Interfaces/CoordinateRange.h"
 #include "TrigT1Interfaces/CPRoIDecoder.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
-#include "TrigT1CaloTools/L1CPHitsTools.h"
+#include "L1CPHitsTools.h"
 
 namespace LVL1 {
 
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPHitsTools.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPHitsTools.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPHitsTools.h
rename to Trigger/TrigT1/TrigT1CaloTools/src/L1CPHitsTools.h
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx
index e5cd87fa05efcbc52a6340eada5c7a1b4dd1c070..339b421c09cff0b1c91de86357ed01c356656141 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.cxx
@@ -5,7 +5,7 @@
 // L1CPMTools.cxx,  
 ///////////////////////////////////////////////////////////////////
 
-#include "TrigT1CaloTools/L1CPMTools.h"
+#include "L1CPMTools.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
 #include "TrigT1Interfaces/CoordinateRange.h"
 #include "TrigT1CaloUtils/TriggerTowerKey.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPMTools.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPMTools.h
rename to Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTools.h
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTowerTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTowerTools.cxx
index 21aa2860aec0d1de113990df7347726d736f0310..3ff4232ad9f2d13321e4b73bf66ec717e355046e 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTowerTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTowerTools.cxx
@@ -5,7 +5,7 @@
 // L1CPMTowerTools.cxx,  
 ///////////////////////////////////////////////////////////////////
 
-#include "TrigT1CaloTools/L1CPMTowerTools.h"
+#include "L1CPMTowerTools.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
 #include "TrigT1CaloEvent/TriggerTower_ClassDEF.h"
 #include "TrigT1CaloUtils/TriggerTowerKey.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPMTowerTools.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTowerTools.h
old mode 100755
new mode 100644
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1CPMTowerTools.h
rename to Trigger/TrigT1/TrigT1CaloTools/src/L1CPMTowerTools.h
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1DatabaseOverrideForDataTool.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1DatabaseOverrideForDataTool.cxx
index 8c607d1bf46386cdf886ebd423ce954a370430d1..6f65f135cb6ccf33925a151d62614b841ebd5435 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1DatabaseOverrideForDataTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1DatabaseOverrideForDataTool.cxx
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
-#include "TrigT1CaloTools/L1DatabaseOverrideForDataTool.h"
+#include "L1DatabaseOverrideForDataTool.h"
 
 #include "TrigT1CaloCalibConditions/L1CaloPprChanDefaultsContainer.h"
 #include "TrigT1CaloCalibConditions/L1CaloPprChanCalibContainer.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DatabaseOverrideForDataTool.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1DatabaseOverrideForDataTool.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DatabaseOverrideForDataTool.h
rename to Trigger/TrigT1/TrigT1CaloTools/src/L1DatabaseOverrideForDataTool.h
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.cxx
index 26ce045a1ecf96dd27157401d486ce6f81a8ad74..92222222f54aed2317bac819b35d1a3356723636 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.cxx
@@ -5,7 +5,7 @@
 //  L1DynamicPedestalProviderRoot.cxx 
 ///////////////////////////////////////////////////////////////////////
 
-#include "TrigT1CaloTools/L1DynamicPedestalProviderRoot.h"
+#include "L1DynamicPedestalProviderRoot.h"
 
 #include "PathResolver/PathResolver.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderRoot.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.h
similarity index 96%
rename from Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderRoot.h
rename to Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.h
index 9a939970e2662e9ada7435a3580083b0dbb38a62..8433b28c72b3dfe00252a8007759709f03ff8b6a 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderRoot.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderRoot.h
@@ -3,7 +3,7 @@
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 /**
- * @file TrigT1CaloTools/L1DynamicPedestalProviderRoot.h
+ * @file L1DynamicPedestalProviderRoot.h
  * @author V. Scharf <vscharf@kip.uni-heidelberg.de>
  * @date June 2014
  * @brief Tool to retrieve dynamic pedestal values from an external root-file.
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx
index 32351c05d2277664b707a74058fca2852cf1df87..29c3f3e5c2a3bd3b06ddfde52671938999b15b76 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.cxx
@@ -5,7 +5,7 @@
 //  L1DynamicPedestalProviderTxt.cxx 
 ///////////////////////////////////////////////////////////////////////
 
-#include "TrigT1CaloTools/L1DynamicPedestalProviderTxt.h"
+#include "L1DynamicPedestalProviderTxt.h"
 
 #include "TrigAnalysisInterfaces/IBunchCrossingTool.h"
 #include "TrigBunchCrossingTool/BunchCrossing.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderTxt.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.h
similarity index 98%
rename from Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderTxt.h
rename to Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.h
index e21e3d91a450bb30acd2b9044c97dd6274fe9fdd..06f005f14a83f86a7ca6c624fc24ca006f84a691 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1DynamicPedestalProviderTxt.h
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1DynamicPedestalProviderTxt.h
@@ -3,7 +3,7 @@
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 /* 
- * @file TrigT1CaloTools/L1DynamicPedestalProviderTxt.h
+ * @file L1DynamicPedestalProviderTxt.h
  * @author V. Scharf <vscharf@kip.uni-heidelberg.de>
  * @date June 2014
  * @brief Tool to retrieve dynamic pedestal values from a text file.
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1EmTauTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1EmTauTools.cxx
index 92a725085053b78b536650546d2b576e7c86a6b4..8261ef01739b0bf3d71c055755a30083c2f9ec46 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1EmTauTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1EmTauTools.cxx
@@ -5,7 +5,7 @@
 // L1EmTauTools.cxx,  
 ///////////////////////////////////////////////////////////////////
 
-#include "TrigT1CaloTools/L1EmTauTools.h"
+#include "L1EmTauTools.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
 #include "TrigT1Interfaces/CoordinateRange.h"
 #include "TrigT1CaloEvent/TriggerTower_ClassDEF.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EmTauTools.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1EmTauTools.h
old mode 100755
new mode 100644
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EmTauTools.h
rename to Trigger/TrigT1/TrigT1CaloTools/src/L1EmTauTools.h
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx
index e1f51a6b65cd49833fd1c8d4cfc3083358a5a573..671787f55902c99a36e680f1a673f5509f534184 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.cxx
@@ -13,7 +13,7 @@
 #include "TrigT1CaloUtils/CrateEnergy.h"
 #include "TrigT1CaloUtils/SystemEnergy.h"
 #include "TrigT1CaloUtils/DataError.h"
-#include "TrigT1CaloTools/L1EnergyCMXTools.h"
+#include "L1EnergyCMXTools.h"
 #include "TrigConfL1Data/TriggerThreshold.h"
 #include "TrigConfL1Data/L1DataDef.h"
 #include "TrigConfL1Data/CTPConfig.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EnergyCMXTools.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EnergyCMXTools.h
rename to Trigger/TrigT1/TrigT1CaloTools/src/L1EnergyCMXTools.h
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.cxx
index 30b96d83c88be30302b60b4c7026d101519386a6..9de1b9e8dedd0094c7e0517aeb217e130cffe81c 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.cxx
@@ -5,7 +5,7 @@
 // L1EtTools.cxx,  
 ///////////////////////////////////////////////////////////////////
 
-#include "TrigT1CaloTools/L1EtTools.h"
+#include "L1EtTools.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
 #include "TrigConfL1Data/CTPConfig.h"
 #include "TrigConfL1Data/L1DataDef.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EtTools.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.h
old mode 100755
new mode 100644
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1EtTools.h
rename to Trigger/TrigT1/TrigT1CaloTools/src/L1EtTools.h
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEMJetTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEMJetTools.cxx
index e5579fa46b287d7fa9a83f3f7c77681ecaf342e2..6178ed1d1d9507b5c5ac3c00ffed953a9b303cb7 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEMJetTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEMJetTools.cxx
@@ -5,7 +5,7 @@
 // L1JEMJetTools.cxx,  
 ///////////////////////////////////////////////////////////////////
 
-#include "TrigT1CaloTools/L1JEMJetTools.h"
+#include "L1JEMJetTools.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
 #include "TrigT1Interfaces/CoordinateRange.h"
 #include "TrigT1CaloEvent/JetInput.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEMJetTools.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEMJetTools.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEMJetTools.h
rename to Trigger/TrigT1/TrigT1CaloTools/src/L1JEMJetTools.h
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.cxx
index b700fcd1f1b30df5af3a56d441a8c55c17312dac..fe790d964af4716cec43e76eb14874b582500502 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.cxx
@@ -15,7 +15,7 @@
 #include "TrigT1CaloUtils/CrateEnergy.h"
 #include "TrigT1CaloUtils/SystemEnergy.h"
 #include "TrigT1CaloUtils/DataError.h"
-#include "TrigT1CaloTools/L1JEPEtSumsTools.h"
+#include "L1JEPEtSumsTools.h"
 
 namespace LVL1 {
 
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPEtSumsTools.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPEtSumsTools.h
rename to Trigger/TrigT1/TrigT1CaloTools/src/L1JEPEtSumsTools.h
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPHitsTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPHitsTools.cxx
index 2805e82f4ca1ac6655e7324f83d5d4bf18db7a1a..f9b7210ad2661be5fa01f59ea16d85e1d92040f9 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPHitsTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPHitsTools.cxx
@@ -27,7 +27,7 @@
 #include "TrigT1Interfaces/CoordinateRange.h"
 #include "TrigT1Interfaces/JEPRoIDecoder.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
-#include "TrigT1CaloTools/L1JEPHitsTools.h"
+#include "L1JEPHitsTools.h"
 
 namespace LVL1 {
 
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPHitsTools.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1JEPHitsTools.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JEPHitsTools.h
rename to Trigger/TrigT1/TrigT1CaloTools/src/L1JEPHitsTools.h
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetCMXTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetCMXTools.cxx
index f93b78d797fb6ca34ddd387df667833b64a23aa0..5314ee8581a3c96d271003949f5cd2279c6d7169 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetCMXTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetCMXTools.cxx
@@ -20,7 +20,7 @@
 #include "TrigT1CaloEvent/CMXJetTob.h"
 #include "TrigT1CaloEvent/JEMTobRoI.h"
 #include "TrigT1CaloEvent/JetROI.h"
-#include "TrigT1CaloTools/L1JetCMXTools.h"
+#include "L1JetCMXTools.h"
 #include "TrigT1CaloUtils/DataError.h"
 #include "TrigT1CaloUtils/JetAlgorithm.h"
 #include "TrigT1Interfaces/CoordinateRange.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetCMXTools.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetCMXTools.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetCMXTools.h
rename to Trigger/TrigT1/TrigT1CaloTools/src/L1JetCMXTools.h
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetElementTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetElementTools.cxx
index c1c39cd1ac37efcc9c9875b988983f01de861210..f5e9d83845ecc375f602b01f5043784c1302fef1 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetElementTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetElementTools.cxx
@@ -5,7 +5,7 @@
 // L1JetElementTools.cxx,  
 ///////////////////////////////////////////////////////////////////
 
-#include "TrigT1CaloTools/L1JetElementTools.h"
+#include "L1JetElementTools.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
 #include "TrigT1CaloEvent/TriggerTower_ClassDEF.h"
 #include "TrigT1CaloUtils/JetElementKey.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetElementTools.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetElementTools.h
old mode 100755
new mode 100644
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetElementTools.h
rename to Trigger/TrigT1/TrigT1CaloTools/src/L1JetElementTools.h
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetEtTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetEtTools.cxx
index 6a38edff82171c728b0af357351f293537277d04..e39c5c6454649acb2af573034596b3faa92f15d7 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetEtTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetEtTools.cxx
@@ -5,7 +5,7 @@
 // L1JetEtTools.cxx,  
 ///////////////////////////////////////////////////////////////////
 
-#include "TrigT1CaloTools/L1JetEtTools.h"
+#include "L1JetEtTools.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
 #include "TrigConfL1Data/CTPConfig.h"
 #include "TrigConfL1Data/Menu.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetEtTools.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetEtTools.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetEtTools.h
rename to Trigger/TrigT1/TrigT1CaloTools/src/L1JetEtTools.h
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.cxx
index 8949eb0b5b37713643de33cfe374c803c536986e..e5237642bc39f9793244d0c38385c53eceedb252 100755
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.cxx
@@ -5,7 +5,7 @@
 // L1JetTools.cxx,  
 ///////////////////////////////////////////////////////////////////
 
-#include "TrigT1CaloTools/L1JetTools.h"
+#include "L1JetTools.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
 #include "TrigT1Interfaces/CoordinateRange.h"
 #include "TrigT1CaloEvent/JetInput.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetTools.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.h
old mode 100755
new mode 100644
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1JetTools.h
rename to Trigger/TrigT1/TrigT1CaloTools/src/L1JetTools.h
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1NonlinearLutDatabaseOverrideTool.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1NonlinearLutDatabaseOverrideTool.cxx
index 003f9ad9ab5959c586c6bc577bc47e09567da657..3519d3b610bf680cece1c8f5fd33d121c6626061 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1NonlinearLutDatabaseOverrideTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1NonlinearLutDatabaseOverrideTool.cxx
@@ -1,7 +1,7 @@
 /*
   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
-#include "TrigT1CaloTools/L1NonlinearLutDatabaseOverrideTool.h"
+#include "L1NonlinearLutDatabaseOverrideTool.h"
 
 #include "TrigT1CaloCalibConditions/L1CaloPprChanDefaultsContainer.h"
 #include "TrigT1CaloCalibConditions/L1CaloPprChanCalibContainer.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1NonlinearLutDatabaseOverrideTool.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1NonlinearLutDatabaseOverrideTool.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1NonlinearLutDatabaseOverrideTool.h
rename to Trigger/TrigT1/TrigT1CaloTools/src/L1NonlinearLutDatabaseOverrideTool.h
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
index 2f1744d6485d908856996295777dbe89269d451b..f293758dc4489c2238930d4a83ba0655b1d95a19 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.cxx
@@ -4,7 +4,7 @@
 //////////////////////////////////////////////////////////////////////
 //  L1TriggerTowerTool.cxx 
 ///////////////////////////////////////////////////////////////////////
-#include "TrigT1CaloTools/L1TriggerTowerTool.h"
+#include "L1TriggerTowerTool.h"
 
 #include "GaudiKernel/Incident.h"
 #include "GaudiKernel/IIncidentSvc.h"
@@ -42,7 +42,7 @@
 #include "TrigT1CaloCalibConditions/L1CaloRunParametersContainer.h"
 
 #include "TrigT1CaloCalibToolInterfaces/IL1CaloTTIdTools.h"
-#include "TrigT1CaloMappingToolInterfaces/IL1CaloMappingTool.h"
+#include "TrigT1CaloToolInterfaces/IL1CaloMappingTool.h"
 #include "TrigT1CaloToolInterfaces/IL1DynamicPedestalProvider.h"
 
 #include "StoreGate/ReadHandle.h"
diff --git a/Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1TriggerTowerTool.h b/Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloTools/TrigT1CaloTools/L1TriggerTowerTool.h
rename to Trigger/TrigT1/TrigT1CaloTools/src/L1TriggerTowerTool.h
diff --git a/Trigger/TrigT1/TrigT1CaloTools/src/components/TrigT1CaloTools_entries.cxx b/Trigger/TrigT1/TrigT1CaloTools/src/components/TrigT1CaloTools_entries.cxx
index 4753a3bb0535b8f8a73ea3147e9425254c33b6e5..1ee38814d0840b210e2bd9157b7d02e4cc4228bf 100644
--- a/Trigger/TrigT1/TrigT1CaloTools/src/components/TrigT1CaloTools_entries.cxx
+++ b/Trigger/TrigT1/TrigT1CaloTools/src/components/TrigT1CaloTools_entries.cxx
@@ -1,23 +1,23 @@
-#include "TrigT1CaloTools/L1DatabaseOverrideForDataTool.h"
-#include "TrigT1CaloTools/L1DynamicPedestalProviderTxt.h"
-#include "TrigT1CaloTools/L1DynamicPedestalProviderRoot.h"
-#include "TrigT1CaloTools/L1EmTauTools.h"
-#include "TrigT1CaloTools/L1JetTools.h"
-#include "TrigT1CaloTools/L1EtTools.h"
-#include "TrigT1CaloTools/L1JetElementTools.h"
-#include "TrigT1CaloTools/L1CPHitsTools.h"
-#include "TrigT1CaloTools/L1JEPHitsTools.h"
-#include "TrigT1CaloTools/L1JEPEtSumsTools.h"
-#include "TrigT1CaloTools/L1JetEtTools.h"
-#include "TrigT1CaloTools/L1TriggerTowerTool.h"
+#include "../L1DatabaseOverrideForDataTool.h"
+#include "../L1DynamicPedestalProviderTxt.h"
+#include "../L1DynamicPedestalProviderRoot.h"
+#include "../L1EmTauTools.h"
+#include "../L1JetTools.h"
+#include "../L1EtTools.h"
+#include "../L1JetElementTools.h"
+#include "../L1CPHitsTools.h"
+#include "../L1JEPHitsTools.h"
+#include "../L1JEPEtSumsTools.h"
+#include "../L1JetEtTools.h"
+#include "../L1TriggerTowerTool.h"
 // #include "TrigT1CaloTools/L1RoITools.h"
-#include "TrigT1CaloTools/L1CPMTowerTools.h"
-#include "TrigT1CaloTools/L1CPMTools.h"
-#include "TrigT1CaloTools/L1JEMJetTools.h"
-#include "TrigT1CaloTools/L1CPCMXTools.h"
-#include "TrigT1CaloTools/L1EnergyCMXTools.h"
-#include "TrigT1CaloTools/L1JetCMXTools.h"
-#include "TrigT1CaloTools/L1NonlinearLutDatabaseOverrideTool.h"
+#include "../L1CPMTowerTools.h"
+#include "../L1CPMTools.h"
+#include "../L1JEMJetTools.h"
+#include "../L1CPCMXTools.h"
+#include "../L1EnergyCMXTools.h"
+#include "../L1JetCMXTools.h"
+#include "../L1NonlinearLutDatabaseOverrideTool.h"
 
 DECLARE_COMPONENT( LVL1::L1DatabaseOverrideForDataTool )
 DECLARE_COMPONENT( LVL1::L1DynamicPedestalProviderTxt )