diff --git a/Reconstruction/tauRec/CMakeLists.txt b/Reconstruction/tauRec/CMakeLists.txt
index 58efb54427892632532af8e31771f757f48c00fb..6358a9be007a32e358f01b808fa496f6553c4d0f 100644
--- a/Reconstruction/tauRec/CMakeLists.txt
+++ b/Reconstruction/tauRec/CMakeLists.txt
@@ -1,37 +1,17 @@
-################################################################################
-# Package: tauRec
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( tauRec )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          GaudiKernel
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-                          InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
-                          PhysicsAnalysis/AnalysisCommon/ParticleEvent
-                          Reconstruction/tauRecTools
-                          PRIVATE
-                          Reconstruction/tauEvent )
-
 # External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( Boost )
 
 # Component(s) in the package:
-atlas_add_library( tauRecLib
-                   src/*.cxx
-                   PUBLIC_HEADERS tauRec
-                   INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel InDetReadoutGeometry TRT_ReadoutGeometry ParticleEvent tauRecToolsLib CaloEvent xAODCaloEvent CaloUtilsLib
-                   PRIVATE_LINK_LIBRARIES tauEvent )
-
 atlas_add_component( tauRec
+                     src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel ParticleEvent tauRecToolsLib CaloEvent xAODCaloEvent CaloUtilsLib tauEvent tauRecLib )
+                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${Boost_LIBRARIES} AthenaBaseComps CaloEvent CaloInterfaceLib CaloUtilsLib GaudiKernel InDetReadoutGeometry NavFourMom StoreGateLib TRT_ReadoutGeometry tauRecToolsLib xAODCaloEvent xAODCore xAODJet xAODPFlow xAODParticleEvent xAODTau xAODTracking )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
diff --git a/Reconstruction/tauRec/src/ClusterCellRelinkAlg.cxx b/Reconstruction/tauRec/src/ClusterCellRelinkAlg.cxx
index 6d27dbea8eb578b86b5c5bf4f3ed25393dc59ff3..3ec7b97d9d580fb26fcb97d790ea38e5678b0b6e 100644
--- a/Reconstruction/tauRec/src/ClusterCellRelinkAlg.cxx
+++ b/Reconstruction/tauRec/src/ClusterCellRelinkAlg.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
 */
 
-#include "tauRec/ClusterCellRelinkAlg.h"
+#include "ClusterCellRelinkAlg.h"
 #include "StoreGate/ReadHandle.h"
 #include "StoreGate/WriteHandle.h"
 #include "xAODCaloEvent/CaloClusterAuxContainer.h"
diff --git a/Reconstruction/tauRec/tauRec/ClusterCellRelinkAlg.h b/Reconstruction/tauRec/src/ClusterCellRelinkAlg.h
similarity index 100%
rename from Reconstruction/tauRec/tauRec/ClusterCellRelinkAlg.h
rename to Reconstruction/tauRec/src/ClusterCellRelinkAlg.h
diff --git a/Reconstruction/tauRec/src/TauCellThinningAlg.cxx b/Reconstruction/tauRec/src/TauCellThinningAlg.cxx
index 15dcd85b8e4bb5d4f09d9f668adc29653b14ddec..83f32876faaf241025e80852706c22035fb90bf5 100644
--- a/Reconstruction/tauRec/src/TauCellThinningAlg.cxx
+++ b/Reconstruction/tauRec/src/TauCellThinningAlg.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
 */
 
-#include "tauRec/TauCellThinningAlg.h"
+#include "TauCellThinningAlg.h"
 #include "StoreGate/ReadHandle.h"
 #include "StoreGate/ThinningHandle.h"
 #include "xAODCaloEvent/CaloCluster.h"
diff --git a/Reconstruction/tauRec/tauRec/TauCellThinningAlg.h b/Reconstruction/tauRec/src/TauCellThinningAlg.h
similarity index 100%
rename from Reconstruction/tauRec/tauRec/TauCellThinningAlg.h
rename to Reconstruction/tauRec/src/TauCellThinningAlg.h
diff --git a/Reconstruction/tauRec/src/TauProcessorAlg.cxx b/Reconstruction/tauRec/src/TauProcessorAlg.cxx
index 43136600269b3124febb7536b04428feb3fdee9e..0a904f8fa9319aacdade7fecb8827b230adbb7c7 100644
--- a/Reconstruction/tauRec/src/TauProcessorAlg.cxx
+++ b/Reconstruction/tauRec/src/TauProcessorAlg.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "tauRec/TauProcessorAlg.h"
+#include "TauProcessorAlg.h"
 #include "xAODTau/TauJetAuxContainer.h"
 #include "xAODTau/TauTrackAuxContainer.h"
 #include "xAODCaloEvent/CaloClusterAuxContainer.h"
diff --git a/Reconstruction/tauRec/tauRec/TauProcessorAlg.h b/Reconstruction/tauRec/src/TauProcessorAlg.h
similarity index 100%
rename from Reconstruction/tauRec/tauRec/TauProcessorAlg.h
rename to Reconstruction/tauRec/src/TauProcessorAlg.h
diff --git a/Reconstruction/tauRec/src/TauRunnerAlg.cxx b/Reconstruction/tauRec/src/TauRunnerAlg.cxx
index d7c255f922c0db4e5e2c2e4028df8b3edb8aa804..fe7655a953625da853bc6bfd96edf82602478259 100644
--- a/Reconstruction/tauRec/src/TauRunnerAlg.cxx
+++ b/Reconstruction/tauRec/src/TauRunnerAlg.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "tauRec/TauRunnerAlg.h"
+#include "TauRunnerAlg.h"
 
 #include "xAODJet/Jet.h"
 #include "xAODJet/JetContainer.h"
diff --git a/Reconstruction/tauRec/tauRec/TauRunnerAlg.h b/Reconstruction/tauRec/src/TauRunnerAlg.h
similarity index 100%
rename from Reconstruction/tauRec/tauRec/TauRunnerAlg.h
rename to Reconstruction/tauRec/src/TauRunnerAlg.h
diff --git a/Reconstruction/tauRec/src/components/tauRec_entries.cxx b/Reconstruction/tauRec/src/components/tauRec_entries.cxx
index 53f12d8ea3b79193fdceeda1b82741b02bda0e75..b95afa30f2c1cbfe0e31416300252f613e446658 100644
--- a/Reconstruction/tauRec/src/components/tauRec_entries.cxx
+++ b/Reconstruction/tauRec/src/components/tauRec_entries.cxx
@@ -1,7 +1,7 @@
-#include "tauRec/TauProcessorAlg.h"
-#include "tauRec/TauRunnerAlg.h"
-#include "tauRec/TauCellThinningAlg.h"
-#include "tauRec/ClusterCellRelinkAlg.h"
+#include "../TauProcessorAlg.h"
+#include "../TauRunnerAlg.h"
+#include "../TauCellThinningAlg.h"
+#include "../ClusterCellRelinkAlg.h"
 
 DECLARE_COMPONENT( TauProcessorAlg )
 DECLARE_COMPONENT( TauRunnerAlg )