diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/CMakeLists.txt b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/CMakeLists.txt
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/CMakeLists.txt
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/CMakeLists.txt
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/ATLAS_CHECK_THREAD_SAFETY
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/ATLAS_CHECK_THREAD_SAFETY
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/ATLAS_CHECK_THREAD_SAFETY
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXFPGA.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXFPGA.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXFPGA.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXFPGA.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXFPGATowerIdProvider.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXFPGATowerIdProvider.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXFPGATowerIdProvider.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXFPGATowerIdProvider.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXFillEDM.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXFillEDM.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXFillEDM.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXFillEDM.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXFormTOBs.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXFormTOBs.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXFormTOBs.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXFormTOBs.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXSim.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXSim.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXSim.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXSim.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXSuperCellTowerIdProvider.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXSuperCellTowerIdProvider.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXSuperCellTowerIdProvider.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXSuperCellTowerIdProvider.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXSysSim.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXSysSim.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXSysSim.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXSysSim.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXegAlgo.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXegAlgo.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXegAlgo.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXegAlgo.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXtauAlgo.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXtauAlgo.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXtauAlgo.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFEXtauAlgo.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFakeTower.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFakeTower.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFakeTower.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeFakeTower.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeSuperCellTowerMapper.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeSuperCellTowerMapper.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeSuperCellTowerMapper.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeSuperCellTowerMapper.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeTowerBuilder.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeTowerBuilder.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeTowerBuilder.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IeTowerBuilder.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXFPGA.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXFPGA.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXFPGA.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXFPGA.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXJetAlgo.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXJetAlgo.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXJetAlgo.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXJetAlgo.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXJwoJAlgo.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXJwoJAlgo.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXJwoJAlgo.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXJwoJAlgo.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXSim.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXSim.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXSim.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXSim.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXSysSim.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXSysSim.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXSysSim.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXSysSim.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXaltMetAlgo.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXaltMetAlgo.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXaltMetAlgo.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgFEXaltMetAlgo.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgSuperCellTowerMapper.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgSuperCellTowerMapper.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgSuperCellTowerMapper.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgSuperCellTowerMapper.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgTowerBuilder.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgTowerBuilder.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgTowerBuilder.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IgTowerBuilder.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXFPGA.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXFPGA.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXFPGA.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXFPGA.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXFormTOBs.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXFormTOBs.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXFormTOBs.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXFormTOBs.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXForwardElecAlgo.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXForwardElecAlgo.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXForwardElecAlgo.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXForwardElecAlgo.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXForwardJetsAlgo.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXForwardJetsAlgo.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXForwardJetsAlgo.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXForwardJetsAlgo.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXLargeRJetAlgo.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXLargeRJetAlgo.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXLargeRJetAlgo.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXLargeRJetAlgo.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXPileupAndNoise.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXPileupAndNoise.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXPileupAndNoise.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXPileupAndNoise.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXSim.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXSim.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXSim.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXSim.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXSmallRJetAlgo.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXSmallRJetAlgo.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXSmallRJetAlgo.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXSmallRJetAlgo.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXSysSim.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXSysSim.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXSysSim.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXSysSim.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXmetAlgo.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXmetAlgo.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXmetAlgo.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXmetAlgo.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXsumETAlgo.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXsumETAlgo.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXsumETAlgo.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXsumETAlgo.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXtauAlgo.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXtauAlgo.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXtauAlgo.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjFEXtauAlgo.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjSuperCellTowerMapper.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjSuperCellTowerMapper.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjSuperCellTowerMapper.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjSuperCellTowerMapper.h
diff --git a/Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjTowerBuilder.h b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjTowerBuilder.h
similarity index 100%
rename from Trigger/TrigT1/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjTowerBuilder.h
rename to Trigger/TrigT1/L1CaloFEX/L1CaloFEXToolInterfaces/L1CaloFEXToolInterfaces/IjTowerBuilder.h
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/ATLAS_CHECK_THREAD_SAFETY
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/ATLAS_CHECK_THREAD_SAFETY
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/ATLAS_CHECK_THREAD_SAFETY
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/CMakeLists.txt b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/CMakeLists.txt
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/CMakeLists.txt
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/CMakeLists.txt
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/Root/JGTowerHelper.cxx b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/Root/JGTowerHelper.cxx
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/Root/JGTowerHelper.cxx
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/Root/JGTowerHelper.cxx
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/TrigT1CaloFexPerf/JGTowerHelper.h b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/TrigT1CaloFexPerf/JGTowerHelper.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/TrigT1CaloFexPerf/JGTowerHelper.h
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/TrigT1CaloFexPerf/JGTowerHelper.h
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/TrigT1CaloFexPerf/JGTowerMappingData.h b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/TrigT1CaloFexPerf/JGTowerMappingData.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/TrigT1CaloFexPerf/JGTowerMappingData.h
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/TrigT1CaloFexPerf/JGTowerMappingData.h
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/python/EFexConfig.py b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/python/EFexConfig.py
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/python/EFexConfig.py
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/python/EFexConfig.py
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/python/EmulationConfig.py b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/python/EmulationConfig.py
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/python/EmulationConfig.py
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/python/EmulationConfig.py
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/python/L1PerfControlFlags.py b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/python/L1PerfControlFlags.py
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/python/L1PerfControlFlags.py
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/python/L1PerfControlFlags.py
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/python/R3L1PerfConfig.py b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/python/R3L1PerfConfig.py
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/python/R3L1PerfConfig.py
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/python/R3L1PerfConfig.py
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/python/Rel22L1PerfSequence.py b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/python/Rel22L1PerfSequence.py
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/python/Rel22L1PerfSequence.py
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/python/Rel22L1PerfSequence.py
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/python/TransBS_forL1_config.py b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/python/TransBS_forL1_config.py
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/python/TransBS_forL1_config.py
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/python/TransBS_forL1_config.py
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/python/__init__.py b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/python/__init__.py
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/python/__init__.py
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/python/__init__.py
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/share/TestJGFex.py b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/share/TestJGFex.py
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/share/TestJGFex.py
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/share/TestJGFex.py
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/share/createRel22L1PerfSequence.py b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/share/createRel22L1PerfSequence.py
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/share/createRel22L1PerfSequence.py
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/share/createRel22L1PerfSequence.py
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/EFexEMAlgorithm.cxx b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/EFexEMAlgorithm.cxx
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/EFexEMAlgorithm.cxx
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/EFexEMAlgorithm.cxx
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/EFexEMAlgorithm.h b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/EFexEMAlgorithm.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/EFexEMAlgorithm.h
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/EFexEMAlgorithm.h
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/EFexEMClusterTool.cxx b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/EFexEMClusterTool.cxx
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/EFexEMClusterTool.cxx
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/EFexEMClusterTool.cxx
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/EFexEMClusterTool.h b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/EFexEMClusterTool.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/EFexEMClusterTool.h
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/EFexEMClusterTool.h
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/EFexEMEnergyWeightedClusterTool.cxx b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/EFexEMEnergyWeightedClusterTool.cxx
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/EFexEMEnergyWeightedClusterTool.cxx
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/EFexEMEnergyWeightedClusterTool.cxx
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/EFexEMEnergyWeightedClusterTool.h b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/EFexEMEnergyWeightedClusterTool.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/EFexEMEnergyWeightedClusterTool.h
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/EFexEMEnergyWeightedClusterTool.h
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/EFexTauAlgorithm.cxx b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/EFexTauAlgorithm.cxx
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/EFexTauAlgorithm.cxx
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/EFexTauAlgorithm.cxx
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/EFexTauAlgorithm.h b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/EFexTauAlgorithm.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/EFexTauAlgorithm.h
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/EFexTauAlgorithm.h
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/GBlockBuilder.cxx b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/GBlockBuilder.cxx
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/GBlockBuilder.cxx
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/GBlockBuilder.cxx
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/GBlockBuilder.h b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/GBlockBuilder.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/GBlockBuilder.h
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/GBlockBuilder.h
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/GTowerHelpers.cxx b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/GTowerHelpers.cxx
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/GTowerHelpers.cxx
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/GTowerHelpers.cxx
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/GTowerHelpers.h b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/GTowerHelpers.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/GTowerHelpers.h
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/GTowerHelpers.h
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/GTowerMappingDataCondAlg.cxx b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/GTowerMappingDataCondAlg.cxx
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/GTowerMappingDataCondAlg.cxx
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/GTowerMappingDataCondAlg.cxx
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/GTowerMappingDataCondAlg.h b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/GTowerMappingDataCondAlg.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/GTowerMappingDataCondAlg.h
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/GTowerMappingDataCondAlg.h
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/GTowerRhoSubtractionAlg.cxx b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/GTowerRhoSubtractionAlg.cxx
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/GTowerRhoSubtractionAlg.cxx
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/GTowerRhoSubtractionAlg.cxx
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/GTowerRhoSubtractionAlg.h b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/GTowerRhoSubtractionAlg.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/GTowerRhoSubtractionAlg.h
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/GTowerRhoSubtractionAlg.h
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/GTowersFromGCaloTowers.cxx b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/GTowersFromGCaloTowers.cxx
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/GTowersFromGCaloTowers.cxx
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/GTowersFromGCaloTowers.cxx
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/GTowersFromGCaloTowers.h b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/GTowersFromGCaloTowers.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/GTowersFromGCaloTowers.h
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/GTowersFromGCaloTowers.h
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/JGTowerBuilder.cxx b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/JGTowerBuilder.cxx
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/JGTowerBuilder.cxx
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/JGTowerBuilder.cxx
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/JGTowerBuilder.h b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/JGTowerBuilder.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/JGTowerBuilder.h
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/JGTowerBuilder.h
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/JGTowerMappingDataCondAlgBase.cxx b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/JGTowerMappingDataCondAlgBase.cxx
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/JGTowerMappingDataCondAlgBase.cxx
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/JGTowerMappingDataCondAlgBase.cxx
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/JGTowerMappingDataCondAlgBase.h b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/JGTowerMappingDataCondAlgBase.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/JGTowerMappingDataCondAlgBase.h
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/JGTowerMappingDataCondAlgBase.h
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/JGTowerNoiseAlg.cxx b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/JGTowerNoiseAlg.cxx
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/JGTowerNoiseAlg.cxx
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/JGTowerNoiseAlg.cxx
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/JGTowerNoiseAlg.h b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/JGTowerNoiseAlg.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/JGTowerNoiseAlg.h
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/JGTowerNoiseAlg.h
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/JTowerMappingDataCondAlg.cxx b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/JTowerMappingDataCondAlg.cxx
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/JTowerMappingDataCondAlg.cxx
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/JTowerMappingDataCondAlg.cxx
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/JTowerMappingDataCondAlg.h b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/JTowerMappingDataCondAlg.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/JTowerMappingDataCondAlg.h
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/JTowerMappingDataCondAlg.h
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/JTowerRhoSubtractionAlg.cxx b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/JTowerRhoSubtractionAlg.cxx
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/JTowerRhoSubtractionAlg.cxx
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/JTowerRhoSubtractionAlg.cxx
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/JTowerRhoSubtractionAlg.h b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/JTowerRhoSubtractionAlg.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/JTowerRhoSubtractionAlg.h
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/JTowerRhoSubtractionAlg.h
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/METJWoJPerfFex.cxx b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/METJWoJPerfFex.cxx
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/METJWoJPerfFex.cxx
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/METJWoJPerfFex.cxx
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/METJWoJPerfFex.h b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/METJWoJPerfFex.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/METJWoJPerfFex.h
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/METJWoJPerfFex.h
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/METNoiseCutPerfFex.cxx b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/METNoiseCutPerfFex.cxx
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/METNoiseCutPerfFex.cxx
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/METNoiseCutPerfFex.cxx
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/METNoiseCutPerfFex.h b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/METNoiseCutPerfFex.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/METNoiseCutPerfFex.h
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/METNoiseCutPerfFex.h
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/METPerfFexBase.cxx b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/METPerfFexBase.cxx
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/METPerfFexBase.cxx
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/METPerfFexBase.cxx
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/METPerfFexBase.h b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/METPerfFexBase.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/METPerfFexBase.h
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/METPerfFexBase.h
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/SCEmulation.cxx b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/SCEmulation.cxx
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/SCEmulation.cxx
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/SCEmulation.cxx
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/SCEmulation.h b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/SCEmulation.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/SCEmulation.h
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/SCEmulation.h
diff --git a/Trigger/TrigT1/TrigT1CaloFexPerf/src/components/TrigT1CaloFexPerf_entries.cxx b/Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/components/TrigT1CaloFexPerf_entries.cxx
similarity index 100%
rename from Trigger/TrigT1/TrigT1CaloFexPerf/src/components/TrigT1CaloFexPerf_entries.cxx
rename to Trigger/TrigT1/L1CaloFEX/TrigT1CaloFexPerf/src/components/TrigT1CaloFexPerf_entries.cxx