diff --git a/LArCalorimeter/LArTest/LArCalibTest/CMakeLists.txt b/LArCalorimeter/LArTest/LArCalibTest/CMakeLists.txt
index 8bbc069caf8ef7540cc2f6b64723a9747c0214df..e0efce0719a38bf92d08808404d8717644af8bdd 100644
--- a/LArCalorimeter/LArTest/LArCalibTest/CMakeLists.txt
+++ b/LArCalorimeter/LArTest/LArCalibTest/CMakeLists.txt
@@ -20,13 +20,16 @@ atlas_depends_on_subdirs( PUBLIC
                           Control/StoreGate
                           Event/xAOD/xAODEventInfo
                           LArCalorimeter/LArRawConditions
+                          LArCalorimeter/LArCOOLConditions
                           Tools/PathResolver )
 
 # Component(s) in the package:
 atlas_add_component( LArCalibTest
-                     src/*.cxx
+                     src/LAr*.cxx
+                     src/DumpCaloBadChannels.cxx
+                     src/FixLArElecCalib.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES CaloConditions CaloIdentifier AthenaBaseComps GaudiKernel LArIdentifier LArRawEvent LArRecConditions LArCablingLib CaloDetDescrLib StoreGateLib SGtests xAODEventInfo LArRawConditions PathResolver )
+                     LINK_LIBRARIES CaloConditions CaloIdentifier AthenaBaseComps GaudiKernel LArIdentifier LArRawEvent LArRecConditions LArCablingLib CaloDetDescrLib StoreGateLib SGtests xAODEventInfo LArRawConditions LArCOOLConditions PathResolver )
 
 # Install files from the package:
 atlas_install_headers( LArCalibTest )
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/FixLArElecCalib.h b/LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/FixLArElecCalib.h
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/FixLArElecCalib.h
rename to LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/FixLArElecCalib.h
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/FixLArIdMap.h b/LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/FixLArIdMap.h
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/FixLArIdMap.h
rename to LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/FixLArIdMap.h
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArFebRodMapConvert.h b/LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArFebRodMapConvert.h
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArFebRodMapConvert.h
rename to LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArFebRodMapConvert.h
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArFecLvTempDcsTest.h b/LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArFecLvTempDcsTest.h
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArFecLvTempDcsTest.h
rename to LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArFecLvTempDcsTest.h
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArIdMapConvert.h b/LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArIdMapConvert.h
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArIdMapConvert.h
rename to LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArIdMapConvert.h
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArOFCtoOFC.h b/LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArOFCtoOFC.h
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArOFCtoOFC.h
rename to LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArOFCtoOFC.h
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArShapeToSCShape.h b/LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArShapeToSCShape.h
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/LArConditionsTest/LArShapeToSCShape.h
rename to LArCalorimeter/LArTest/LArCalibTest/LArCalibTest/LArShapeToSCShape.h
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/AllPedestalToPool.csh b/LArCalorimeter/LArTest/LArCalibTest/share/AllPedestalToPool.csh
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/AllPedestalToPool.csh
rename to LArCalorimeter/LArTest/LArCalibTest/share/AllPedestalToPool.csh
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_FcalIdFix7_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_FcalIdFix7_jobOptions.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_FcalIdFix7_jobOptions.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_FcalIdFix7_jobOptions.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix3_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix3_jobOptions.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix3_jobOptions.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix3_jobOptions.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix4_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix4_jobOptions.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix4_jobOptions.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix4_jobOptions.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix5_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix5_jobOptions.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix5_jobOptions.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix5_jobOptions.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix6_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix6_jobOptions.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix6_jobOptions.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix6_jobOptions.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix7_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix7_jobOptions.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix7_jobOptions.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix7_jobOptions.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix8_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix8_jobOptions.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix8_jobOptions.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix8_jobOptions.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix9_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix9_jobOptions.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/FixLArElecCalib_fix9_jobOptions.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/FixLArElecCalib_fix9_jobOptions.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/FixLArIdMap_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/FixLArIdMap_jobOptions.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/FixLArIdMap_jobOptions.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/FixLArIdMap_jobOptions.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertCTBConditonsToPool.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertCTBConditonsToPool.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertCTBConditonsToPool.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/LArConvertCTBConditonsToPool.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertH6ConditonsToPool.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH6ConditonsToPool.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertH6ConditonsToPool.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH6ConditonsToPool.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertH6IdMapToPool.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH6IdMapToPool.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertH6IdMapToPool.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH6IdMapToPool.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertH8IdMapToPool.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH8IdMapToPool.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertH8IdMapToPool.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/LArConvertH8IdMapToPool.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertMCNovaToPool.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertMCNovaToPool.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertMCNovaToPool.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/LArConvertMCNovaToPool.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertMCNovaToPool_DC3-05.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArConvertMCNovaToPool_DC3-05.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/LArConvertMCNovaToPool_DC3-05.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/LArConvertMCNovaToPool_DC3-05.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArFecLvCTempTest_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArFecLvCTempTest_jobOptions.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/LArFecLvCTempTest_jobOptions.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/LArFecLvCTempTest_jobOptions.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArHVCommissionTest_jobOptions.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArHVCommissionTest_jobOptions.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/LArHVCommissionTest_jobOptions.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/LArHVCommissionTest_jobOptions.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArIdMapConvert.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArIdMapConvert.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/LArIdMapConvert.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/LArIdMapConvert.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArOFCtoOFC.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArOFCtoOFC.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/LArOFCtoOFC.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/LArOFCtoOFC.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArShapeToShapeSC.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArShapeToShapeSC.py
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/LArShapeToShapeSC.py
rename to LArCalorimeter/LArTest/LArCalibTest/share/LArShapeToShapeSC.py
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/autocorr_hec.txt b/LArCalorimeter/LArTest/LArCalibTest/share/autocorr_hec.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/autocorr_hec.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/autocorr_hec.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/barrel_dac2ua_oct06.txt b/LArCalorimeter/LArTest/LArCalibTest/share/barrel_dac2ua_oct06.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/barrel_dac2ua_oct06.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/barrel_dac2ua_oct06.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/dac2ua_em.txt b/LArCalorimeter/LArTest/LArCalibTest/share/dac2ua_em.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/dac2ua_em.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/dac2ua_em.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/dac2ua_hec.txt b/LArCalorimeter/LArTest/LArCalibTest/share/dac2ua_hec.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/dac2ua_hec.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/dac2ua_hec.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/dac2ua_ua2mev_rel13.txt b/LArCalorimeter/LArTest/LArCalibTest/share/dac2ua_ua2mev_rel13.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/dac2ua_ua2mev_rel13.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/dac2ua_ua2mev_rel13.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/fsampl_1250.txt b/LArCalorimeter/LArTest/LArCalibTest/share/fsampl_1250.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/fsampl_1250.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/fsampl_1250.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/fsampl_1300.txt b/LArCalorimeter/LArTest/LArCalibTest/share/fsampl_1300.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/fsampl_1300.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/fsampl_1300.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/fsampl_1300_qgsp-bert.txt b/LArCalorimeter/LArTest/LArCalibTest/share/fsampl_1300_qgsp-bert.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/fsampl_1300_qgsp-bert.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/fsampl_1300_qgsp-bert.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/fsampl_1303_qgsp-bert.txt b/LArCalorimeter/LArTest/LArCalibTest/share/fsampl_1303_qgsp-bert.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/fsampl_1303_qgsp-bert.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/fsampl_1303_qgsp-bert.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/mbrms_em_rel12.txt b/LArCalorimeter/LArTest/LArCalibTest/share/mbrms_em_rel12.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/mbrms_em_rel12.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/mbrms_em_rel12.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/mbrms_hec_rel12.txt b/LArCalorimeter/LArTest/LArCalibTest/share/mbrms_hec_rel12.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/mbrms_hec_rel12.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/mbrms_hec_rel12.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/mphys_hec.txt b/LArCalorimeter/LArTest/LArCalibTest/share/mphys_hec.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/mphys_hec.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/mphys_hec.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/noise_hec.txt b/LArCalorimeter/LArTest/LArCalibTest/share/noise_hec.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/noise_hec.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/noise_hec.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/ramp_hec.txt b/LArCalorimeter/LArTest/LArCalibTest/share/ramp_hec.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/ramp_hec.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/ramp_hec.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/shape_hec.txt b/LArCalorimeter/LArTest/LArCalibTest/share/shape_hec.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/shape_hec.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/shape_hec.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/ua2mev_em.txt b/LArCalorimeter/LArTest/LArCalibTest/share/ua2mev_em.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/ua2mev_em.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/ua2mev_em.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/ua2mev_hec.txt b/LArCalorimeter/LArTest/LArCalibTest/share/ua2mev_hec.txt
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/share/ua2mev_hec.txt
rename to LArCalorimeter/LArTest/LArCalibTest/share/ua2mev_hec.txt
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/FixLArElecCalib.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/FixLArElecCalib.cxx
similarity index 99%
rename from LArCalorimeter/LArTest/LArConditionsTest/src/FixLArElecCalib.cxx
rename to LArCalorimeter/LArTest/LArCalibTest/src/FixLArElecCalib.cxx
index 3a4964b7c4b4b94f24259f3cb43c1aba7dec5892..3997f9833bbe95bd7739acf28974e1aee498f8b7 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/FixLArElecCalib.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/FixLArElecCalib.cxx
@@ -58,7 +58,7 @@
 **/ 
 
 
-#include "LArConditionsTest/FixLArElecCalib.h"
+#include "LArCalibTest/FixLArElecCalib.h"
 #include "GaudiKernel/Property.h"
 #include "GaudiKernel/IToolSvc.h"
 
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/FixLArIdMap.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/FixLArIdMap.cxx
similarity index 99%
rename from LArCalorimeter/LArTest/LArConditionsTest/src/FixLArIdMap.cxx
rename to LArCalorimeter/LArTest/LArCalibTest/src/FixLArIdMap.cxx
index fddb4b7853ba2939f97f8bffb4c1f28bdf511add..e605e0eed20c97b448b0f7d89ca8d4e3df6f0c02 100755
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/FixLArIdMap.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/FixLArIdMap.cxx
@@ -177,7 +177,7 @@ quadrant:
 **/ 
 
 
-#include "LArConditionsTest/FixLArIdMap.h"
+#include "LArCalibTest/FixLArIdMap.h"
 #include "GaudiKernel/Algorithm.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Property.h"
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LArFebRodMapConvert.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/LArFebRodMapConvert.cxx
similarity index 98%
rename from LArCalorimeter/LArTest/LArConditionsTest/src/LArFebRodMapConvert.cxx
rename to LArCalorimeter/LArTest/LArCalibTest/src/LArFebRodMapConvert.cxx
index 5fee4f48624c44a2ff95960420a57a46b90d573e..873cb93d449d366b349526eb9e522b8fecee6dda 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/LArFebRodMapConvert.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/LArFebRodMapConvert.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "LArConditionsTest/LArFebRodMapConvert.h"
+#include "LArCalibTest/LArFebRodMapConvert.h"
           
 //#include "LArTools/LArOnOffIdMap.h"
 #include "LArIdentifier/LArOnlineID.h"
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LArFecLvTempDcsTest.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/LArFecLvTempDcsTest.cxx
similarity index 98%
rename from LArCalorimeter/LArTest/LArConditionsTest/src/LArFecLvTempDcsTest.cxx
rename to LArCalorimeter/LArTest/LArCalibTest/src/LArFecLvTempDcsTest.cxx
index c7d8129270dabb902eed8552be26becea3f9d1cb..af934d85d885a4a8c56fe2be035bbb8ca58e3acd 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/LArFecLvTempDcsTest.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/LArFecLvTempDcsTest.cxx
@@ -15,7 +15,7 @@
 #include "StoreGate/StoreGateSvc.h"
 #include "GaudiKernel/AlgTool.h"
 
-#include "LArConditionsTest/LArFecLvTempDcsTest.h" 
+#include "LArCalibTest/LArFecLvTempDcsTest.h" 
 #include "LArRawConditions/LArFecLvTempDcs.h" 
 #include "LArIdentifier/LArOnlineID.h"
 
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LArIdMapConvert.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/LArIdMapConvert.cxx
similarity index 99%
rename from LArCalorimeter/LArTest/LArConditionsTest/src/LArIdMapConvert.cxx
rename to LArCalorimeter/LArTest/LArCalibTest/src/LArIdMapConvert.cxx
index e270a419347f69ad4b9152c1b91d214510d37c01..3a7c8c3f1425f2fa40f2e3feb919fbfe6d2c7f63 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/LArIdMapConvert.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/LArIdMapConvert.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "LArConditionsTest/LArIdMapConvert.h"
+#include "LArCalibTest/LArIdMapConvert.h"
           
 //#include "LArTools/LArCablingBlob.h"
 //#include "LArTools/LArOnOffIdMap.h"
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LArOFCtoOFC.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/LArOFCtoOFC.cxx
similarity index 99%
rename from LArCalorimeter/LArTest/LArConditionsTest/src/LArOFCtoOFC.cxx
rename to LArCalorimeter/LArTest/LArCalibTest/src/LArOFCtoOFC.cxx
index 1ec1d51e4c73a1c180186d88e8228f69248814b5..49765c0b1cf5242279367947967d2a4f1a678cb4 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/LArOFCtoOFC.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/LArOFCtoOFC.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "LArConditionsTest/LArOFCtoOFC.h"
+#include "LArCalibTest/LArOFCtoOFC.h"
 #include "LArRawConditions/LArOFCComplete.h"
 #include "LArRawConditions/LArShapeComplete.h"
 #include "CaloIdentifier/CaloGain.h"
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LArShapeToSCShape.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/LArShapeToSCShape.cxx
similarity index 98%
rename from LArCalorimeter/LArTest/LArConditionsTest/src/LArShapeToSCShape.cxx
rename to LArCalorimeter/LArTest/LArCalibTest/src/LArShapeToSCShape.cxx
index fc7e1407f02b1a706bcdbf266e1987cdc74a0303..e8730d22a065242113036fa294eb2398c633e9c2 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/LArShapeToSCShape.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/LArShapeToSCShape.cxx
@@ -7,8 +7,8 @@
 // LArShapeToSCShape.cxx 
 /////////////////////////////////////////////////////////////////// 
 
-// LArConditionsTest includes
-#include "LArConditionsTest/LArShapeToSCShape.h"
+// LArCalibTest includes
+#include "LArCalibTest/LArShapeToSCShape.h"
 #include "CaloDetDescr/ICaloSuperCellIDTool.h"
 #include "LArElecCalib/ILArShape.h"
 #include "LArCOOLConditions/LArShapeSC.h"
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LisIOVList.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/LisIOVList.cxx
similarity index 100%
rename from LArCalorimeter/LArTest/LArConditionsTest/src/LisIOVList.cxx
rename to LArCalorimeter/LArTest/LArCalibTest/src/LisIOVList.cxx
diff --git a/LArCalorimeter/LArTest/LArCalibTest/src/components/LArCalibTest_entries.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/components/LArCalibTest_entries.cxx
index 2658ad2cfcaa3f4d3317c67d79f4cbe0e6d584bf..1944782279e4bb9a0c0ee6fdcabe7a69ec7bc896 100644
--- a/LArCalorimeter/LArTest/LArCalibTest/src/components/LArCalibTest_entries.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/components/LArCalibTest_entries.cxx
@@ -3,6 +3,14 @@
 #include "LArCalibTest/LArReadHadDMCoeffFile.h"
 #include "LArCalibTest/LArReadHadDMCoeffFile2.h"
 #include "LArCalibTest/DumpCaloBadChannels.h"
+//#include "LArCalibTest/FixLArIdMap.h"
+#include "LArCalibTest/LArFecLvTempDcsTest.h"
+#include "LArCalibTest/FixLArElecCalib.h"
+#include "LArCalibTest/LArIdMapConvert.h"
+#include "LArCalibTest/LArFebRodMapConvert.h"
+#include "LArCalibTest/LArShapeToSCShape.h"
+#include "LArCalibTest/LArOFCtoOFC.h"
+
 
 
 
@@ -11,4 +19,11 @@ DECLARE_COMPONENT( LArReadHadDMCoeffFile )
 DECLARE_COMPONENT( LArReadHadDMCoeffFile2 )
 DECLARE_COMPONENT( LArFakeCellFactor )
 DECLARE_COMPONENT( DumpCaloBadChannels )
+//DECLARE_COMPONENT( FixLArIdMap )
+DECLARE_COMPONENT( LArFecLvTempDcsTest )
+DECLARE_COMPONENT( FixLArElecCalib )
+DECLARE_COMPONENT( LArIdMapConvert )
+DECLARE_COMPONENT( LArFebRodMapConvert )
+DECLARE_COMPONENT( LArShapeToSCShape )
+DECLARE_COMPONENT( LArOFCtoOFC )
 
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt b/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
index 45c17411bff4094fda64f70a6ff0da65a341954c..b469e64fb826700d5e52cc219dfadfdbd48e4490 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
+++ b/LArCalorimeter/LArTest/LArConditionsTest/CMakeLists.txt
@@ -34,15 +34,9 @@ find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
 atlas_add_component( LArConditionsTest
                      src/LArConditionsTest_entries.cxx
                      src/TestLArConditionsTools.cxx
-                     src/FixLArElecCalib.cxx
                      src/LArCondDataTest.cxx
                      src/LArConditionsTestAlg.cxx
-                     src/LArFecLvTempDcsTest.cxx
                      src/LArCablingTest.cxx
-                     src/LArIdMapConvert.cxx
-                     src/LArShapeToSCShape.cxx
-                     src/LArOFCtoOFC.cxx
-                     src/LArFebRodMapConvert.cxx
                      INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
                      LINK_LIBRARIES ${CORAL_LIBRARIES} AthenaBaseComps StoreGateLib SGtests Identifier GaudiKernel LArCablingLib LArIdentifier LArRawConditions LArRawUtilsLib LArToolsLib CaloDetDescrLib CaloEvent CaloIdentifier AthenaKernel AthenaPoolUtilities LArCOOLConditions )
 
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx b/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx
index 51e8f14f3c8e905ee37e9b3b7be539492012156b..50af6ab76808e0a33fec9136a1548abbb86e2c8b 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx
+++ b/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTest_entries.cxx
@@ -1,27 +1,13 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 #include "LArConditionsTest/LArConditionsTestAlg.h"
 #include "LArConditionsTest/LArCondDataTest.h"
-//#include "LArConditionsTest/FixLArIdMap.h"
-#include "LArConditionsTest/LArFecLvTempDcsTest.h"
-#include "LArConditionsTest/FixLArElecCalib.h"
 #include "LArConditionsTest/TestLArConditionsTools.h" 
 #include "LArConditionsTest/LArCablingTest.h"
-#include "LArConditionsTest/LArIdMapConvert.h"
-#include "LArConditionsTest/LArFebRodMapConvert.h"
-#include "LArConditionsTest/LArShapeToSCShape.h"
-#include "LArConditionsTest/LArOFCtoOFC.h"
 
 DECLARE_COMPONENT( LArConditionsTestAlg )
 DECLARE_COMPONENT( LArCondDataTest )
-//DECLARE_COMPONENT( FixLArIdMap )
-DECLARE_COMPONENT( LArFecLvTempDcsTest )
-DECLARE_COMPONENT( FixLArElecCalib )
 DECLARE_COMPONENT( TestLArConditionsTools ) 
 DECLARE_COMPONENT( LArCablingTest )
-DECLARE_COMPONENT( LArIdMapConvert )
-DECLARE_COMPONENT( LArFebRodMapConvert )
-DECLARE_COMPONENT( LArShapeToSCShape )
-DECLARE_COMPONENT( LArOFCtoOFC )