diff --git a/Trigger/TrigConfiguration/HLTUtils/CMakeLists.txt b/Trigger/TrigConfiguration/HLTUtils/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..31263449398693cc6e444037c6482ead77b78d77
--- /dev/null
+++ b/Trigger/TrigConfiguration/HLTUtils/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+
+# Declare the package name.
+atlas_subdir( HLTUtils )
+
+# Add the package's stand alone library
+atlas_add_library( HLTUtilsLib
+  HLTUtils/*.h Root/*.cxx
+  PUBLIC_HEADERS HLTUtils
+  LINK_LIBRARIES CxxUtils )
+
+# Executable(s).
+atlas_add_executable( trigconf_string2hash
+  util/trigconf_string2hash.cxx
+  LINK_LIBRARIES HLTUtilsLib )
diff --git a/Trigger/TrigConfiguration/HLTUtils/HLTUtils/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigConfiguration/HLTUtils/HLTUtils/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..20c4eef653a82ad5e65926342fc52a64d56f2595
--- /dev/null
+++ b/Trigger/TrigConfiguration/HLTUtils/HLTUtils/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Trigger/TrigConfiguration/HLTUtils
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/HLTUtils.h b/Trigger/TrigConfiguration/HLTUtils/HLTUtils/HLTUtils.h
similarity index 93%
rename from Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/HLTUtils.h
rename to Trigger/TrigConfiguration/HLTUtils/HLTUtils/HLTUtils.h
index b7a2f3fdd2e9ea6f48b3acba8c5ccc9e38b6efbf..9d0205995ea977d35905bc1c024ed657b38e57f2 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/HLTUtils.h
+++ b/Trigger/TrigConfiguration/HLTUtils/HLTUtils/HLTUtils.h
@@ -2,8 +2,8 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#ifndef TrigCompositeUtils_HLTUtils
-#define TrigCompositeUtils_HLTUtils
+#ifndef HLTUtils_HLTUtils
+#define HLTUtils_HLTUtils
 
 #include <string>
 #include <inttypes.h>
diff --git a/Trigger/TrigConfiguration/HLTUtils/README.md b/Trigger/TrigConfiguration/HLTUtils/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..1f7d3808b6a852f0a2e30af2c585cc35729510f0
--- /dev/null
+++ b/Trigger/TrigConfiguration/HLTUtils/README.md
@@ -0,0 +1,10 @@
+# HLTUtils
+
+Package to host the `string2hash`, `hash2string`, `hashes2file` and `file2hashes` helper functions.
+
+In Run 2 these were hosted in the `Trigger/TriConfiguration/TrigConfHLTData` package along with Run 2 specific trigger element helper functions.
+
+For Run 3, the deprecated trigger element helper functions are moved under a new `HLTTEUtils` class, the hashing helper functions remain under the `HLTUtils` class and move into this package.
+
+This package cannot have any Gaudi dependencies.
+
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/Root/HLTUtils.cxx b/Trigger/TrigConfiguration/HLTUtils/Root/HLTUtils.cxx
similarity index 98%
rename from Trigger/TrigSteer/TrigCompositeUtils/Root/HLTUtils.cxx
rename to Trigger/TrigConfiguration/HLTUtils/Root/HLTUtils.cxx
index 45ddbd7d9945f8e8aad0e63051dd539dc2dd266c..f55b3972a45ffef6d0ffe8d2304b0cecbef88b25 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/Root/HLTUtils.cxx
+++ b/Trigger/TrigConfiguration/HLTUtils/Root/HLTUtils.cxx
@@ -13,7 +13,7 @@
 #include <vector>
 #include <fstream>
 
-#include "TrigCompositeUtils/HLTUtils.h"
+#include "HLTUtils/HLTUtils.h"
 #include "CxxUtils/checker_macros.h"
 
 using namespace TrigConf;
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/util/trigconf_string2hash.cxx b/Trigger/TrigConfiguration/HLTUtils/util/trigconf_string2hash.cxx
similarity index 86%
rename from Trigger/TrigSteer/TrigCompositeUtils/util/trigconf_string2hash.cxx
rename to Trigger/TrigConfiguration/HLTUtils/util/trigconf_string2hash.cxx
index e48d0519ec8cfe6c87200e049738fb2254c753fc..064cb66b9856d4cbe5ff5c16ccc03ee2d2237ea2 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/util/trigconf_string2hash.cxx
+++ b/Trigger/TrigConfiguration/HLTUtils/util/trigconf_string2hash.cxx
@@ -3,7 +3,7 @@
 */
 
 #include <iostream>
-#include "TrigCompositeUtils/HLTUtils.h"
+#include "HLTUtils/HLTUtils.h"
 
 int main (int argc, char *argv []) {
   if (argc > 1) {
diff --git a/Trigger/TrigConfiguration/TrigConfHLTData/CMakeLists.txt b/Trigger/TrigConfiguration/TrigConfHLTData/CMakeLists.txt
index b0a40ea93af136401052992e2aaa08f146029626..d8da5f472d296431a633054a2aae7d13bb75c785 100644
--- a/Trigger/TrigConfiguration/TrigConfHLTData/CMakeLists.txt
+++ b/Trigger/TrigConfiguration/TrigConfHLTData/CMakeLists.txt
@@ -9,7 +9,7 @@ atlas_subdir( TrigConfHLTData )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
    Trigger/TrigConfiguration/TrigConfL1Data
-   Trigger/TrigSteer/TrigCompositeUtils )
+   Trigger/TrigConfiguration/HLTUtils )
 
 # External dependencies:
 find_package( Boost COMPONENTS system thread )
diff --git a/Trigger/TrigConfiguration/TrigConfHLTData/TrigConfHLTData/HLTUtils.h b/Trigger/TrigConfiguration/TrigConfHLTData/TrigConfHLTData/HLTUtils.h
index 071fc0824cfc52b86d33155e7d1fbd477fd67699..7abdc8a637f92ef1735823752e7cba0d3163c020 100644
--- a/Trigger/TrigConfiguration/TrigConfHLTData/TrigConfHLTData/HLTUtils.h
+++ b/Trigger/TrigConfiguration/TrigConfHLTData/TrigConfHLTData/HLTUtils.h
@@ -3,10 +3,10 @@
 */
 
 /// Hashing functions have moved here
-#include "TrigCompositeUtils/HLTUtils.h"
+#include "HLTUtils/HLTUtils.h"
 
-#ifndef TrigConf_HLTUtils
-#define TrigConf_HLTUtils
+#ifndef TrigConfHLTData_HLTUtils
+#define TrigConfHLTData_HLTUtils
 
 #include <string>
 #include <inttypes.h>
@@ -24,7 +24,7 @@ namespace TrigConf {
    class HLTFrame;
      
   /**
-   * @brief HLTUtils is renamed in r22 toHLTTEUtils. The hashing functionality remains in HLTUtils, which moves to the TrigCompositeUtils package
+   * @brief HLTUtils is renamed in r22 to HLTTEUtils. The hashing functionality remains in HLTUtils, which moves to the standalone HLTUtils package
    */ 
    class HLTTEUtils {
 
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/CMakeLists.txt b/Trigger/TrigSteer/TrigCompositeUtils/CMakeLists.txt
index cd7a5a367c2deaf2bcbabc131777ac27531cf8ab..a7cd4aafa2bbf03e6a486f0170ae7c2c37bbd4cc 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/CMakeLists.txt
+++ b/Trigger/TrigSteer/TrigCompositeUtils/CMakeLists.txt
@@ -12,26 +12,15 @@ if( NOT XAOD_STANDALONE )
     xAODTrigger )
 endif()
 
-# Add the package's stand alone library
-atlas_add_library( HLTUtilsLib
-  TrigCompositeUtils/HLTUtils.h Root/HLTUtils.cxx
-  PUBLIC_HEADERS TrigCompositeUtils
-  LINK_LIBRARIES CxxUtils )
-
 # Add the package's dual use library.
 atlas_add_library( TrigCompositeUtilsLib
-  TrigCompositeUtils/HLTIdentifier.h TrigCompositeUtils/Combinators.h TrigCompositeUtils/TrigCompositeUtils.h TrigCompositeUtils/TrigCompositeUtils.icc Root/HLTIdentifier.cxx Root/Combinators.cxx ${extra_srcs}
+  TrigCompositeUtils/*.h TrigCompositeUtils/*.icc Root/*.cxx ${extra_srcs}
   PUBLIC_HEADERS TrigCompositeUtils
   LINK_LIBRARIES HLTUtilsLib CxxUtils AsgMessagingLib ${extra_libs} )
 
 # Install files from the package.
 atlas_install_python_modules( python/*.py )
 
-# Executable(s).
-atlas_add_executable( trigconf_string2hash
-  util/trigconf_string2hash.cxx
-  LINK_LIBRARIES HLTUtilsLib )
-
 # Unit test(s).
 if( NOT XAOD_STANDALONE )
   atlas_add_test( TrigCompositeUtils_test
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/README.md b/Trigger/TrigSteer/TrigCompositeUtils/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..240dfa4388aa701a67346c7b5eea9f1e65be9ee9
--- /dev/null
+++ b/Trigger/TrigSteer/TrigCompositeUtils/README.md
@@ -0,0 +1,15 @@
+# TrigCompositeUtils
+
+Package to host helper classes used both online in HLT execution and offline in the analysis of the HLT result.
+
+## TrigCompositeUtils
+
+Quality of life helpers and navigation helpers to aid in creating and interpreting `xAOD::TrigComposite` (also known as `Decision`) objects linked together to form a directed acyclic graph structure. This graph is referred to as the trigger navigation.  
+
+## HLTIdentifier
+
+Wrapper function around a HLT chain's name (or chain's leg's name), allowing easier access to both the `std::string` and hashed `uint32_t` representations along with iostream functions.
+
+## Combinators
+
+Placeholder for combinatoric iteration helper code over combined chains
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/Root/HLTIdentifier.cxx b/Trigger/TrigSteer/TrigCompositeUtils/Root/HLTIdentifier.cxx
index 27461a455ec77708e1b89e24d93ced5de71c4c27..12bcac92753f8310c5978e39b4245b3f67f383ec 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/Root/HLTIdentifier.cxx
+++ b/Trigger/TrigSteer/TrigCompositeUtils/Root/HLTIdentifier.cxx
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "TrigCompositeUtils/HLTUtils.h"
+#include "HLTUtils/HLTUtils.h"
 #include "TrigCompositeUtils/HLTIdentifier.h"
 
 using namespace HLT;