diff --git a/TestBeam/TBRec/src/CBNTAA_BeamInstrumentation.cxx b/TestBeam/TBRec/src/CBNTAA_BeamInstrumentation.cxx
old mode 100755
new mode 100644
index 9442df20423cdd21b1a2a4095c1616e988637ed1..32f0013dbdd2cd89cff0f76e6bf1bd6950ed4764
--- a/TestBeam/TBRec/src/CBNTAA_BeamInstrumentation.cxx
+++ b/TestBeam/TBRec/src/CBNTAA_BeamInstrumentation.cxx
@@ -2,10 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TBRec/CBNTAA_BeamInstrumentation.h"
-#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/INTupleSvc.h"
+#include "CBNTAA_BeamInstrumentation.h"
 
 #include "TBEvent/TBScintillatorCont.h"
 #include "TBEvent/TBBPCCont.h"
@@ -75,10 +72,6 @@ StatusCode CBNTAA_BeamInstrumentation::CBNT_initialize()
 {
   ATH_MSG_DEBUG ( "in initialize()" );
 
-  IToolSvc* toolSvc = nullptr;
-  ATH_CHECK( service( "ToolSvc",toolSvc  ) );
-
-
   const unsigned nScint=m_scint_names.size();  
   addBranch("Beam_sNames",m_scint_ntnames);
   for (unsigned i=0;i<nScint;i++) {
diff --git a/TestBeam/TBRec/TBRec/CBNTAA_BeamInstrumentation.h b/TestBeam/TBRec/src/CBNTAA_BeamInstrumentation.h
old mode 100755
new mode 100644
similarity index 93%
rename from TestBeam/TBRec/TBRec/CBNTAA_BeamInstrumentation.h
rename to TestBeam/TBRec/src/CBNTAA_BeamInstrumentation.h
index e426c5401ae52edabd116987415c3d701bee11ca..bc824fbb86c30274f0677b4f79c782769bb8e42a
--- a/TestBeam/TBRec/TBRec/CBNTAA_BeamInstrumentation.h
+++ b/TestBeam/TBRec/src/CBNTAA_BeamInstrumentation.h
@@ -2,11 +2,9 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef CBNT_BEAM_H
-#define CBNT_BEAM_H
+#ifndef TBREC_CBNTAA_BEAMINSTRUMENTATION_H
+#define TBREC_CBNTAA_BEAMINSTRUMENTATION_H
 
-#include "GaudiKernel/NTuple.h"
-#include "GaudiKernel/SmartDataPtr.h"
 #include "CBNT_TBRecBase.h"
 #include <fstream>
 #include <string>
diff --git a/TestBeam/TBRec/src/CBNTAA_TBADCRaw.cxx b/TestBeam/TBRec/src/CBNTAA_TBADCRaw.cxx
old mode 100755
new mode 100644
index 9f222c13379d5b1dc0631d3208666bdefebc9a3d..736f13869e746fc555cd126910c5b40781043f12
--- a/TestBeam/TBRec/src/CBNTAA_TBADCRaw.cxx
+++ b/TestBeam/TBRec/src/CBNTAA_TBADCRaw.cxx
@@ -2,11 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TBRec/CBNTAA_TBADCRaw.h"
-#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/INTupleSvc.h"
-#include "GaudiKernel/MsgStream.h"
+#include "CBNTAA_TBADCRaw.h"
 
 #include "TBEvent/TBADCRawCont.h"
 #include <vector>
@@ -27,9 +23,6 @@ StatusCode CBNTAA_TBADCRaw::CBNT_initialize()
 {
   ATH_MSG_DEBUG ( "in initialize()" );
 
-  IToolSvc* toolSvc = nullptr;
-  ATH_CHECK( service( "ToolSvc",toolSvc  ) );
-
   addBranch("TBADCRaw",m_adc);
   return StatusCode::SUCCESS; 
   
diff --git a/TestBeam/TBRec/TBRec/CBNTAA_TBADCRaw.h b/TestBeam/TBRec/src/CBNTAA_TBADCRaw.h
old mode 100755
new mode 100644
similarity index 94%
rename from TestBeam/TBRec/TBRec/CBNTAA_TBADCRaw.h
rename to TestBeam/TBRec/src/CBNTAA_TBADCRaw.h
index 171d39abb1369df319abd835ce626ec9276bb6f1..836c4b8942472ca5ea5e560e629732597d8c820b
--- a/TestBeam/TBRec/TBRec/CBNTAA_TBADCRaw.h
+++ b/TestBeam/TBRec/src/CBNTAA_TBADCRaw.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef CBNT_TBADCRAW_H
-#define CBNT_TBADCRAW_H
+#ifndef TBREC_CBNTAA_TBADCRAW_H
+#define TBREC_CBNTAA_TBADCRAW_H
 
 #include "GaudiKernel/NTuple.h"
 #include "GaudiKernel/SmartDataPtr.h"
diff --git a/TestBeam/TBRec/src/CBNTAA_TBInfo.cxx b/TestBeam/TBRec/src/CBNTAA_TBInfo.cxx
old mode 100755
new mode 100644
index 918e78476c12c1be3022349559bce0277066797e..413f1fbc2333191d60c8e0d64415f1a3be10cdd7
--- a/TestBeam/TBRec/src/CBNTAA_TBInfo.cxx
+++ b/TestBeam/TBRec/src/CBNTAA_TBInfo.cxx
@@ -2,15 +2,12 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TBRec/CBNTAA_TBInfo.h"
+#include "CBNTAA_TBInfo.h"
 
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/ISvcLocator.h"
 #include "GaudiKernel/IToolSvc.h"
 
 #include "StoreGate/StoreGate.h"
 #include "StoreGate/StoreGateSvc.h"
-#include "StoreGate/DataHandle.h"
 
 #include "CaloGeoHelpers/CaloPhiRange.h"
 #include "TBCaloGeometry/TBCaloCoordinate.h"
diff --git a/TestBeam/TBRec/TBRec/CBNTAA_TBInfo.h b/TestBeam/TBRec/src/CBNTAA_TBInfo.h
old mode 100755
new mode 100644
similarity index 96%
rename from TestBeam/TBRec/TBRec/CBNTAA_TBInfo.h
rename to TestBeam/TBRec/src/CBNTAA_TBInfo.h
index b282f8d0853a315be0681726653685e2dc47fba3..3e06d50bcca46f11baae317fa533c7cc90bc5391
--- a/TestBeam/TBRec/TBRec/CBNTAA_TBInfo.h
+++ b/TestBeam/TBRec/src/CBNTAA_TBInfo.h
@@ -2,11 +2,10 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef CBNTAA_TBInfo_H
-#define CBNTAA_TBInfo_H
+#ifndef TBREC_CBNTAA_TBINFO_H
+#define TBREC_CBNTAA_TBINFO_H
 
 #include "CBNT_TBRecBase.h"
-#include "GaudiKernel/NTuple.h"
 #include <vector>
 
 class TBCaloCoordinate;
diff --git a/TestBeam/TBRec/src/CBNTAA_TBScint.cxx b/TestBeam/TBRec/src/CBNTAA_TBScint.cxx
index bd7cf6c85603946fd5acab3bf45d30dd09d5695d..cbdec9f486709b68eeaa7af1aa425622298b47de 100644
--- a/TestBeam/TBRec/src/CBNTAA_TBScint.cxx
+++ b/TestBeam/TBRec/src/CBNTAA_TBScint.cxx
@@ -2,10 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TBRec/CBNTAA_TBScint.h"
-#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/INTupleSvc.h"
+#include "CBNTAA_TBScint.h"
 
 #include "LArG4TBSimEvent/LArG4H6FrontHitCollection.h"
 #include <fstream>
diff --git a/TestBeam/TBRec/TBRec/CBNTAA_TBScint.h b/TestBeam/TBRec/src/CBNTAA_TBScint.h
similarity index 92%
rename from TestBeam/TBRec/TBRec/CBNTAA_TBScint.h
rename to TestBeam/TBRec/src/CBNTAA_TBScint.h
index 7dac53375b140d8e33aa075fce558d5b778bc0c1..730afc207fe73b44404d870f15e42ebe7687c28f 100644
--- a/TestBeam/TBRec/TBRec/CBNTAA_TBScint.h
+++ b/TestBeam/TBRec/src/CBNTAA_TBScint.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef CBNTAA_TBSCINT_H
-#define CBNTAA_TBSCINT_H
+#ifndef TBREC_CBNTAA_TBSCINT_H
+#define TBREC_CBNTAA_TBSCINT_H
 
 #include "GaudiKernel/NTuple.h"
 #include "GaudiKernel/SmartDataPtr.h"
diff --git a/TestBeam/TBRec/src/CBNTAA_TBTDCRaw.cxx b/TestBeam/TBRec/src/CBNTAA_TBTDCRaw.cxx
old mode 100755
new mode 100644
index 2bd9a1c9722a0d83f67ddc992b7e4a85e65a5952..c61cd95d7bdfce7111c75d54e5f90557279840df
--- a/TestBeam/TBRec/src/CBNTAA_TBTDCRaw.cxx
+++ b/TestBeam/TBRec/src/CBNTAA_TBTDCRaw.cxx
@@ -2,11 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TBRec/CBNTAA_TBTDCRaw.h"
-#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/INTupleSvc.h"
-
+#include "CBNTAA_TBTDCRaw.h"
 #include "TBEvent/TBTDCRawCont.h"
 #include <vector>
 
@@ -30,9 +26,6 @@ StatusCode CBNTAA_TBTDCRaw::CBNT_initialize()
 {
   ATH_MSG_DEBUG ( "in initialize()" );
 
-  IToolSvc* toolSvc = nullptr;
-  ATH_CHECK( service( "ToolSvc",toolSvc  ) );
-
   addBranch("TBTDCRaw",m_tdc);
   addBranch("TBTDCRaw_underThreshold",m_underThreshold);
 
diff --git a/TestBeam/TBRec/TBRec/CBNTAA_TBTDCRaw.h b/TestBeam/TBRec/src/CBNTAA_TBTDCRaw.h
old mode 100755
new mode 100644
similarity index 94%
rename from TestBeam/TBRec/TBRec/CBNTAA_TBTDCRaw.h
rename to TestBeam/TBRec/src/CBNTAA_TBTDCRaw.h
index 4f688a1c33804886cec2188009fdd7cf4e5588c9..9e7d267d68a2b0b488d26dae2fdbc48143c004ed
--- a/TestBeam/TBRec/TBRec/CBNTAA_TBTDCRaw.h
+++ b/TestBeam/TBRec/src/CBNTAA_TBTDCRaw.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef CBNT_TBTDCRAW_H
-#define CBNT_TBTDCRAW_H
+#ifndef TBREC_CBNTAA_TBTDCRAW_H
+#define TBREC_CBNTAA_TBTDCRAW_H
 
 #include "GaudiKernel/NTuple.h"
 #include "GaudiKernel/SmartDataPtr.h"
diff --git a/TestBeam/TBRec/src/CBNTAA_TBTPValidation.cxx b/TestBeam/TBRec/src/CBNTAA_TBTPValidation.cxx
old mode 100755
new mode 100644
index ccc5cc79375f073ae2de2282de6e2171a2301d4b..2300e08b95f4f84f878281820e73eb554041c0b9
--- a/TestBeam/TBRec/src/CBNTAA_TBTPValidation.cxx
+++ b/TestBeam/TBRec/src/CBNTAA_TBTPValidation.cxx
@@ -2,10 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TBRec/CBNTAA_TBTPValidation.h"
-#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/INTupleSvc.h"
+#include "CBNTAA_TBTPValidation.h"
 
 #include "TBEvent/TBADCRawCont.h"
 #include "TBEvent/TBTDCRawCont.h"
@@ -231,9 +228,6 @@ StatusCode CBNTAA_TBTPValidation::CBNT_initialize()
 {
   ATH_MSG_DEBUG ( "in initialize()" );
 
-  IToolSvc* toolSvc = nullptr;
-  ATH_CHECK( service( "ToolSvc",toolSvc  ) );
-
   // TBADCRawCont
   addBranch("TBTPValid_TBADCRaw_m_adc",m_adc);
   addBranch("TBTPValid_TBADCRaw_tbDetectorName",m_tbDetectorName_TBADCRawCont);
diff --git a/TestBeam/TBRec/TBRec/CBNTAA_TBTPValidation.h b/TestBeam/TBRec/src/CBNTAA_TBTPValidation.h
old mode 100755
new mode 100644
similarity index 98%
rename from TestBeam/TBRec/TBRec/CBNTAA_TBTPValidation.h
rename to TestBeam/TBRec/src/CBNTAA_TBTPValidation.h
index 30386d7a3ce83497efab51c3800aeaa33eead862..0b620e90f3a92f2ccb033300994161bff1565478
--- a/TestBeam/TBRec/TBRec/CBNTAA_TBTPValidation.h
+++ b/TestBeam/TBRec/src/CBNTAA_TBTPValidation.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef CBNTAA_TBTPVALIDATION_H
-#define CBNTAA_TBTPVALIDATION_H
+#ifndef TBREC_CBNTAA_TBTPVALIDATION_H
+#define TBREC_CBNTAA_TBTPVALIDATION_H
 
 #include "GaudiKernel/NTuple.h"
 #include "GaudiKernel/SmartDataPtr.h"
diff --git a/TestBeam/TBRec/src/CBNTAA_TBTrack.cxx b/TestBeam/TBRec/src/CBNTAA_TBTrack.cxx
index a4a623f1a64341df7dde4b89852f044ae421351b..c799eafd540bac97a53edaa397a13b890427e97d 100644
--- a/TestBeam/TBRec/src/CBNTAA_TBTrack.cxx
+++ b/TestBeam/TBRec/src/CBNTAA_TBTrack.cxx
@@ -2,16 +2,13 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TBRec/CBNTAA_TBTrack.h"
-#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/INTupleSvc.h"
+#include "CBNTAA_TBTrack.h"
 
 #include "TBEvent/TBEventInfo.h"
 #include "TBEvent/TBTrack.h"
+#include "PathResolver/PathResolver.h"
 #include <fstream>
 #include <string>
-#include "PathResolver/PathResolver.h"
 
 
 CBNTAA_TBTrack::CBNTAA_TBTrack(const std::string & name, ISvcLocator * pSvcLocator) :
@@ -33,9 +30,6 @@ CBNTAA_TBTrack::CBNTAA_TBTrack(const std::string & name, ISvcLocator * pSvcLocat
 StatusCode CBNTAA_TBTrack::CBNT_initialize() {
   ATH_MSG_DEBUG ( "in initialize()"  );
   
-  IToolSvc* toolSvc = nullptr;
-  ATH_CHECK( service("ToolSvc",toolSvc) );
-
   // Add beam track parameters
   addBranch("bm_x",      m_beam_coor_x,     "bm_x/f");
   addBranch("bm_y",      m_beam_coor_y,     "bm_y/f");
diff --git a/TestBeam/TBRec/TBRec/CBNTAA_TBTrack.h b/TestBeam/TBRec/src/CBNTAA_TBTrack.h
similarity index 95%
rename from TestBeam/TBRec/TBRec/CBNTAA_TBTrack.h
rename to TestBeam/TBRec/src/CBNTAA_TBTrack.h
index 42c0b919b73e9ea65b8a66f8f81bff3eefb51e76..6d46a2593869affb014b7e768a6ab6d67af1ea29 100644
--- a/TestBeam/TBRec/TBRec/CBNTAA_TBTrack.h
+++ b/TestBeam/TBRec/src/CBNTAA_TBTrack.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef CBNTAA_TBTRACK_H
-#define CBNTAA_TBTRACK_H
+#ifndef TBREC_CBNTAA_TBTRACK_H
+#define TBREC_CBNTAA_TBTRACK_H
 
 #include "GaudiKernel/NTuple.h"
 #include "GaudiKernel/SmartDataPtr.h"
diff --git a/TestBeam/TBRec/src/CBNT_BeamInstrumentation.cxx b/TestBeam/TBRec/src/CBNT_BeamInstrumentation.cxx
old mode 100755
new mode 100644
index eeb0646b0ca3be728846d90394fdea682cd799f1..81313b272680391ec80647c5a8997e2d3c483056
--- a/TestBeam/TBRec/src/CBNT_BeamInstrumentation.cxx
+++ b/TestBeam/TBRec/src/CBNT_BeamInstrumentation.cxx
@@ -2,10 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TBRec/CBNT_BeamInstrumentation.h"
-#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/INTupleSvc.h"
+#include "CBNT_BeamInstrumentation.h"
 
 #include "TBEvent/TBScintillatorCont.h"
 #include "TBEvent/TBBPCCont.h"
diff --git a/TestBeam/TBRec/TBRec/CBNT_BeamInstrumentation.h b/TestBeam/TBRec/src/CBNT_BeamInstrumentation.h
old mode 100755
new mode 100644
similarity index 95%
rename from TestBeam/TBRec/TBRec/CBNT_BeamInstrumentation.h
rename to TestBeam/TBRec/src/CBNT_BeamInstrumentation.h
index 59ab41d2d181f72a2905c277d00f4ca4483030d1..c44a17a89069a5c75689164217ab616a0450167a
--- a/TestBeam/TBRec/TBRec/CBNT_BeamInstrumentation.h
+++ b/TestBeam/TBRec/src/CBNT_BeamInstrumentation.h
@@ -2,10 +2,9 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef CBNT_BEAM_H
-#define CBNT_BEAM_H
+#ifndef TBREC_CBNT_BEAM_H
+#define TBREC_CBNT_BEAM_H
 
-#include "GaudiKernel/SmartDataPtr.h"
 #include "CBNT_TBRecBase.h"
 #include <fstream>
 #include <string>
diff --git a/TestBeam/TBRec/src/CBNT_CaloH6.cxx b/TestBeam/TBRec/src/CBNT_CaloH6.cxx
old mode 100755
new mode 100644
index 704b211d090ab6f7af9e66cfc7ffd7e6546dcfb9..1429de8253d324f421c85706df03d294253ca3e6
--- a/TestBeam/TBRec/src/CBNT_CaloH6.cxx
+++ b/TestBeam/TBRec/src/CBNT_CaloH6.cxx
@@ -12,15 +12,7 @@
 //#                                                   #
 //#####################################################
 
-#include "TBRec/CBNT_CaloH6.h"
-
-#include "GaudiKernel/SmartDataPtr.h"
-#include "GaudiKernel/INTupleSvc.h"
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/ListItem.h"
-
-#include "StoreGate/StoreGate.h"
-#include "StoreGate/StoreGateSvc.h" 
+#include "CBNT_CaloH6.h"
 
 #include "CaloIdentifier/CaloCell_ID.h"
 #include "CaloEvent/CaloCellContainer.h"
@@ -33,7 +25,6 @@
 
 #include "Identifier/Identifier.h"
 
-#include <list>
 
 CBNT_CaloH6::CBNT_CaloH6(const std::string & name, ISvcLocator * pSvcLocator) :
   CBNT_TBRecBase(name, pSvcLocator),
diff --git a/TestBeam/TBRec/TBRec/CBNT_CaloH6.h b/TestBeam/TBRec/src/CBNT_CaloH6.h
old mode 100755
new mode 100644
similarity index 96%
rename from TestBeam/TBRec/TBRec/CBNT_CaloH6.h
rename to TestBeam/TBRec/src/CBNT_CaloH6.h
index 633ddfcfc0fd330db3ab3a6767c46f3ec2368c0b..3bb767da063c80d3b46014ae1f29629bf3a73ee0
--- a/TestBeam/TBRec/TBRec/CBNT_CaloH6.h
+++ b/TestBeam/TBRec/src/CBNT_CaloH6.h
@@ -12,10 +12,9 @@
 //#                                                    #
 //######################################################
 
-#ifndef CBNT_CALOH6_H
-#define CBNT_CALOH6_H
+#ifndef TBREC_CBNT_CALOH6_H
+#define TBREC_CBNT_CALOH6_H
 
-#include "GaudiKernel/NTuple.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "CBNT_TBRecBase.h"
 
diff --git a/TestBeam/TBRec/src/CBNT_TBRecBase.cxx b/TestBeam/TBRec/src/CBNT_TBRecBase.cxx
index b2fd2501c5baf937c4e0b06cc33b4e7c64c68bd2..a78ea073161913655c40412b3f9bc255ca9f196a 100644
--- a/TestBeam/TBRec/src/CBNT_TBRecBase.cxx
+++ b/TestBeam/TBRec/src/CBNT_TBRecBase.cxx
@@ -2,10 +2,11 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TBRec/CBNT_TBRecBase.h"
+#include "CBNT_TBRecBase.h"
 
 #include "LArIdentifier/LArOnlineID.h"
 #include "CaloIdentifier/CaloIdManager.h"
+#include "GaudiKernel/ITHistSvc.h"
 
 
 CBNT_TBRecBase::CBNT_TBRecBase(const std::string& name, ISvcLocator* pSvcLocator): 
diff --git a/TestBeam/TBRec/TBRec/CBNT_TBRecBase.h b/TestBeam/TBRec/src/CBNT_TBRecBase.h
similarity index 94%
rename from TestBeam/TBRec/TBRec/CBNT_TBRecBase.h
rename to TestBeam/TBRec/src/CBNT_TBRecBase.h
index e8c2e2fcfc9e6e743ed196e7a650d9384c6d09e9..4cf7ba0c65a490d460610a65f7380139b0337d1c 100644
--- a/TestBeam/TBRec/TBRec/CBNT_TBRecBase.h
+++ b/TestBeam/TBRec/src/CBNT_TBRecBase.h
@@ -3,12 +3,10 @@
 */
 
 //Dear emacs, this is -*-c++-*-
-#ifndef CBNT_TBRECBASE_H
-#define CBNT_TBRECBASE_H
+#ifndef TBREC_CBNT_TBRECBASE_H
+#define TBREC_CBNT_TBRECBASE_H
 
 #include "AthenaBaseComps/AthAlgorithm.h"
-//#include "GaudiKernel/NTuple.h"
-#include "GaudiKernel/ITHistSvc.h"
 #include "GaudiKernel/ToolHandle.h"
 
 #include "LArCabling/LArCablingService.h"
diff --git a/TestBeam/TBRec/src/CBNT_Timing.cxx b/TestBeam/TBRec/src/CBNT_Timing.cxx
old mode 100755
new mode 100644
index 52480759fefd47002e54bc38272bbfffe411b5ff..9136e9c703eb2f9fb1e0cfc19cd1f720e3272add
--- a/TestBeam/TBRec/src/CBNT_Timing.cxx
+++ b/TestBeam/TBRec/src/CBNT_Timing.cxx
@@ -2,11 +2,9 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TBRec/CBNT_Timing.h"
+#include "CBNT_Timing.h"
 
 #include "CLHEP/Units/SystemOfUnits.h"
-#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/NTuple.h"
 
 #include "CaloEvent/CaloCell.h"
 #include "CaloEvent/CaloCellContainer.h"
diff --git a/TestBeam/TBRec/TBRec/CBNT_Timing.h b/TestBeam/TBRec/src/CBNT_Timing.h
old mode 100755
new mode 100644
similarity index 96%
rename from TestBeam/TBRec/TBRec/CBNT_Timing.h
rename to TestBeam/TBRec/src/CBNT_Timing.h
index 1cae276e107e89f92c3d97527fcc3da9e8e87c55..5ac2a4d31b2e218b7ce73c574ac83fcbba24cfbb
--- a/TestBeam/TBRec/TBRec/CBNT_Timing.h
+++ b/TestBeam/TBRec/src/CBNT_Timing.h
@@ -2,10 +2,9 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef CBNT_TIMING_H
-#define CBNT_TIMING_H
+#ifndef TBREC_CBNT_TIMING_H
+#define TBREC_CBNT_TIMING_H
 
-#include "GaudiKernel/NTuple.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "CBNT_TBRecBase.h"
 #include "CaloGeoHelpers/CaloSampling.h"
diff --git a/TestBeam/TBRec/src/CBNT_UpstreamMat.cxx b/TestBeam/TBRec/src/CBNT_UpstreamMat.cxx
old mode 100755
new mode 100644
index 12249dd71fc54085a4bbe2ff0dcf82ca1db19782..d0539d0fee9a03799a43ec74850b3e4ff081575f
--- a/TestBeam/TBRec/src/CBNT_UpstreamMat.cxx
+++ b/TestBeam/TBRec/src/CBNT_UpstreamMat.cxx
@@ -2,9 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TBRec/CBNT_UpstreamMat.h"
+#include "CBNT_UpstreamMat.h"
 
-#include "StoreGate/StoreGate.h"
 #include "StoreGate/StoreGateSvc.h"
 
 #include "GaudiKernel/MsgStream.h"
diff --git a/TestBeam/TBRec/TBRec/CBNT_UpstreamMat.h b/TestBeam/TBRec/src/CBNT_UpstreamMat.h
old mode 100755
new mode 100644
similarity index 89%
rename from TestBeam/TBRec/TBRec/CBNT_UpstreamMat.h
rename to TestBeam/TBRec/src/CBNT_UpstreamMat.h
index b1d901ce41bc29494771af2da99ae4bf156ac9de..74eba111a8ff4ca94685d9ec73394842fa1993f2
--- a/TestBeam/TBRec/TBRec/CBNT_UpstreamMat.h
+++ b/TestBeam/TBRec/src/CBNT_UpstreamMat.h
@@ -2,11 +2,10 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef CBNT_UPSTREAMMAT_H
-#define CBNT_UPSTREAMMAT_H
+#ifndef TBREC_CBNT_UPSTREAMMAT_H
+#define TBREC_CBNT_UPSTREAMMAT_H
 
 #include "CBNT_TBRecBase.h"
-#include "GaudiKernel/NTuple.h"
 #include <string>
 
 class StoreGateSvc;
diff --git a/TestBeam/TBRec/src/ImpactInCalo.cxx b/TestBeam/TBRec/src/ImpactInCalo.cxx
old mode 100755
new mode 100644
index bab95c27e9239e2a281f60081207dc039d50dd0c..03019859034d309f15c1b2b8bf228788de59f8ad
--- a/TestBeam/TBRec/src/ImpactInCalo.cxx
+++ b/TestBeam/TBRec/src/ImpactInCalo.cxx
@@ -3,7 +3,7 @@
 */
 
 
-#include "TBRec/ImpactInCalo.h"
+#include "ImpactInCalo.h"
 #include <iostream>
 
 
diff --git a/TestBeam/TBRec/TBRec/ImpactInCalo.h b/TestBeam/TBRec/src/ImpactInCalo.h
old mode 100755
new mode 100644
similarity index 98%
rename from TestBeam/TBRec/TBRec/ImpactInCalo.h
rename to TestBeam/TBRec/src/ImpactInCalo.h
index 8a31996edf30736581835f2ed1badff04cb5773a..785ceb29310ba71047f021dd7a9558bb95d55c15
--- a/TestBeam/TBRec/TBRec/ImpactInCalo.h
+++ b/TestBeam/TBRec/src/ImpactInCalo.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef IMPACTINCALO_H
-#define IMPACTINCALO_H
+#ifndef TBREC_IMPACTINCALO_H
+#define TBREC_IMPACTINCALO_H
 /*************************************************************************
 	Package:
 	File: ImpactInCalo.h
diff --git a/TestBeam/TBRec/src/ImpactInCaloCollection.cxx b/TestBeam/TBRec/src/ImpactInCaloCollection.cxx
old mode 100755
new mode 100644
index 0f576382677747524c063618d6ee10b54c17837a..89fd871012496f7437717088f309811737ae312c
--- a/TestBeam/TBRec/src/ImpactInCaloCollection.cxx
+++ b/TestBeam/TBRec/src/ImpactInCaloCollection.cxx
@@ -3,8 +3,8 @@
 */
 
 
-#include "TBRec/ImpactInCaloCollection.h"
-#include "TBRec/ImpactInCalo.h"
+#include "ImpactInCaloCollection.h"
+#include "ImpactInCalo.h"
 
 void ImpactInCaloCollection::print() const{
 	ImpactInCaloCollection::const_iterator iter;
diff --git a/TestBeam/TBRec/TBRec/ImpactInCaloCollection.h b/TestBeam/TBRec/src/ImpactInCaloCollection.h
old mode 100755
new mode 100644
similarity index 80%
rename from TestBeam/TBRec/TBRec/ImpactInCaloCollection.h
rename to TestBeam/TBRec/src/ImpactInCaloCollection.h
index db872843c3c4cead73e7abe5ea7229da6483388e..5f4317b4396b011b37c18e330f7e07cb1395b9de
--- a/TestBeam/TBRec/TBRec/ImpactInCaloCollection.h
+++ b/TestBeam/TBRec/src/ImpactInCaloCollection.h
@@ -2,12 +2,12 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef IMPACTINCALOCOLLECTION_H
-#define IMPACTINCALOCOLLECTION_H
+#ifndef TBREC_IMPACTINCALOCOLLECTION_H
+#define TBREC_IMPACTINCALOCOLLECTION_H
 
 #include "AthContainers/DataVector.h"
 #include "AthenaKernel/CLASS_DEF.h"
-#include "TBRec/ImpactInCalo.h"
+#include "ImpactInCalo.h"
 
 //class ImpactInCalo;
 class ImpactInCaloCollection : public DataVector<ImpactInCalo> {
diff --git a/TestBeam/TBRec/src/TBAlgoSequencer.cxx b/TestBeam/TBRec/src/TBAlgoSequencer.cxx
old mode 100755
new mode 100644
index e446f1ea79aea8bd56ce220c69e7e9240022537d..f10becf0d506dece97304217cb0f12bff0fa2c8e
--- a/TestBeam/TBRec/src/TBAlgoSequencer.cxx
+++ b/TestBeam/TBRec/src/TBAlgoSequencer.cxx
@@ -3,14 +3,9 @@
 */
 
 
-#include "StoreGate/StoreGateSvc.h"
-
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "TBAlgoSequencer.h"
 #include "GaudiKernel/ListItem.h"
 
-#include "TBRec/TBAlgoSequencer.h"
-
 #include <string>
 #include <map>
 #include <iostream>
diff --git a/TestBeam/TBRec/TBRec/TBAlgoSequencer.h b/TestBeam/TBRec/src/TBAlgoSequencer.h
old mode 100755
new mode 100644
similarity index 100%
rename from TestBeam/TBRec/TBRec/TBAlgoSequencer.h
rename to TestBeam/TBRec/src/TBAlgoSequencer.h
diff --git a/TestBeam/TBRec/src/TBBPCRec.cxx b/TestBeam/TBRec/src/TBBPCRec.cxx
old mode 100755
new mode 100644
index 0afe4bd65ffb6f08db4cda9f4f87686cd61a123f..2d56d0015f4d972ddd1e4f6318f7cfb426341622
--- a/TestBeam/TBRec/src/TBBPCRec.cxx
+++ b/TestBeam/TBRec/src/TBBPCRec.cxx
@@ -3,9 +3,7 @@
 */
 
 
-#include "StoreGate/StoreGateSvc.h"
-
-#include "GaudiKernel/Property.h"
+#include "TBBPCRec.h"
 
 #include "PathResolver/PathResolver.h"
 
@@ -16,8 +14,6 @@
 #include <fstream>
 #include <math.h>
 
-#include "TBRec/TBBPCRec.h"
-
 // static const AlgFactory<TBBPCRec> s_factory;
 // const IAlgFactory& TBBPCRecFactory = s_factory;
 
diff --git a/TestBeam/TBRec/TBRec/TBBPCRec.h b/TestBeam/TBRec/src/TBBPCRec.h
old mode 100755
new mode 100644
similarity index 97%
rename from TestBeam/TBRec/TBRec/TBBPCRec.h
rename to TestBeam/TBRec/src/TBBPCRec.h
index 917f1ab88b7965ab366b2f52d69e9f3c89357442..76d12acd6643cbc1da61356b5411ade78ec951a5
--- a/TestBeam/TBRec/TBRec/TBBPCRec.h
+++ b/TestBeam/TBRec/src/TBBPCRec.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef TBREC_TBBPCREC
-#define TBREC_TBBPCREC
+#ifndef TBREC_TBBPCREC_H
+#define TBREC_TBBPCREC_H
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
 // This algorithm controls event flow and reconstruction and monitoring      //
diff --git a/TestBeam/TBRec/src/TBBeamQuality.cxx b/TestBeam/TBRec/src/TBBeamQuality.cxx
old mode 100755
new mode 100644
index 8ae8c9ee36ad62dd462ccf60d6b45122134ee246..e3f49973828e8b4e1d0c67e4386e42bba71d7fd1
--- a/TestBeam/TBRec/src/TBBeamQuality.cxx
+++ b/TestBeam/TBRec/src/TBBeamQuality.cxx
@@ -13,18 +13,10 @@
 //#####################################################
                                  
 
-#include "GaudiKernel/Algorithm.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
-#include "GaudiKernel/ListItem.h"
-
-#include "StoreGate/StoreGate.h"
-#include "StoreGate/StoreGateSvc.h"
+#include "TBBeamQuality.h"
+#include "TBBeamQualityTool.h"
 #include "TBEvent/TBEventInfo.h"
 
-#include "TBRec/TBBeamQualityTool.h"
-#include "TBRec/TBBeamQuality.h"
-
 
 TBBeamQuality::TBBeamQuality(const std::string& name,  
 			     ISvcLocator* pService)
diff --git a/TestBeam/TBRec/TBRec/TBBeamQuality.h b/TestBeam/TBRec/src/TBBeamQuality.h
old mode 100755
new mode 100644
similarity index 100%
rename from TestBeam/TBRec/TBRec/TBBeamQuality.h
rename to TestBeam/TBRec/src/TBBeamQuality.h
diff --git a/TestBeam/TBRec/src/TBBeamQualityDoubleHitsTool.cxx b/TestBeam/TBRec/src/TBBeamQualityDoubleHitsTool.cxx
old mode 100755
new mode 100644
index ab71de0924b84534fe72a6c879847552b990b315..ece802cfa872e24a683c0aa5cb4c7106b839a661
--- a/TestBeam/TBRec/src/TBBeamQualityDoubleHitsTool.cxx
+++ b/TestBeam/TBRec/src/TBBeamQualityDoubleHitsTool.cxx
@@ -13,16 +13,10 @@
 //#####################################################
 
 
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/AlgTool.h"
-
-#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/Property.h"
+#include "TBBeamQualityDoubleHitsTool.h"
 
 #include "TBEvent/TBScintillatorCont.h"
 #include "TBEvent/TBScintillator.h"
-#include "TBRec/TBBeamQualityDoubleHitsTool.h"
 
 #include <string>
 #include <ios>
diff --git a/TestBeam/TBRec/TBRec/TBBeamQualityDoubleHitsTool.h b/TestBeam/TBRec/src/TBBeamQualityDoubleHitsTool.h
old mode 100755
new mode 100644
similarity index 91%
rename from TestBeam/TBRec/TBRec/TBBeamQualityDoubleHitsTool.h
rename to TestBeam/TBRec/src/TBBeamQualityDoubleHitsTool.h
index e8edf152d21e26cd67a0eb87b46f493f59367fbb..b5a4492356a1276bca97801fb848c9f96f8dd3a0
--- a/TestBeam/TBRec/TBRec/TBBeamQualityDoubleHitsTool.h
+++ b/TestBeam/TBRec/src/TBBeamQualityDoubleHitsTool.h
@@ -12,10 +12,10 @@
 //# Last Modified: Feb 7/2005                         #
 //#####################################################
 
-#ifndef TBBEAMQUALITYDOUBLEHITSTOOL_H
-#define TBBEAMQUALITYDOUBLEHITSTOOL_H
+#ifndef TBREC_TBBEAMQUALITYDOUBLEHITSTOOL_H
+#define TBREC_TBBEAMQUALITYDOUBLEHITSTOOL_H
 
-#include "TBRec/TBBeamQualityTool.h"
+#include "TBBeamQualityTool.h"
 
 #include <string>
 #include <vector>
diff --git a/TestBeam/TBRec/src/TBBeamQualityEMFractionTool.cxx b/TestBeam/TBRec/src/TBBeamQualityEMFractionTool.cxx
old mode 100755
new mode 100644
index bbca3303ce25008adf6cfa4356adede13ab166c5..88d4fb110275e7bffd8aabaac356b5de0cfbf104
--- a/TestBeam/TBRec/src/TBBeamQualityEMFractionTool.cxx
+++ b/TestBeam/TBRec/src/TBBeamQualityEMFractionTool.cxx
@@ -12,23 +12,12 @@
 //#                                                   #
 //#####################################################
 
-#include "TBRec/TBBeamQualityEMFractionTool.h"
-
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/AlgTool.h"
-
-#include "GaudiKernel/ListItem.h"
-#include "GaudiKernel/Property.h"
-
-#include "StoreGate/StoreGate.h"
-#include "StoreGate/StoreGateSvc.h" 
+#include "TBBeamQualityEMFractionTool.h"
 
 #include "CaloIdentifier/CaloCell_ID.h"
 #include "CaloEvent/CaloCellContainer.h"
 
 #include "Identifier/Identifier.h"
-#include <list>
 
 TBBeamQualityEMFractionTool::TBBeamQualityEMFractionTool(const std::string& name,
 							 const std::string& type,
diff --git a/TestBeam/TBRec/TBRec/TBBeamQualityEMFractionTool.h b/TestBeam/TBRec/src/TBBeamQualityEMFractionTool.h
old mode 100755
new mode 100644
similarity index 97%
rename from TestBeam/TBRec/TBRec/TBBeamQualityEMFractionTool.h
rename to TestBeam/TBRec/src/TBBeamQualityEMFractionTool.h
index a6cd7cddf2df004062071df4ae66cd76e0860df3..27c67b0191e661cf880c2e8c41f5500128831f31
--- a/TestBeam/TBRec/TBRec/TBBeamQualityEMFractionTool.h
+++ b/TestBeam/TBRec/src/TBBeamQualityEMFractionTool.h
@@ -15,7 +15,7 @@
 #ifndef TBBEAMQUALITYEMFRACTIONTOOL_H
 #define TBBEAMQUALITYEMFRACTIONTOOL_H
 
-#include "TBRec/TBBeamQualityTool.h"
+#include "TBBeamQualityTool.h"
 
 //#include "LArDetDescr/LArDetDescrManager.h"
 
diff --git a/TestBeam/TBRec/src/TBBeamQualityMC.cxx b/TestBeam/TBRec/src/TBBeamQualityMC.cxx
index 52479b4c2508ccf2c49d26125afe4c5769f160a1..e6aa098e864fbdbe408cced90b3a32bb3c778af2 100644
--- a/TestBeam/TBRec/src/TBBeamQualityMC.cxx
+++ b/TestBeam/TBRec/src/TBBeamQualityMC.cxx
@@ -2,17 +2,16 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TBRec/TBBeamQualityMC.h"
-#include "StoreGate/StoreGateSvc.h"
+#include "TBBeamQualityMC.h"
 
 #include "TBEvent/TBEventInfo.h"
 #include "TBEvent/TBTrack.h"
 #include "LArG4TBSimEvent/LArG4H6FrontHitCollection.h"
 #include "CaloEvent/CaloClusterContainer.h"
+#include "PathResolver/PathResolver.h"
 #include <fstream>
 #include <string>
 #include <math.h>
-#include "PathResolver/PathResolver.h"
 
 
 TBBeamQualityMC::TBBeamQualityMC(const std::string & name, ISvcLocator * pSvcLocator) :
diff --git a/TestBeam/TBRec/TBRec/TBBeamQualityMC.h b/TestBeam/TBRec/src/TBBeamQualityMC.h
old mode 100755
new mode 100644
similarity index 92%
rename from TestBeam/TBRec/TBRec/TBBeamQualityMC.h
rename to TestBeam/TBRec/src/TBBeamQualityMC.h
index 1caea4f57a7e0701a927f1c79a3797061f79c3fb..3b5ff9278c61f5c445c1bf6846beff28c54f4fba
--- a/TestBeam/TBRec/TBRec/TBBeamQualityMC.h
+++ b/TestBeam/TBRec/src/TBBeamQualityMC.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef TBBEAMQUALITYMC_H
-#define TBBEAMQUALITYMC_H
+#ifndef TBREC_TBBEAMQUALITYMC_H
+#define TBREC_TBBEAMQUALITYMC_H
 
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include <vector>
diff --git a/TestBeam/TBRec/src/TBBeamQualityMuonToolH6.cxx b/TestBeam/TBRec/src/TBBeamQualityMuonToolH6.cxx
old mode 100755
new mode 100644
index cabca65d2cdeaacda5b9b5c5e3625eb2673e61ff..1516c5b3f62fdc58ab7cabccfb3a596741bcc1c7
--- a/TestBeam/TBRec/src/TBBeamQualityMuonToolH6.cxx
+++ b/TestBeam/TBRec/src/TBBeamQualityMuonToolH6.cxx
@@ -12,17 +12,11 @@
 //# Last Modofied: Nov 18/2004                        #
 //##################################################### 
 
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/AlgTool.h"
-
-#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/Property.h"
+#include "TBBeamQualityMuonToolH6.h"
 
 // TRIGGERS
 #include "TBEvent/TBTriggerPatternUnit.h"
 
-#include "TBRec/TBBeamQualityMuonToolH6.h"
 
 #include <string>
 #include <ios>
diff --git a/TestBeam/TBRec/TBRec/TBBeamQualityMuonToolH6.h b/TestBeam/TBRec/src/TBBeamQualityMuonToolH6.h
old mode 100755
new mode 100644
similarity index 91%
rename from TestBeam/TBRec/TBRec/TBBeamQualityMuonToolH6.h
rename to TestBeam/TBRec/src/TBBeamQualityMuonToolH6.h
index 577a6c80238292a2beaf424b9d5eb82142c06f19..a85f39c2b49f86c3da97dae62919316af801d939
--- a/TestBeam/TBRec/TBRec/TBBeamQualityMuonToolH6.h
+++ b/TestBeam/TBRec/src/TBBeamQualityMuonToolH6.h
@@ -12,10 +12,10 @@
 //# Last Modified: Nov 18/2004                        #
 //##################################################### 
 
-#ifndef TBBEAMQUALITYMUONTOOLH6_H
-#define TBBEAMQUALITYMUONTOOLH6_H
+#ifndef TBREC_TBBEAMQUALITYMUONTOOLH6_H
+#define TBREC_TBBEAMQUALITYMUONTOOLH6_H
 
-#include "TBRec/TBBeamQualityTool.h"
+#include "TBBeamQualityTool.h"
 
 #include <string>
 #include <vector>
diff --git a/TestBeam/TBRec/src/TBBeamQualityTool.cxx b/TestBeam/TBRec/src/TBBeamQualityTool.cxx
old mode 100755
new mode 100644
index dceb40f4e1e92cdcdc1e7f156997a044c05d1fc4..d05f6e2af113f9ea779dca43bc8b2d5973c529d2
--- a/TestBeam/TBRec/src/TBBeamQualityTool.cxx
+++ b/TestBeam/TBRec/src/TBBeamQualityTool.cxx
@@ -13,12 +13,7 @@
 //#####################################################
 
 
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Service.h"
-
-#include "StoreGate/StoreGateSvc.h"
-
-#include "TBRec/TBBeamQualityTool.h"
+#include "TBBeamQualityTool.h"
 
 #include <string>
 #include <vector>
diff --git a/TestBeam/TBRec/TBRec/TBBeamQualityTool.h b/TestBeam/TBRec/src/TBBeamQualityTool.h
old mode 100755
new mode 100644
similarity index 94%
rename from TestBeam/TBRec/TBRec/TBBeamQualityTool.h
rename to TestBeam/TBRec/src/TBBeamQualityTool.h
index 6e57d18d2642f6004bcdd7b2e7bbf133ac748f5c..05c856c7a83731d13667bc8471df96bacd813296
--- a/TestBeam/TBRec/TBRec/TBBeamQualityTool.h
+++ b/TestBeam/TBRec/src/TBBeamQualityTool.h
@@ -12,8 +12,8 @@
 //# Last Modified: Nov 18/2004                        #
 //#####################################################
 
-#ifndef TBBEAMQUALITYTOOL_H
-#define TBBEAMQUALITYTOOL_H
+#ifndef TBREC_TBBEAMQUALITYTOOL_H
+#define TBREC_TBBEAMQUALITYTOOL_H
 
 #include "AthenaBaseComps/AthAlgTool.h"
 
diff --git a/TestBeam/TBRec/src/TBBeamQualityTrackingTool.cxx b/TestBeam/TBRec/src/TBBeamQualityTrackingTool.cxx
old mode 100755
new mode 100644
index d060cebbacd8432c0dc2469e9b7b49e80b4250df..2bd0968d5824120f5506dd9acbceb246dd95654f
--- a/TestBeam/TBRec/src/TBBeamQualityTrackingTool.cxx
+++ b/TestBeam/TBRec/src/TBBeamQualityTrackingTool.cxx
@@ -12,17 +12,9 @@
 //# Last Modified: Jun 30/2005                        #
 //##################################################### 
 
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/AlgTool.h"
-
-#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/Property.h"
-
+#include "TBBeamQualityTrackingTool.h"
 #include "TBEvent/TBTrack.h"
 
-#include "TBRec/TBBeamQualityTrackingTool.h"
-
 #include <string>
 #include <ios>
 #include <algorithm>
diff --git a/TestBeam/TBRec/TBRec/TBBeamQualityTrackingTool.h b/TestBeam/TBRec/src/TBBeamQualityTrackingTool.h
old mode 100755
new mode 100644
similarity index 91%
rename from TestBeam/TBRec/TBRec/TBBeamQualityTrackingTool.h
rename to TestBeam/TBRec/src/TBBeamQualityTrackingTool.h
index 0f2e80a93fa73605a9f0874c35493326626fbdd0..e3db4890befba13b3d95aff1400a0695b03409e6
--- a/TestBeam/TBRec/TBRec/TBBeamQualityTrackingTool.h
+++ b/TestBeam/TBRec/src/TBBeamQualityTrackingTool.h
@@ -12,10 +12,10 @@
 //# Last Modified: Jun 30/2005                        #
 //##################################################### 
 
-#ifndef TBBEAMQUALITYTRACKINGTOOL_H
-#define TBBEAMQUALITYTRACKINGTOOL_H
+#ifndef TBREC_TBBEAMQUALITYTRACKINGTOOL_H
+#define TBREC_TBBEAMQUALITYTRACKINGTOOL_H
 
-#include "TBRec/TBBeamQualityTool.h"
+#include "TBBeamQualityTool.h"
 
 #include <string>
 #include <vector>
diff --git a/TestBeam/TBRec/src/TBCellContainerFillerTool.cxx b/TestBeam/TBRec/src/TBCellContainerFillerTool.cxx
index 2686f895e1c9d091a70988f5f6add8cd4c588022..46cbfa08febfadc0ac4f7e71947cedd85d9c8a5d 100644
--- a/TestBeam/TBRec/src/TBCellContainerFillerTool.cxx
+++ b/TestBeam/TBRec/src/TBCellContainerFillerTool.cxx
@@ -2,14 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TBRec/TBCellContainerFillerTool.h"
-
-#include "GaudiKernel/Service.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
-#include "GaudiKernel/ListItem.h"
-
-#include "StoreGate/StoreGateSvc.h"
+#include "TBCellContainerFillerTool.h"
 
 #include "CaloEvent/CaloCellContainer.h"
 #include "CaloIdentifier/CaloCell_ID.h"
diff --git a/TestBeam/TBRec/TBRec/TBCellContainerFillerTool.h b/TestBeam/TBRec/src/TBCellContainerFillerTool.h
similarity index 92%
rename from TestBeam/TBRec/TBRec/TBCellContainerFillerTool.h
rename to TestBeam/TBRec/src/TBCellContainerFillerTool.h
index 1089b5c2c70bc44d1509958beedfabdbb74370e2..a9d19e210851ce3f263360b351568e81f417e95c 100644
--- a/TestBeam/TBRec/TBRec/TBCellContainerFillerTool.h
+++ b/TestBeam/TBRec/src/TBCellContainerFillerTool.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef CALOREC_TBCellContainerFillerTool_H
-#define CALOREC_TBCellContainerFillerTool_H
+#ifndef TBREC_TBCELLCONTAINERFILLERTOOL_H
+#define TBREC_TBCELLCONTAINERFILLERTOOL_H
 
 #include "AthenaBaseComps/AthAlgTool.h"
 //#include "CaloUtils/ICaloCellMakerTool.h"
diff --git a/TestBeam/TBRec/src/TBCellNoiseCorrection.cxx b/TestBeam/TBRec/src/TBCellNoiseCorrection.cxx
index 4d1ad9683f4342e8526b6b2ae54b7a18ab7c0b72..b0732dda36d26d89977183cbc8a9f58d632d4afd 100644
--- a/TestBeam/TBRec/src/TBCellNoiseCorrection.cxx
+++ b/TestBeam/TBRec/src/TBCellNoiseCorrection.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TBRec/TBCellNoiseCorrection.h"
+#include "TBCellNoiseCorrection.h"
 
 #include "CaloDetDescr/CaloDetDescrElement.h"
 #include "CaloEvent/CaloCell.h"
@@ -10,8 +10,6 @@
 
 #include "PathResolver/PathResolver.h"
 
-#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/Incident.h"
 #include "CLHEP/Random/RandFlat.h"
 
 #include <TFile.h>
diff --git a/TestBeam/TBRec/TBRec/TBCellNoiseCorrection.h b/TestBeam/TBRec/src/TBCellNoiseCorrection.h
similarity index 95%
rename from TestBeam/TBRec/TBRec/TBCellNoiseCorrection.h
rename to TestBeam/TBRec/src/TBCellNoiseCorrection.h
index 8c650eb427815c0aa1dcea76a01ac4002615f157..b5c053e1e9b4c07d0e452fdf19c998088b407c46 100644
--- a/TestBeam/TBRec/TBRec/TBCellNoiseCorrection.h
+++ b/TestBeam/TBRec/src/TBCellNoiseCorrection.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef TBREC_TBCellNoiseCorrection_H
-#define TBREC_TBCellNoiseCorrection_H
+#ifndef TBREC_TBCELLNOISECORRECTION_H
+#define TBREC_TBCELLNOISECORRECTION_H
 /********************************************************************
 NAME:     TBCellNoiseCorrection.cxx
 PACKAGE:  offline/TestBeam/TBRec
diff --git a/TestBeam/TBRec/src/TBClusterMaker.cxx b/TestBeam/TBRec/src/TBClusterMaker.cxx
index 61927bfa32c4dbec685d3b621468726542cbbf84..68150d4599047bdf67ad4a8d277c115afc840ee0 100644
--- a/TestBeam/TBRec/src/TBClusterMaker.cxx
+++ b/TestBeam/TBRec/src/TBClusterMaker.cxx
@@ -2,14 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-// Gaudi
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/ListItem.h"
+#include "TBClusterMaker.h"
 
-#include "StoreGate/StoreGateSvc.h" 
 #include "CLHEP/Units/SystemOfUnits.h"
 #include "CaloDetDescr/CaloDetDescrManager.h"
 #include "CaloGeoHelpers/CaloPhiRange.h"
@@ -24,8 +18,7 @@
 #include "xAODCaloEvent/CaloClusterKineHelper.h"
 #include "CaloGeoHelpers/proxim.h"
 #include "CaloUtils/CaloClusterStoreHelper.h"
-
-#include "TBRec/TBClusterMaker.h"
+#include "GaudiKernel/ListItem.h"
 
 //#############################################################################
 
diff --git a/TestBeam/TBRec/TBRec/TBClusterMaker.h b/TestBeam/TBRec/src/TBClusterMaker.h
similarity index 98%
rename from TestBeam/TBRec/TBRec/TBClusterMaker.h
rename to TestBeam/TBRec/src/TBClusterMaker.h
index 24d42760d1fef0d45a8b9221946ac2a8d9edde86..324934822271451a7cbd1cb15bb3e2e7c790f0b4 100644
--- a/TestBeam/TBRec/TBRec/TBClusterMaker.h
+++ b/TestBeam/TBRec/src/TBClusterMaker.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef TBCLUSTERMAKER_H
-#define TBCLUSTERMAKER_H
+#ifndef TBREC_TBCLUSTERMAKER_H
+#define TBREC_TBCLUSTERMAKER_H
 /**
  * @class TBClusterMaker
  * @version \$Id: TBClusterMaker.h,v 1.2 2009-04-17 09:51:30 pavol Exp $
diff --git a/TestBeam/TBRec/src/TBDMContainerSplitter.cxx b/TestBeam/TBRec/src/TBDMContainerSplitter.cxx
index 488c26f6b073ad2f9a36f5ab58d37d707748fc43..efc9fe09836ec203d217340f35f200bca6d9df35 100644
--- a/TestBeam/TBRec/src/TBDMContainerSplitter.cxx
+++ b/TestBeam/TBRec/src/TBDMContainerSplitter.cxx
@@ -2,17 +2,11 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/ListItem.h"
+#include "TBDMContainerSplitter.h"
 
-#include "StoreGate/StoreGateSvc.h"
 #include "CaloDmDetDescr/CaloDmDescrManager.h"
 #include "CaloSimEvent/CaloCalibrationHitContainer.h"
 
-#include "TBRec/TBDMContainerSplitter.h"
-
 TBDMContainerSplitter::TBDMContainerSplitter(const std::string& name, 
 				   ISvcLocator* pSvcLocator) : 
   AthAlgorithm(name, pSvcLocator),
diff --git a/TestBeam/TBRec/TBRec/TBDMContainerSplitter.h b/TestBeam/TBRec/src/TBDMContainerSplitter.h
similarity index 92%
rename from TestBeam/TBRec/TBRec/TBDMContainerSplitter.h
rename to TestBeam/TBRec/src/TBDMContainerSplitter.h
index 43ebdf455f19c788b01ab78fe120c49fd6f15f70..eaaa0562ba0ae7b90447de80cb3525eaa0d273d6 100644
--- a/TestBeam/TBRec/TBRec/TBDMContainerSplitter.h
+++ b/TestBeam/TBRec/src/TBDMContainerSplitter.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef TBDMCONTAINERSPLITTER
-#define TBDMCONTAINERSPLITTER
+#ifndef TBREC_TBDMCONTAINERSPLITTER_H
+#define TBREC_TBDMCONTAINERSPLITTER_H
 
 // 
 // class TBDMContainerSplitter 
diff --git a/TestBeam/TBRec/src/TBECLArRawChannelBuilder.cxx b/TestBeam/TBRec/src/TBECLArRawChannelBuilder.cxx
index 0d1048456770b7ca3b8da50e756a9fdf762eee47..c5a1cf2a50b668aadd7238dbd4ca3caa6fdea2ef 100644
--- a/TestBeam/TBRec/src/TBECLArRawChannelBuilder.cxx
+++ b/TestBeam/TBRec/src/TBECLArRawChannelBuilder.cxx
@@ -2,8 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TBRec/TBECLArRawChannelBuilder.h"
-#include "StoreGate/StoreGateSvc.h"
+#include "TBECLArRawChannelBuilder.h"
 #include "CaloDetDescr/CaloDetDescrManager.h"
 #include "CaloIdentifier/CaloCell_ID.h"
 
diff --git a/TestBeam/TBRec/TBRec/TBECLArRawChannelBuilder.h b/TestBeam/TBRec/src/TBECLArRawChannelBuilder.h
similarity index 97%
rename from TestBeam/TBRec/TBRec/TBECLArRawChannelBuilder.h
rename to TestBeam/TBRec/src/TBECLArRawChannelBuilder.h
index b2313b2ceffc855b299429209d7318ae7bc736b2..348042fe0d2238bf9e94734ddce5fe2f70ad731c 100644
--- a/TestBeam/TBRec/TBRec/TBECLArRawChannelBuilder.h
+++ b/TestBeam/TBRec/src/TBECLArRawChannelBuilder.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef TBECLARRAWCHANNELBUILDER
-#define TBECLARRAWCHANNELBUILDER
+#ifndef TBREC_TBECLARRAWCHANNELBUILDER_H
+#define TBREC_TBECLARRAWCHANNELBUILDER_H
 
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "GaudiKernel/ToolHandle.h"
diff --git a/TestBeam/TBRec/src/TBEMECCellEtaCorrection.cxx b/TestBeam/TBRec/src/TBEMECCellEtaCorrection.cxx
index ffe7d59341207526f455b2d5bb029de752cd154f..eaeab8c89ae012bee1dfdf4475d0fab886c2ae87 100644
--- a/TestBeam/TBRec/src/TBEMECCellEtaCorrection.cxx
+++ b/TestBeam/TBRec/src/TBEMECCellEtaCorrection.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TBRec/TBEMECCellEtaCorrection.h"
+#include "TBEMECCellEtaCorrection.h"
 
 // INCLUDE LAr header files:
 
diff --git a/TestBeam/TBRec/TBRec/TBEMECCellEtaCorrection.h b/TestBeam/TBRec/src/TBEMECCellEtaCorrection.h
similarity index 100%
rename from TestBeam/TBRec/TBRec/TBEMECCellEtaCorrection.h
rename to TestBeam/TBRec/src/TBEMECCellEtaCorrection.h
diff --git a/TestBeam/TBRec/src/TBEMECXTalkToyModel.cxx b/TestBeam/TBRec/src/TBEMECXTalkToyModel.cxx
old mode 100755
new mode 100644
index 7c06f6e901ed89a6922cca579781c337263771e7..59ea1221a4bd2bcadb877058ecb7149b10eba95a
--- a/TestBeam/TBRec/src/TBEMECXTalkToyModel.cxx
+++ b/TestBeam/TBRec/src/TBEMECXTalkToyModel.cxx
@@ -16,10 +16,7 @@ PURPOSE:  A simple toy model to simulate longitudinal cross-talk
 
 ********************************************************************/
 
-#include "TBRec/TBEMECXTalkToyModel.h"
-
-#include "StoreGate/StoreGateSvc.h"
-
+#include "TBEMECXTalkToyModel.h"
 
 #include "CaloEvent/CaloCellContainer.h"
 #include "CaloEvent/CaloCell.h"
diff --git a/TestBeam/TBRec/TBRec/TBEMECXTalkToyModel.h b/TestBeam/TBRec/src/TBEMECXTalkToyModel.h
old mode 100755
new mode 100644
similarity index 94%
rename from TestBeam/TBRec/TBRec/TBEMECXTalkToyModel.h
rename to TestBeam/TBRec/src/TBEMECXTalkToyModel.h
index f4713b0031bb7cf83ff8c5a1bd4eb8d3b9de7bb4..18252de837f647f162b108ac69c82736a4682e36
--- a/TestBeam/TBRec/TBRec/TBEMECXTalkToyModel.h
+++ b/TestBeam/TBRec/src/TBEMECXTalkToyModel.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef CALOREC_TBEMECXTALKTOYMODEL_H
-#define CALOREC_TBEMECXTALKTOYMODEL_H
+#ifndef TBREC_TBEMECXTALKTOYMODEL_H
+#define TBREC_TBEMECXTALKTOYMODEL_H
 
 class StoreGateSvc; 
 #include "AthenaBaseComps/AthAlgTool.h"
diff --git a/TestBeam/TBRec/src/TBEventInfoStreamerTool.cxx b/TestBeam/TBRec/src/TBEventInfoStreamerTool.cxx
old mode 100755
new mode 100644
index 86c38d2b4abbb15bb608ba9e300609761a51b329..7476e2799fe80f9a50103a22f60a2bbd302dd42c
--- a/TestBeam/TBRec/src/TBEventInfoStreamerTool.cxx
+++ b/TestBeam/TBRec/src/TBEventInfoStreamerTool.cxx
@@ -2,12 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Service.h"
-
-#include "StoreGate/StoreGateSvc.h"
-
-#include "TBRec/TBEventInfoStreamerTool.h"
+#include "TBEventInfoStreamerTool.h"
 #include "TBEvent/TBEventInfo.h"
 
 #include <string>
diff --git a/TestBeam/TBRec/TBRec/TBEventInfoStreamerTool.h b/TestBeam/TBRec/src/TBEventInfoStreamerTool.h
old mode 100755
new mode 100644
similarity index 94%
rename from TestBeam/TBRec/TBRec/TBEventInfoStreamerTool.h
rename to TestBeam/TBRec/src/TBEventInfoStreamerTool.h
index 0c5c8c820b932b2f4279ad04f0b8b440ee414fab..22a5590edd1a3ecd15a24ac7d3657024440997e1
--- a/TestBeam/TBRec/TBRec/TBEventInfoStreamerTool.h
+++ b/TestBeam/TBRec/src/TBEventInfoStreamerTool.h
@@ -5,7 +5,7 @@
 #ifndef TBREC_TBEVENTINFOSTREAMERTOOL_H
 #define TBREC_TBEVENTINFOSTREAMERTOOL_H
 
-#include "TBRec/TBEventStreamerTool.h"
+#include "TBEventStreamerTool.h"
 
 #include <string>
 #include <vector>
diff --git a/TestBeam/TBRec/src/TBEventStreamer.cxx b/TestBeam/TBRec/src/TBEventStreamer.cxx
old mode 100755
new mode 100644
index 5ae7572bb38679481e30a92cc34abbac43c0357d..e2c7c22986e2504a322d1e4eceb90bf667ac1851
--- a/TestBeam/TBRec/src/TBEventStreamer.cxx
+++ b/TestBeam/TBRec/src/TBEventStreamer.cxx
@@ -3,14 +3,8 @@
 */
 
 
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
-#include "GaudiKernel/ListItem.h"
-
-#include "StoreGate/StoreGateSvc.h"
-
-#include "TBRec/TBEventStreamerTool.h"
-#include "TBRec/TBEventStreamer.h"
+#include "TBEventStreamerTool.h"
+#include "TBEventStreamer.h"
 
 TBEventStreamer::TBEventStreamer(const std::string& name,
 				 ISvcLocator* pService)
diff --git a/TestBeam/TBRec/TBRec/TBEventStreamer.h b/TestBeam/TBRec/src/TBEventStreamer.h
old mode 100755
new mode 100644
similarity index 100%
rename from TestBeam/TBRec/TBRec/TBEventStreamer.h
rename to TestBeam/TBRec/src/TBEventStreamer.h
diff --git a/TestBeam/TBRec/src/TBEventStreamerTool.cxx b/TestBeam/TBRec/src/TBEventStreamerTool.cxx
old mode 100755
new mode 100644
index c41587ca26943f304085dbe8f5898185682cd4d0..026db78245461d049173cc50d1197f041853e300
--- a/TestBeam/TBRec/src/TBEventStreamerTool.cxx
+++ b/TestBeam/TBRec/src/TBEventStreamerTool.cxx
@@ -2,13 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Service.h"
-
-#include "StoreGate/StoreGateSvc.h"
-
-#include "TBRec/TBEventStreamerTool.h"
-
+#include "TBEventStreamerTool.h"
 #include <string>
 
 TBEventStreamerTool::TBEventStreamerTool(const std::string& name,
diff --git a/TestBeam/TBRec/TBRec/TBEventStreamerTool.h b/TestBeam/TBRec/src/TBEventStreamerTool.h
old mode 100755
new mode 100644
similarity index 100%
rename from TestBeam/TBRec/TBRec/TBEventStreamerTool.h
rename to TestBeam/TBRec/src/TBEventStreamerTool.h
diff --git a/TestBeam/TBRec/src/TBExtrapolTrackToCaloTool.cxx b/TestBeam/TBRec/src/TBExtrapolTrackToCaloTool.cxx
old mode 100755
new mode 100644
index bec48ed2bbe19b4ddfda2dbc7530e96e5412f2a4..b8085890e1afe019634a0515f2fa4f3e627088d1
--- a/TestBeam/TBRec/src/TBExtrapolTrackToCaloTool.cxx
+++ b/TestBeam/TBRec/src/TBExtrapolTrackToCaloTool.cxx
@@ -8,10 +8,7 @@
 //
 //****************************************************************************
 
-#include "TBRec/TBExtrapolTrackToCaloTool.h"
-
-#include "GaudiKernel/Property.h"
-
+#include "TBExtrapolTrackToCaloTool.h"
 #include <vector>
 
 // Stuff needed for the extrapolation :
diff --git a/TestBeam/TBRec/TBRec/TBExtrapolTrackToCaloTool.h b/TestBeam/TBRec/src/TBExtrapolTrackToCaloTool.h
old mode 100755
new mode 100644
similarity index 99%
rename from TestBeam/TBRec/TBRec/TBExtrapolTrackToCaloTool.h
rename to TestBeam/TBRec/src/TBExtrapolTrackToCaloTool.h
index 7e09da8c5c382b2be9f37a95a96c767b89c44256..6da14524e866a8a6a7a45904153ab4934591d140
--- a/TestBeam/TBRec/TBRec/TBExtrapolTrackToCaloTool.h
+++ b/TestBeam/TBRec/src/TBExtrapolTrackToCaloTool.h
@@ -10,8 +10,8 @@
 //
 // ***************************************************************************
 
-#ifndef TRACKTOCALO_TBEXTRAPOLTRACKTOCALO_H
-#define TRACKTOCALO_TBEXTRAPOLTRACKTOCALO_H
+#ifndef TBREC_TBEXTRAPOLTRACKTOCALO_H
+#define TBREC_TBEXTRAPOLTRACKTOCALO_H
 
 //#include "ITrackToCalo/IExtrapolTrackToCaloTool.h"
 //#include "RecoToolInterfaces/IExtrapolateToCaloTool.h"
diff --git a/TestBeam/TBRec/src/TBLArRawChannelBuilder.cxx b/TestBeam/TBRec/src/TBLArRawChannelBuilder.cxx
old mode 100755
new mode 100644
index 4379693e1d1c8ffdf087f3bdcf7480eb0fee0a3a..647517b037bee55e57ba5bd33df32077bfe1acba
--- a/TestBeam/TBRec/src/TBLArRawChannelBuilder.cxx
+++ b/TestBeam/TBRec/src/TBLArRawChannelBuilder.cxx
@@ -2,8 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TBRec/TBLArRawChannelBuilder.h"
-#include "StoreGate/StoreGateSvc.h"
+#include "TBLArRawChannelBuilder.h"
 #include "LArIdentifier/LArOnlineID.h"
 
 #include <cmath>
diff --git a/TestBeam/TBRec/TBRec/TBLArRawChannelBuilder.h b/TestBeam/TBRec/src/TBLArRawChannelBuilder.h
old mode 100755
new mode 100644
similarity index 95%
rename from TestBeam/TBRec/TBRec/TBLArRawChannelBuilder.h
rename to TestBeam/TBRec/src/TBLArRawChannelBuilder.h
index be2e8cdc8e97221254e8a0d217f77d4ef607a55c..57ef0dbd68e7fdfabb3258d51ef7036b11ac89c0
--- a/TestBeam/TBRec/TBRec/TBLArRawChannelBuilder.h
+++ b/TestBeam/TBRec/src/TBLArRawChannelBuilder.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef TBLARRAWCHANNELBUILDER
-#define TBLARRAWCHANNELBUILDER
+#ifndef TBREC_TBLARRAWCHANNELBUILDER_H
+#define TBREC_TBLARRAWCHANNELBUILDER_H
 
 #include "AthenaBaseComps/AthAlgorithm.h"
 #include "GaudiKernel/IToolSvc.h"
diff --git a/TestBeam/TBRec/src/TBMWPCRec.cxx b/TestBeam/TBRec/src/TBMWPCRec.cxx
old mode 100755
new mode 100644
index 2303357e1030ba9394488a5fc70afd87fbdf6115..105c2df2b596b7aa299db2c215f47740cd46eb2d
--- a/TestBeam/TBRec/src/TBMWPCRec.cxx
+++ b/TestBeam/TBRec/src/TBMWPCRec.cxx
@@ -3,17 +3,7 @@
 */
 
 
-#include "StoreGate/StoreGateSvc.h"
-
-#include "GaudiKernel/Property.h"
-
-#include "TBRec/TBMWPCRec.h"
-
-// static const AlgFactory<TBMWPCRec> s_factory;
-// const IAlgFactory& TBMWPCRecFactory = s_factory;
-
-
-
+#include "TBMWPCRec.h"
 
 
 TBMWPCRec::TBMWPCRec(const std::string& name,
diff --git a/TestBeam/TBRec/TBRec/TBMWPCRec.h b/TestBeam/TBRec/src/TBMWPCRec.h
old mode 100755
new mode 100644
similarity index 100%
rename from TestBeam/TBRec/TBRec/TBMWPCRec.h
rename to TestBeam/TBRec/src/TBMWPCRec.h
diff --git a/TestBeam/TBRec/src/TBNoiseWrite.cxx b/TestBeam/TBRec/src/TBNoiseWrite.cxx
index 266dadd64434298f3ae10db39bc07191cf5926b8..decaa9becc089d1737b5a5aad6bab4a9555a7cf3 100644
--- a/TestBeam/TBRec/src/TBNoiseWrite.cxx
+++ b/TestBeam/TBRec/src/TBNoiseWrite.cxx
@@ -8,24 +8,18 @@
 // author: A.Minaenko
 // date:  08/05/2008
 
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/ListItem.h"
+#include "TBNoiseWrite.h"
 
 #include "PathResolver/PathResolver.h"
 
 #include <TFile.h>
 #include <TTree.h>
 
-#include "StoreGate/StoreGate.h" 
 #include "CaloEvent/CaloCell.h"
 #include "CaloEvent/CaloCellContainer.h"
 
 #include "TBEvent/TBEventInfo.h"
 
-#include "TBRec/TBNoiseWrite.h"
-
 #include <fstream>
 
 TBNoiseWrite::TBNoiseWrite(const std::string& name, 
diff --git a/TestBeam/TBRec/TBRec/TBNoiseWrite.h b/TestBeam/TBRec/src/TBNoiseWrite.h
similarity index 97%
rename from TestBeam/TBRec/TBRec/TBNoiseWrite.h
rename to TestBeam/TBRec/src/TBNoiseWrite.h
index fbb90e524827ee4837592e640ac650baf965561e..417deb40991074019073b4a30f5b2cc649afae99 100644
--- a/TestBeam/TBRec/TBRec/TBNoiseWrite.h
+++ b/TestBeam/TBRec/src/TBNoiseWrite.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef TBNOISEWRITE
-#define TBNOISEWRITE
+#ifndef TBREC_TBNOISEWRITE_H
+#define TBREC_TBNOISEWRITE_H
 
 // 
 // class TBNoiseWrite 
diff --git a/TestBeam/TBRec/src/TBPartIDCherenkovMuTag.cxx b/TestBeam/TBRec/src/TBPartIDCherenkovMuTag.cxx
old mode 100755
new mode 100644
index ec5200ddf9d4446323af7e70e91a5f4cc2db21a0..2f66c7aad7a7067b22eb7a6497486402a1840cf3
--- a/TestBeam/TBRec/src/TBPartIDCherenkovMuTag.cxx
+++ b/TestBeam/TBRec/src/TBPartIDCherenkovMuTag.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TBRec/TBPartIDCherenkovMuTag.h"
+#include "TBPartIDCherenkovMuTag.h"
 #include "TBEvent/TBIdentifiedParticle.h"
 #include "TBEvent/TBScintillatorCont.h"
 
diff --git a/TestBeam/TBRec/TBRec/TBPartIDCherenkovMuTag.h b/TestBeam/TBRec/src/TBPartIDCherenkovMuTag.h
old mode 100755
new mode 100644
similarity index 85%
rename from TestBeam/TBRec/TBRec/TBPartIDCherenkovMuTag.h
rename to TestBeam/TBRec/src/TBPartIDCherenkovMuTag.h
index fe7ced1a6f3c1617b4ae11a6ca55547ec0370096..af136d4cca5cae6dbfcb11b68b29251b4631f311
--- a/TestBeam/TBRec/TBRec/TBPartIDCherenkovMuTag.h
+++ b/TestBeam/TBRec/src/TBPartIDCherenkovMuTag.h
@@ -4,11 +4,10 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef TBPARTICLEIDCHERENKOVMUTAG
-#define TBPARTICLEIDCHERENKOVMUTAG
+#ifndef TBREC_TBPARTICLEIDCHERENKOVMUTAG_H
+#define TBREC_TBPARTICLEIDCHERENKOVMUTAG_H
 
 #include "AthenaBaseComps/AthAlgorithm.h"
-#include "StoreGate/StoreGateSvc.h"
 
 class TBPartIDCherenkovMuTag : public AthAlgorithm
 {
diff --git a/TestBeam/TBRec/src/TBPatternUnitStreamerTool.cxx b/TestBeam/TBRec/src/TBPatternUnitStreamerTool.cxx
old mode 100755
new mode 100644
index c46375a0cd87f254f03dfba3149c59f15fbd6306..b7865f70450d4ac2261443c1e18918d2213f9a11
--- a/TestBeam/TBRec/src/TBPatternUnitStreamerTool.cxx
+++ b/TestBeam/TBRec/src/TBPatternUnitStreamerTool.cxx
@@ -2,21 +2,13 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Service.h"
-
-#include "StoreGate/StoreGateSvc.h"
+#include "TBPatternUnitStreamerTool.h"
 
 #include "TBEvent/TBTriggerPatternUnit.h"
 #include "TBEvent/TBEventInfo.h"
 
-#include "TBRec/TBPatternUnitStreamerTool.h"
-
 #include <string>
-
-//#include <iomanip>
 #include <ios>
-//#include <iomanip>
 
 TBPatternUnitStreamerTool::TBPatternUnitStreamerTool(const std::string& name,
 						     const std::string& type,
diff --git a/TestBeam/TBRec/TBRec/TBPatternUnitStreamerTool.h b/TestBeam/TBRec/src/TBPatternUnitStreamerTool.h
old mode 100755
new mode 100644
similarity index 98%
rename from TestBeam/TBRec/TBRec/TBPatternUnitStreamerTool.h
rename to TestBeam/TBRec/src/TBPatternUnitStreamerTool.h
index 867ed5241bd341082473a0c66de77f1313669fec..d82e35f54959c88bfcca6ab6910370e535280438
--- a/TestBeam/TBRec/TBRec/TBPatternUnitStreamerTool.h
+++ b/TestBeam/TBRec/src/TBPatternUnitStreamerTool.h
@@ -24,7 +24,7 @@
  * \date   June 20, 2004 - first implementation
  */
 
-#include "TBRec/TBEventStreamerTool.h"
+#include "TBEventStreamerTool.h"
 
 #include <string>
 #include <map>
diff --git a/TestBeam/TBRec/src/TBPatternUnitStreamerToolH8.cxx b/TestBeam/TBRec/src/TBPatternUnitStreamerToolH8.cxx
old mode 100755
new mode 100644
index 4dcbd680c33492576577356539fc8171bc608be7..687b3e0be329851a49eee30c534ce44f338c5be6
--- a/TestBeam/TBRec/src/TBPatternUnitStreamerToolH8.cxx
+++ b/TestBeam/TBRec/src/TBPatternUnitStreamerToolH8.cxx
@@ -2,20 +2,11 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Service.h"
-
-#include "StoreGate/StoreGateSvc.h"
-
+#include "TBPatternUnitStreamerToolH8.h"
 #include "TBEvent/TBTriggerPatternUnit.h"
-
-#include "TBRec/TBPatternUnitStreamerToolH8.h"
-
 #include <string>
-
-//#include <iomanip>
 #include <ios>
-//#include <iomanip>
+
 
 TBPatternUnitStreamerToolH8::TBPatternUnitStreamerToolH8(
 						     const std::string& name,
diff --git a/TestBeam/TBRec/TBRec/TBPatternUnitStreamerToolH8.h b/TestBeam/TBRec/src/TBPatternUnitStreamerToolH8.h
old mode 100755
new mode 100644
similarity index 98%
rename from TestBeam/TBRec/TBRec/TBPatternUnitStreamerToolH8.h
rename to TestBeam/TBRec/src/TBPatternUnitStreamerToolH8.h
index 67555b208c15b8e5aea1a047e2122fa98f833c9b..e3a2c04af8b4839ee32afd5b0cb803ddfd2861dd
--- a/TestBeam/TBRec/TBRec/TBPatternUnitStreamerToolH8.h
+++ b/TestBeam/TBRec/src/TBPatternUnitStreamerToolH8.h
@@ -24,7 +24,7 @@
  * \date   July 28, 2004 - copy of TBPatternUnitStreamerTool adapted for H8
  */
 
-#include "TBRec/TBEventStreamerTool.h"
+#include "TBEventStreamerTool.h"
 
 #include <string>
 #include <map>
diff --git a/TestBeam/TBRec/src/TBPhaseRec.cxx b/TestBeam/TBRec/src/TBPhaseRec.cxx
old mode 100755
new mode 100644
index 2989133e8be1c153034c515ba5a93c9ae58fb349..f2c6cc12ac45a419e237bb80ff8c20a88342dd34
--- a/TestBeam/TBRec/src/TBPhaseRec.cxx
+++ b/TestBeam/TBRec/src/TBPhaseRec.cxx
@@ -3,15 +3,11 @@
 */
 
 
-#include "StoreGate/StoreGateSvc.h"
-
-#include "GaudiKernel/Property.h"
+#include "TBPhaseRec.h"
 
 #include "EventInfo/EventInfo.h"
 #include "EventInfo/EventID.h"
 
-#include "TBRec/TBPhaseRec.h"
-
 #include "TBEvent/TBTDCRaw.h"
 #include "TBEvent/TBTDCRawCont.h"
 #include "TBEvent/TBPhase.h"
diff --git a/TestBeam/TBRec/TBRec/TBPhaseRec.h b/TestBeam/TBRec/src/TBPhaseRec.h
old mode 100755
new mode 100644
similarity index 100%
rename from TestBeam/TBRec/TBRec/TBPhaseRec.h
rename to TestBeam/TBRec/src/TBPhaseRec.h
diff --git a/TestBeam/TBRec/src/TBPhaseStreamerTool.cxx b/TestBeam/TBRec/src/TBPhaseStreamerTool.cxx
old mode 100755
new mode 100644
index 7d2f5f17bbfe26f92cdcf9ede29d85468f8c5923..27f74eb3c3daf72604b8fc44f24b3f28ac3e567e
--- a/TestBeam/TBRec/src/TBPhaseStreamerTool.cxx
+++ b/TestBeam/TBRec/src/TBPhaseStreamerTool.cxx
@@ -2,13 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Service.h"
-
-#include "StoreGate/StoreGateSvc.h"
+#include "TBPhaseStreamerTool.h"
 #include "TBEvent/TBPhase.h"
-#include "TBRec/TBPhaseStreamerTool.h"
-
 #include <string>
 #include <ios>
 
diff --git a/TestBeam/TBRec/TBRec/TBPhaseStreamerTool.h b/TestBeam/TBRec/src/TBPhaseStreamerTool.h
old mode 100755
new mode 100644
similarity index 96%
rename from TestBeam/TBRec/TBRec/TBPhaseStreamerTool.h
rename to TestBeam/TBRec/src/TBPhaseStreamerTool.h
index d916924a909b8419749e34d11f2e213fea1df73e..728162d3e8328685e2dabc7aa7cf8a2622347b53
--- a/TestBeam/TBRec/TBRec/TBPhaseStreamerTool.h
+++ b/TestBeam/TBRec/src/TBPhaseStreamerTool.h
@@ -19,7 +19,7 @@
  * \date   February 10, 2005 - first implementation
  */
 
-#include "TBRec/TBEventStreamerTool.h"
+#include "TBEventStreamerTool.h"
 
 #include <string>
 #include <map>
diff --git a/TestBeam/TBRec/src/TBPlaneTrackingAlgo.cxx b/TestBeam/TBRec/src/TBPlaneTrackingAlgo.cxx
old mode 100755
new mode 100644
index b2a1218bf8cbf532f21f37eef618c5562213fbc1..11c249d5b36b789151818c05d0557e05def2dce3
--- a/TestBeam/TBRec/src/TBPlaneTrackingAlgo.cxx
+++ b/TestBeam/TBRec/src/TBPlaneTrackingAlgo.cxx
@@ -2,11 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "GaudiKernel/StatusCode.h"
-
-#include "PathResolver/PathResolver.h"
-
-#include "TBRec/TBPlaneTrackingAlgo.h"
+#include "TBPlaneTrackingAlgo.h"
 #include "TBEvent/TBHitPlaneCont.h"
 #include "TBEvent/TBBPCCont.h"
 #include "TBEvent/TBHitPlane.h"
@@ -15,6 +11,7 @@
 
 #include "EventInfo/EventInfo.h"
 #include "EventInfo/EventID.h"
+#include "PathResolver/PathResolver.h"
 
 #include <vector>
 #include <iostream>
diff --git a/TestBeam/TBRec/TBRec/TBPlaneTrackingAlgo.h b/TestBeam/TBRec/src/TBPlaneTrackingAlgo.h
old mode 100755
new mode 100644
similarity index 97%
rename from TestBeam/TBRec/TBRec/TBPlaneTrackingAlgo.h
rename to TestBeam/TBRec/src/TBPlaneTrackingAlgo.h
index 1574c9380efcc9dbbb6dfc57d64e9a88e1607db5..711cb606a6b6a9ef774a884b3822ca181953bdd0
--- a/TestBeam/TBRec/TBRec/TBPlaneTrackingAlgo.h
+++ b/TestBeam/TBRec/src/TBPlaneTrackingAlgo.h
@@ -2,11 +2,10 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef TBPLANETRACKINGALGO_H
-#define TBPLANETRACKINGALGO_H
+#ifndef TBREC_TBPLANETRACKINGALGO_H
+#define TBREC_TBPLANETRACKINGALGO_H
 
 #include "AthenaBaseComps/AthAlgorithm.h"
-#include "StoreGate/StoreGateSvc.h"
 
 #include "TBEvent/TBHitPlaneCont.h"
 
diff --git a/TestBeam/TBRec/src/TBPreScalerStreamerTool.cxx b/TestBeam/TBRec/src/TBPreScalerStreamerTool.cxx
old mode 100755
new mode 100644
index 9a1a5317ab41fe400236079353cc3857baeb2357..d86120a46d874de44760e296cf54194cae7b5146
--- a/TestBeam/TBRec/src/TBPreScalerStreamerTool.cxx
+++ b/TestBeam/TBRec/src/TBPreScalerStreamerTool.cxx
@@ -2,13 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Service.h"
-
-#include "StoreGate/StoreGateSvc.h"
-
-#include "TBRec/TBEventStreamerTool.h"
-#include "TBRec/TBPreScalerStreamerTool.h"
+#include "TBEventStreamerTool.h"
+#include "TBPreScalerStreamerTool.h"
 
 // already included in TBPreScalerStreamerTool.h
 //#include "CLHEP/Random/RanluxEngine.h"
diff --git a/TestBeam/TBRec/TBRec/TBPreScalerStreamerTool.h b/TestBeam/TBRec/src/TBPreScalerStreamerTool.h
old mode 100755
new mode 100644
similarity index 96%
rename from TestBeam/TBRec/TBRec/TBPreScalerStreamerTool.h
rename to TestBeam/TBRec/src/TBPreScalerStreamerTool.h
index 249ca9a609f0de26ff032f5670f1d569a0662518..56a18444425ecda2478ccb438d77583977a710ab
--- a/TestBeam/TBRec/TBRec/TBPreScalerStreamerTool.h
+++ b/TestBeam/TBRec/src/TBPreScalerStreamerTool.h
@@ -5,7 +5,7 @@
 #ifndef TBREC_TBPRESCALERSTREAMERTOOL_H
 #define TBREC_TBPRESCALERSTREAMERTOOL_H
 
-#include "TBRec/TBEventStreamerTool.h"
+#include "TBEventStreamerTool.h"
 
 // This is needed for migration to CLHEP 1.9
 // (Forward declarations of CLHEP classes will give rise to an error...)
diff --git a/TestBeam/TBRec/src/TBScintillatorRec.cxx b/TestBeam/TBRec/src/TBScintillatorRec.cxx
old mode 100755
new mode 100644
index e2e904f17769e60ee543caa9365e93dbf45cf075..114d5fe1a25f4bd73ad93a8bfeb663f9e61bd4b3
--- a/TestBeam/TBRec/src/TBScintillatorRec.cxx
+++ b/TestBeam/TBRec/src/TBScintillatorRec.cxx
@@ -3,19 +3,11 @@
 */
 
 
-#include "StoreGate/StoreGateSvc.h"
-
-#include "GaudiKernel/Property.h"
-
-#include "TBRec/TBScintillatorRec.h"
+#include "TBScintillatorRec.h"
 
 #include "TBEvent/TBScintillatorCont.h"
 #include "TBEvent/TBScintillatorRawCont.h"
 
-// static const AlgFactory<TBScintillatorRec> s_factory;
-// const IAlgFactory& TBScintillatorRecFactory = s_factory;
-
-
 
 TBScintillatorRec::TBScintillatorRec(const std::string& name,
 				 ISvcLocator* pSvcLocator) :
diff --git a/TestBeam/TBRec/TBRec/TBScintillatorRec.h b/TestBeam/TBRec/src/TBScintillatorRec.h
old mode 100755
new mode 100644
similarity index 95%
rename from TestBeam/TBRec/TBRec/TBScintillatorRec.h
rename to TestBeam/TBRec/src/TBScintillatorRec.h
index b0a63af49ebfd41223dfd18587c8e19966e10f6f..50e7ca3bf6700c0a28f96384b04001c3f366c290
--- a/TestBeam/TBRec/TBRec/TBScintillatorRec.h
+++ b/TestBeam/TBRec/src/TBScintillatorRec.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef TBREC_TBSCINTREC
-#define TBREC_TBSCINTREC
+#ifndef TBREC_TBSCINTREC_H
+#define TBREC_TBSCINTREC_H
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
 // This algorithm controls event flow and reconstruction and monitoring      //
diff --git a/TestBeam/TBRec/src/TBTailCatcherRec.cxx b/TestBeam/TBRec/src/TBTailCatcherRec.cxx
old mode 100755
new mode 100644
index 262566a7185cfeb978191af83e32528eedbb9de4..cb87906e5bfbdbee081bf38f7e2be2d737d34329
--- a/TestBeam/TBRec/src/TBTailCatcherRec.cxx
+++ b/TestBeam/TBRec/src/TBTailCatcherRec.cxx
@@ -2,18 +2,9 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#define WTC_ADC_MAX 1024
-#include "StoreGate/StoreGateSvc.h"
-
-#include "GaudiKernel/Property.h"
-
-#include "TBRec/TBTailCatcherRec.h"
-
-// static const AlgFactory<TBObjectRecoAlgo> s_factory;
-// const IAlgFactory& TBObjectRecoAlgoFactory = s_factory;
-
-
+#include "TBTailCatcherRec.h"
 
+#define WTC_ADC_MAX 1024
 
 
 TBTailCatcherRec::TBTailCatcherRec(const std::string& name,
diff --git a/TestBeam/TBRec/TBRec/TBTailCatcherRec.h b/TestBeam/TBRec/src/TBTailCatcherRec.h
old mode 100755
new mode 100644
similarity index 94%
rename from TestBeam/TBRec/TBRec/TBTailCatcherRec.h
rename to TestBeam/TBRec/src/TBTailCatcherRec.h
index ebf776183fe5166db568e22c319975e5559160a8..37963627f0e2db3d2d4276bab06ab874925078d5
--- a/TestBeam/TBRec/TBRec/TBTailCatcherRec.h
+++ b/TestBeam/TBRec/src/TBTailCatcherRec.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef TBREC_TBTAILCATCHERREC
-#define TBREC_TBTAILCATCHERREC
+#ifndef TBREC_TBTAILCATCHERREC_H
+#define TBREC_TBTAILCATCHERREC_H
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
 // This algorithm controls event flow and reconstruction and monitoring      //
diff --git a/TestBeam/TBRec/src/TBTrackInfoFromTag.cxx b/TestBeam/TBRec/src/TBTrackInfoFromTag.cxx
index 7ab588b3cd3ecbe959069408c15d1da414522222..05cc2ea64dff6fcc6d1c0e3ff799e2a5e3eb55e3 100644
--- a/TestBeam/TBRec/src/TBTrackInfoFromTag.cxx
+++ b/TestBeam/TBRec/src/TBTrackInfoFromTag.cxx
@@ -3,11 +3,7 @@
 */
 
 
-#include "StoreGate/StoreGateSvc.h"
-
-#include "GaudiKernel/Property.h"
-
-#include "TBRec/TBTrackInfoFromTag.h"
+#include "TBTrackInfoFromTag.h"
 
 
 // template functions for copying the contents of a 1- and 2-dim array into a vector
diff --git a/TestBeam/TBRec/TBRec/TBTrackInfoFromTag.h b/TestBeam/TBRec/src/TBTrackInfoFromTag.h
similarity index 95%
rename from TestBeam/TBRec/TBRec/TBTrackInfoFromTag.h
rename to TestBeam/TBRec/src/TBTrackInfoFromTag.h
index 733c980ca862e21f90be705d2261c1033f3909df..0b93269bc2d07923779d78e0c0a57180ea950d49 100644
--- a/TestBeam/TBRec/TBRec/TBTrackInfoFromTag.h
+++ b/TestBeam/TBRec/src/TBTrackInfoFromTag.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef TBTrackInfoFromTag_H
-#define TBTrackInfoFromTag_H
+#ifndef TBREC_TBTRACKINFOFROMTAG_H
+#define TBREC_TBTRACKINFOFROMTAG_H
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
 // MWPC Reconstruction algorithm. Based on code for 2002 TestBeam            //
@@ -45,8 +45,8 @@ class TChain;
 class TFile;
 class TString;
 
-#include "TBRec/TileRec_h1000.h"
-#include "TBRec/TB_tree.h"
+#include "TileRec_h1000.h"
+#include "TB_tree.h"
 
 
 class TBTrackInfoFromTag : public AthAlgorithm
diff --git a/TestBeam/TBRec/src/TBTrackToCaloAlg.cxx b/TestBeam/TBRec/src/TBTrackToCaloAlg.cxx
old mode 100755
new mode 100644
index 718fafc34220695cbb93bc7f2625cc74923951e4..24600bfffc9922301bf7dec373be02d08beba544
--- a/TestBeam/TBRec/src/TBTrackToCaloAlg.cxx
+++ b/TestBeam/TBRec/src/TBTrackToCaloAlg.cxx
@@ -7,12 +7,10 @@
 //   Implementation file for class TBTrackToCaloAlg
 ///////////////////////////////////////////////////////////////////
 
-#include "TBRec/TBTrackToCaloAlg.h"
-#include "TBRec/TBExtrapolTrackToCaloTool.h"
+#include "TBTrackToCaloAlg.h"
+#include "TBExtrapolTrackToCaloTool.h"
 
 // Gaudi includes
-#include "StoreGate/StoreGate.h"
-#include "StoreGate/StoreGateSvc.h"
 #include "GaudiKernel/IToolSvc.h"
 
 // Tracking includes
@@ -37,7 +35,7 @@
 
 //#include "ITrackToCalo/IExtrapolTrackToCaloTool.h"
 //#include "RecoToolInterfaces/IExtrapolateToCaloTool.h"
-#include "TBRec/ImpactInCaloCollection.h"
+#include "ImpactInCaloCollection.h"
 #include "AthenaKernel/Units.h"
 
 
diff --git a/TestBeam/TBRec/TBRec/TBTrackToCaloAlg.h b/TestBeam/TBRec/src/TBTrackToCaloAlg.h
old mode 100755
new mode 100644
similarity index 98%
rename from TestBeam/TBRec/TBRec/TBTrackToCaloAlg.h
rename to TestBeam/TBRec/src/TBTrackToCaloAlg.h
index 708e4d6a59baf29b95f7b035fb6e38f27df311d4..d1091ab64ddc8ca8e7f2edb2e98b6ba8790938ad
--- a/TestBeam/TBRec/TBRec/TBTrackToCaloAlg.h
+++ b/TestBeam/TBRec/src/TBTrackToCaloAlg.h
@@ -10,8 +10,8 @@
 ///////////////////////////////////////////////////////////////////
 
 
-#ifndef TESTLARDETDESCR_TESTTRACKTOCALO_H
-#define TESTLARDETDESCR_TESTTRACKTOCALO_H
+#ifndef TBREC_TBTRACKTOCALOALG_H
+#define TBREC_TBTRACKTOCALOALG_H
 
 // Base class
 #include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/TestBeam/TBRec/src/TBTree_CaloClusterH6.cxx b/TestBeam/TBRec/src/TBTree_CaloClusterH6.cxx
index d85bc684b62e5c3316a57258b5076fd4d6499fb4..9b0d22af30720a7b97855cf2637f2575a4f91fa9 100644
--- a/TestBeam/TBRec/src/TBTree_CaloClusterH6.cxx
+++ b/TestBeam/TBRec/src/TBTree_CaloClusterH6.cxx
@@ -7,8 +7,9 @@
 // author: A.Minaenko
 // date:  25/07/2006
 
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/StatusCode.h"
+#include "TBTree_CaloClusterH6.h"
+#include "TBRec/TBH6RunHeader.h"
+
 #include "GaudiKernel/IToolSvc.h"
 #include "GaudiKernel/ListItem.h"
 
@@ -17,8 +18,6 @@
 #include <TFile.h>
 #include <TTree.h>
 
-#include "StoreGate/StoreGate.h" 
-
 #include "CaloDetDescr/CaloDetDescrManager.h"
 #include "CaloIdentifier/CaloCell_ID.h"
 #include "CaloIdentifier/CaloIdManager.h"
@@ -41,9 +40,6 @@
 #include "TBEvent/TBTrack.h"
 #include "TBEvent/TBTailCatcher.h"
 
-#include "TBRec/TBH6RunHeader.h"
-#include "TBRec/TBTree_CaloClusterH6.h"
-
 #include <fstream>
 
 TBTree_CaloClusterH6::TBTree_CaloClusterH6(const std::string& name, 
diff --git a/TestBeam/TBRec/TBRec/TBTree_CaloClusterH6.h b/TestBeam/TBRec/src/TBTree_CaloClusterH6.h
similarity index 100%
rename from TestBeam/TBRec/TBRec/TBTree_CaloClusterH6.h
rename to TestBeam/TBRec/src/TBTree_CaloClusterH6.h
diff --git a/TestBeam/TBRec/src/TBXCryYTableRead.cxx b/TestBeam/TBRec/src/TBXCryYTableRead.cxx
index 907cd83f4f00397b0b28cd19a617f03a45c6e5eb..4b751997f8d5f26c33e6a5348138bbcb8aa56614 100644
--- a/TestBeam/TBRec/src/TBXCryYTableRead.cxx
+++ b/TestBeam/TBRec/src/TBXCryYTableRead.cxx
@@ -4,15 +4,9 @@
 
 // class TBXCryYTableRead 
 
-#include "GaudiKernel/ISvcLocator.h"
-#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/ListItem.h"
+#include "TBXCryYTableRead.h"
 #include "PathResolver/PathResolver.h"
-#include "StoreGate/StoreGate.h" 
 #include "TBEvent/TBEventInfo.h"
-#include "TBRec/TBXCryYTableRead.h"
 #include <fstream>
 
 TBXCryYTableRead::TBXCryYTableRead(const std::string& name, 
diff --git a/TestBeam/TBRec/TBRec/TBXCryYTableRead.h b/TestBeam/TBRec/src/TBXCryYTableRead.h
similarity index 94%
rename from TestBeam/TBRec/TBRec/TBXCryYTableRead.h
rename to TestBeam/TBRec/src/TBXCryYTableRead.h
index 9cb58647db98135f0cf9b0817378bf97e067f3ec..b0e75692a5d7b208013c05e3a37200896d434a81 100644
--- a/TestBeam/TBRec/TBRec/TBXCryYTableRead.h
+++ b/TestBeam/TBRec/src/TBXCryYTableRead.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef TBXCRYYTABLEREAD
-#define TBXCRYYTABLEREAD
+#ifndef TBREC_TBXCRYYTABLEREAD_H
+#define TBREC_TBXCRYYTABLEREAD_H
 // 
 // class TBXCryYTableRead 
 //
diff --git a/TestBeam/TBRec/src/TBXMLCaloCellWriterTool.cxx b/TestBeam/TBRec/src/TBXMLCaloCellWriterTool.cxx
old mode 100755
new mode 100644
index 9231fdb27274a4103e817a3a3403c6c5bc53109d..6c584eecfb5ff8d1a93fd347004fffa91e9e722d
--- a/TestBeam/TBRec/src/TBXMLCaloCellWriterTool.cxx
+++ b/TestBeam/TBRec/src/TBXMLCaloCellWriterTool.cxx
@@ -3,16 +3,17 @@
 */
 
 
+#include "TBXMLWriterToolBase.h"
+#include "TBXMLCaloCellWriterTool.h"
+#include "TBXMLWriter.h"
+
 #include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/AlgTool.h"
 
 #include "CLHEP/Units/SystemOfUnits.h"
 
 #include "Identifier/Identifier.h"
 #include "Identifier/IdentifierHash.h"
 
-#include "StoreGate/StoreGateSvc.h"
-
 #include "CaloDetDescr/CaloDetDescrManager.h"
 #include "CaloDetDescr/CaloDetDescrElement.h"
 
@@ -23,9 +24,6 @@
 #include "CaloEvent/CaloCell.h"
 #include "CaloEvent/CaloCellContainer.h"
 
-#include "TBRec/TBXMLWriterToolBase.h"
-#include "TBRec/TBXMLCaloCellWriterTool.h"
-#include "TBRec/TBXMLWriter.h"
 #include "boost/io/ios_state.hpp"
 
 #include <iostream>
diff --git a/TestBeam/TBRec/TBRec/TBXMLCaloCellWriterTool.h b/TestBeam/TBRec/src/TBXMLCaloCellWriterTool.h
old mode 100755
new mode 100644
similarity index 97%
rename from TestBeam/TBRec/TBRec/TBXMLCaloCellWriterTool.h
rename to TestBeam/TBRec/src/TBXMLCaloCellWriterTool.h
index 82d068682b2cd9436a93cd8b4acde619db9be1a6..c4afbb7d363a1dd2eb4199d795838f13da83d5e1
--- a/TestBeam/TBRec/TBRec/TBXMLCaloCellWriterTool.h
+++ b/TestBeam/TBRec/src/TBXMLCaloCellWriterTool.h
@@ -11,7 +11,7 @@
 #include "CaloIdentifier/CaloCell_ID.h"
 #include "CaloGeoHelpers/CaloSampling.h"
 
-#include "TBRec/TBXMLWriterToolBase.h"
+#include "TBXMLWriterToolBase.h"
 
 #include <iostream>
 #include <vector>
diff --git a/TestBeam/TBRec/src/TBXMLEventWriterTool.cxx b/TestBeam/TBRec/src/TBXMLEventWriterTool.cxx
old mode 100755
new mode 100644
index 5bf10c4353b2a35a4d45bf0e4b79911102952196..630320f320670a8547f10732fde7f3f8a2f22f43
--- a/TestBeam/TBRec/src/TBXMLEventWriterTool.cxx
+++ b/TestBeam/TBRec/src/TBXMLEventWriterTool.cxx
@@ -3,11 +3,9 @@
 */
 
 
-#include "GaudiKernel/AlgTool.h"
-
-#include "TBRec/TBXMLWriterToolBase.h"
-#include "TBRec/TBXMLEventWriterTool.h"
-#include "TBRec/TBXMLWriter.h"
+#include "TBXMLWriterToolBase.h"
+#include "TBXMLEventWriterTool.h"
+#include "TBXMLWriter.h"
 
 #include <string>
 
diff --git a/TestBeam/TBRec/TBRec/TBXMLEventWriterTool.h b/TestBeam/TBRec/src/TBXMLEventWriterTool.h
old mode 100755
new mode 100644
similarity index 96%
rename from TestBeam/TBRec/TBRec/TBXMLEventWriterTool.h
rename to TestBeam/TBRec/src/TBXMLEventWriterTool.h
index efb411e36497d7c44f31a5108bb77af75c85db01..2d54842ece1c967718f4507110c9aa32cf3488d6
--- a/TestBeam/TBRec/TBRec/TBXMLEventWriterTool.h
+++ b/TestBeam/TBRec/src/TBXMLEventWriterTool.h
@@ -8,7 +8,7 @@
 /// \brief writes out event header
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "TBRec/TBXMLWriterToolBase.h"
+#include "TBXMLWriterToolBase.h"
 
 #include <iostream>
 #include <string>
diff --git a/TestBeam/TBRec/src/TBXMLWriter.cxx b/TestBeam/TBRec/src/TBXMLWriter.cxx
old mode 100755
new mode 100644
index 99e03e8be4f47e494d632df6a16a687f16386eba..cb43e1baf02fa041c096ac9ff653fe5fffc4383b
--- a/TestBeam/TBRec/src/TBXMLWriter.cxx
+++ b/TestBeam/TBRec/src/TBXMLWriter.cxx
@@ -3,21 +3,15 @@
 */
 
 
-// Gaudi
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
-#include "GaudiKernel/ListItem.h"
+#include "TBXMLWriterToolBase.h"
+#include "TBXMLWriter.h"
 
-// StoreGate services
-#include "StoreGate/StoreGateSvc.h"
 
 // event
 #include "EventInfo/EventInfo.h"
 #include "EventInfo/EventID.h"
 
-// TBRec includes
-#include "TBRec/TBXMLWriterToolBase.h"
-#include "TBRec/TBXMLWriter.h"
+#include "GaudiKernel/ListItem.h"
 
 #include <string>
 #include <vector>
diff --git a/TestBeam/TBRec/TBRec/TBXMLWriter.h b/TestBeam/TBRec/src/TBXMLWriter.h
old mode 100755
new mode 100644
similarity index 100%
rename from TestBeam/TBRec/TBRec/TBXMLWriter.h
rename to TestBeam/TBRec/src/TBXMLWriter.h
diff --git a/TestBeam/TBRec/src/TBXMLWriterToolBase.cxx b/TestBeam/TBRec/src/TBXMLWriterToolBase.cxx
old mode 100755
new mode 100644
index 78fcb75cbd41fdd539a6fc2dd0563bf99d5ded01..89d679c689ea9d0acb7e6fd0cb616062643cbe9b
--- a/TestBeam/TBRec/src/TBXMLWriterToolBase.cxx
+++ b/TestBeam/TBRec/src/TBXMLWriterToolBase.cxx
@@ -3,7 +3,7 @@
 */
 
 
-#include "TBRec/TBXMLWriterToolBase.h"
+#include "TBXMLWriterToolBase.h"
 
 #include <iostream>
 #include <string>
diff --git a/TestBeam/TBRec/TBRec/TBXMLWriterToolBase.h b/TestBeam/TBRec/src/TBXMLWriterToolBase.h
old mode 100755
new mode 100644
similarity index 97%
rename from TestBeam/TBRec/TBRec/TBXMLWriterToolBase.h
rename to TestBeam/TBRec/src/TBXMLWriterToolBase.h
index 88e2be4c8972176957a10bbe36c1cc2cdc0eb613..764fbc18ec09cdb0e951427715b7f13205dd5017
--- a/TestBeam/TBRec/TBRec/TBXMLWriterToolBase.h
+++ b/TestBeam/TBRec/src/TBXMLWriterToolBase.h
@@ -8,13 +8,8 @@
 /// \brief base class for XML writer tools for 2004 event display
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "GaudiKernel/MsgStream.h"
 #include "AthenaBaseComps/AthAlgTool.h"
-
-#include "StoreGate/StoreGateSvc.h"
-
 #include <iostream>
-
 #include <vector>
 #include <string>
 
diff --git a/TestBeam/TBRec/src/TB_tree.cxx b/TestBeam/TBRec/src/TB_tree.cxx
index f23ce3e28d66c3b7e8e562843a5e1b30fc1d4abf..5c2dcc1a8fe01bdf421a4ac230c503bd26d914b9 100644
--- a/TestBeam/TBRec/src/TB_tree.cxx
+++ b/TestBeam/TBRec/src/TB_tree.cxx
@@ -2,8 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#define TB_tree_cxx
-#include "TBRec/TB_tree.h"
+#include "TB_tree.h"
 
 TB_tree::TB_tree(TTree *tree)
   : fChain(0),
diff --git a/TestBeam/TBRec/TBRec/TB_tree.h b/TestBeam/TBRec/src/TB_tree.h
similarity index 99%
rename from TestBeam/TBRec/TBRec/TB_tree.h
rename to TestBeam/TBRec/src/TB_tree.h
index 67b1390cac686c8cb0892a5c112c88b47b01e349..c0c9c6a4b7768bc51896a3f413e1adb96d652234 100644
--- a/TestBeam/TBRec/TBRec/TB_tree.h
+++ b/TestBeam/TBRec/src/TB_tree.h
@@ -9,8 +9,8 @@
 // found on file: cbnt_RecExTB_Combined_1207_2102095.0.root
 //////////////////////////////////////////////////////////
 
-#ifndef TB_tree_h
-#define TB_tree_h
+#ifndef TBREC_TB_TREE_H
+#define TBREC_TB_TREE_H
 
 #include "AthenaKernel/CLASS_DEF.h"
 
diff --git a/TestBeam/TBRec/src/TileRec_h1000.cxx b/TestBeam/TBRec/src/TileRec_h1000.cxx
index 09db502f34c6aaf212969e5f9f536e0aef2d2073..c8ea33320a5847aee93aa0bba2a47aa83ed61750 100644
--- a/TestBeam/TBRec/src/TileRec_h1000.cxx
+++ b/TestBeam/TBRec/src/TileRec_h1000.cxx
@@ -2,8 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#define TileRec_h1000_cxx
-#include "TBRec/TileRec_h1000.h"
+#include "TileRec_h1000.h"
 
 TileRec_h1000::TileRec_h1000(TTree *tree)
   : fChain(0),
diff --git a/TestBeam/TBRec/TBRec/TileRec_h1000.h b/TestBeam/TBRec/src/TileRec_h1000.h
similarity index 99%
rename from TestBeam/TBRec/TBRec/TileRec_h1000.h
rename to TestBeam/TBRec/src/TileRec_h1000.h
index 3ab6f91eeb097a2d2f4584ede576cb6bfbe2eb9e..4c1e1a0e66476187332a42e039552871b89f4b1a 100644
--- a/TestBeam/TBRec/TBRec/TileRec_h1000.h
+++ b/TestBeam/TBRec/src/TileRec_h1000.h
@@ -9,8 +9,8 @@
 // found on file: cbnt_RecExTB_Combined_1207_2102095.0.root
 //////////////////////////////////////////////////////////
 
-#ifndef TileRec_h1000_h
-#define TileRec_h1000_h
+#ifndef TBREC_TILEREC_H1000_H
+#define TBREC_TILEREC_H1000_H
 
 #include "AthenaKernel/CLASS_DEF.h"
 
diff --git a/TestBeam/TBRec/src/components/TBRec_entries.cxx b/TestBeam/TBRec/src/components/TBRec_entries.cxx
index ad9244c6747758fab254200294956e6497d7159f..541cc7dd36462c69aa01f4a1a1793da5b9bbfd14 100644
--- a/TestBeam/TBRec/src/components/TBRec_entries.cxx
+++ b/TestBeam/TBRec/src/components/TBRec_entries.cxx
@@ -1,52 +1,52 @@
-#include "TBRec/TBAlgoSequencer.h"
+#include "../TBAlgoSequencer.h"
 
-#include "TBRec/TBXMLWriter.h"
-#include "TBRec/TBXMLEventWriterTool.h"
-#include "TBRec/TBXMLCaloCellWriterTool.h"
-#include "TBRec/TBBPCRec.h"
-#include "TBRec/TBMWPCRec.h"
-#include "TBRec/TBScintillatorRec.h"
-#include "TBRec/TBTailCatcherRec.h"
-#include "TBRec/TBPlaneTrackingAlgo.h"
-#include "TBRec/TBPhaseRec.h"
-#include "TBRec/TBLArRawChannelBuilder.h"
-#include "TBRec/TBECLArRawChannelBuilder.h"
-#include "TBRec/TBEventStreamer.h"
-#include "TBRec/TBPatternUnitStreamerTool.h"
-#include "TBRec/TBPatternUnitStreamerToolH8.h"
-#include "TBRec/TBEventInfoStreamerTool.h"
-#include "TBRec/TBPreScalerStreamerTool.h"
-#include "TBRec/CBNTAA_BeamInstrumentation.h"
-#include "TBRec/CBNTAA_TBADCRaw.h"
-#include "TBRec/CBNTAA_TBTDCRaw.h"
-#include "TBRec/CBNTAA_TBInfo.h"
-#include "TBRec/CBNTAA_TBTrack.h"
-#include "TBRec/CBNTAA_TBScint.h"
-#include "TBRec/CBNT_Timing.h"
-#include "TBRec/CBNT_CaloH6.h"
-#include "TBRec/CBNT_UpstreamMat.h"
-#include "TBRec/TBPartIDCherenkovMuTag.h"
-#include "TBRec/TBBeamQuality.h"
-#include "TBRec/TBBeamQualityTool.h"
-#include "TBRec/TBBeamQualityDoubleHitsTool.h"
-#include "TBRec/TBBeamQualityMuonToolH6.h"
-#include "TBRec/TBBeamQualityEMFractionTool.h"
-#include "TBRec/TBBeamQualityTrackingTool.h"
-#include "TBRec/TBPhaseStreamerTool.h"
-#include "TBRec/TBEMECCellEtaCorrection.h"
-#include "TBRec/TBClusterMaker.h"
-#include "TBRec/TBTree_CaloClusterH6.h"
-#include "TBRec/TBNoiseWrite.h"
-#include "TBRec/TBCellNoiseCorrection.h"
-#include "TBRec/TBCellContainerFillerTool.h"
-#include "TBRec/CBNTAA_TBTPValidation.h"
-#include "TBRec/TBTrackInfoFromTag.h"
-#include "TBRec/TBBeamQualityMC.h"
-#include "TBRec/TBXCryYTableRead.h"
-#include "TBRec/TBDMContainerSplitter.h"
-#include "TBRec/TBEMECXTalkToyModel.h"
-#include "TBRec/TBExtrapolTrackToCaloTool.h"
-#include "TBRec/TBTrackToCaloAlg.h"
+#include "../TBXMLWriter.h"
+#include "../TBXMLEventWriterTool.h"
+#include "../TBXMLCaloCellWriterTool.h"
+#include "../TBBPCRec.h"
+#include "../TBMWPCRec.h"
+#include "../TBScintillatorRec.h"
+#include "../TBTailCatcherRec.h"
+#include "../TBPlaneTrackingAlgo.h"
+#include "../TBPhaseRec.h"
+#include "../TBLArRawChannelBuilder.h"
+#include "../TBECLArRawChannelBuilder.h"
+#include "../TBEventStreamer.h"
+#include "../TBPatternUnitStreamerTool.h"
+#include "../TBPatternUnitStreamerToolH8.h"
+#include "../TBEventInfoStreamerTool.h"
+#include "../TBPreScalerStreamerTool.h"
+#include "../CBNTAA_BeamInstrumentation.h"
+#include "../CBNTAA_TBADCRaw.h"
+#include "../CBNTAA_TBTDCRaw.h"
+#include "../CBNTAA_TBInfo.h"
+#include "../CBNTAA_TBTrack.h"
+#include "../CBNTAA_TBScint.h"
+#include "../CBNT_Timing.h"
+#include "../CBNT_CaloH6.h"
+#include "../CBNT_UpstreamMat.h"
+#include "../TBPartIDCherenkovMuTag.h"
+#include "../TBBeamQuality.h"
+#include "../TBBeamQualityTool.h"
+#include "../TBBeamQualityDoubleHitsTool.h"
+#include "../TBBeamQualityMuonToolH6.h"
+#include "../TBBeamQualityEMFractionTool.h"
+#include "../TBBeamQualityTrackingTool.h"
+#include "../TBPhaseStreamerTool.h"
+#include "../TBEMECCellEtaCorrection.h"
+#include "../TBClusterMaker.h"
+#include "../TBTree_CaloClusterH6.h"
+#include "../TBNoiseWrite.h"
+#include "../TBCellNoiseCorrection.h"
+#include "../TBCellContainerFillerTool.h"
+#include "../CBNTAA_TBTPValidation.h"
+#include "../TBTrackInfoFromTag.h"
+#include "../TBBeamQualityMC.h"
+#include "../TBXCryYTableRead.h"
+#include "../TBDMContainerSplitter.h"
+#include "../TBEMECXTalkToyModel.h"
+#include "../TBExtrapolTrackToCaloTool.h"
+#include "../TBTrackToCaloAlg.h"
 
 DECLARE_COMPONENT( TBXMLWriter )
 DECLARE_COMPONENT( TBAlgoSequencer )