diff --git a/Trigger/TrigHypothesis/TrigHypoCommonTools/TrigHypoCommonTools/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigHypothesis/TrigHypoCommonTools/ATLAS_CHECK_THREAD_SAFETY
similarity index 100%
rename from Trigger/TrigHypothesis/TrigHypoCommonTools/TrigHypoCommonTools/ATLAS_CHECK_THREAD_SAFETY
rename to Trigger/TrigHypothesis/TrigHypoCommonTools/ATLAS_CHECK_THREAD_SAFETY
diff --git a/Trigger/TrigHypothesis/TrigHypoCommonTools/CMakeLists.txt b/Trigger/TrigHypothesis/TrigHypoCommonTools/CMakeLists.txt
index 4b23bc6fd60f9c90f7143f04312bc26adcc1d620..4b917d045b62d6f62a21584792d563e04c071c13 100644
--- a/Trigger/TrigHypothesis/TrigHypoCommonTools/CMakeLists.txt
+++ b/Trigger/TrigHypothesis/TrigHypoCommonTools/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TrigHypoCommonTools )
@@ -7,8 +7,7 @@ atlas_subdir( TrigHypoCommonTools )
 atlas_add_component( TrigHypoCommonTools
                      src/*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES DecisionHandlingLib L1DecoderLib GaudiKernel TrigT1Result)
+                     LINK_LIBRARIES AsgTools AthLinks AthenaBaseComps AthenaMonitoringKernelLib DecisionHandlingLib GaudiKernel L1DecoderLib TrigCompositeUtilsLib TrigT1Result xAODBase )
 
 # Install files from the package:
-atlas_install_headers( TrigHypoCommonTools )
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
diff --git a/Trigger/TrigHypothesis/TrigHypoCommonTools/TrigHypoCommonTools/IL1InfoHypoTool.h b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/IL1InfoHypoTool.h
similarity index 100%
rename from Trigger/TrigHypothesis/TrigHypoCommonTools/TrigHypoCommonTools/IL1InfoHypoTool.h
rename to Trigger/TrigHypothesis/TrigHypoCommonTools/src/IL1InfoHypoTool.h
diff --git a/Trigger/TrigHypothesis/TrigHypoCommonTools/src/L1InfoHypo.cxx b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/L1InfoHypo.cxx
index 221e98864cd6d3cbd4e85d4488dcc857d9ab6dbe..057954fe2db58c3ec022d46e451bc62247bbeeee 100644
--- a/Trigger/TrigHypothesis/TrigHypoCommonTools/src/L1InfoHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/L1InfoHypo.cxx
@@ -6,8 +6,8 @@
 #include "AthLinks/ElementLink.h"
 #include "TrigT1Result/RoIBResult.h"
 
-#include "TrigHypoCommonTools/IL1InfoHypoTool.h"
-#include "TrigHypoCommonTools/L1InfoHypo.h"
+#include "IL1InfoHypoTool.h"
+#include "L1InfoHypo.h"
 
 
 L1InfoHypo::L1InfoHypo(const std::string& name, ISvcLocator* pSvcLocator)
diff --git a/Trigger/TrigHypothesis/TrigHypoCommonTools/TrigHypoCommonTools/L1InfoHypo.h b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/L1InfoHypo.h
similarity index 100%
rename from Trigger/TrigHypothesis/TrigHypoCommonTools/TrigHypoCommonTools/L1InfoHypo.h
rename to Trigger/TrigHypothesis/TrigHypoCommonTools/src/L1InfoHypo.h
diff --git a/Trigger/TrigHypothesis/TrigHypoCommonTools/src/L1InfoHypoTool.cxx b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/L1InfoHypoTool.cxx
index 71be13c5349e425721537788fde3e80068e925a8..6c917d98c12bfb172c02f7cae28dc37f006d29a8 100644
--- a/Trigger/TrigHypothesis/TrigHypoCommonTools/src/L1InfoHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/L1InfoHypoTool.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TrigHypoCommonTools/L1InfoHypoTool.h"
+#include "L1InfoHypoTool.h"
 
 L1InfoHypoTool::L1InfoHypoTool(const std::string& type, const std::string& name, const IInterface* parent) :
     base_class(type, name, parent),
diff --git a/Trigger/TrigHypothesis/TrigHypoCommonTools/TrigHypoCommonTools/L1InfoHypoTool.h b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/L1InfoHypoTool.h
similarity index 100%
rename from Trigger/TrigHypothesis/TrigHypoCommonTools/TrigHypoCommonTools/L1InfoHypoTool.h
rename to Trigger/TrigHypothesis/TrigHypoCommonTools/src/L1InfoHypoTool.h
diff --git a/Trigger/TrigHypothesis/TrigHypoCommonTools/src/TrigComboHypoTool.cxx b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/TrigComboHypoTool.cxx
index 183bd6f3b93f0a9eff20c4d4426e6e3e51fb7b63..08da67487aebe7440c4d0a584bf71393b9ece434 100644
--- a/Trigger/TrigHypothesis/TrigHypoCommonTools/src/TrigComboHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/TrigComboHypoTool.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TrigHypoCommonTools/TrigComboHypoTool.h"
+#include "TrigComboHypoTool.h"
 
 #include <cmath>
 
diff --git a/Trigger/TrigHypothesis/TrigHypoCommonTools/TrigHypoCommonTools/TrigComboHypoTool.h b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/TrigComboHypoTool.h
similarity index 100%
rename from Trigger/TrigHypothesis/TrigHypoCommonTools/TrigHypoCommonTools/TrigComboHypoTool.h
rename to Trigger/TrigHypothesis/TrigHypoCommonTools/src/TrigComboHypoTool.h
diff --git a/Trigger/TrigHypothesis/TrigHypoCommonTools/src/components/TrigHypoCommonTools_entries.cxx b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/components/TrigHypoCommonTools_entries.cxx
index 6f0ffa8489b891b0109f26e22c0b14f16723183b..d7dab0a206094047b5293e1326d3da6566ea957d 100644
--- a/Trigger/TrigHypothesis/TrigHypoCommonTools/src/components/TrigHypoCommonTools_entries.cxx
+++ b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/components/TrigHypoCommonTools_entries.cxx
@@ -1,6 +1,6 @@
-#include "TrigHypoCommonTools/L1InfoHypo.h"
-#include "TrigHypoCommonTools/L1InfoHypoTool.h"
-#include "TrigHypoCommonTools/TrigComboHypoTool.h"
+#include "../L1InfoHypo.h"
+#include "../L1InfoHypoTool.h"
+#include "../TrigComboHypoTool.h"
 
 DECLARE_COMPONENT(L1InfoHypo)
 DECLARE_COMPONENT(L1InfoHypoTool)