diff --git a/Trigger/TrigT1/TrigT1CaloSim/CMakeLists.txt b/Trigger/TrigT1/TrigT1CaloSim/CMakeLists.txt
index 79960a5cedcf0f98646c643df9065b0a96730f23..ee76de9aa499d3c036f801a9e662724634316a63 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CaloSim/CMakeLists.txt
@@ -1,67 +1,19 @@
-################################################################################
-# Package: TrigT1CaloSim
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrigT1CaloSim )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Calorimeter/CaloDetDescr
-   Calorimeter/CaloEvent
-   Calorimeter/CaloIdentifier
-   Calorimeter/CaloTTDetDescr
-   Control/AthenaBaseComps
-   Control/AthContainers
-   Control/PileUpTools
-   Control/StoreGate
-   Event/xAOD/xAODTrigL1Calo
-   GaudiKernel
-   LArCalorimeter/LArRawEvent
-   LArCalorimeter/LArCabling
-   TileCalorimeter/TileConditions
-   TileCalorimeter/TileEvent
-   Trigger/TrigConfiguration/TrigConfInterfaces
-   Trigger/TrigConfiguration/TrigConfL1Data
-   Trigger/TrigT1/TrigT1CaloCalibConditions
-   Trigger/TrigT1/TrigT1CaloCalibToolInterfaces
-   Trigger/TrigT1/TrigT1CaloEvent
-   Trigger/TrigT1/TrigT1CaloToolInterfaces
-   Trigger/TrigT1/TrigT1CaloToolInterfaces
-   Trigger/TrigT1/TrigT1CaloUtils
-   Trigger/TrigT1/TrigT1Interfaces
-   Trigger/TrigT1/TrigT1CaloByteStream
-   PRIVATE
-   Control/AthenaKernel
-   Event/xAOD/xAODEventInfo
-   LumiBlock/LumiBlockComps
-   Tools/PathResolver
-   Trigger/TrigT1/TrigT1CaloCondSvc )
-
 # External dependencies:
 find_package( CLHEP )
 
 # Component(s) in the package:
-atlas_add_library( TrigT1CaloSimLib
-   TrigT1CaloSim/*.h src/*.cxx
-   PUBLIC_HEADERS TrigT1CaloSim
-   INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
-   DEFINITIONS ${CLHEP_DEFINITIONS}
-   LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloEvent CaloIdentifier CaloTTDetDescr
-   AthenaBaseComps AthContainers xAODTrigL1Calo GaudiKernel LArRawEvent
-   TileEvent TrigConfL1Data TrigT1CaloCalibConditions 
-   TrigT1CaloCalibToolInterfaces TrigT1CaloToolInterfaces TrigT1Interfaces
-   CaloDetDescrLib PileUpToolsLib StoreGateLib SGtests LArCablingLib
-   TileConditionsLib TrigT1CaloEventLib TrigT1CaloUtilsLib LumiBlockCompsLib
-   PRIVATE_LINK_LIBRARIES AthenaKernel
-   xAODEventInfo
-   PathResolver TrigT1CaloCondSvcLib )
-
 atlas_add_component( TrigT1CaloSim
-   src/components/*.cxx
-   LINK_LIBRARIES GaudiKernel TrigT1CaloSimLib )
+                     src/*.cxx
+                     src/components/*.cxx
+                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
+                     DEFINITIONS ${CLHEP_DEFINITIONS}
+                     LINK_LIBRARIES ${CLHEP_LIBRARIES} AthContainers AthenaBaseComps AthenaKernel CaloDetDescrLib CaloEvent CaloIdentifier CaloTTDetDescr GaudiKernel Identifier LArRawEvent LumiBlockCompsLib PathResolver PileUpToolsLib StoreGateLib TileConditionsLib TileEvent TrigConfInterfaces TrigConfL1Data TrigT1CaloByteStreamLib TrigT1CaloCalibConditions TrigT1CaloCalibToolInterfaces TrigT1CaloCondSvcLib TrigT1CaloEventLib TrigT1CaloToolInterfaces TrigT1CaloUtilsLib TrigT1Interfaces xAODEventInfo xAODTrigL1Calo )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.py )
diff --git a/Trigger/TrigT1/TrigT1CaloSim/python/OverlayTTL1ConfigLegacy.py b/Trigger/TrigT1/TrigT1CaloSim/python/OverlayTTL1ConfigLegacy.py
index 674b921ef06a9d5712275d4db5c45a99b82d3ec5..9d45388284941a9dad21c5a48bce6ac00e71fd8b 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/python/OverlayTTL1ConfigLegacy.py
+++ b/Trigger/TrigT1/TrigT1CaloSim/python/OverlayTTL1ConfigLegacy.py
@@ -1,34 +1,34 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 from AthenaCommon import CfgMgr
 
 def getTTL1Overlay(name="OverlayTTL1", **kwargs):
     from OverlayCommonAlgs.OverlayFlags import overlayFlags
     if overlayFlags.isOverlayMT():
-        kwargs.setdefault("BkgEmTTL1Key", overlayFlags.bkgPrefix() + "LArTTL1EM");
-        kwargs.setdefault("SignalEmTTL1Key", overlayFlags.sigPrefix() + "LArTTL1EM");
-        kwargs.setdefault("OutputEmTTL1Key", "LArTTL1EM");
-        kwargs.setdefault("BkgHadTTL1Key", overlayFlags.bkgPrefix() + "LArTTL1HAD");
-        kwargs.setdefault("SignalHadTTL1Key", overlayFlags.sigPrefix() + "LArTTL1HAD");
-        kwargs.setdefault("OutputHadTTL1Key", "LArTTL1HAD");
-        kwargs.setdefault("BkgTileTTL1Key", overlayFlags.bkgPrefix() + "TileTTL1Cnt");
-        kwargs.setdefault("SignalTileTTL1Key", overlayFlags.sigPrefix() + "TileTTL1Cnt");
-        kwargs.setdefault("OutputTileTTL1Key", "TileTTL1Cnt");
-        kwargs.setdefault("BkgTileMBTSTTL1Key", overlayFlags.bkgPrefix() + "TileTTL1MBTS");
-        kwargs.setdefault("SignalTileMBTSTTL1Key", overlayFlags.sigPrefix() + "TileTTL1MBTS");
-        kwargs.setdefault("OutputTileMBTSTTL1Key", "TileTTL1MBTS");
+        kwargs.setdefault("BkgEmTTL1Key", overlayFlags.bkgPrefix() + "LArTTL1EM")
+        kwargs.setdefault("SignalEmTTL1Key", overlayFlags.sigPrefix() + "LArTTL1EM")
+        kwargs.setdefault("OutputEmTTL1Key", "LArTTL1EM")
+        kwargs.setdefault("BkgHadTTL1Key", overlayFlags.bkgPrefix() + "LArTTL1HAD")
+        kwargs.setdefault("SignalHadTTL1Key", overlayFlags.sigPrefix() + "LArTTL1HAD")
+        kwargs.setdefault("OutputHadTTL1Key", "LArTTL1HAD")
+        kwargs.setdefault("BkgTileTTL1Key", overlayFlags.bkgPrefix() + "TileTTL1Cnt")
+        kwargs.setdefault("SignalTileTTL1Key", overlayFlags.sigPrefix() + "TileTTL1Cnt")
+        kwargs.setdefault("OutputTileTTL1Key", "TileTTL1Cnt")
+        kwargs.setdefault("BkgTileMBTSTTL1Key", overlayFlags.bkgPrefix() + "TileTTL1MBTS")
+        kwargs.setdefault("SignalTileMBTSTTL1Key", overlayFlags.sigPrefix() + "TileTTL1MBTS")
+        kwargs.setdefault("OutputTileMBTSTTL1Key", "TileTTL1MBTS")
     else:
-        kwargs.setdefault("BkgEmTTL1Key", overlayFlags.dataStore() + "+LArTTL1EM");
-        kwargs.setdefault("SignalEmTTL1Key", overlayFlags.evtStore() + "+LArTTL1EM");
-        kwargs.setdefault("OutputEmTTL1Key", overlayFlags.outputStore() + "+LArTTL1EM");
-        kwargs.setdefault("BkgHadTTL1Key", overlayFlags.dataStore() + "+LArTTL1HAD");
-        kwargs.setdefault("SignalHadTTL1Key", overlayFlags.evtStore() + "+LArTTL1HAD");
-        kwargs.setdefault("OutputHadTTL1Key", overlayFlags.outputStore() + "+LArTTL1HAD");
-        kwargs.setdefault("BkgTileTTL1Key", overlayFlags.dataStore() + "+TileTTL1Cnt");
-        kwargs.setdefault("SignalTileTTL1Key", overlayFlags.evtStore() + "+TileTTL1Cnt");
-        kwargs.setdefault("OutputTileTTL1Key", overlayFlags.outputStore() + "+TileTTL1Cnt");
-        kwargs.setdefault("BkgTileMBTSTTL1Key", overlayFlags.dataStore() + "+TileTTL1MBTS");
-        kwargs.setdefault("SignalTileMBTSTTL1Key", overlayFlags.evtStore() + "+TileTTL1MBTS");
-        kwargs.setdefault("OutputTileMBTSTTL1Key", overlayFlags.outputStore() + "+TileTTL1MBTS");
+        kwargs.setdefault("BkgEmTTL1Key", overlayFlags.dataStore() + "+LArTTL1EM")
+        kwargs.setdefault("SignalEmTTL1Key", overlayFlags.evtStore() + "+LArTTL1EM")
+        kwargs.setdefault("OutputEmTTL1Key", overlayFlags.outputStore() + "+LArTTL1EM")
+        kwargs.setdefault("BkgHadTTL1Key", overlayFlags.dataStore() + "+LArTTL1HAD")
+        kwargs.setdefault("SignalHadTTL1Key", overlayFlags.evtStore() + "+LArTTL1HAD")
+        kwargs.setdefault("OutputHadTTL1Key", overlayFlags.outputStore() + "+LArTTL1HAD")
+        kwargs.setdefault("BkgTileTTL1Key", overlayFlags.dataStore() + "+TileTTL1Cnt")
+        kwargs.setdefault("SignalTileTTL1Key", overlayFlags.evtStore() + "+TileTTL1Cnt")
+        kwargs.setdefault("OutputTileTTL1Key", overlayFlags.outputStore() + "+TileTTL1Cnt")
+        kwargs.setdefault("BkgTileMBTSTTL1Key", overlayFlags.dataStore() + "+TileTTL1MBTS")
+        kwargs.setdefault("SignalTileMBTSTTL1Key", overlayFlags.evtStore() + "+TileTTL1MBTS")
+        kwargs.setdefault("OutputTileMBTSTTL1Key", overlayFlags.outputStore() + "+TileTTL1MBTS")
 
     return CfgMgr.LVL1__OverlayTTL1(name, **kwargs)
diff --git a/Trigger/TrigT1/TrigT1CaloSim/python/TrigT1CaloSimConfig.py b/Trigger/TrigT1/TrigT1CaloSim/python/TrigT1CaloSimConfig.py
index bedeb0974a0b2777094a36086ec1f9c5c4901cf2..06bd6e9da5ddbd1a70adc0e32b1e27ab32f2386a 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/python/TrigT1CaloSimConfig.py
+++ b/Trigger/TrigT1/TrigT1CaloSim/python/TrigT1CaloSimConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__TriggerTowerMaker
 
@@ -7,6 +7,7 @@ class TriggerTowerMakerBase (LVL1__TriggerTowerMaker):
     def __init__(self, name):
         super( TriggerTowerMakerBase, self ).__init__( name )
         from AthenaCommon.DetFlags import DetFlags
+        from AthenaCommon.Constants import WARNING
         if DetFlags.digitize.LVL1_on():
             from Digitization.DigitizationFlags import jobproperties
             self.RndmSvc=jobproperties.Digitization.rndmSvc.get_Value()
@@ -15,21 +16,19 @@ class TriggerTowerMakerBase (LVL1__TriggerTowerMaker):
             jobproperties.Digitization.rndmSeedList.addSeed( str(self.PedEngine), 8594832, 5736213 )
             jobproperties.Digitization.rndmSeedList.addSeed( str(self.DigiEngine), 8631309, 4492432) 
         else:
-            rndmSvc = 'AtRanluxGenSvc'
-            self.RndmSvc = rndmSvc
+            self.RndmSvc = 'AtRanluxGenSvc'
             self.PedEngine = "%s_Pedestal"%name
             self.DigiEngine =  "%s_Digitization"%name
           
             from AthenaCommon.AppMgr import ServiceMgr
-            if not hasattr( ServiceMgr, rndmSvc):
-                from AthenaServices.AthenaServicesConf import  AtRanluxGenSvc
-                randomSvc = eval(rndmSvc)(rndmSvc)
-                ServiceMgr += randomSvc
+            if not hasattr( ServiceMgr, 'AtRanluxGenSvc'):
+                from AthenaServices.AthenaServicesConf import AtRanluxGenSvc
+                ServiceMgr += AtRanluxGenSvc()
                
             # init random number seeds
-            getattr(ServiceMgr, rndmSvc).Seeds += [ str(self.PedEngine) + " 8594832 5736213" ]
-            getattr(ServiceMgr, rndmSvc).Seeds += [ str(self.DigiEngine) + " 8631309 4492432" ]
-            getattr(ServiceMgr, rndmSvc).OutputLevel=4 # suppress 1 per event INFO messages.
+            ServiceMgr.AtRanluxGenSvc.Seeds += [ str(self.PedEngine) + " 8594832 5736213" ]
+            ServiceMgr.AtRanluxGenSvc.Seeds += [ str(self.DigiEngine) + " 8631309 4492432" ]
+            ServiceMgr.AtRanluxGenSvc.OutputLevel = WARNING # suppress 1 per event INFO messages.
     
 class TriggerTowerMaker_TTL1(TriggerTowerMakerBase) :
   __slots__ = []
@@ -142,17 +141,17 @@ useNoiseCuts2012: use 2012 values of noise cuts (only available for matched filt
     from AthenaCommon.Logging import logging  # loads logger
     log = logging.getLogger( "TrigT1CaloSimConfig.py" )
     log.info("configureTriggerTowerMaker will override the TriggerTowerMaker configuration")
-    log.info("AutoCorrelation = %s" % useAutoCorr)
-    log.info("PedestalCorrection = %s" % usePedestalCorrection)
-    log.info("NoiseCuts = %s" % useNoiseCuts)
-    log.info("PedestalCorrection from ROOT-File = %s" % usePedestalCorrectionProviderROOT)
+    log.info("AutoCorrelation = %s", useAutoCorr)
+    log.info("PedestalCorrection = %s", usePedestalCorrection)
+    log.info("NoiseCuts = %s", useNoiseCuts)
+    log.info("PedestalCorrection from ROOT-File = %s", usePedestalCorrectionProviderROOT)
     if usePedestalCorrection:
         if usePedestalCorrectionProviderROOT:
-            log.info("ROOT input file = %s" % inputFileRoot)
+            log.info("ROOT input file = %s", inputFileRoot)
         else:
-            log.info("EM input file = %s" % inputFileTxtEM)
-            log.info("HAD input file = %s" % inputFileTxtHAD)
-    log.info("NoiseCuts2012 = %s" % useNoiseCuts2012)
+            log.info("EM input file = %s", inputFileTxtEM)
+            log.info("HAD input file = %s", inputFileTxtHAD)
+    log.info("NoiseCuts2012 = %s", useNoiseCuts2012)
     if useAutoCorr and useNoiseCuts2012:
         log.warning("useNoiseCuts2012: 2012 NoiseCuts only available for matched filters - setting will have not effect")
     if (not useAutoCorr) and useNoiseCuts and useNoiseCuts2012:
@@ -355,7 +354,7 @@ useNoiseCuts2012: use 2012 values of noise cuts (only available for matched filt
                 pedestalProvider = ToolSvc.L1DynamicPedestalProviderRoot
         else:
 
-            if not 'MetaReaderPeeker' in dir():
+            if 'MetaReaderPeeker' not in dir():
                 try:
                     from PyUtils.MetaReaderPeekerFull import metadata
                 except ImportError:
diff --git a/Trigger/TrigT1/TrigT1CaloSim/python/TrigT1CaloSimRun2Config.py b/Trigger/TrigT1/TrigT1CaloSim/python/TrigT1CaloSimRun2Config.py
index 0afdb6d4bab3d10076674724b5e45db671ec470e..7328ab7c6fed381306538106707741c44d9afeaf 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/python/TrigT1CaloSimRun2Config.py
+++ b/Trigger/TrigT1/TrigT1CaloSim/python/TrigT1CaloSimRun2Config.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__Run2TriggerTowerMaker
 
@@ -7,25 +7,24 @@ class Run2TriggerTowerMakerBase (LVL1__Run2TriggerTowerMaker):
     def __init__(self, name):
         super( Run2TriggerTowerMakerBase, self ).__init__( name )
         from AthenaCommon.DetFlags import DetFlags
+        from AthenaCommon.Constants import WARNING
         if DetFlags.digitize.LVL1_on():
             from Digitization.DigitizationFlags import jobproperties
             self.RndmSvc=jobproperties.Digitization.rndmSvc.get_Value()
             self.DigiEngine =  "%s_Digitization"%name
             jobproperties.Digitization.rndmSeedList.addSeed( str(self.DigiEngine), 8631309, 4492432) 
         else:
-            rndmSvc = 'AtRanluxGenSvc'
-            self.RndmSvc = rndmSvc
-            self.DigiEngine =  "%s_Digitization"%name
+            self.RndmSvc = 'AtRanluxGenSvc'
+            self.DigiEngine = "%s_Digitization" % name
           
             from AthenaCommon.AppMgr import ServiceMgr
-            if not hasattr( ServiceMgr, rndmSvc):
-                from AthenaServices.AthenaServicesConf import  AtRanluxGenSvc
-                randomSvc = eval(rndmSvc)(rndmSvc)
-                ServiceMgr += randomSvc
+            if not hasattr( ServiceMgr, 'AtRanluxGenSvc'):
+                from AthenaServices.AthenaServicesConf import AtRanluxGenSvc
+                ServiceMgr += AtRanluxGenSvc()
                
             # init random number seeds
-            getattr(ServiceMgr, rndmSvc).Seeds += [ str(self.DigiEngine) + " 8631309 4492432" ]
-            getattr(ServiceMgr, rndmSvc).OutputLevel=4 # suppress 1 per event INFO messages.
+            ServiceMgr.AtRanluxGenSvc.Seeds += [ str(self.DigiEngine) + " 8631309 4492432" ]
+            ServiceMgr.AtRanluxGenSvc.OutputLevel = WARNING # suppress 1 per event INFO messages.
     
 class Run2TriggerTowerMaker(Run2TriggerTowerMakerBase):
     """ Baseline Run2 TriggerTower configuration:
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/CPCMX.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/CPCMX.cxx
index 4edeb2c8d1313bda1f57f5298e03a0524d635cfb..aa0bcfc777d75aba3ee7d8aeff9edaeae6550604 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/CPCMX.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/CPCMX.cxx
@@ -20,7 +20,7 @@
 // Utilities
 
 // This algorithm includes
-#include "TrigT1CaloSim/CPCMX.h"
+#include "CPCMX.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
 #include "TrigT1CaloUtils/CoordToHardware.h"
 #include "TrigConfL1Data/L1DataDef.h"
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/CPCMX.h b/Trigger/TrigT1/TrigT1CaloSim/src/CPCMX.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/CPCMX.h
rename to Trigger/TrigT1/TrigT1CaloSim/src/CPCMX.h
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/CPMSim.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/CPMSim.cxx
index 0842b14ced57224ccd3369806d6df3a0c6d8d1e3..164b4dbe792c93f9ac64addad7566fb6082e032b 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/CPMSim.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/CPMSim.cxx
@@ -20,7 +20,7 @@
 // Utilities
 
 // This algorithm includes
-#include "TrigT1CaloSim/CPMSim.h"
+#include "CPMSim.h"
 #include "TrigT1CaloUtils/CoordToHardware.h"
 #include "TrigConfL1Data/L1DataDef.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/CPMSim.h b/Trigger/TrigT1/TrigT1CaloSim/src/CPMSim.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/CPMSim.h
rename to Trigger/TrigT1/TrigT1CaloSim/src/CPMSim.h
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/CPMTowerMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/CPMTowerMaker.cxx
index 68fcf62ec9bede82531cb1a3b8ee730bdb6d8d8b..80b5606f882d6a241fb33e64017986224929bb53 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/src/CPMTowerMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/CPMTowerMaker.cxx
@@ -12,7 +12,7 @@
 #include <cmath>
 
 // This algorithm includes
-#include "TrigT1CaloSim/CPMTowerMaker.h"
+#include "CPMTowerMaker.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
 #include "TrigT1CaloEvent/TriggerTowerCollection.h"
 #include "TrigT1CaloEvent/CPMTower_ClassDEF.h"
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/CPMTowerMaker.h b/Trigger/TrigT1/TrigT1CaloSim/src/CPMTowerMaker.h
old mode 100755
new mode 100644
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/CPMTowerMaker.h
rename to Trigger/TrigT1/TrigT1CaloSim/src/CPMTowerMaker.h
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.cxx
index fb931c8dadeecb87049a6c66772318e3fdeae177..4a211ebb3404075e6d543a44adfd13c5c5614c48 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.cxx
@@ -22,7 +22,7 @@
 
 
 // This algorithm includes
-#include "TrigT1CaloSim/EnergyCMX.h"
+#include "EnergyCMX.h"
 
 #include "TrigConfL1Data/TriggerThreshold.h"
 #include "TrigConfL1Data/CTPConfig.h"
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/EnergyCMX.h b/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/EnergyCMX.h
rename to Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.h
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/JEMEnergySim.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/JEMEnergySim.cxx
index 758fae0c9cc85e1982fed762770375122a62fe77..d14910b731838a43ad11229d78b72cfeec7a1d99 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/JEMEnergySim.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/JEMEnergySim.cxx
@@ -20,7 +20,7 @@
 #include <cmath>
 
 // This algorithm includes
-#include "TrigT1CaloSim/JEMEnergySim.h"
+#include "JEMEnergySim.h"
 #include "TrigT1CaloUtils/JetEnergyModuleKey.h" 
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JEMEnergySim.h b/Trigger/TrigT1/TrigT1CaloSim/src/JEMEnergySim.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JEMEnergySim.h
rename to Trigger/TrigT1/TrigT1CaloSim/src/JEMEnergySim.h
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/JEMJetSim.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/JEMJetSim.cxx
index 9d1863ffb04bb173b4ff63c98371806d8fda4a8c..013e0386d331e2c044fa8adf267b76c52188a2ac 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/JEMJetSim.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/JEMJetSim.cxx
@@ -20,7 +20,7 @@
 // Utilities
 
 // This algorithm includes
-#include "TrigT1CaloSim/JEMJetSim.h"
+#include "JEMJetSim.h"
 #include "TrigT1CaloUtils/JetEnergyModuleKey.h"
 
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JEMJetSim.h b/Trigger/TrigT1/TrigT1CaloSim/src/JEMJetSim.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JEMJetSim.h
rename to Trigger/TrigT1/TrigT1CaloSim/src/JEMJetSim.h
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/JetCMX.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/JetCMX.cxx
index 3ce05cd24da08df2007ff54aee1c736f7aed51c0..221db36c9b0327f5f2bb8edacf8f4e2fcbe39990 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/JetCMX.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/JetCMX.cxx
@@ -20,7 +20,7 @@
 // Utilities
 
 // This algorithm includes
-#include "TrigT1CaloSim/JetCMX.h"
+#include "JetCMX.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
 #include "TrigT1CaloUtils/CoordToHardware.h"
 #include "TrigConfL1Data/L1DataDef.h"
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JetCMX.h b/Trigger/TrigT1/TrigT1CaloSim/src/JetCMX.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JetCMX.h
rename to Trigger/TrigT1/TrigT1CaloSim/src/JetCMX.h
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/JetElementMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/JetElementMaker.cxx
index 61b7b6f386491368f1c3a558f151b144b78ede31..2ffa9ba17211f5b163d6e5b1a0ce960907f9a8d5 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/src/JetElementMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/JetElementMaker.cxx
@@ -11,7 +11,7 @@
 
 
 // This algorithm includes
-#include "TrigT1CaloSim/JetElementMaker.h"
+#include "JetElementMaker.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
 #include "TrigT1CaloEvent/TriggerTowerCollection.h"
 #include "TrigT1CaloEvent/JetElement_ClassDEF.h"
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JetElementMaker.h b/Trigger/TrigT1/TrigT1CaloSim/src/JetElementMaker.h
old mode 100755
new mode 100644
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/JetElementMaker.h
rename to Trigger/TrigT1/TrigT1CaloSim/src/JetElementMaker.h
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/MergeSlices.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/MergeSlices.cxx
index 03ccad29fb4f5ae0c4c347ecbfac4efe114e3343..cfe2b64130224353e8bd0f02a99718f54fd1b8e7 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/MergeSlices.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/MergeSlices.cxx
@@ -13,7 +13,7 @@
 #include "TrigT1CaloEvent/JEMHits.h"
 #include "TrigT1CaloEvent/JetElement.h"
 #include "TrigT1CaloUtils/JetElementKey.h"
-#include "TrigT1CaloSim/MergeSlices.h"
+#include "MergeSlices.h"
 #include "TrigT1CaloEvent/TriggerTower.h"
 #include "TrigT1CaloUtils/TriggerTowerKey.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/MergeSlices.h b/Trigger/TrigT1/TrigT1CaloSim/src/MergeSlices.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/MergeSlices.h
rename to Trigger/TrigT1/TrigT1CaloSim/src/MergeSlices.h
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx
index f29d72bed4b2515ffe24fda6b69b5dfb7af7410e..01cd13924aeea1d21a467f0e84b0e1e245409b52 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.cxx
@@ -5,7 +5,7 @@
 // OverlayRun2TriggerTowerMaker class Implementation
 // ================================================
 
-#include "TrigT1CaloSim/OverlayRun2TriggerTowerMaker.h"
+#include "OverlayRun2TriggerTowerMaker.h"
 
 // trigger include(s)
 #include "TrigT1CaloCalibConditions/L1CaloModuleType.h"
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/OverlayRun2TriggerTowerMaker.h b/Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/OverlayRun2TriggerTowerMaker.h
rename to Trigger/TrigT1/TrigT1CaloSim/src/OverlayRun2TriggerTowerMaker.h
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/OverlayTTL1.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/OverlayTTL1.cxx
index 7d1c023ea2b1f649d93adb3b69818d79937d7b99..71e47465670e5b4f8ad24bc92bd4845ae0854896 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/OverlayTTL1.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/OverlayTTL1.cxx
@@ -6,7 +6,7 @@
 // OverlayTTL1 class Implementation
 // ================================================
 
-#include "TrigT1CaloSim/OverlayTTL1.h"
+#include "OverlayTTL1.h"
 
 // Atlas includes
 #include "StoreGate/ReadHandle.h"
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/OverlayTTL1.h b/Trigger/TrigT1/TrigT1CaloSim/src/OverlayTTL1.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/OverlayTTL1.h
rename to Trigger/TrigT1/TrigT1CaloSim/src/OverlayTTL1.h
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/ReprocessTriggerTowers.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/ReprocessTriggerTowers.cxx
index ffecec55e9bfe324c49b67a5bd5895c77d988d70..62eb357df943d8da7f3681c6d09510b93c1af35c 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/ReprocessTriggerTowers.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/ReprocessTriggerTowers.cxx
@@ -20,7 +20,7 @@
 #include "GaudiKernel/IIncidentSvc.h"
 
 // This algorithm includes
-#include "TrigT1CaloSim/ReprocessTriggerTowers.h"
+#include "ReprocessTriggerTowers.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
 #include "TrigT1CaloUtils/CoordToHardware.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/ReprocessTriggerTowers.h b/Trigger/TrigT1/TrigT1CaloSim/src/ReprocessTriggerTowers.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/ReprocessTriggerTowers.h
rename to Trigger/TrigT1/TrigT1CaloSim/src/ReprocessTriggerTowers.h
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/RoIROD.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/RoIROD.cxx
index b0273d7b270f58e55f2d1bf55c1f553e93ed1967..a5898f0ea1a8ea53f4ead41db500a1d4e884eabd 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/RoIROD.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/RoIROD.cxx
@@ -14,7 +14,7 @@
 #include <string>
 
 // running in Athena
-#include "TrigT1CaloSim/RoIROD.h"
+#include "RoIROD.h"
 
 #include "TrigT1Interfaces/TrigT1Interfaces_ClassDEF.h"
 
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/RoIROD.h b/Trigger/TrigT1/TrigT1CaloSim/src/RoIROD.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/RoIROD.h
rename to Trigger/TrigT1/TrigT1CaloSim/src/RoIROD.h
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/Run2CPMTowerMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/Run2CPMTowerMaker.cxx
index cd725bf50516b6a566bfa30ec88ab3e1ea630a4a..e29fc01fa59235ece101d1a050f6529deaec6870 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/Run2CPMTowerMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/Run2CPMTowerMaker.cxx
@@ -12,7 +12,7 @@
 #include <cmath>
 
 // This algorithm includes
-#include "TrigT1CaloSim/Run2CPMTowerMaker.h"
+#include "Run2CPMTowerMaker.h"
 #include "TrigT1CaloEvent/CPMTower_ClassDEF.h"
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Run2CPMTowerMaker.h b/Trigger/TrigT1/TrigT1CaloSim/src/Run2CPMTowerMaker.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Run2CPMTowerMaker.h
rename to Trigger/TrigT1/TrigT1CaloSim/src/Run2CPMTowerMaker.h
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/Run2JetElementMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/Run2JetElementMaker.cxx
index 9ce07ae552c0becedabe789badfba80da2a83b33..462e2462fb01b32c93006474c62544320b9a266f 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/Run2JetElementMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/Run2JetElementMaker.cxx
@@ -11,7 +11,7 @@
 
 
 // This algorithm includes
-#include "TrigT1CaloSim/Run2JetElementMaker.h"
+#include "Run2JetElementMaker.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
 
 
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Run2JetElementMaker.h b/Trigger/TrigT1/TrigT1CaloSim/src/Run2JetElementMaker.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Run2JetElementMaker.h
rename to Trigger/TrigT1/TrigT1CaloSim/src/Run2JetElementMaker.h
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx
index 46622cfc4d231af3095f49f2104789209d87984e..3de7a56593685342ca151def0e10c8f4bfad297d 100755
--- a/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.cxx
@@ -6,7 +6,7 @@
 // Run2TriggerTowerMaker class Implementation
 // ================================================
 
-#include "TrigT1CaloSim/Run2TriggerTowerMaker.h"
+#include "Run2TriggerTowerMaker.h"
 
 // trigger include(s)
 #include "TrigT1CaloCalibConditions/L1CaloModuleType.h"
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Run2TriggerTowerMaker.h b/Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.h
old mode 100755
new mode 100644
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Run2TriggerTowerMaker.h
rename to Trigger/TrigT1/TrigT1CaloSim/src/Run2TriggerTowerMaker.h
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/Tester.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/Tester.cxx
index ed5a127b457135e0828021048f054a048b2b8915..2a7d4b80fcc55165815e83d4613cbd9937f45f28 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/Tester.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/Tester.cxx
@@ -18,7 +18,7 @@
 //
 
 // This algorithm includes
-#include "TrigT1CaloSim/Tester.h"
+#include "Tester.h"
 #include <fstream>
 #include <algorithm>
 // #include "CaloGeoHelpers/CaloSampling.h"
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Tester.h b/Trigger/TrigT1/TrigT1CaloSim/src/Tester.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/Tester.h
rename to Trigger/TrigT1/TrigT1CaloSim/src/Tester.h
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/TransientDatabaseOverride.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/TransientDatabaseOverride.cxx
index 51a47329c2b32a88f4740c1ba59a532f7776d330..790e309c0c084b26dd7e952539a5f0672b9f0ff2 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/TransientDatabaseOverride.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/TransientDatabaseOverride.cxx
@@ -4,7 +4,7 @@
   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TrigT1CaloSim/TransientDatabaseOverride.h"
+#include "TransientDatabaseOverride.h"
 
 #include <functional>
 #include <utility>
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/TransientDatabaseOverride.h b/Trigger/TrigT1/TrigT1CaloSim/src/TransientDatabaseOverride.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/TransientDatabaseOverride.h
rename to Trigger/TrigT1/TrigT1CaloSim/src/TransientDatabaseOverride.h
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.cxx
index 0f1ea96ee8ed77d53302195d75bd4502802571a9..1af2c525f871faed214a23da39c32a2fc4565a9a 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.cxx
@@ -11,7 +11,7 @@
 
 // This algorithm includes
 #include "GaudiKernel/IIncidentSvc.h"
-#include "TrigT1CaloSim/TriggerTowerMaker.h"
+#include "TriggerTowerMaker.h"
 #include "TrigT1Interfaces/TrigT1CaloDefs.h"
 #include <fstream>
 #include <cmath>
diff --git a/Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/TriggerTowerMaker.h b/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloSim/TrigT1CaloSim/TriggerTowerMaker.h
rename to Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.h
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/components/TrigT1CaloSim_entries.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/components/TrigT1CaloSim_entries.cxx
index 7d530edcf74cc7a2c8be74a5aa7203b2c3770bfc..2ab1ef78e937922248d11012e72538f14a344b99 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/components/TrigT1CaloSim_entries.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/components/TrigT1CaloSim_entries.cxx
@@ -1,22 +1,22 @@
-#include "TrigT1CaloSim/TriggerTowerMaker.h"
-#include "TrigT1CaloSim/Run2TriggerTowerMaker.h"
-#include "TrigT1CaloSim/CPMTowerMaker.h"
-#include "TrigT1CaloSim/JetElementMaker.h"
-#include "TrigT1CaloSim/Run2CPMTowerMaker.h"
-#include "TrigT1CaloSim/Run2JetElementMaker.h"
-#include "TrigT1CaloSim/MergeSlices.h"
-#include "TrigT1CaloSim/Tester.h"
-#include "TrigT1CaloSim/ReprocessTriggerTowers.h"
-#include "TrigT1CaloSim/CPMSim.h"
-#include "TrigT1CaloSim/JEMJetSim.h"
-#include "TrigT1CaloSim/JEMEnergySim.h"
-#include "TrigT1CaloSim/RoIROD.h"
-#include "TrigT1CaloSim/CPCMX.h"
-#include "TrigT1CaloSim/JetCMX.h"
-#include "TrigT1CaloSim/EnergyCMX.h"
-#include "TrigT1CaloSim/OverlayRun2TriggerTowerMaker.h"
-#include "TrigT1CaloSim/TransientDatabaseOverride.h"
-#include "TrigT1CaloSim/OverlayTTL1.h"
+#include "../TriggerTowerMaker.h"
+#include "../Run2TriggerTowerMaker.h"
+#include "../CPMTowerMaker.h"
+#include "../JetElementMaker.h"
+#include "../Run2CPMTowerMaker.h"
+#include "../Run2JetElementMaker.h"
+#include "../MergeSlices.h"
+#include "../Tester.h"
+#include "../ReprocessTriggerTowers.h"
+#include "../CPMSim.h"
+#include "../JEMJetSim.h"
+#include "../JEMEnergySim.h"
+#include "../RoIROD.h"
+#include "../CPCMX.h"
+#include "../JetCMX.h"
+#include "../EnergyCMX.h"
+#include "../OverlayRun2TriggerTowerMaker.h"
+#include "../TransientDatabaseOverride.h"
+#include "../OverlayTTL1.h"
 
 
 using namespace LVL1;