diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/CMakeLists.txt b/AtlasTest/DatabaseTest/IOVDbTestAlg/CMakeLists.txt
index e73dd1aad1d43c7a24b426d30844259ce9dffb03..7c75723a7c36dabeaaba6de1b570e650600c551f 100644
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/CMakeLists.txt
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( IOVDbTestAlg )
@@ -10,7 +10,7 @@ find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
atlas_add_component( IOVDbTestAlg
src/IOVDbTestAlg.cxx
src/IOVDbTestCoolDCS.cxx
- src/IOVDbTestAlg_entries.cxx
+ src/components/IOVDbTestAlg_entries.cxx
INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
LINK_LIBRARIES ${CORAL_LIBRARIES} IOVDbTestConditions AthenaBaseComps AthenaKernel StoreGateLib GaudiKernel AthenaPoolUtilities RegistrationServicesLib )
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx
deleted file mode 100644
index b9ada94820796a58b33c2c623c57a4bbb1ad1cd8..0000000000000000000000000000000000000000
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/IOVDbTestAlg_entries.cxx
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-#include "IOVDbTestAlg.h"
-#include "IOVDbTestCoolDCS.h"
-
-DECLARE_COMPONENT( IOVDbTestAlg )
-DECLARE_COMPONENT( IOVDbTestCoolDCS )
-
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/src/components/IOVDbTestAlg_entries.cxx b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/components/IOVDbTestAlg_entries.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..76438db3737ffdcd25832ce87883b72fd2711d44
--- /dev/null
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/src/components/IOVDbTestAlg_entries.cxx
@@ -0,0 +1,9 @@
+/*
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
+*/
+#include "../IOVDbTestAlg.h"
+#include "../IOVDbTestCoolDCS.h"
+
+DECLARE_COMPONENT( IOVDbTestAlg )
+DECLARE_COMPONENT( IOVDbTestCoolDCS )
+
diff --git a/Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt b/Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt
index 2c48906cf221f8d4642339f1e6414567dffbe7f6..3a189bab7478a944adfbb5f9c2a728f8c0610504 100644
--- a/Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt
@@ -1,10 +1,10 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloIdCnv )
# Component(s) in the package:
atlas_add_component( CaloIdCnv
- src/*.cxx
+ src/*.cxx src/components/*.cxx
LINK_LIBRARIES CaloIdentifier AthenaKernel DetDescrCnvSvcLib StoreGateLib IdDictDetDescr Identifier GaudiKernel )
diff --git a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx b/Calorimeter/CaloCnv/CaloIdCnv/src/components/CaloIdCnv_entries.cxx
similarity index 96%
rename from Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx
rename to Calorimeter/CaloCnv/CaloIdCnv/src/components/CaloIdCnv_entries.cxx
index a5a6a6887ad733ea615c8f31524c389e61289708..9266c1d8b82b08f91e6fa8e78f1fa77a13f09458 100644
--- a/Calorimeter/CaloCnv/CaloIdCnv/src/CaloIdCnv_entries.cxx
+++ b/Calorimeter/CaloCnv/CaloIdCnv/src/components/CaloIdCnv_entries.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
#include "CaloIdCnv/CaloIdMgrDetDescrCnv.h"
#include "CaloIdCnv/CaloCell_IDDetDescrCnv.h"
diff --git a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/CMakeLists.txt b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/CMakeLists.txt
index 3de2fffe7d33c637c8f687fc49aefee113d45b67..a3f866d4102611f53d6846c2e6d28ef69f64e660 100644
--- a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloTTDetDescrCnv )
# Component(s) in the package:
atlas_add_component( CaloTTDetDescrCnv
- src/*.cxx
+ src/*.cxx src/components/*.cxx
LINK_LIBRARIES GaudiKernel CaloDetDescrLib CaloIdentifier CaloTTDetDescr CaloTriggerToolLib StoreGateLib DetDescrCnvSvcLib )
diff --git a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_entries.cxx b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_entries.cxx
deleted file mode 100644
index 0186997eaed38cf270eb58c1d541caac3b544e9e..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/CaloTTDetDescrCnv_entries.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-#include "CaloTTMgrDetDescrCnv.h"
-
-DECLARE_CONVERTER( CaloTTMgrDetDescrCnv )
-
diff --git a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/components/CaloTTDetDescrCnv_entries.cxx b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/components/CaloTTDetDescrCnv_entries.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..3ddec967fe1975a64ff91861fcb51e1a65762f0a
--- /dev/null
+++ b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/src/components/CaloTTDetDescrCnv_entries.cxx
@@ -0,0 +1,7 @@
+/*
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
+*/
+#include "../CaloTTMgrDetDescrCnv.h"
+
+DECLARE_CONVERTER( CaloTTMgrDetDescrCnv )
+
diff --git a/DetectorDescription/IdDictDetDescrCnv/CMakeLists.txt b/DetectorDescription/IdDictDetDescrCnv/CMakeLists.txt
index 3db9b4028155fdbe8d1c1e21b5cc2e9e08972073..2b3f1692e4475bc9faaab2e480980d711bc7571b 100644
--- a/DetectorDescription/IdDictDetDescrCnv/CMakeLists.txt
+++ b/DetectorDescription/IdDictDetDescrCnv/CMakeLists.txt
@@ -1,10 +1,10 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( IdDictDetDescrCnv )
# Component(s) in the package:
atlas_add_component( IdDictDetDescrCnv
- src/*.cxx
+ src/*.cxx src/cpmponents/*.cxx
LINK_LIBRARIES AthenaBaseComps AthenaKernel AtlasDetDescr DetDescrCnvSvcLib GaudiKernel GeoModelInterfaces GeoModelUtilities IdDictDetDescr IdDictParser Identifier RDBAccessSvcLib StoreGateLib )
diff --git a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx b/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
deleted file mode 100644
index 6a0ccc30f0b63a424b0f3abb6833b0d4e03b8b56..0000000000000000000000000000000000000000
--- a/DetectorDescription/IdDictDetDescrCnv/src/IdDictDetDescrCnv_entries.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-#include "IdDictDetDescrCnv.h"
-#include "AtlasIDDetDescrCnv.h"
-#include "IdDictCnvTest.h"
-
-DECLARE_CONVERTER( AtlasIDDetDescrCnv )
-DECLARE_CONVERTER( IdDictDetDescrCnv )
-DECLARE_COMPONENT( IdDictCnvTest )
-
diff --git a/DetectorDescription/IdDictDetDescrCnv/src/components/IdDictDetDescrCnv_entries.cxx b/DetectorDescription/IdDictDetDescrCnv/src/components/IdDictDetDescrCnv_entries.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..aba8545f1e46e57e1befc19aa33489161f967eca
--- /dev/null
+++ b/DetectorDescription/IdDictDetDescrCnv/src/components/IdDictDetDescrCnv_entries.cxx
@@ -0,0 +1,11 @@
+/*
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
+*/
+#include "../IdDictDetDescrCnv.h"
+#include "../AtlasIDDetDescrCnv.h"
+#include "../IdDictCnvTest.h"
+
+DECLARE_CONVERTER( AtlasIDDetDescrCnv )
+DECLARE_CONVERTER( IdDictDetDescrCnv )
+DECLARE_COMPONENT( IdDictCnvTest )
+
diff --git a/Event/EventInfoMgt/CMakeLists.txt b/Event/EventInfoMgt/CMakeLists.txt
index a4f514a5339a77530e16fd32efb97ffe587ef72b..9a74bbc707e9f5a29c357b84d4bf958988bc97e2 100644
--- a/Event/EventInfoMgt/CMakeLists.txt
+++ b/Event/EventInfoMgt/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( EventInfoMgt )
@@ -11,7 +11,7 @@ atlas_add_library( EventInfoMgtLib
# Component(s) in the package:
atlas_add_component( EventInfoMgt
src/TagInfoMgr.cxx
- src/EventInfoMgt_entries.cxx
+ src/components/EventInfoMgt_entries.cxx
LINK_LIBRARIES AthenaBaseComps AthenaKernel AthenaPoolUtilities EventInfo EventInfoMgtLib EventInfoUtils GaudiKernel IOVDbMetaDataToolsLib StoreGateLib )
# Install files from the package:
diff --git a/Event/EventInfoMgt/src/EventInfoMgt_entries.cxx b/Event/EventInfoMgt/src/EventInfoMgt_entries.cxx
deleted file mode 100644
index fb3fe98b025e19b7b33197653963bec46b88c12a..0000000000000000000000000000000000000000
--- a/Event/EventInfoMgt/src/EventInfoMgt_entries.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-#include "TagInfoMgr.h"
-
-DECLARE_COMPONENT( TagInfoMgr )
-
diff --git a/Event/EventInfoMgt/src/components/EventInfoMgt_entries.cxx b/Event/EventInfoMgt/src/components/EventInfoMgt_entries.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..c6c8feb153033a89891f2e4f563a8a045da78db2
--- /dev/null
+++ b/Event/EventInfoMgt/src/components/EventInfoMgt_entries.cxx
@@ -0,0 +1,7 @@
+/*
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
+*/
+#include "../TagInfoMgr.h"
+
+DECLARE_COMPONENT( TagInfoMgr )
+
diff --git a/Generators/McEventSelector/CMakeLists.txt b/Generators/McEventSelector/CMakeLists.txt
index 3d384e0a73f488c8070082ce5f5b0724aeb061c6..abe39078028aae96b39a943cfd04ce58378d3f62 100644
--- a/Generators/McEventSelector/CMakeLists.txt
+++ b/Generators/McEventSelector/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( McEventSelector )
@@ -9,7 +9,7 @@ atlas_add_component( McEventSelector
src/McEventSelector.cxx
src/McEventCnv.cxx
src/McCnvSvc.cxx
- src/McEventSelector_entries.cxx
+ src/components/McEventSelector_entries.cxx
LINK_LIBRARIES AthenaBaseComps AthenaKernel CxxUtils GaudiKernel EventInfo )
# Install files from the package:
diff --git a/Generators/McEventSelector/src/McEventSelector_entries.cxx b/Generators/McEventSelector/src/components/McEventSelector_entries.cxx
similarity index 79%
rename from Generators/McEventSelector/src/McEventSelector_entries.cxx
rename to Generators/McEventSelector/src/components/McEventSelector_entries.cxx
index 9f92f8a0de5caeb3e4c5acf433003341a43fcc0f..8a97d69beda4f14327c003cb6101e25e30a24838 100644
--- a/Generators/McEventSelector/src/McEventSelector_entries.cxx
+++ b/Generators/McEventSelector/src/components/McEventSelector_entries.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
#include "McEventSelector/McEventCnv.h"
#include "McEventSelector/McCnvSvc.h"
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/CMakeLists.txt b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/CMakeLists.txt
index 44dc73113f95a3e41d18c5b8ffc072bdc5b25f38..92085a765b471aa2c0da2ba38d4341538654b860 100644
--- a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/CMakeLists.txt
+++ b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/CMakeLists.txt
@@ -1,10 +1,10 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetIdCnv )
# Component(s) in the package:
atlas_add_component( InDetIdCnv
- src/*.cxx
+ src/*.cxx src/components/*.cxx
LINK_LIBRARIES StoreGateLib DetDescrCnvSvcLib IdDictDetDescr GaudiKernel InDetIdentifier )
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx
deleted file mode 100644
index 4250d786e5992ca66c468dcbc074cee4ad61c8af..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/InDetIdCnv_entries.cxx
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
-*/
-#include "PixelIDDetDescrCnv.h"
-#include "SCT_IDDetDescrCnv.h"
-#include "SiliconIDDetDescrCnv.h"
-#include "TRT_IDDetDescrCnv.h"
-#include "PLR_IDDetDescrCnv.h"
-
-DECLARE_CONVERTER(SCT_IDDetDescrCnv)
-DECLARE_CONVERTER(PixelIDDetDescrCnv)
-DECLARE_CONVERTER(SiliconIDDetDescrCnv)
-DECLARE_CONVERTER(TRT_IDDetDescrCnv)
-DECLARE_CONVERTER(PLR_IDDetDescrCnv)
-
diff --git a/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/components/InDetIdCnv_entries.cxx b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/components/InDetIdCnv_entries.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..fdc4a63ad0d739fef8e6a049e959102bd07740c5
--- /dev/null
+++ b/InnerDetector/InDetDetDescrCnv/InDetIdCnv/src/components/InDetIdCnv_entries.cxx
@@ -0,0 +1,15 @@
+/*
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
+*/
+#include "../PixelIDDetDescrCnv.h"
+#include "../SCT_IDDetDescrCnv.h"
+#include "../SiliconIDDetDescrCnv.h"
+#include "../TRT_IDDetDescrCnv.h"
+#include "../PLR_IDDetDescrCnv.h"
+
+DECLARE_CONVERTER(SCT_IDDetDescrCnv)
+DECLARE_CONVERTER(PixelIDDetDescrCnv)
+DECLARE_CONVERTER(SiliconIDDetDescrCnv)
+DECLARE_CONVERTER(TRT_IDDetDescrCnv)
+DECLARE_CONVERTER(PLR_IDDetDescrCnv)
+
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/CMakeLists.txt b/LArCalorimeter/LArCnv/LArIdCnv/CMakeLists.txt
index 2f79bba0fcd13dd5fcf44f6685d9ee276dfd0885..e3205b864c89756ab443ff14d6f3cb10eeea80cc 100644
--- a/LArCalorimeter/LArCnv/LArIdCnv/CMakeLists.txt
+++ b/LArCalorimeter/LArCnv/LArIdCnv/CMakeLists.txt
@@ -1,10 +1,10 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LArIdCnv )
# Component(s) in the package:
atlas_add_component( LArIdCnv
- src/*.cxx
+ src/*.cxx src/components/*.cxx
LINK_LIBRARIES DetDescrCnvSvcLib CaloIdentifier StoreGateLib IdDictDetDescr Identifier GaudiKernel LArIdentifier )
diff --git a/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx b/LArCalorimeter/LArCnv/LArIdCnv/src/components/LArIdCnv_entries.cxx
similarity index 86%
rename from LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx
rename to LArCalorimeter/LArCnv/LArIdCnv/src/components/LArIdCnv_entries.cxx
index ba7ef79cb119452ef582abcab6dca40c741b9922..bf5cecab10e4cf599ae9207e7f9e7c373eb51afb 100644
--- a/LArCalorimeter/LArCnv/LArIdCnv/src/LArIdCnv_entries.cxx
+++ b/LArCalorimeter/LArCnv/LArIdCnv/src/components/LArIdCnv_entries.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
#include "LArIdCnv/LArOnlineIDDetDescrCnv.h"
#include "LArIdCnv/LArOnline_SuperCellIDDetDescrCnv.h"
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt b/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
index f663f4f11c9a83c4798e320f906e40e8357667fd..01624e0475b316da5d74e22ed7a6ec72b7b511ca 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
+++ b/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
@@ -1,11 +1,11 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LArConditionsTest )
# Component(s) in the package:
atlas_add_component( LArConditionsTest
- src/LArConditionsTest_entries.cxx
+ src/components/LArConditionsTest_entries.cxx
src/LArCondDataTest.cxx
src/LArConditionsTestAlg.cxx
src/LArCablingTest.cxx
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx b/LArCalorimeter/LArTest/LArConditionsTest/src/components/LArConditionsTest_entries.cxx
similarity index 76%
rename from LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx
rename to LArCalorimeter/LArTest/LArConditionsTest/src/components/LArConditionsTest_entries.cxx
index f70938c4477644351fe9e0ee0e646ed5f16de21d..b553fd7c1a6e177b80769f8f817b3e25c2d06cde 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx
+++ b/LArCalorimeter/LArTest/LArConditionsTest/src/components/LArConditionsTest_entries.cxx
@@ -1,10 +1,10 @@
/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
#include "LArConditionsTest/LArConditionsTestAlg.h"
#include "LArConditionsTest/LArCondDataTest.h"
#include "LArConditionsTest/LArCablingTest.h"
-#include "LArSCIdVsIdTest.h"
+#include "../LArSCIdVsIdTest.h"
DECLARE_COMPONENT( LArConditionsTestAlg )
DECLARE_COMPONENT( LArCondDataTest )
DECLARE_COMPONENT( LArCablingTest )
diff --git a/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt b/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt
index a80dffa64a083d9b9a642561f9ab9383b43a4de3..366beef6f2ee7024de56b2da3006e08241275f3b 100644
--- a/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt
+++ b/Simulation/G4Atlas/G4AtlasTests/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( G4AtlasTests )
@@ -10,7 +10,7 @@ find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_library( G4AtlasTests
- src/*.cxx
+ src/*.cxx src/components/*.cxx
OBJECT
NO_PUBLIC_HEADERS
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS}
diff --git a/Simulation/G4Atlas/G4AtlasTests/src/G4AtlasTests_entries.cxx b/Simulation/G4Atlas/G4AtlasTests/src/components/G4AtlasTests_entries.cxx
similarity index 54%
rename from Simulation/G4Atlas/G4AtlasTests/src/G4AtlasTests_entries.cxx
rename to Simulation/G4Atlas/G4AtlasTests/src/components/G4AtlasTests_entries.cxx
index 7e56677743a98cb1129073fbb50a2bcec9baff94..60673aab5c4787cd302c3a958cfb5da514608440 100644
--- a/Simulation/G4Atlas/G4AtlasTests/src/G4AtlasTests_entries.cxx
+++ b/Simulation/G4Atlas/G4AtlasTests/src/components/G4AtlasTests_entries.cxx
@@ -1,29 +1,29 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
#include "G4AtlasTests/G4TestAlg.h"
-#include "SiHitsTestTool.h"
-#include "TrtHitsTestTool.h"
-#include "LArHitsTestTool.h"
-#include "EMBHitsTestTool.h"
-#include "EMECHitsTestTool.h"
-#include "FCALHitsTestTool.h"
-#include "HECHitsTestTool.h"
-#include "TileHitsTestTool.h"
-#include "MDTHitsTestTool.h"
-#include "RPCHitsTestTool.h"
-#include "CSCHitsTestTool.h"
-#include "TGCHitsTestTool.h"
-#include "MMHitsTestTool.h"
-#include "sTGCHitsTestTool.h"
-#include "ALFA_SimHitsTestTool.h"
-#include "ZDCHitsTestTool.h"
-#include "TruthTestTool.h"
-#include "LayerTestTool.h"
-#include "CaloCalibrationHitsTestTool.h"
-#include "SteppingValidationTool.h"
-#include "LucidHitsTestTool.h"
-#include "CalibHitValidate.h"
+#include "../SiHitsTestTool.h"
+#include "../TrtHitsTestTool.h"
+#include "../LArHitsTestTool.h"
+#include "../EMBHitsTestTool.h"
+#include "../EMECHitsTestTool.h"
+#include "../FCALHitsTestTool.h"
+#include "../HECHitsTestTool.h"
+#include "../TileHitsTestTool.h"
+#include "../MDTHitsTestTool.h"
+#include "../RPCHitsTestTool.h"
+#include "../CSCHitsTestTool.h"
+#include "../TGCHitsTestTool.h"
+#include "../MMHitsTestTool.h"
+#include "../sTGCHitsTestTool.h"
+#include "../ALFA_SimHitsTestTool.h"
+#include "../ZDCHitsTestTool.h"
+#include "../TruthTestTool.h"
+#include "../LayerTestTool.h"
+#include "../CaloCalibrationHitsTestTool.h"
+#include "../SteppingValidationTool.h"
+#include "../LucidHitsTestTool.h"
+#include "../CalibHitValidate.h"
DECLARE_COMPONENT( TruthTestTool )
diff --git a/TestBeam/TBDetDescrCnv/CMakeLists.txt b/TestBeam/TBDetDescrCnv/CMakeLists.txt
index 0eaa4fedeadfbded22d394347dcce3bb78be52b1..63b897e42d1d6aa182d5fddbdd036f25be69d2c3 100644
--- a/TestBeam/TBDetDescrCnv/CMakeLists.txt
+++ b/TestBeam/TBDetDescrCnv/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TBDetDescrCnv )
@@ -9,7 +9,7 @@ find_package( Geant4 )
# Component(s) in the package:
atlas_add_library( TBDetDescrCnv
- src/TB*.cxx
+ src/TB*.cxx src/components/*.cxx
OBJECT
NO_PUBLIC_HEADERS
PRIVATE_INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
diff --git a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx b/TestBeam/TBDetDescrCnv/src/components/TBDetDescrCnv_entries.cxx
similarity index 59%
rename from TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx
rename to TestBeam/TBDetDescrCnv/src/components/TBDetDescrCnv_entries.cxx
index a104ffd43473eb37e54205e0f8ce536185817f77..699d888b042d4a920604d1db5142b74ac049d96c 100644
--- a/TestBeam/TBDetDescrCnv/src/TBDetDescrCnv_entries.cxx
+++ b/TestBeam/TBDetDescrCnv/src/components/TBDetDescrCnv_entries.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
#include "TBDetDescrCnv/TBDetDescrCnv.h"
diff --git a/TileCalorimeter/TileSvc/TileIdCnv/CMakeLists.txt b/TileCalorimeter/TileSvc/TileIdCnv/CMakeLists.txt
index 2f4d6addc16638267a06c507365eb3cb3e7a58d2..348a2c6b80e99f7b8b1c79872c365a102e453239 100644
--- a/TileCalorimeter/TileSvc/TileIdCnv/CMakeLists.txt
+++ b/TileCalorimeter/TileSvc/TileIdCnv/CMakeLists.txt
@@ -1,10 +1,10 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TileIdCnv )
# Component(s) in the package:
atlas_add_component( TileIdCnv
- src/*.cxx
+ src/*.cxx src/components/*.cxx
LINK_LIBRARIES DetDescrCnvSvcLib StoreGateLib IdDictDetDescr GaudiKernel TileIdentifier )
diff --git a/TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_entries.cxx b/TileCalorimeter/TileSvc/TileIdCnv/src/components/TileIdCnv_entries.cxx
similarity index 61%
rename from TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_entries.cxx
rename to TileCalorimeter/TileSvc/TileIdCnv/src/components/TileIdCnv_entries.cxx
index 3f9b871d91b2a37e7066f0944eabc8d7d2542255..54e0e6f362be64f19b3704ff2e8a3a082e33055e 100644
--- a/TileCalorimeter/TileSvc/TileIdCnv/src/TileIdCnv_entries.cxx
+++ b/TileCalorimeter/TileSvc/TileIdCnv/src/components/TileIdCnv_entries.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
*/
#include "TileIdCnv/TileHWIDDetDescrCnv.h"