From dcf4b3416bc83b1785d962b0edbbb41760aa5230 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Sat, 7 Jul 2018 13:15:29 +0200
Subject: [PATCH] TBRec: Move headers to src.

Headers in this package are not used from any other package.
Move those to src.
---
 .../TBRec/src/CBNTAA_BeamInstrumentation.cxx  |  9 +-
 .../CBNTAA_BeamInstrumentation.h              |  6 +-
 TestBeam/TBRec/src/CBNTAA_TBADCRaw.cxx        |  9 +-
 .../TBRec/{TBRec => src}/CBNTAA_TBADCRaw.h    |  4 +-
 TestBeam/TBRec/src/CBNTAA_TBInfo.cxx          |  5 +-
 TestBeam/TBRec/{TBRec => src}/CBNTAA_TBInfo.h |  5 +-
 TestBeam/TBRec/src/CBNTAA_TBScint.cxx         |  5 +-
 .../TBRec/{TBRec => src}/CBNTAA_TBScint.h     |  4 +-
 TestBeam/TBRec/src/CBNTAA_TBTDCRaw.cxx        |  9 +-
 .../TBRec/{TBRec => src}/CBNTAA_TBTDCRaw.h    |  4 +-
 TestBeam/TBRec/src/CBNTAA_TBTPValidation.cxx  |  8 +-
 .../{TBRec => src}/CBNTAA_TBTPValidation.h    |  4 +-
 TestBeam/TBRec/src/CBNTAA_TBTrack.cxx         | 10 +-
 .../TBRec/{TBRec => src}/CBNTAA_TBTrack.h     |  4 +-
 .../TBRec/src/CBNT_BeamInstrumentation.cxx    |  5 +-
 .../{TBRec => src}/CBNT_BeamInstrumentation.h |  5 +-
 TestBeam/TBRec/src/CBNT_CaloH6.cxx            | 11 +--
 TestBeam/TBRec/{TBRec => src}/CBNT_CaloH6.h   |  5 +-
 TestBeam/TBRec/src/CBNT_TBRecBase.cxx         |  3 +-
 .../TBRec/{TBRec => src}/CBNT_TBRecBase.h     |  6 +-
 TestBeam/TBRec/src/CBNT_Timing.cxx            |  4 +-
 TestBeam/TBRec/{TBRec => src}/CBNT_Timing.h   |  5 +-
 TestBeam/TBRec/src/CBNT_UpstreamMat.cxx       |  3 +-
 .../TBRec/{TBRec => src}/CBNT_UpstreamMat.h   |  5 +-
 TestBeam/TBRec/src/ImpactInCalo.cxx           |  2 +-
 TestBeam/TBRec/{TBRec => src}/ImpactInCalo.h  |  4 +-
 TestBeam/TBRec/src/ImpactInCaloCollection.cxx |  4 +-
 .../{TBRec => src}/ImpactInCaloCollection.h   |  6 +-
 TestBeam/TBRec/src/TBAlgoSequencer.cxx        |  7 +-
 .../TBRec/{TBRec => src}/TBAlgoSequencer.h    |  0
 TestBeam/TBRec/src/TBBPCRec.cxx               |  6 +-
 TestBeam/TBRec/{TBRec => src}/TBBPCRec.h      |  4 +-
 TestBeam/TBRec/src/TBBeamQuality.cxx          | 12 +--
 TestBeam/TBRec/{TBRec => src}/TBBeamQuality.h |  0
 .../TBRec/src/TBBeamQualityDoubleHitsTool.cxx |  8 +-
 .../TBBeamQualityDoubleHitsTool.h             |  6 +-
 .../TBRec/src/TBBeamQualityEMFractionTool.cxx | 13 +--
 .../TBBeamQualityEMFractionTool.h             |  2 +-
 TestBeam/TBRec/src/TBBeamQualityMC.cxx        |  5 +-
 .../TBRec/{TBRec => src}/TBBeamQualityMC.h    |  4 +-
 .../TBRec/src/TBBeamQualityMuonToolH6.cxx     |  8 +-
 .../{TBRec => src}/TBBeamQualityMuonToolH6.h  |  6 +-
 TestBeam/TBRec/src/TBBeamQualityTool.cxx      |  7 +-
 .../TBRec/{TBRec => src}/TBBeamQualityTool.h  |  4 +-
 .../TBRec/src/TBBeamQualityTrackingTool.cxx   | 10 +-
 .../TBBeamQualityTrackingTool.h               |  6 +-
 .../TBRec/src/TBCellContainerFillerTool.cxx   |  9 +-
 .../TBCellContainerFillerTool.h               |  4 +-
 TestBeam/TBRec/src/TBCellNoiseCorrection.cxx  |  4 +-
 .../{TBRec => src}/TBCellNoiseCorrection.h    |  4 +-
 TestBeam/TBRec/src/TBClusterMaker.cxx         | 11 +--
 .../TBRec/{TBRec => src}/TBClusterMaker.h     |  4 +-
 TestBeam/TBRec/src/TBDMContainerSplitter.cxx  |  8 +-
 .../{TBRec => src}/TBDMContainerSplitter.h    |  4 +-
 .../TBRec/src/TBECLArRawChannelBuilder.cxx    |  3 +-
 .../{TBRec => src}/TBECLArRawChannelBuilder.h |  4 +-
 .../TBRec/src/TBEMECCellEtaCorrection.cxx     |  2 +-
 .../{TBRec => src}/TBEMECCellEtaCorrection.h  |  0
 TestBeam/TBRec/src/TBEMECXTalkToyModel.cxx    |  5 +-
 .../{TBRec => src}/TBEMECXTalkToyModel.h      |  4 +-
 .../TBRec/src/TBEventInfoStreamerTool.cxx     |  7 +-
 .../{TBRec => src}/TBEventInfoStreamerTool.h  |  2 +-
 TestBeam/TBRec/src/TBEventStreamer.cxx        | 10 +-
 .../TBRec/{TBRec => src}/TBEventStreamer.h    |  0
 TestBeam/TBRec/src/TBEventStreamerTool.cxx    |  8 +-
 .../{TBRec => src}/TBEventStreamerTool.h      |  0
 .../TBRec/src/TBExtrapolTrackToCaloTool.cxx   |  5 +-
 .../TBExtrapolTrackToCaloTool.h               |  4 +-
 TestBeam/TBRec/src/TBLArRawChannelBuilder.cxx |  3 +-
 .../{TBRec => src}/TBLArRawChannelBuilder.h   |  4 +-
 TestBeam/TBRec/src/TBMWPCRec.cxx              | 12 +--
 TestBeam/TBRec/{TBRec => src}/TBMWPCRec.h     |  0
 TestBeam/TBRec/src/TBNoiseWrite.cxx           |  8 +-
 TestBeam/TBRec/{TBRec => src}/TBNoiseWrite.h  |  4 +-
 TestBeam/TBRec/src/TBPartIDCherenkovMuTag.cxx |  2 +-
 .../{TBRec => src}/TBPartIDCherenkovMuTag.h   |  5 +-
 .../TBRec/src/TBPatternUnitStreamerTool.cxx   | 10 +-
 .../TBPatternUnitStreamerTool.h               |  2 +-
 .../TBRec/src/TBPatternUnitStreamerToolH8.cxx | 13 +--
 .../TBPatternUnitStreamerToolH8.h             |  2 +-
 TestBeam/TBRec/src/TBPhaseRec.cxx             |  6 +-
 TestBeam/TBRec/{TBRec => src}/TBPhaseRec.h    |  0
 TestBeam/TBRec/src/TBPhaseStreamerTool.cxx    |  7 +-
 .../{TBRec => src}/TBPhaseStreamerTool.h      |  2 +-
 TestBeam/TBRec/src/TBPlaneTrackingAlgo.cxx    |  7 +-
 .../{TBRec => src}/TBPlaneTrackingAlgo.h      |  5 +-
 .../TBRec/src/TBPreScalerStreamerTool.cxx     |  9 +-
 .../{TBRec => src}/TBPreScalerStreamerTool.h  |  2 +-
 TestBeam/TBRec/src/TBScintillatorRec.cxx      | 10 +-
 .../TBRec/{TBRec => src}/TBScintillatorRec.h  |  4 +-
 TestBeam/TBRec/src/TBTailCatcherRec.cxx       | 13 +--
 .../TBRec/{TBRec => src}/TBTailCatcherRec.h   |  4 +-
 TestBeam/TBRec/src/TBTrackInfoFromTag.cxx     |  6 +-
 .../TBRec/{TBRec => src}/TBTrackInfoFromTag.h |  8 +-
 TestBeam/TBRec/src/TBTrackToCaloAlg.cxx       |  8 +-
 .../TBRec/{TBRec => src}/TBTrackToCaloAlg.h   |  4 +-
 TestBeam/TBRec/src/TBTree_CaloClusterH6.cxx   | 10 +-
 .../{TBRec => src}/TBTree_CaloClusterH6.h     |  0
 TestBeam/TBRec/src/TBXCryYTableRead.cxx       |  8 +-
 .../TBRec/{TBRec => src}/TBXCryYTableRead.h   |  4 +-
 .../TBRec/src/TBXMLCaloCellWriterTool.cxx     | 10 +-
 .../{TBRec => src}/TBXMLCaloCellWriterTool.h  |  2 +-
 TestBeam/TBRec/src/TBXMLEventWriterTool.cxx   |  8 +-
 .../{TBRec => src}/TBXMLEventWriterTool.h     |  2 +-
 TestBeam/TBRec/src/TBXMLWriter.cxx            | 12 +--
 TestBeam/TBRec/{TBRec => src}/TBXMLWriter.h   |  0
 TestBeam/TBRec/src/TBXMLWriterToolBase.cxx    |  2 +-
 .../{TBRec => src}/TBXMLWriterToolBase.h      |  5 -
 TestBeam/TBRec/src/TB_tree.cxx                |  3 +-
 TestBeam/TBRec/{TBRec => src}/TB_tree.h       |  4 +-
 TestBeam/TBRec/src/TileRec_h1000.cxx          |  3 +-
 TestBeam/TBRec/{TBRec => src}/TileRec_h1000.h |  4 +-
 .../TBRec/src/components/TBRec_entries.cxx    | 96 +++++++++----------
 113 files changed, 216 insertions(+), 481 deletions(-)
 mode change 100755 => 100644 TestBeam/TBRec/src/CBNTAA_BeamInstrumentation.cxx
 rename TestBeam/TBRec/{TBRec => src}/CBNTAA_BeamInstrumentation.h (93%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/CBNTAA_TBADCRaw.cxx
 rename TestBeam/TBRec/{TBRec => src}/CBNTAA_TBADCRaw.h (94%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/CBNTAA_TBInfo.cxx
 rename TestBeam/TBRec/{TBRec => src}/CBNTAA_TBInfo.h (96%)
 mode change 100755 => 100644
 rename TestBeam/TBRec/{TBRec => src}/CBNTAA_TBScint.h (92%)
 mode change 100755 => 100644 TestBeam/TBRec/src/CBNTAA_TBTDCRaw.cxx
 rename TestBeam/TBRec/{TBRec => src}/CBNTAA_TBTDCRaw.h (94%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/CBNTAA_TBTPValidation.cxx
 rename TestBeam/TBRec/{TBRec => src}/CBNTAA_TBTPValidation.h (98%)
 mode change 100755 => 100644
 rename TestBeam/TBRec/{TBRec => src}/CBNTAA_TBTrack.h (95%)
 mode change 100755 => 100644 TestBeam/TBRec/src/CBNT_BeamInstrumentation.cxx
 rename TestBeam/TBRec/{TBRec => src}/CBNT_BeamInstrumentation.h (95%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/CBNT_CaloH6.cxx
 rename TestBeam/TBRec/{TBRec => src}/CBNT_CaloH6.h (96%)
 mode change 100755 => 100644
 rename TestBeam/TBRec/{TBRec => src}/CBNT_TBRecBase.h (94%)
 mode change 100755 => 100644 TestBeam/TBRec/src/CBNT_Timing.cxx
 rename TestBeam/TBRec/{TBRec => src}/CBNT_Timing.h (96%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/CBNT_UpstreamMat.cxx
 rename TestBeam/TBRec/{TBRec => src}/CBNT_UpstreamMat.h (89%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/ImpactInCalo.cxx
 rename TestBeam/TBRec/{TBRec => src}/ImpactInCalo.h (98%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/ImpactInCaloCollection.cxx
 rename TestBeam/TBRec/{TBRec => src}/ImpactInCaloCollection.h (80%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBAlgoSequencer.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBAlgoSequencer.h (100%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBBPCRec.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBBPCRec.h (97%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBBeamQuality.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBBeamQuality.h (100%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBBeamQualityDoubleHitsTool.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBBeamQualityDoubleHitsTool.h (91%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBBeamQualityEMFractionTool.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBBeamQualityEMFractionTool.h (97%)
 mode change 100755 => 100644
 rename TestBeam/TBRec/{TBRec => src}/TBBeamQualityMC.h (92%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBBeamQualityMuonToolH6.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBBeamQualityMuonToolH6.h (91%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBBeamQualityTool.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBBeamQualityTool.h (94%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBBeamQualityTrackingTool.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBBeamQualityTrackingTool.h (91%)
 mode change 100755 => 100644
 rename TestBeam/TBRec/{TBRec => src}/TBCellContainerFillerTool.h (92%)
 rename TestBeam/TBRec/{TBRec => src}/TBCellNoiseCorrection.h (95%)
 rename TestBeam/TBRec/{TBRec => src}/TBClusterMaker.h (98%)
 rename TestBeam/TBRec/{TBRec => src}/TBDMContainerSplitter.h (92%)
 rename TestBeam/TBRec/{TBRec => src}/TBECLArRawChannelBuilder.h (97%)
 rename TestBeam/TBRec/{TBRec => src}/TBEMECCellEtaCorrection.h (100%)
 mode change 100755 => 100644 TestBeam/TBRec/src/TBEMECXTalkToyModel.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBEMECXTalkToyModel.h (94%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBEventInfoStreamerTool.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBEventInfoStreamerTool.h (94%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBEventStreamer.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBEventStreamer.h (100%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBEventStreamerTool.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBEventStreamerTool.h (100%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBExtrapolTrackToCaloTool.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBExtrapolTrackToCaloTool.h (99%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBLArRawChannelBuilder.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBLArRawChannelBuilder.h (95%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBMWPCRec.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBMWPCRec.h (100%)
 mode change 100755 => 100644
 rename TestBeam/TBRec/{TBRec => src}/TBNoiseWrite.h (97%)
 mode change 100755 => 100644 TestBeam/TBRec/src/TBPartIDCherenkovMuTag.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBPartIDCherenkovMuTag.h (85%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBPatternUnitStreamerTool.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBPatternUnitStreamerTool.h (98%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBPatternUnitStreamerToolH8.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBPatternUnitStreamerToolH8.h (98%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBPhaseRec.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBPhaseRec.h (100%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBPhaseStreamerTool.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBPhaseStreamerTool.h (96%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBPlaneTrackingAlgo.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBPlaneTrackingAlgo.h (97%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBPreScalerStreamerTool.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBPreScalerStreamerTool.h (96%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBScintillatorRec.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBScintillatorRec.h (95%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBTailCatcherRec.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBTailCatcherRec.h (94%)
 mode change 100755 => 100644
 rename TestBeam/TBRec/{TBRec => src}/TBTrackInfoFromTag.h (95%)
 mode change 100755 => 100644 TestBeam/TBRec/src/TBTrackToCaloAlg.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBTrackToCaloAlg.h (98%)
 mode change 100755 => 100644
 rename TestBeam/TBRec/{TBRec => src}/TBTree_CaloClusterH6.h (100%)
 rename TestBeam/TBRec/{TBRec => src}/TBXCryYTableRead.h (94%)
 mode change 100755 => 100644 TestBeam/TBRec/src/TBXMLCaloCellWriterTool.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBXMLCaloCellWriterTool.h (97%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBXMLEventWriterTool.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBXMLEventWriterTool.h (96%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBXMLWriter.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBXMLWriter.h (100%)
 mode change 100755 => 100644
 mode change 100755 => 100644 TestBeam/TBRec/src/TBXMLWriterToolBase.cxx
 rename TestBeam/TBRec/{TBRec => src}/TBXMLWriterToolBase.h (97%)
 mode change 100755 => 100644
 rename TestBeam/TBRec/{TBRec => src}/TB_tree.h (99%)
 rename TestBeam/TBRec/{TBRec => src}/TileRec_h1000.h (99%)

diff --git a/TestBeam/TBRec/src/CBNTAA_BeamInstrumentation.cxx b/TestBeam/TBRec/src/CBNTAA_BeamInstrumentation.cxx
old mode 100755
new mode 100644
index 9442df20423..32f0013dbdd
--- 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 e426c5401ae..bc824fbb86c
--- 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 9f222c13379..736f13869e7
--- 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 171d39abb13..836c4b89424
--- 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 918e78476c1..413f1fbc233
--- 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 b282f8d0853..3e06d50bcca
--- 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 bd7cf6c8560..cbdec9f4867 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 7dac53375b1..730afc207fe 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 2bd9a1c9722..c61cd95d7bd
--- 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 4f688a1c338..9e7d267d68a
--- 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 ccc5cc79375..2300e08b95f
--- 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 30386d7a3ce..0b620e90f3a
--- 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 a4a623f1a64..c799eafd540 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 42c0b919b73..6d46a259386 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 eeb0646b0ca..81313b27268
--- 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 59ab41d2d18..c44a17a8906
--- 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 704b211d090..1429de8253d
--- 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 633ddfcfc0f..3bb767da063
--- 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 b2fd2501c5b..a78ea073161 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 e8c2e2fcfc9..4cf7ba0c65a 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 52480759fef..9136e9c703e
--- 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 1cae276e107..5ac2a4d31b2
--- 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 12249dd71fc..d0539d0fee9
--- 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 b1d901ce41b..74eba111a8f
--- 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 bab95c27e92..03019859034
--- 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 8a31996edf3..785ceb29310
--- 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 0f576382677..89fd8710124
--- 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 db872843c3c..5f4317b4396
--- 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 e446f1ea79a..f10becf0d50
--- 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 0afe4bd65ff..2d56d0015f4
--- 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 917f1ab88b7..76d12acd664
--- 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 8ae8c9ee36a..e3f49973828
--- 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 ab71de0924b..ece802cfa87
--- 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 e8edf152d21..b5a4492356a
--- 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 bbca3303ce2..88d4fb11027
--- 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 a6cd7cddf2d..27c67b0191e
--- 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 52479b4c250..e6aa098e864 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 1caea4f57a7..3b5ff9278c6
--- 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 cabca65d2cd..1516c5b3f62
--- 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 577a6c80238..a85f39c2b49
--- 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 dceb40f4e1e..d05f6e2af11
--- 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 6e57d18d264..05c856c7a83
--- 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 d060cebbacd..2bd0968d582
--- 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 0f2e80a93fa..e3db4890bef
--- 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 2686f895e1c..46cbfa08feb 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 1089b5c2c70..a9d19e21085 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 4d1ad9683f4..b0732dda36d 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 8c650eb4278..b5c053e1e9b 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 61927bfa32c..68150d45990 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 24d42760d1f..32493482227 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 488c26f6b07..efc9fe09836 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 43ebdf455f1..eaaa0562ba0 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 0d104845677..c5a1cf2a50b 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 b2313b2ceff..348042fe0d2 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 ffe7d593412..eaeab8c89ae 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 7c06f6e901e..59ea1221a4b
--- 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 f4713b0031b..18252de837f
--- 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 86c38d2b4ab..7476e2799fe
--- 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 0c5c8c820b9..22a5590edd1
--- 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 5ae7572bb38..e2c7c22986e
--- 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 c41587ca269..026db782454
--- 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 bec48ed2bbe..b8085890e1a
--- 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 7e09da8c5c3..6da14524e86
--- 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 4379693e1d1..647517b037b
--- 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 be2e8cdc8e9..57ef0dbd68e
--- 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 2303357e103..105c2df2b59
--- 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 266dadd6443..decaa9becc0 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 fbb90e52482..417deb40991 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 ec5200ddf9d..2f66c7aad7a
--- 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 fe7ced1a6f3..af136d4cca5
--- 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 c46375a0cd8..b7865f70450
--- 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 867ed5241bd..d82e35f5495
--- 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 4dcbd680c33..687b3e0be32
--- 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 67555b208c1..e3a2c04af8b
--- 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 2989133e8be..f2c6cc12ac4
--- 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 7d2f5f17bbf..27f74eb3c3d
--- 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 d916924a909..728162d3e83
--- 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 b2a1218bf8c..11c249d5b36
--- 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 1574c9380ef..711cb606a6b
--- 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 9a1a5317ab4..d86120a46d8
--- 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 249ca9a609f..56a18444425
--- 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 e2e904f1776..114d5fe1a25
--- 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 b0a63af49eb..50e7ca3bf67
--- 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 262566a7185..cb87906e5bf
--- 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 ebf776183fe..37963627f0e
--- 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 7ab588b3cd3..05cc2ea64df 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 733c980ca86..0b93269bc2d 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 718fafc3422..24600bfffc9
--- 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 708e4d6a59b..d1091ab64dd
--- 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 d85bc684b62..9b0d22af307 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 907cd83f4f0..4b751997f8d 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 9cb58647db9..b0e75692a5d 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 9231fdb2727..6c584eecfb5
--- 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 82d068682b2..c4afbb7d363
--- 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 5bf10c4353b..630320f3206
--- 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 efb411e3649..2d54842ece1
--- 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 99e03e8be4f..cb43e1baf02
--- 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 78fcb75cbd4..89d679c689e
--- 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 88e2be4c897..764fbc18ec0
--- 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 f23ce3e28d6..5c2dcc1a8fe 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 67b1390cac6..c0c9c6a4b77 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 09db502f34c..c8ea33320a5 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 3ab6f91eeb0..4c1e1a0e664 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 ad9244c6747..541cc7dd364 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 )
-- 
GitLab