diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/CMakeLists.txt b/Trigger/TrigT1/TrigT1ResultByteStream/CMakeLists.txt
index 4f017ff7d677c5b8d1e31d6e2522a9770bc4a9a0..90af52a29357d65e66ad3f788b9f7e6c05502b72 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrigT1ResultByteStream )
@@ -8,16 +8,16 @@ find_package( tdaq-common COMPONENTS CTPfragment eformat )
 
 # Component(s) in the package:
 atlas_add_library( TrigT1ResultByteStreamLib
-                   src/*.cxx
+                   TrigT1ResultByteStream/*.h
+                   INTERFACE
                    PUBLIC_HEADERS TrigT1ResultByteStream
-                   INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
-                   LINK_LIBRARIES AthenaBaseComps AthenaKernel ByteStreamCnvSvcBaseLib ByteStreamCnvSvcLib ByteStreamData GaudiKernel L1TopoRDO TrigConfInterfaces TrigConfL1Data TrigT1Interfaces TrigT1Result xAODTrigger
-                   PRIVATE_LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} )
+                   LINK_LIBRARIES ByteStreamData GaudiKernel )
 
 atlas_add_component( TrigT1ResultByteStream
+                     src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES TrigT1ResultByteStreamLib )
+                     INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps AthenaKernel ByteStreamCnvSvcBaseLib ByteStreamCnvSvcLib ByteStreamData GaudiKernel L1TopoRDO StoreGateLib TrigConfInterfaces TrigConfL1Data TrigT1Interfaces TrigT1Result TrigT1ResultByteStreamLib xAODTrigger )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/*.py )
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/share/ReadLVL1BS_jobOptions.py b/Trigger/TrigT1/TrigT1ResultByteStream/share/ReadLVL1BS_jobOptions.py
deleted file mode 100644
index d4e39d6b6fac6f1fd12462b301c1cc6898fa87fb..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/TrigT1ResultByteStream/share/ReadLVL1BS_jobOptions.py
+++ /dev/null
@@ -1,89 +0,0 @@
-#=================================================================
-#
-# JobOption for testing the reading of the LVL1 content of a BS
-# file. The jobO is designed to be used together with
-# WriteLVL1BS_jobOption.py.
-#
-#=================================================================
-
-#
-# User configuration:
-#
-CBNTAAOutput = "LVL1BSTest.root"
-EvtMax = -1
-
-#
-# Create the necessary Python objects:
-#
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-from AthenaCommon.Logging import logging
-log = logging.getLogger( "ReadLVL1BS" )
-
-from AthenaCommon.AppMgr import ServiceMgr
-
-#
-# Set up the reading of the BS file:
-#
-include( "ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py" )
-svcMgr.EventSelector.Input = [
-  "daq.lvl1test.0000000.Single.Stream.LB0000.Athena._0001.data"
-]
-
-include( "ByteStreamCnvSvcBase/BSAddProvSvc_RDO_jobOptions.py" )
-include( "ByteStreamCnvSvcBase/BSAddProvSvc_RIO_jobOptions.py" )
-
-log.info( "Set input BS file" )
-
-#
-# Set up writing of the AANT file:
-#
-from GaudiSvc.GaudiSvcConf import THistSvc
-histSvc = THistSvc()
-histSvc.Output = [ "AANT DATAFILE='" + CBNTAAOutput + "' OPT='RECREATE'" ]
-ServiceMgr += histSvc
-
-from AnalysisTools.AnalysisToolsConf import AANTupleStream
-ntupleStream = AANTupleStream()
-ntupleStream.OutputName = CBNTAAOutput
-ntupleStream.ExistDataHeader = False
-topSequence += ntupleStream
-
-theApp.HistogramPersistency = "ROOT"
-
-log.info( "Configured output AANT file" )
-
-#
-# Configure the LVL1 config svc.:
-#
-from TrigConfigSvc.TrigConfigSvcConfig import LVL1ConfigSvc
-ServiceMgr += LVL1ConfigSvc( "LVL1ConfigSvc" )
-ServiceMgr.LVL1ConfigSvc.XMLFile = "Rel3_Sept_12_outputLVL1config.xml"
-ServiceMgr.LVL1ConfigSvc.CreateLegacyObjects = True
-log.info( "Set up the LVL1 configuration service" )
-
-#
-# The CBNTAA algorithms:
-#
-from CBNT_Athena.CBNT_AthenaAwareCfg import CBNT_AthenaAware
-topSequence += CBNT_AthenaAware()
-
-from TrigT1CTP.TrigT1CTPConf import LVL1CTP__CBNTAA_CTP_RDO
-topSequence.CBNT_AthenaAware += LVL1CTP__CBNTAA_CTP_RDO( "CBNTAA_CTP_RDO" )
-
-from TrigT1Muctpi.TrigT1MuctpiConf import CBNTAA_ReadMuCTPI_RDO
-topSequence.CBNT_AthenaAware += CBNTAA_ReadMuCTPI_RDO()
-
-from TrigT1RoIB.TrigT1RoIBConf import CBNTAA_ReadRoIBResult
-topSequence.CBNT_AthenaAware += CBNTAA_ReadRoIBResult()
-
-log.info( "Added all CBNTAA algorithms" )
-
-#
-# Additional configuration:
-#
-theApp.EvtMax = EvtMax
-ServiceMgr.MessageSvc.OutputLevel = 3
-ServiceMgr.MessageSvc.Format = "% F%50W%S%7W%R%T %0W%M"
-#ToolSvc.OutputLevel = 2
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/share/WriteLVL1BS_jobOptions.py b/Trigger/TrigT1/TrigT1ResultByteStream/share/WriteLVL1BS_jobOptions.py
deleted file mode 100644
index b3cfb610d20d121a287d8e9e138db24a2b28b28f..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/TrigT1ResultByteStream/share/WriteLVL1BS_jobOptions.py
+++ /dev/null
@@ -1,55 +0,0 @@
-#=================================================================
-#
-# JobOption for writing out a BS file with all the LVL1
-# information. This is just intended as an example and for usage
-# while developing/modifying the converters.
-#
-#=================================================================
-
-#
-# User configuration:
-#
-RDOInput = [ "/scratch/krasznaa/top_rdo/RDO.017303._00028.pool.root.1",
-             "/scratch/krasznaa/top_rdo/RDO.017303._00037.pool.root.1" ]
-EvtMax = 100
-
-#
-# Create the necessary Python objects:
-#
-from AthenaCommon.Logging import logging
-log = logging.getLogger( "WriteLVL1BS" )
-
-from AthenaCommon.AppMgr import ServiceMgr
-from AthenaCommon.AppMgr import ToolSvc
-
-#
-# Set up reading of the POOL RDO file(s):
-#
-include( "AthenaPoolCnvSvc/ReadAthenaPool_jobOptions.py" )
-ServiceMgr.EventSelector.InputCollections = RDOInput
-log.info( "Set input POOL file" )
-
-#
-# Load the dinctionaries and converters for the LVL1 objects:
-#
-include( "TrigT1Result/TrigT1ResultDict_joboptions.py" )
-include( "TrigT1EventAthenaPool/TrigT1EventAthenaPool_joboptions.py" )
-
-#
-# Configure the output BS file:
-#
-include( "ByteStreamCnvSvc/WriteByteStream_EventStorage_jobOptions.py" )
-ServiceMgr.ByteStreamEventStorageOutputSvc.FileTag = "lvl1test"
-
-oStream.ItemList += [ "ROIB::RoIBResult#*" ]
-oStream.ItemList += [ "CTP_RDO#*" ]
-oStream.ItemList += [ "MuCTPI_RDO#*" ]
-log.info( "Configured output BS file" )
-
-#
-# Additional configuration:
-#
-theApp.EvtMax = EvtMax
-ServiceMgr.MessageSvc.OutputLevel = 3
-ServiceMgr.MessageSvc.Format = "% F%50W%S%7W%R%T %0W%M"
-#ToolSvc.OutputLevel = 2
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.cxx
index 5741d57ef07154d9e9361bb4b331bb52033e36cc..da2b2544acbf669fecb2d3610175511d1cfbeb63 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.cxx
@@ -15,7 +15,7 @@
 #include "TrigT1Result/CTP_RDO.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/CTPByteStreamCnv.h"
+#include "CTPByteStreamCnv.h"
 
 /**
  * The constructor sets up all the ToolHandle and ServiceHandle objects and initialises the
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.h
similarity index 95%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamCnv.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.h
index c5b6cf2589a44ff0bdaf9fd62452ceb3400c438a..d85f59b37d399b2995d1f1de7cd9ff9ae85c6b22 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamCnv.h
@@ -16,8 +16,8 @@
 #include "ByteStreamCnvSvcBase/IByteStreamEventAccess.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/CTPByteStreamTool.h"
-#include "TrigT1ResultByteStream/CTPSrcIdMap.h"
+#include "CTPByteStreamTool.h"
+#include "CTPSrcIdMap.h"
 
 
 /**
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamTool.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamTool.cxx
index 067ce650adc8ec812a76825f6dc4eb1dcada6151..f03c9481adddf4aaff34d5d436885db5c496ae18 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamTool.cxx
@@ -11,7 +11,7 @@
 #include "TrigT1Result/CTP_RDO.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/CTPByteStreamTool.h"
+#include "CTPByteStreamTool.h"
 
 /// Unique interface ID of the tool that identifies it to the framweork
 static const InterfaceID IID_ICTPByteStreamTool( "CTPByteStreamTool", 1, 0 );
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamTool.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamTool.h
old mode 100755
new mode 100644
similarity index 97%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamTool.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamTool.h
index 3d2f221d0d41172951052f97ad34d7c148b10ce6..c5ccf7c164f544f2fdcda3b93340ca978e4b6ef8
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPByteStreamTool.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPByteStreamTool.h
@@ -14,7 +14,7 @@
 #include "ByteStreamCnvSvcBase/FullEventAssembler.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/CTPSrcIdMap.h"
+#include "CTPSrcIdMap.h"
 
 // Forward declaration(s):
 class CTP_RDO;
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPSrcIdMap.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPSrcIdMap.cxx
index 831e9171bbfae3fa3367a2127d9f4bf4dd319143..e12d72b94031047d81cf2b16e987c2cf6a7fdda0 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPSrcIdMap.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPSrcIdMap.cxx
@@ -5,7 +5,7 @@
 
 #include "eformat/SourceIdentifier.h"
 
-#include "TrigT1ResultByteStream/CTPSrcIdMap.h"
+#include "CTPSrcIdMap.h"
 
 using eformat::helper::SourceIdentifier;
 
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPSrcIdMap.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/CTPSrcIdMap.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/CTPSrcIdMap.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/CTPSrcIdMap.h
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/L1TriggerResultByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/L1TriggerResultByteStreamCnv.cxx
index 4e86aa7744b37ae63198675372df297a5943b437..a67daa759029a2b8a5cde7b177ecf8340502533c 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/L1TriggerResultByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/L1TriggerResultByteStreamCnv.cxx
@@ -3,7 +3,7 @@
 */
 
 // Trigger includes
-#include "TrigT1ResultByteStream/L1TriggerResultByteStreamCnv.h"
+#include "L1TriggerResultByteStreamCnv.h"
 #include "xAODTrigger/TrigCompositeContainer.h"
 
 // Athena includes
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/L1TriggerResultByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/L1TriggerResultByteStreamCnv.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/L1TriggerResultByteStreamCnv.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/L1TriggerResultByteStreamCnv.h
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.cxx
index 0438a9478e6ed0c5c0a4a423d1655ad383407eca..7d1b335d6a5fc29ed20d01bfbee64db505b1826f 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.cxx
@@ -14,14 +14,14 @@
 #include "TrigT1Result/MuCTPI_RDO.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/MuCTPIByteStreamCnv.h"
-#include "TrigT1ResultByteStream/MuCTPIByteStreamTool.h"
+#include "MuCTPIByteStreamCnv.h"
+#include "MuCTPIByteStreamTool.h"
 
 // Hack for early data, where CTP and MuCTPI were plugged into the
 // same ROS PC
 #ifdef CTP_MUCTPI_HAVE_SAME_ROS
-#  include "TrigT1ResultByteStream/CTPByteStreamTool.h"
-#  include "TrigT1ResultByteStream/RecCTPByteStreamTool.h"
+#  include "CTPByteStreamTool.h"
+#  include "RecCTPByteStreamTool.h"
 #  include "TrigT1Result/CTP_RDO.h"
 #  include "TrigT1Result/CTP_RIO.h"
 #endif
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.h
similarity index 94%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamCnv.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.h
index 1dc1933930de559f8f1af9fafef25ebf2545d091..5235d8c06b9fc3cbe570bfc6fb56842d8f3b617a 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamCnv.h
@@ -22,11 +22,11 @@
 #include "ByteStreamCnvSvcBase/IByteStreamEventAccess.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/MuCTPIByteStreamTool.h"
-#include "TrigT1ResultByteStream/MuCTPISrcIdMap.h"
+#include "MuCTPIByteStreamTool.h"
+#include "MuCTPISrcIdMap.h"
 #ifdef CTP_MUCTPI_HAVE_SAME_ROS
 #  include "TrigT1ResultByteStream/CTPByteStreamTool.h"
-#  include "TrigT1ResultByteStream/RecCTPByteStreamTool.h"
+#  include "RecCTPByteStreamTool.h"
 #endif
 
 
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamTool.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamTool.cxx
index 67e18ae5bb9f08f8f94cd4f0063f3ca52536113e..edb71fd60216bfb1f627828168d842e1d0c756a0 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamTool.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TrigT1ResultByteStream/MuCTPIByteStreamTool.h"
+#include "MuCTPIByteStreamTool.h"
 #include "TrigT1Result/MuCTPI_RDO.h"
 
 
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamTool.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamTool.h
old mode 100755
new mode 100644
similarity index 96%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamTool.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamTool.h
index 311fc95613fe09ccc5d72b014fd4a33d958610f1..17e7a6d96a55b520dbc0bf72738e5f4f81e0ebd5
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPIByteStreamTool.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPIByteStreamTool.h
@@ -13,7 +13,7 @@
 #include "ByteStreamCnvSvcBase/FullEventAssembler.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/MuCTPISrcIdMap.h"
+#include "MuCTPISrcIdMap.h"
 
 // Forward declaration(s):
 class MuCTPI_RDO;
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPISrcIdMap.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPISrcIdMap.cxx
index a6bee524657bbf40fc1d4647b53b43969ea14c0b..985f724ba5219fc67300aed1ece620757b46f607 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPISrcIdMap.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPISrcIdMap.cxx
@@ -4,7 +4,7 @@
 
 #include "eformat/SourceIdentifier.h"
 
-#include "TrigT1ResultByteStream/MuCTPISrcIdMap.h"
+#include "MuCTPISrcIdMap.h"
 
 using eformat::helper::SourceIdentifier;
 
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPISrcIdMap.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPISrcIdMap.h
similarity index 100%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/MuCTPISrcIdMap.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/MuCTPISrcIdMap.h
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.cxx
index a4c7fbc0279a3b69b25fabe5e318384c92d72dcf..a9a295fe4df9491b7638bb4c0c63230f93d6b14d 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.cxx
@@ -15,7 +15,7 @@
 #include "TrigT1Result/CTP_RIO.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/RecCTPByteStreamCnv.h"
+#include "RecCTPByteStreamCnv.h"
 
 /**
  * The constructor sets up all the ToolHandle and ServiceHandle objects and initialises the
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.h
similarity index 94%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamCnv.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.h
index 436698f78ef4a55b6eafb1a4294106e1f0efeb8b..ec2ac6bf3b4b4ae320abdefdd70cc3cdb19dec01 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamCnv.h
@@ -16,8 +16,8 @@
 #include "ByteStreamCnvSvcBase/IByteStreamEventAccess.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/RecCTPByteStreamTool.h"
-#include "TrigT1ResultByteStream/CTPSrcIdMap.h"
+#include "RecCTPByteStreamTool.h"
+#include "CTPSrcIdMap.h"
 
 
 /**
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamTool.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamTool.cxx
index 415d731e8e7fd3a1a70b2cd95f0be836771a5576..2f69053de072591f8ee25858fc0a864935737a8d 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamTool.cxx
@@ -6,7 +6,7 @@
 #include "TrigT1Result/CTP_RIO.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/RecCTPByteStreamTool.h"
+#include "RecCTPByteStreamTool.h"
 
 /// Unique interface ID of the tool that identifies it to the framweork
 static const InterfaceID IID_IRecCTPByteStreamTool( "RecCTPByteStreamTool", 1, 0 );
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamTool.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamTool.h
old mode 100755
new mode 100644
similarity index 96%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamTool.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamTool.h
index 08a66425a344fdbab8a35562160ecedb7e698786..1fab6672cd097855d54cfd764a1cab1646894c21
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecCTPByteStreamTool.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecCTPByteStreamTool.h
@@ -14,7 +14,7 @@
 #include "ByteStreamCnvSvcBase/FullEventAssembler.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/CTPSrcIdMap.h"
+#include "CTPSrcIdMap.h"
 
 // Forward declaration(s):
 class CTP_RIO;
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.cxx
index 50d72b0bf3f728501bb34771da5db9e392c47ad3..592b7504b7773404585df73e604f9b17d585ad2c 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.cxx
@@ -14,7 +14,7 @@
 #include "TrigT1Result/MuCTPI_RIO.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/RecMuCTPIByteStreamCnv.h"
+#include "RecMuCTPIByteStreamCnv.h"
 
 /**
  * The constructor sets up all the ToolHandle and ServiceHandle objects and initialises the
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.h
similarity index 94%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamCnv.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.h
index f9536e6a3847cf06321f856da163e4b1079abb39..244577bc860ffa57033247326fee3ca4bb966038 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamCnv.h
@@ -16,8 +16,8 @@
 #include "ByteStreamCnvSvcBase/IByteStreamEventAccess.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/RecMuCTPIByteStreamTool.h"
-#include "TrigT1ResultByteStream/MuCTPISrcIdMap.h"
+#include "RecMuCTPIByteStreamTool.h"
+#include "MuCTPISrcIdMap.h"
 
 
 /**
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamTool.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamTool.cxx
index 9075125d67a81b0ee7114b0edea9d6a6048f1c62..80288da57f627b9bb9258ff2bf4d182ef84df4de 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamTool.cxx
@@ -14,7 +14,7 @@
 #include "TrigConfL1Data/TriggerItem.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/RecMuCTPIByteStreamTool.h"
+#include "RecMuCTPIByteStreamTool.h"
 
 /// Unique interface ID of the tool that identifies it to the framweork
 static const InterfaceID IID_IRecMuCTPIByteStreamTool( "RecMuCTPIByteStreamTool", 1, 1 );
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamTool.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamTool.h
old mode 100755
new mode 100644
similarity index 97%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamTool.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamTool.h
index 36c6d797d5c915713244c256cfff722990237be9..0b89900ef35e280e7f664001cec6f826a413a4bb
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecMuCTPIByteStreamTool.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecMuCTPIByteStreamTool.h
@@ -16,7 +16,7 @@
 #include "TrigConfInterfaces/ILVL1ConfigSvc.h"
 
 // Local include(s):
-#include "TrigT1ResultByteStream/MuCTPISrcIdMap.h"
+#include "MuCTPISrcIdMap.h"
 
 // Forward declaration(s):
 class MuCTPI_RIO;
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamCnv.h
similarity index 90%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamCnv.h
index 1bd47c960566316c8a840195f17a3e2a12b6f8af..360d2846f8c4669f5c055b4443008e8eb7aed205 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamCnv.h
@@ -1,12 +1,12 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULTBYTESTREAM_RECROIBRESULTBYTESTREAMCNV_H
 #define TRIGT1RESULTBYTESTREAM_RECROIBRESULTBYTESTREAMCNV_H
 
 // Local includes
-#include "TrigT1ResultByteStream/RecRoIBResultByteStreamTool.h"
+#include "RecRoIBResultByteStreamTool.h"
 
 // Athena includes
 #include "AthenaBaseComps/AthMessaging.h"
@@ -59,6 +59,6 @@ private:
 }; // class RecRoIBResultByteStreamCnv
 
 // Include the implementation:
-#include "TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.icc"
+#include "RecRoIBResultByteStreamCnv.icc"
 
 #endif // TRIGT1RESULTBYTESTREAM_RECROIBRESULTBYTESTREAMCNV_H
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.icc b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamCnv.icc
similarity index 100%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.icc
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamCnv.icc
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.cxx
index 05a180ef87f5e89f348b49f30388f44ea1306ed2..059cd2887f38890debb3c38fbc3a8917f47d32b4 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.cxx
@@ -3,7 +3,7 @@
 */
 
 // Local includes:
-#include "TrigT1ResultByteStream/RecRoIBResultByteStreamTool.h"
+#include "RecRoIBResultByteStreamTool.h"
 
 // Trigger includes:
 #include "TrigConfL1Data/CTPConfig.h"
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamTool.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.h
old mode 100755
new mode 100644
similarity index 100%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RecRoIBResultByteStreamTool.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/RecRoIBResultByteStreamTool.h
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamCnv.h
similarity index 92%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamCnv.h
index 8c8528f6965b180c43849d008dbf4923298f9b93..7b11b39dcc5a113faa26afb5d92d1ffa153811d7 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamCnv.h
@@ -1,12 +1,12 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGT1RESULTBYTESTREAM_ROIBRESULTBYTESTREAMCNV_H
 #define TRIGT1RESULTBYTESTREAM_ROIBRESULTBYTESTREAMCNV_H
 
 // Local includes
-#include "TrigT1ResultByteStream/RoIBResultByteStreamTool.h"
+#include "RoIBResultByteStreamTool.h"
 
 // Athena includes
 #include "AthenaBaseComps/AthMessaging.h"
@@ -66,6 +66,6 @@ private:
 }; // class RoIBResultByteStreamCnv
 
 // Include the implementation:
-#include "TrigT1ResultByteStream/RoIBResultByteStreamCnv.icc"
+#include "RoIBResultByteStreamCnv.icc"
 
 #endif // TRIGT1RESULTBYTESTREAM_ROIBRESULTBYTESTREAMCNV_H
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.icc b/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamCnv.icc
similarity index 100%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamCnv.icc
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamCnv.icc
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamTool.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamTool.cxx
index 74583d6358778b1c7a1f98f6206bad4dd1207876..e301f5167c41704241d426bfe1559408d1c0ab92 100755
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamTool.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamTool.cxx
@@ -3,7 +3,7 @@
 */
 
 // Local includes:
-#include "TrigT1ResultByteStream/RoIBResultByteStreamTool.h"
+#include "RoIBResultByteStreamTool.h"
 
 // Trigger includes:
 #include "CTPfragment/CTPdataformat.h"
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamTool.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamTool.h
old mode 100755
new mode 100644
similarity index 100%
rename from Trigger/TrigT1/TrigT1ResultByteStream/TrigT1ResultByteStream/RoIBResultByteStreamTool.h
rename to Trigger/TrigT1/TrigT1ResultByteStream/src/RoIBResultByteStreamTool.h
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/components/TrigT1ResultByteStream_entries.cxx b/Trigger/TrigT1/TrigT1ResultByteStream/src/components/TrigT1ResultByteStream_entries.cxx
index da58962a2114f842e65d48a20e0b145d9523254a..0bc86fd1e98da00d99b15e4ba5a4471eecd26cc3 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/components/TrigT1ResultByteStream_entries.cxx
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/components/TrigT1ResultByteStream_entries.cxx
@@ -1,18 +1,18 @@
-#include "TrigT1ResultByteStream/L1TriggerResultByteStreamCnv.h"
-#include "TrigT1ResultByteStream/RoIBResultByteStreamCnv.h"
-#include "TrigT1ResultByteStream/RecRoIBResultByteStreamCnv.h"
-
-#include "TrigT1ResultByteStream/MuCTPIByteStreamCnv.h"
-#include "TrigT1ResultByteStream/CTPByteStreamCnv.h"
-#include "TrigT1ResultByteStream/RecMuCTPIByteStreamCnv.h"
-#include "TrigT1ResultByteStream/RecCTPByteStreamCnv.h"
-
-#include "TrigT1ResultByteStream/CTPByteStreamTool.h"
-#include "TrigT1ResultByteStream/MuCTPIByteStreamTool.h"
-#include "TrigT1ResultByteStream/RecCTPByteStreamTool.h"
-#include "TrigT1ResultByteStream/RecMuCTPIByteStreamTool.h"
-#include "TrigT1ResultByteStream/RecRoIBResultByteStreamTool.h"
-#include "TrigT1ResultByteStream/RoIBResultByteStreamTool.h"
+#include "../L1TriggerResultByteStreamCnv.h"
+#include "../RoIBResultByteStreamCnv.h"
+#include "../RecRoIBResultByteStreamCnv.h"
+
+#include "../MuCTPIByteStreamCnv.h"
+#include "../CTPByteStreamCnv.h"
+#include "../RecMuCTPIByteStreamCnv.h"
+#include "../RecCTPByteStreamCnv.h"
+
+#include "../CTPByteStreamTool.h"
+#include "../MuCTPIByteStreamTool.h"
+#include "../RecCTPByteStreamTool.h"
+#include "../RecMuCTPIByteStreamTool.h"
+#include "../RecRoIBResultByteStreamTool.h"
+#include "../RoIBResultByteStreamTool.h"
 
 #include "../L1TriggerByteStreamDecoderAlg.h"
 #include "../ExampleL1TriggerByteStreamTool.h"