diff --git a/LArCalorimeter/LArCafJobs/CMakeLists.txt b/LArCalorimeter/LArCafJobs/CMakeLists.txt
index a63617ae29219cdbcda37d872260557948fa6b9c..c80e408d74ee42aabf67b121f07d41dc231c97e7 100644
--- a/LArCalorimeter/LArCafJobs/CMakeLists.txt
+++ b/LArCalorimeter/LArCafJobs/CMakeLists.txt
@@ -37,7 +37,6 @@ atlas_depends_on_subdirs( PUBLIC
                           Event/xAOD/xAODEventInfo
                           Event/NavFourMom
                           LArCalorimeter/LArElecCalib
-                          LArCalorimeter/LArCondUtils
                           LArCalorimeter/LArRecEvent
                           LArCalorimeter/LArGeoModel/LArHV
                           LArCalorimeter/LArGeoModel/LArReadoutGeometry
diff --git a/LArCalorimeter/LArCafJobs/LArCafJobs/LArNoiseBursts.h b/LArCalorimeter/LArCafJobs/LArCafJobs/LArNoiseBursts.h
index df2726aef183b9e4b503b445c7722770ba80516c..0c4e6ddb5b12d06e3ed1b32ce11acc1395db7bd3 100755
--- a/LArCalorimeter/LArCafJobs/LArCafJobs/LArNoiseBursts.h
+++ b/LArCalorimeter/LArCafJobs/LArCafJobs/LArNoiseBursts.h
@@ -31,7 +31,6 @@
 #include "LArIdentifier/LArElectrodeID.h"
 #include "CaloDetDescr/CaloDetDescrManager.h"
 #include "CaloIdentifier/CaloIdManager.h"
-//#include "LArCondUtils/LArHVToolDB.h"
 //#include "LArElecCalib/ILArHVTool.h"
 
 // Trigger
diff --git a/LArCalorimeter/LArCalibTools/CMakeLists.txt b/LArCalorimeter/LArCalibTools/CMakeLists.txt
index de1f4607b87e129116ee34e69dd418b309a45f13..4264fce1759b78a52330bcdd238d701e0589d486 100644
--- a/LArCalorimeter/LArCalibTools/CMakeLists.txt
+++ b/LArCalorimeter/LArCalibTools/CMakeLists.txt
@@ -22,7 +22,6 @@ atlas_depends_on_subdirs( PUBLIC
                           Database/AthenaPOOL/AthenaPoolUtilities
                           Event/EventInfo
                           LArCalorimeter/LArCOOLConditions
-                          LArCalorimeter/LArCondUtils
                           LArCalorimeter/LArRawEvent
                           LArCalorimeter/LArTools )
 
diff --git a/LArCalorimeter/LArCalibTools/src/LArCond2NtupleBase.cxx b/LArCalorimeter/LArCalibTools/src/LArCond2NtupleBase.cxx
index 9169e3fac4d3b3431d599be48a2524056f68ce13..e50c85a00ac2c903926ff81632d2e1b2a0ff63a6 100644
--- a/LArCalorimeter/LArCalibTools/src/LArCond2NtupleBase.cxx
+++ b/LArCalorimeter/LArCalibTools/src/LArCond2NtupleBase.cxx
@@ -7,7 +7,6 @@
 #include "LArIdentifier/LArOnlineID.h"
 #include "LArIdentifier/LArOnline_SuperCellID.h"
 #include "CaloIdentifier/CaloIdManager.h"
-#include "LArCondUtils/LArFEBTempTool.h"
 #include "CaloIdentifier/CaloCell_ID.h"
 
 LArCond2NtupleBase::LArCond2NtupleBase(const std::string& name, ISvcLocator* pSvcLocator): 
diff --git a/LArCalorimeter/LArCalibTools/src/LArFEBTemp2Ntuple.cxx b/LArCalorimeter/LArCalibTools/src/LArFEBTemp2Ntuple.cxx
index 1680021bcf45af1ef11e149a7403c5d9d0717c34..e5f28c5771eb241b11b919735fa42510320d2d5b 100755
--- a/LArCalorimeter/LArCalibTools/src/LArFEBTemp2Ntuple.cxx
+++ b/LArCalorimeter/LArCalibTools/src/LArFEBTemp2Ntuple.cxx
@@ -4,7 +4,6 @@
 
 #include "LArCalibTools/LArFEBTemp2Ntuple.h"
 #include "LArElecCalib/ILArFEBTempTool.h"
-#include "LArCondUtils/LArFEBTempTool.h"
 #include "LArIdentifier/LArOnlineID.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "LArCabling/LArCablingService.h"
diff --git a/LArCalorimeter/LArCondUtils/CMakeLists.txt b/LArCalorimeter/LArCondUtils/CMakeLists.txt
index 1fb9e19f96377fcc5d26a3a8e080e970ee2bf8ea..ba2beb618392c2776e2f0d1b1ef738bd5922283a 100644
--- a/LArCalorimeter/LArCondUtils/CMakeLists.txt
+++ b/LArCalorimeter/LArCondUtils/CMakeLists.txt
@@ -6,21 +6,19 @@
 atlas_subdir( LArCondUtils )
 
 # Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
+atlas_depends_on_subdirs( PRIVATE
                           Control/AthenaBaseComps
                           Control/StoreGate
                           Database/AthenaPOOL/AthenaPoolUtilities
                           DetectorDescription/Identifier
                           GaudiKernel
                           LArCalorimeter/LArElecCalib
-                          PRIVATE
                           Calorimeter/CaloDetDescr
                           Calorimeter/CaloIdentifier
                           Calorimeter/CaloGeoHelpers
                           Control/AthenaKernel
                           Database/RDBAccessSvc
                           Database/RegistrationServices
-                          Event/EventInfo
                           LArCalorimeter/LArCabling
                           LArCalorimeter/LArGeoModel/LArHV
                           LArCalorimeter/LArGeoModel/LArReadoutGeometry
@@ -38,10 +36,9 @@ atlas_add_component( LArCondUtils
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps StoreGateLib SGtests AthenaPoolUtilities Identifier GaudiKernel CaloDetDescrLib CaloIdentifier CaloGeoHelpers AthenaKernel EventInfo LArCablingLib LArHV LArReadoutGeometry LArIdentifier LArRawConditions LArRecConditions )
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps StoreGateLib SGtests AthenaPoolUtilities Identifier GaudiKernel CaloDetDescrLib CaloIdentifier CaloGeoHelpers AthenaKernel LArCablingLib LArHV LArReadoutGeometry LArIdentifier LArRawConditions LArRecConditions )
 
 # Install files from the package:
-atlas_install_headers( LArCondUtils )
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( share/LArEmLvl1.data share/LArHecLvl1.data share/LArFcalLvl1.data )
 atlas_install_scripts( share/LArBuildHVPathologies.sh share/fillPileUpNoiseLumi.py share/dumpHVPathFromNtuple.py )
diff --git a/LArCalorimeter/LArCondUtils/src/LArFEBTempTool.cxx b/LArCalorimeter/LArCondUtils/src/LArFEBTempTool.cxx
index dfd7c70e09fd49ce5983b46589b0872c318fe2ab..f55d0ba9edd877933037351c78f64e48e57e3bb6 100755
--- a/LArCalorimeter/LArCondUtils/src/LArFEBTempTool.cxx
+++ b/LArCalorimeter/LArCondUtils/src/LArFEBTempTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //-----------------------------------------------------------------------
@@ -16,15 +16,13 @@
 //
 //-----------------------------------------------------------------------
 
-#include "LArCondUtils/LArFEBTempTool.h" 
+#include "LArFEBTempTool.h" 
 #include "LArIdentifier/LArOnlineID.h"
 
 #include "GaudiKernel/IToolSvc.h"
 #include "GaudiKernel/MsgStream.h"
 #include "StoreGate/StoreGateSvc.h"
 
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
 #include "AthenaPoolUtilities/CondAttrListCollection.h"
 
 // constructor 
diff --git a/LArCalorimeter/LArCondUtils/LArCondUtils/LArFEBTempTool.h b/LArCalorimeter/LArCondUtils/src/LArFEBTempTool.h
similarity index 89%
rename from LArCalorimeter/LArCondUtils/LArCondUtils/LArFEBTempTool.h
rename to LArCalorimeter/LArCondUtils/src/LArFEBTempTool.h
index 10e4f3c6922fddf84071baf1fa2367e6cbe6c0e9..e3f4bb729f5b87dbb167df1bd340d638b7b4a3c6 100755
--- a/LArCalorimeter/LArCondUtils/LArCondUtils/LArFEBTempTool.h
+++ b/LArCalorimeter/LArCondUtils/src/LArFEBTempTool.h
@@ -1,9 +1,9 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef LARFEBTEMPTOOL_H
-#define LARFEBTEMPTOOL_H
+#ifndef LARCONDUTILS_LARFEBTEMPTOOL_H
+#define LARCONDUTILS_LARFEBTEMPTOOL_H
 
 /**
  @class LArFEBTempTool
diff --git a/LArCalorimeter/LArCondUtils/src/LArFecLvTempDcsTool.cxx b/LArCalorimeter/LArCondUtils/src/LArFecLvTempDcsTool.cxx
index f8d587e45bd84c8e7028f998dc7c64acae164c1f..d121c4013ab2fc7622fa1a34f7396742a05742f5 100755
--- a/LArCalorimeter/LArCondUtils/src/LArFecLvTempDcsTool.cxx
+++ b/LArCalorimeter/LArCondUtils/src/LArFecLvTempDcsTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //-----------------------------------------------------------------------
@@ -16,15 +16,13 @@
 //
 //-----------------------------------------------------------------------
 
+#include "LArFecLvTempDcsTool.h" 
 #include "LArIdentifier/LArIdManager.h"
-#include "LArCondUtils/LArFecLvTempDcsTool.h" 
 #include "LArRawConditions/LArFecLvTempDcs.h" 
 
 #include "GaudiKernel/IToolSvc.h"
 #include "GaudiKernel/MsgStream.h"
 #include "StoreGate/StoreGateSvc.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
 #include "AthenaPoolUtilities/CondAttrListCollection.h"
 #include "LArIdentifier/LArOnlineID.h"
 #include <iostream> 
@@ -73,21 +71,6 @@ StatusCode LArFecLvTempDcsTool::initialize()
 StatusCode LArFecLvTempDcsTool::getV1( const std::string& cratename, 
 			float&  hv  ) 
 {
-/*
-  // first print event number and time details
-  const EventInfo* event;
-  if (StatusCode::SUCCESS==StoreGate->retrieve(event)) {
-    int time=event->event_ID()->time_stamp();
-    log << MSG::INFO << "In run/event [" << event->event_ID()->run_number() <<
-      "," << event->event_ID()->event_number() << "] timestamp " << time <<
-      endmsg;
-  } else {
-    log << MSG::ERROR << "Could not get pointer to event" << endmsg;
-  }
-
-
-*/
-
    bool crate_found = false;
    if ( m_atrlistcol.isValid() ) 
    {
@@ -118,21 +101,6 @@ StatusCode LArFecLvTempDcsTool::getV1( const std::string& cratename,
 StatusCode LArFecLvTempDcsTool::getFec( const std::string& cratename, 
 			LArFecLvTempDcs&  fec  ) 
 {
-/*
-  // first print event number and time details
-  const EventInfo* event;
-  if (StatusCode::SUCCESS==StoreGate->retrieve(event)) {
-    int time=event->event_ID()->time_stamp();
-    log << MSG::INFO << "In run/event [" << event->event_ID()->run_number() <<
-      "," << event->event_ID()->event_number() << "] timestamp " << time <<
-      endmsg;
-  } else {
-    log << MSG::ERROR << "Could not get pointer to event" << endmsg;
-  }
-  const CondAttrListCollection* atrlistcol;
-
-*/
-
   bool crate_found = false;
   // through joboptions
   if (m_atrlistcol.isValid() ) {
diff --git a/LArCalorimeter/LArCondUtils/LArCondUtils/LArFecLvTempDcsTool.h b/LArCalorimeter/LArCondUtils/src/LArFecLvTempDcsTool.h
similarity index 91%
rename from LArCalorimeter/LArCondUtils/LArCondUtils/LArFecLvTempDcsTool.h
rename to LArCalorimeter/LArCondUtils/src/LArFecLvTempDcsTool.h
index b0e2a559b269e0df7484a052ab32a3a161030817..025f92065ba7721cfca087caa50b3b3e0abda025 100755
--- a/LArCalorimeter/LArCondUtils/LArCondUtils/LArFecLvTempDcsTool.h
+++ b/LArCalorimeter/LArCondUtils/src/LArFecLvTempDcsTool.h
@@ -1,9 +1,9 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef LARFECLVTEMPDCSTOOL_H
-#define LARFECLVTEMPDCSTOOL_H
+#ifndef LARCONDUTILS_LARFECLVTEMPDCSTOOL_H
+#define LARCONDUTILS_LARFECLVTEMPDCSTOOL_H
 
 /**
  @class LArFecLvTempDcsTool
diff --git a/LArCalorimeter/LArCondUtils/src/LArHV2Ntuple.cxx b/LArCalorimeter/LArCondUtils/src/LArHV2Ntuple.cxx
index 72f63a9a27a62bf5317ea85f0d2a75aa85607eda..08d6ddf40607627c34fad9732f9fc4eadc28a680 100644
--- a/LArCalorimeter/LArCondUtils/src/LArHV2Ntuple.cxx
+++ b/LArCalorimeter/LArCondUtils/src/LArHV2Ntuple.cxx
@@ -1,8 +1,8 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "LArCondUtils/LArHV2Ntuple.h"
+#include "LArHV2Ntuple.h"
 #include "GaudiKernel/Property.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/NTuple.h"
diff --git a/LArCalorimeter/LArCondUtils/LArCondUtils/LArHV2Ntuple.h b/LArCalorimeter/LArCondUtils/src/LArHV2Ntuple.h
similarity index 92%
rename from LArCalorimeter/LArCondUtils/LArCondUtils/LArHV2Ntuple.h
rename to LArCalorimeter/LArCondUtils/src/LArHV2Ntuple.h
index 1a6191750c7d3d5c1c20b993652a37bc062b0be9..12d83182b1a743fc7c3fd1ed64a16064765d663f 100644
--- a/LArCalorimeter/LArCondUtils/LArCondUtils/LArHV2Ntuple.h
+++ b/LArCalorimeter/LArCondUtils/src/LArHV2Ntuple.h
@@ -1,12 +1,12 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // TheLArHV2Ntuple.h
 //
 
-#ifndef _LArCondUtils_LArHV2Ntuple_H
-#define _LArCondUtils_LArHV2Ntuple_H
+#ifndef LARCONDUTILS_LARHV2NTUPLE_H
+#define LARCONDUTILS_LARHV2NTUPLE_H
 
 #include <string>
 
diff --git a/LArCalorimeter/LArCondUtils/src/LArHVPathologyDbAlg.cxx b/LArCalorimeter/LArCondUtils/src/LArHVPathologyDbAlg.cxx
index b9eae5f19377f359cf9aeeef1914f59aee8f6d2e..339f265f31e250bf7bfe5e8509bec46ad116b349 100644
--- a/LArCalorimeter/LArCondUtils/src/LArHVPathologyDbAlg.cxx
+++ b/LArCalorimeter/LArCondUtils/src/LArHVPathologyDbAlg.cxx
@@ -1,8 +1,8 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "LArCondUtils/LArHVPathologyDbAlg.h"
+#include "LArHVPathologyDbAlg.h"
 #include "LArElecCalib/ILArHVPathologyDbTool.h"
 #include "LArRecConditions/LArHVPathologiesDb.h"
 #include "RegistrationServices/IIOVRegistrationSvc.h"
@@ -34,10 +34,6 @@
 #include "LArHV/FCALHVLineConstLink.h"
 #include "LArHV/FCALHVLine.h"
 
-
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-
 #include <fstream>
 #include <cstdlib>
 
@@ -48,7 +44,6 @@ LArHVPathologyDbAlg::LArHVPathologyDbAlg(const std::string& name, ISvcLocator* p
   , m_outFile("")
   , m_folder("")
   , m_outpTag("HVPathologies-TEST")
-  , m_evt(0)
   , m_regSvc("IOVRegistrationSvc",name)
   , m_pathologyTool("LArHVPathologyDbTool")
   , m_mode(0)
@@ -135,28 +130,21 @@ StatusCode LArHVPathologyDbAlg::execute()
 {
   msg(MSG::INFO) <<" in execute()" <<endmsg;
 
-  StatusCode sc = evtStore()->retrieve(m_evt);
-  if(!sc.isSuccess()) {
-     msg(MSG::ERROR) << "Could not get event info " << endmsg;
-     return sc;
-  }
- 
-  int nevt = m_evt->event_ID()->event_number();
+  int nevt = getContext().eventID().event_number();
 
   if(m_writeCondObjs && nevt==1) {
     msg(MSG::INFO) << "Creating conditions objects" << endmsg;
 
     // Create cond objects
-    sc = createCondObjects(); 
-    if(!sc.isSuccess()) {
+    if(!createCondObjects().isSuccess()) {
       msg(MSG::ERROR) << "Could not create cond objects " << endmsg;
       m_writeCondObjs = false;
-      return sc;
+      return StatusCode::FAILURE;
     }
   }
 
   // Dump cond objects
-  sc = printCondObjects();
+  StatusCode sc = printCondObjects();
   if(!sc.isSuccess()) {
     msg(MSG::ERROR) << "Could not print out cond objects" << endmsg;
     return sc;
diff --git a/LArCalorimeter/LArCondUtils/LArCondUtils/LArHVPathologyDbAlg.h b/LArCalorimeter/LArCondUtils/src/LArHVPathologyDbAlg.h
similarity index 89%
rename from LArCalorimeter/LArCondUtils/LArCondUtils/LArHVPathologyDbAlg.h
rename to LArCalorimeter/LArCondUtils/src/LArHVPathologyDbAlg.h
index cf8e2ad2342459c7aa76509495bf304b5b8e7c8e..5c9181f7bce63a5769b50e15c50531f490e8d505 100644
--- a/LArCalorimeter/LArCondUtils/LArCondUtils/LArHVPathologyDbAlg.h
+++ b/LArCalorimeter/LArCondUtils/src/LArHVPathologyDbAlg.h
@@ -1,14 +1,13 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef LArHVPathologyDbAlg_H
-#define LArHVPathologyDbAlg_H
+#ifndef LARCONDUTILS_LARHVPATHOLOGYDBALG_H
+#define LARCONDUTILS_LARHVPATHOLOGYDBALG_H
 
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "GaudiKernel/ToolHandle.h"
 
-class EventInfo;
 class IIOVRegistrationSvc;
 class ILArHVPathologyDbTool;
 class LArCablingService ;
@@ -45,8 +44,6 @@ class LArHVPathologyDbAlg : public AthAlgorithm
   StringProperty            m_folder;
   StringProperty            m_outpTag;
 
-  const EventInfo*          m_evt;
- 
   ServiceHandle<IIOVRegistrationSvc>   m_regSvc;
   ToolHandle<ILArHVPathologyDbTool>    m_pathologyTool;
 
diff --git a/LArCalorimeter/LArCondUtils/src/LArHVToolDB.cxx b/LArCalorimeter/LArCondUtils/src/LArHVToolDB.cxx
index aaf6d4fab9ba083fee4e78f31be8028945a3a35e..cd4a771a8105429e3dba0cbf2bf25f06885936bf 100755
--- a/LArCalorimeter/LArCondUtils/src/LArHVToolDB.cxx
+++ b/LArCalorimeter/LArCondUtils/src/LArHVToolDB.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "LArCondUtils/LArHVToolDB.h" 
+#include "LArHVToolDB.h" 
 #include "GaudiKernel/IToolSvc.h"
 #include "StoreGate/StoreGateSvc.h"
 #include "LArElecCalib/ILArHVPathologyDbTool.h"
diff --git a/LArCalorimeter/LArCondUtils/LArCondUtils/LArHVToolDB.h b/LArCalorimeter/LArCondUtils/src/LArHVToolDB.h
similarity index 96%
rename from LArCalorimeter/LArCondUtils/LArCondUtils/LArHVToolDB.h
rename to LArCalorimeter/LArCondUtils/src/LArHVToolDB.h
index ae3655b10fedffea863da25f15fc78c3fdc971d7..724bf55cbd1235aa8df389f221bfa8f1ee87da3a 100755
--- a/LArCalorimeter/LArCondUtils/LArCondUtils/LArHVToolDB.h
+++ b/LArCalorimeter/LArCondUtils/src/LArHVToolDB.h
@@ -1,10 +1,10 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //Dear emacs, this is -*-c++-*-
-#ifndef LARHVToolDB_H
-#define LARHVToolDB_H
+#ifndef LARCONDUTILS_LARHVTOOLDB_H
+#define LARCONDUTILS_LARHVTOOLDB_H
 
 
 /**
diff --git a/LArCalorimeter/LArCondUtils/src/LArHVToolMC.cxx b/LArCalorimeter/LArCondUtils/src/LArHVToolMC.cxx
index 10c7697ce8cad6466c71eb7617d114fcfb1de125..698db3e552508bffdb2817952f9982850cfc231b 100755
--- a/LArCalorimeter/LArCondUtils/src/LArHVToolMC.cxx
+++ b/LArCalorimeter/LArCondUtils/src/LArHVToolMC.cxx
@@ -1,11 +1,11 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include <stdlib.h>
 #include <iostream>
 
-#include "LArCondUtils/LArHVToolMC.h" 
+#include "LArHVToolMC.h" 
 
 #include "GaudiKernel/IToolSvc.h"
 #include "StoreGate/StoreGateSvc.h"
diff --git a/LArCalorimeter/LArCondUtils/LArCondUtils/LArHVToolMC.h b/LArCalorimeter/LArCondUtils/src/LArHVToolMC.h
similarity index 92%
rename from LArCalorimeter/LArCondUtils/LArCondUtils/LArHVToolMC.h
rename to LArCalorimeter/LArCondUtils/src/LArHVToolMC.h
index baa8da93e5bfa12018d1b121c92ae4683458bbce..b99a38fe8c4958654c4cf57e2938c8808d2b4ad2 100755
--- a/LArCalorimeter/LArCondUtils/LArCondUtils/LArHVToolMC.h
+++ b/LArCalorimeter/LArCondUtils/src/LArHVToolMC.h
@@ -1,10 +1,9 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef LARHVTOOLMC_H
-#define LARHVTOOLMC_H
-
+#ifndef LARCONDUTILS_LARHVTOOLMC_H
+#define LARCONDUTILS_LARHVTOOLMC_H
 
 /**
  @class LArHVToolMC 
diff --git a/LArCalorimeter/LArCondUtils/src/components/LArCondUtils_entries.cxx b/LArCalorimeter/LArCondUtils/src/components/LArCondUtils_entries.cxx
index 5beb332ac58a582ae93e5912597501520bec9a97..c236f64dda5130eb65a3ead37c38a91d85f5c9ca 100644
--- a/LArCalorimeter/LArCondUtils/src/components/LArCondUtils_entries.cxx
+++ b/LArCalorimeter/LArCondUtils/src/components/LArCondUtils_entries.cxx
@@ -1,9 +1,9 @@
-#include "LArCondUtils/LArFecLvTempDcsTool.h"
-#include "LArCondUtils/LArHVToolMC.h" 
-#include "LArCondUtils/LArHVToolDB.h" 
-#include "LArCondUtils/LArFEBTempTool.h"
-#include "LArCondUtils/LArHVPathologyDbAlg.h"
-#include "LArCondUtils/LArHV2Ntuple.h"
+#include "../LArFecLvTempDcsTool.h"
+#include "../LArHVToolMC.h" 
+#include "../LArHVToolDB.h" 
+#include "../LArFEBTempTool.h"
+#include "../LArHVPathologyDbAlg.h"
+#include "../LArHV2Ntuple.h"