diff --git a/include/llarp.h b/include/llarp.h
index 8c00f9dc9..24779c17d 100644
--- a/include/llarp.h
+++ b/include/llarp.h
@@ -7,7 +7,7 @@
 #include <handlers/tun.hpp>     // for handlers
 #include <service/address.hpp>  // for service::address
 #include <service/endpoint.hpp>
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
 #include <util/mem.h>
 
 extern "C"
diff --git a/libabyss/include/abyss/server.hpp b/libabyss/include/abyss/server.hpp
index e2f446578..e77015d79 100644
--- a/libabyss/include/abyss/server.hpp
+++ b/libabyss/include/abyss/server.hpp
@@ -3,8 +3,8 @@
 
 #include <ev/ev.h>
 #include <util/json.hpp>
-#include <util/logic.hpp>
 #include <util/string_view.hpp>
+#include <util/thread/logic.hpp>
 #include <util/time.hpp>
 
 #include <absl/types/optional.h>
diff --git a/llarp/CMakeLists.txt b/llarp/CMakeLists.txt
index 35485b2b7..b4157f283 100644
--- a/llarp/CMakeLists.txt
+++ b/llarp/CMakeLists.txt
@@ -25,7 +25,6 @@ set(LIB_UTIL_SRC
   util/logging/ostream_logger.cpp
   util/logging/syslog_logger.cpp
   util/logging/win32_logger.cpp
-  util/logic.cpp
   util/mem.cpp
   util/meta/memfn_traits.cpp
   util/meta/memfn.cpp
@@ -39,19 +38,20 @@ set(LIB_UTIL_SRC
   util/metrics/stream_publisher.cpp
   util/metrics/types.cpp
   util/printer.cpp
-  util/queue_manager.cpp
-  util/queue.cpp
-  util/scheduler.cpp
   util/status.cpp
   util/stopwatch.cpp
   util/str.cpp
   util/string_view.cpp
-  util/thread_pool.cpp
-  util/threading.cpp
-  util/threadpool.cpp
+  util/thread/logic.cpp
+  util/thread/queue_manager.cpp
+  util/thread/queue.cpp
+  util/thread/scheduler.cpp
+  util/thread/thread_pool.cpp
+  util/thread/threading.cpp
+  util/thread/threadpool.cpp
+  util/thread/timer.cpp
+  util/thread/timerqueue.cpp
   util/time.cpp
-  util/timer.cpp
-  util/timerqueue.cpp
   util/types.cpp
 )
 
diff --git a/llarp/context.cpp b/llarp/context.cpp
index 326c56871..509902a4d 100644
--- a/llarp/context.cpp
+++ b/llarp/context.cpp
@@ -15,7 +15,7 @@
 #include <util/metrics/metrics.hpp>
 #include <util/metrics/metrictank_publisher.hpp>
 #include <util/metrics/stream_publisher.hpp>
-#include <util/scheduler.hpp>
+#include <util/thread/scheduler.hpp>
 
 #include <absl/strings/str_split.h>
 #include <cxxopts.hpp>
diff --git a/llarp/crypto/encrypted_frame.hpp b/llarp/crypto/encrypted_frame.hpp
index bbd7537da..e1fccab5e 100644
--- a/llarp/crypto/encrypted_frame.hpp
+++ b/llarp/crypto/encrypted_frame.hpp
@@ -6,7 +6,7 @@
 #include <util/buffer.hpp>
 #include <utility>
 #include <util/mem.h>
-#include <util/threadpool.h>
+#include <util/thread/threadpool.h>
 
 namespace llarp
 {
diff --git a/llarp/dht/context.cpp b/llarp/dht/context.cpp
index 0a77440e8..d729543e9 100644
--- a/llarp/dht/context.cpp
+++ b/llarp/dht/context.cpp
@@ -17,7 +17,7 @@
 #include <path/path_context.hpp>
 #include <router/abstractrouter.hpp>
 #include <routing/dht_message.hpp>
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
 #include <nodedb.hpp>
 
 #include <vector>
diff --git a/llarp/dns/server.cpp b/llarp/dns/server.cpp
index eae005b8b..b74d498bc 100644
--- a/llarp/dns/server.cpp
+++ b/llarp/dns/server.cpp
@@ -1,7 +1,7 @@
 #include <dns/server.hpp>
 
 #include <crypto/crypto.hpp>
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
 #include <array>
 #include <utility>
 
diff --git a/llarp/dns/server.hpp b/llarp/dns/server.hpp
index f2f66ab5a..577db8721 100644
--- a/llarp/dns/server.hpp
+++ b/llarp/dns/server.hpp
@@ -5,7 +5,7 @@
 #include <ev/ev.h>
 #include <net/net.hpp>
 #include <util/string_view.hpp>
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
 
 #include <unordered_map>
 
diff --git a/llarp/ev/ev.cpp b/llarp/ev/ev.cpp
index a5a8d0f54..54366cde1 100644
--- a/llarp/ev/ev.cpp
+++ b/llarp/ev/ev.cpp
@@ -1,7 +1,7 @@
 #include <ev/ev.h>
-#include <util/logic.hpp>
 #include <util/mem.hpp>
 #include <util/string_view.hpp>
+#include <util/thread/logic.hpp>
 #include <net/net_addr.hpp>
 
 #include <cstddef>
diff --git a/llarp/ev/ev.hpp b/llarp/ev/ev.hpp
index 4d351292e..9c38d2ac1 100644
--- a/llarp/ev/ev.hpp
+++ b/llarp/ev/ev.hpp
@@ -4,7 +4,7 @@
 #include <ev/ev.h>
 #include <util/buffer.hpp>
 #include <util/codel.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 
 // writev
 #ifndef _WIN32
diff --git a/llarp/handlers/tun.cpp b/llarp/handlers/tun.cpp
index 1ee8b3929..ebf9d6c52 100644
--- a/llarp/handlers/tun.cpp
+++ b/llarp/handlers/tun.cpp
@@ -12,8 +12,8 @@
 #include <ev/ev.hpp>
 #include <router/abstractrouter.hpp>
 #include <service/context.hpp>
-#include <util/logic.hpp>
 #include <util/meta/memfn.hpp>
+#include <util/thread/logic.hpp>
 #include <nodedb.hpp>
 
 #include <util/str.hpp>
diff --git a/llarp/handlers/tun.hpp b/llarp/handlers/tun.hpp
index 8af830e07..61b60a85b 100644
--- a/llarp/handlers/tun.hpp
+++ b/llarp/handlers/tun.hpp
@@ -7,7 +7,7 @@
 #include <net/net.hpp>
 #include <service/endpoint.hpp>
 #include <util/codel.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 
 #include <future>
 
diff --git a/llarp/link/i_link_manager.hpp b/llarp/link/i_link_manager.hpp
index 8af30e7aa..55d32dd4a 100644
--- a/llarp/link/i_link_manager.hpp
+++ b/llarp/link/i_link_manager.hpp
@@ -2,8 +2,8 @@
 #define LLARP_I_LINK_MANAGER_HPP
 
 #include <link/server.hpp>
+#include <util/thread/logic.hpp>
 #include <util/types.hpp>
-#include <util/logic.hpp>
 
 #include <functional>
 
diff --git a/llarp/link/link_manager.hpp b/llarp/link/link_manager.hpp
index 17f29f8c3..877a65816 100644
--- a/llarp/link/link_manager.hpp
+++ b/llarp/link/link_manager.hpp
@@ -4,7 +4,7 @@
 #include <link/i_link_manager.hpp>
 
 #include <util/compare_ptr.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 #include <link/server.hpp>
 
 #include <unordered_map>
diff --git a/llarp/link/server.hpp b/llarp/link/server.hpp
index be25c4fdc..499040db2 100644
--- a/llarp/link/server.hpp
+++ b/llarp/link/server.hpp
@@ -6,9 +6,9 @@
 #include <link/session.hpp>
 #include <net/net.hpp>
 #include <router_contact.hpp>
-#include <util/logic.hpp>
-#include <util/threading.hpp>
 #include <util/status.hpp>
+#include <util/thread/logic.hpp>
+#include <util/thread/threading.hpp>
 
 #include <list>
 #include <memory>
diff --git a/llarp/messages/relay_commit.cpp b/llarp/messages/relay_commit.cpp
index 0fe305f3a..51a08cfb9 100644
--- a/llarp/messages/relay_commit.cpp
+++ b/llarp/messages/relay_commit.cpp
@@ -11,8 +11,8 @@
 #include <util/bencode.hpp>
 #include <util/buffer.hpp>
 #include <util/logging/logger.hpp>
-#include <util/logic.hpp>
 #include <util/meta/memfn.hpp>
+#include <util/thread/logic.hpp>
 
 #include <functional>
 
diff --git a/llarp/messages/relay_status.cpp b/llarp/messages/relay_status.cpp
index 386ecdcb5..a7869a1d5 100644
--- a/llarp/messages/relay_status.cpp
+++ b/llarp/messages/relay_status.cpp
@@ -8,8 +8,8 @@
 #include <util/bencode.hpp>
 #include <util/buffer.hpp>
 #include <util/logging/logger.hpp>
-#include <util/logic.hpp>
 #include <util/meta/memfn.hpp>
+#include <util/thread/logic.hpp>
 
 #include <functional>
 #include <utility>
diff --git a/llarp/nodedb.cpp b/llarp/nodedb.cpp
index 2c79f62c6..ea0fd9a2c 100644
--- a/llarp/nodedb.cpp
+++ b/llarp/nodedb.cpp
@@ -6,9 +6,9 @@
 #include <util/encode.hpp>
 #include <util/fs.hpp>
 #include <util/logging/logger.hpp>
-#include <util/logic.hpp>
 #include <util/mem.hpp>
-#include <util/thread_pool.hpp>
+#include <util/thread/logic.hpp>
+#include <util/thread/thread_pool.hpp>
 
 #include <fstream>
 #include <unordered_map>
diff --git a/llarp/nodedb.hpp b/llarp/nodedb.hpp
index d88eda827..7540f9be5 100644
--- a/llarp/nodedb.hpp
+++ b/llarp/nodedb.hpp
@@ -5,7 +5,7 @@
 #include <router_id.hpp>
 #include <util/common.hpp>
 #include <util/fs.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 
 #include <absl/base/thread_annotations.h>
 
diff --git a/llarp/path/path.cpp b/llarp/path/path.cpp
index e9021de50..381ec6f02 100644
--- a/llarp/path/path.cpp
+++ b/llarp/path/path.cpp
@@ -13,7 +13,7 @@
 #include <routing/transfer_traffic_message.hpp>
 #include <util/buffer.hpp>
 #include <util/endian.hpp>
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
 
 #include <deque>
 
diff --git a/llarp/path/path.hpp b/llarp/path/path.hpp
index ec31a2f40..9d7f275a1 100644
--- a/llarp/path/path.hpp
+++ b/llarp/path/path.hpp
@@ -15,7 +15,7 @@
 #include <service/intro.hpp>
 #include <util/aligned.hpp>
 #include <util/compare_ptr.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 #include <util/time.hpp>
 
 #include <algorithm>
diff --git a/llarp/path/pathbuilder.cpp b/llarp/path/pathbuilder.cpp
index 069cbf20e..7b0ff380b 100644
--- a/llarp/path/pathbuilder.cpp
+++ b/llarp/path/pathbuilder.cpp
@@ -7,8 +7,8 @@
 #include <profiling.hpp>
 #include <router/abstractrouter.hpp>
 #include <util/buffer.hpp>
-#include <util/logic.hpp>
 #include <util/meta/memfn.hpp>
+#include <util/thread/logic.hpp>
 
 #include <functional>
 
diff --git a/llarp/path/pathset.hpp b/llarp/path/pathset.hpp
index 1acb8e7ca..802351d63 100644
--- a/llarp/path/pathset.hpp
+++ b/llarp/path/pathset.hpp
@@ -6,7 +6,7 @@
 #include <routing/message.hpp>
 #include <service/intro_set.hpp>
 #include <util/status.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 #include <util/time.hpp>
 
 #include <functional>
diff --git a/llarp/profiling.hpp b/llarp/profiling.hpp
index 0b0b72b35..f82c93169 100644
--- a/llarp/profiling.hpp
+++ b/llarp/profiling.hpp
@@ -4,7 +4,7 @@
 #include <path/path.hpp>
 #include <router_id.hpp>
 #include <util/bencode.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 
 #include <absl/base/thread_annotations.h>
 #include <map>
diff --git a/llarp/router/outbound_message_handler.hpp b/llarp/router/outbound_message_handler.hpp
index d64a7c905..bebcf3a9d 100644
--- a/llarp/router/outbound_message_handler.hpp
+++ b/llarp/router/outbound_message_handler.hpp
@@ -3,8 +3,8 @@
 
 #include <router/i_outbound_message_handler.hpp>
 
-#include <util/threading.hpp>
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
+#include <util/thread/threading.hpp>
 #include <router_id.hpp>
 
 #include <list>
diff --git a/llarp/router/outbound_session_maker.cpp b/llarp/router/outbound_session_maker.cpp
index 82dbdfa62..f3418171b 100644
--- a/llarp/router/outbound_session_maker.cpp
+++ b/llarp/router/outbound_session_maker.cpp
@@ -5,9 +5,9 @@
 #include <nodedb.hpp>
 #include <router/i_rc_lookup_handler.hpp>
 #include <link/i_link_manager.hpp>
-#include <util/logic.hpp>
 #include <util/meta/memfn.hpp>
-#include <util/threading.hpp>
+#include <util/thread/logic.hpp>
+#include <util/thread/threading.hpp>
 #include <util/status.hpp>
 #include <crypto/crypto.hpp>
 #include <utility>
diff --git a/llarp/router/outbound_session_maker.hpp b/llarp/router/outbound_session_maker.hpp
index 9be7f47c5..501fa5514 100644
--- a/llarp/router/outbound_session_maker.hpp
+++ b/llarp/router/outbound_session_maker.hpp
@@ -4,9 +4,9 @@
 #include <router/i_outbound_session_maker.hpp>
 
 #include <router/i_rc_lookup_handler.hpp>
-#include <util/threading.hpp>
-#include <util/thread_pool.hpp>
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
+#include <util/thread/threading.hpp>
+#include <util/thread/thread_pool.hpp>
 
 #include <unordered_map>
 #include <list>
diff --git a/llarp/router/rc_lookup_handler.cpp b/llarp/router/rc_lookup_handler.cpp
index d08e44926..8cf76c334 100644
--- a/llarp/router/rc_lookup_handler.cpp
+++ b/llarp/router/rc_lookup_handler.cpp
@@ -7,7 +7,7 @@
 #include <router_contact.hpp>
 #include <util/meta/memfn.hpp>
 #include <util/types.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 #include <nodedb.hpp>
 #include <dht/context.hpp>
 
diff --git a/llarp/router/rc_lookup_handler.hpp b/llarp/router/rc_lookup_handler.hpp
index a94a60a1c..5e72eab0d 100644
--- a/llarp/router/rc_lookup_handler.hpp
+++ b/llarp/router/rc_lookup_handler.hpp
@@ -3,8 +3,8 @@
 
 #include <router/i_rc_lookup_handler.hpp>
 
-#include <util/threading.hpp>
-#include <util/thread_pool.hpp>
+#include <util/thread/threading.hpp>
+#include <util/thread/thread_pool.hpp>
 
 #include <unordered_map>
 #include <set>
diff --git a/llarp/router/router.hpp b/llarp/router/router.hpp
index 27a83b1c5..dce19004f 100644
--- a/llarp/router/router.hpp
+++ b/llarp/router/router.hpp
@@ -8,28 +8,28 @@
 #include <ev/ev.h>
 #include <exit/context.hpp>
 #include <handlers/tun.hpp>
+#include <link/factory.hpp>
+#include <link/link_manager.hpp>
 #include <link/server.hpp>
 #include <messages/link_message_parser.hpp>
 #include <nodedb.hpp>
 #include <path/path_context.hpp>
 #include <profiling.hpp>
 #include <router_contact.hpp>
+#include <router/outbound_message_handler.hpp>
+#include <router/outbound_session_maker.hpp>
+#include <router/rc_lookup_handler.hpp>
 #include <routing/handler.hpp>
 #include <routing/message_parser.hpp>
 #include <rpc/rpc.hpp>
 #include <service/context.hpp>
 #include <util/buffer.hpp>
 #include <util/fs.hpp>
-#include <util/logic.hpp>
 #include <util/mem.hpp>
 #include <util/status.hpp>
 #include <util/str.hpp>
-#include <util/threadpool.h>
-#include <router/outbound_message_handler.hpp>
-#include <router/outbound_session_maker.hpp>
-#include <link/link_manager.hpp>
-#include <link/factory.hpp>
-#include <router/rc_lookup_handler.hpp>
+#include <util/thread/logic.hpp>
+#include <util/thread/threadpool.h>
 
 #include <functional>
 #include <list>
diff --git a/llarp/service/async_key_exchange.cpp b/llarp/service/async_key_exchange.cpp
index 6c650f565..cbf06e1b3 100644
--- a/llarp/service/async_key_exchange.cpp
+++ b/llarp/service/async_key_exchange.cpp
@@ -2,8 +2,8 @@
 
 #include <crypto/crypto.hpp>
 #include <crypto/types.hpp>
-#include <util/logic.hpp>
 #include <util/meta/memfn.hpp>
+#include <util/thread/logic.hpp>
 #include <utility>
 
 namespace llarp
diff --git a/llarp/service/endpoint.cpp b/llarp/service/endpoint.cpp
index 11c5f8185..585826cc9 100644
--- a/llarp/service/endpoint.cpp
+++ b/llarp/service/endpoint.cpp
@@ -15,11 +15,12 @@
 #include <service/hidden_service_address_lookup.hpp>
 #include <service/outbound_context.hpp>
 #include <service/protocol.hpp>
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
 #include <util/str.hpp>
 #include <util/buffer.hpp>
 #include <util/meta/memfn.hpp>
 #include <hook/shell.hpp>
+
 #include <utility>
 
 namespace llarp
diff --git a/llarp/service/endpoint.hpp b/llarp/service/endpoint.hpp
index b40dfc345..ebd25e78f 100644
--- a/llarp/service/endpoint.hpp
+++ b/llarp/service/endpoint.hpp
@@ -17,7 +17,7 @@
 #include <service/tag_lookup_job.hpp>
 #include <hook/ihook.hpp>
 #include <util/compare_ptr.hpp>
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
 
 // minimum time between introset shifts
 #ifndef MIN_SHIFT_INTERVAL
diff --git a/llarp/service/lookup.cpp b/llarp/service/lookup.cpp
index e231615f5..90dbcfe84 100644
--- a/llarp/service/lookup.cpp
+++ b/llarp/service/lookup.cpp
@@ -3,7 +3,7 @@
 #include <path/path.hpp>
 #include <util/time.hpp>
 #include <router/abstractrouter.hpp>
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
 #include <utility>
 
 namespace llarp
diff --git a/llarp/service/protocol.cpp b/llarp/service/protocol.cpp
index c2eec134f..8f723c1f2 100644
--- a/llarp/service/protocol.cpp
+++ b/llarp/service/protocol.cpp
@@ -2,9 +2,10 @@
 #include <path/path.hpp>
 #include <routing/handler.hpp>
 #include <util/buffer.hpp>
-#include <util/logic.hpp>
 #include <util/mem.hpp>
 #include <util/meta/memfn.hpp>
+#include <util/thread/logic.hpp>
+
 #include <utility>
 
 namespace llarp
diff --git a/llarp/service/sendcontext.cpp b/llarp/service/sendcontext.cpp
index e25647978..9571caffa 100644
--- a/llarp/service/sendcontext.cpp
+++ b/llarp/service/sendcontext.cpp
@@ -3,7 +3,7 @@
 #include <router/abstractrouter.hpp>
 #include <routing/path_transfer_message.hpp>
 #include <service/endpoint.hpp>
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
 #include <utility>
 
 namespace llarp
diff --git a/llarp/util/codel.hpp b/llarp/util/codel.hpp
index 9e67a7bb8..c0c257c19 100644
--- a/llarp/util/codel.hpp
+++ b/llarp/util/codel.hpp
@@ -3,7 +3,7 @@
 
 #include <util/logging/logger.hpp>
 #include <util/mem.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 #include <util/time.hpp>
 
 #include <algorithm>
diff --git a/llarp/util/logging/file_logger.hpp b/llarp/util/logging/file_logger.hpp
index fef0626ed..c8db68689 100644
--- a/llarp/util/logging/file_logger.hpp
+++ b/llarp/util/logging/file_logger.hpp
@@ -3,7 +3,7 @@
 
 #include <util/logging/logstream.hpp>
 
-#include <util/thread_pool.hpp>
+#include <util/thread/thread_pool.hpp>
 #include <util/time.hpp>
 
 #include <deque>
diff --git a/llarp/util/meta/object.hpp b/llarp/util/meta/object.hpp
index 71b3d8871..c53872997 100644
--- a/llarp/util/meta/object.hpp
+++ b/llarp/util/meta/object.hpp
@@ -1,7 +1,7 @@
 #ifndef LLARP_OBJECT_HPP
 #define LLARP_OBJECT_HPP
 
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 
 #include <absl/types/optional.h>
 #include <vector>
diff --git a/llarp/util/metrics/core.hpp b/llarp/util/metrics/core.hpp
index 029cccfc4..ba7006364 100644
--- a/llarp/util/metrics/core.hpp
+++ b/llarp/util/metrics/core.hpp
@@ -2,9 +2,9 @@
 #define LLARP_METRICS_CORE_HPP
 
 #include <util/metrics/types.hpp>
-#include <util/scheduler.hpp>
 #include <util/stopwatch.hpp>
-#include <util/threading.hpp>
+#include <util/thread/scheduler.hpp>
+#include <util/thread/threading.hpp>
 
 #include <map>
 #include <memory>
diff --git a/llarp/util/metrics/metrictank_publisher.hpp b/llarp/util/metrics/metrictank_publisher.hpp
index 930bf55d2..a8a4e4a4f 100644
--- a/llarp/util/metrics/metrictank_publisher.hpp
+++ b/llarp/util/metrics/metrictank_publisher.hpp
@@ -3,7 +3,7 @@
 
 #include <util/metrics/core.hpp>
 
-#include <util/queue.hpp>
+#include <util/thread/queue.hpp>
 
 #include <absl/types/variant.h>
 #include <string>
diff --git a/llarp/util/metrics/types.hpp b/llarp/util/metrics/types.hpp
index 690f8d103..d00b30e89 100644
--- a/llarp/util/metrics/types.hpp
+++ b/llarp/util/metrics/types.hpp
@@ -3,7 +3,7 @@
 
 #include <util/printer.hpp>
 #include <util/string_view.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 #include <util/types.hpp>
 #include <util/meta/variant.hpp>
 
diff --git a/llarp/util/queue.cpp b/llarp/util/queue.cpp
deleted file mode 100644
index cbb193e22..000000000
--- a/llarp/util/queue.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <util/queue.hpp>
diff --git a/llarp/util/logic.cpp b/llarp/util/thread/logic.cpp
similarity index 98%
rename from llarp/util/logic.cpp
rename to llarp/util/thread/logic.cpp
index 5773143cf..4ff30debd 100644
--- a/llarp/util/logic.cpp
+++ b/llarp/util/thread/logic.cpp
@@ -1,4 +1,4 @@
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
 
 #include <util/logging/logger.hpp>
 #include <util/mem.h>
diff --git a/llarp/util/logic.hpp b/llarp/util/thread/logic.hpp
similarity index 93%
rename from llarp/util/logic.hpp
rename to llarp/util/thread/logic.hpp
index 215ca876e..f29e1dcda 100644
--- a/llarp/util/logic.hpp
+++ b/llarp/util/thread/logic.hpp
@@ -2,8 +2,8 @@
 #define LLARP_LOGIC_HPP
 
 #include <util/mem.h>
-#include <util/threadpool.h>
-#include <util/timer.hpp>
+#include <util/thread/threadpool.h>
+#include <util/thread/timer.hpp>
 
 namespace llarp
 {
diff --git a/llarp/util/thread/queue.cpp b/llarp/util/thread/queue.cpp
new file mode 100644
index 000000000..2947aea43
--- /dev/null
+++ b/llarp/util/thread/queue.cpp
@@ -0,0 +1 @@
+#include <util/thread/queue.hpp>
diff --git a/llarp/util/queue.hpp b/llarp/util/thread/queue.hpp
similarity index 99%
rename from llarp/util/queue.hpp
rename to llarp/util/thread/queue.hpp
index 17e94c7ff..bdef5207e 100644
--- a/llarp/util/queue.hpp
+++ b/llarp/util/thread/queue.hpp
@@ -1,8 +1,8 @@
 #ifndef LLARP_QUEUE_HPP
 #define LLARP_QUEUE_HPP
 
-#include <util/queue_manager.hpp>
-#include <util/threading.hpp>
+#include <util/thread/queue_manager.hpp>
+#include <util/thread/threading.hpp>
 
 #include <absl/types/optional.h>
 #include <atomic>
diff --git a/llarp/util/queue_manager.cpp b/llarp/util/thread/queue_manager.cpp
similarity index 99%
rename from llarp/util/queue_manager.cpp
rename to llarp/util/thread/queue_manager.cpp
index bdec4b55e..5b0c1e7c6 100644
--- a/llarp/util/queue_manager.cpp
+++ b/llarp/util/thread/queue_manager.cpp
@@ -1,5 +1,5 @@
-#include <util/queue_manager.hpp>
-#include <util/threading.hpp>
+#include <util/thread/queue_manager.hpp>
+#include <util/thread/threading.hpp>
 
 #include <thread>
 
diff --git a/llarp/util/queue_manager.hpp b/llarp/util/thread/queue_manager.hpp
similarity index 100%
rename from llarp/util/queue_manager.hpp
rename to llarp/util/thread/queue_manager.hpp
diff --git a/llarp/util/scheduler.cpp b/llarp/util/thread/scheduler.cpp
similarity index 99%
rename from llarp/util/scheduler.cpp
rename to llarp/util/thread/scheduler.cpp
index 0b56f4efc..115c1ce61 100644
--- a/llarp/util/scheduler.cpp
+++ b/llarp/util/thread/scheduler.cpp
@@ -1,4 +1,4 @@
-#include <util/scheduler.hpp>
+#include <util/thread/scheduler.hpp>
 #include <utility>
 
 namespace llarp
diff --git a/llarp/util/scheduler.hpp b/llarp/util/thread/scheduler.hpp
similarity index 99%
rename from llarp/util/scheduler.hpp
rename to llarp/util/thread/scheduler.hpp
index 8e0886aa1..5daa559cf 100644
--- a/llarp/util/scheduler.hpp
+++ b/llarp/util/thread/scheduler.hpp
@@ -2,7 +2,7 @@
 #define LLARP_SCHEDULER_HPP
 
 #include <util/meta/object.hpp>
-#include <util/timerqueue.hpp>
+#include <util/thread/timerqueue.hpp>
 
 #include <absl/time/time.h>
 #include <atomic>
diff --git a/llarp/util/thread_pool.cpp b/llarp/util/thread/thread_pool.cpp
similarity index 98%
rename from llarp/util/thread_pool.cpp
rename to llarp/util/thread/thread_pool.cpp
index 70988d1f4..5243854e2 100644
--- a/llarp/util/thread_pool.cpp
+++ b/llarp/util/thread/thread_pool.cpp
@@ -1,6 +1,6 @@
-#include <util/thread_pool.hpp>
+#include <util/thread/thread_pool.hpp>
 
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 
 namespace llarp
 {
diff --git a/llarp/util/thread_pool.hpp b/llarp/util/thread/thread_pool.hpp
similarity index 98%
rename from llarp/util/thread_pool.hpp
rename to llarp/util/thread/thread_pool.hpp
index c53ec9050..92217f41c 100644
--- a/llarp/util/thread_pool.hpp
+++ b/llarp/util/thread/thread_pool.hpp
@@ -1,9 +1,9 @@
 #ifndef LLARP_THREAD_POOL_HPP
 #define LLARP_THREAD_POOL_HPP
 
-#include <util/queue.hpp>
 #include <util/string_view.hpp>
-#include <util/threading.hpp>
+#include <util/thread/queue.hpp>
+#include <util/thread/threading.hpp>
 
 #include <atomic>
 #include <functional>
diff --git a/llarp/util/threading.cpp b/llarp/util/thread/threading.cpp
similarity index 97%
rename from llarp/util/threading.cpp
rename to llarp/util/thread/threading.cpp
index 24ec5d9d6..285e3cd0b 100644
--- a/llarp/util/threading.cpp
+++ b/llarp/util/thread/threading.cpp
@@ -1,4 +1,4 @@
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 
 #include <util/logging/logger.hpp>
 
diff --git a/llarp/util/threading.hpp b/llarp/util/thread/threading.hpp
similarity index 100%
rename from llarp/util/threading.hpp
rename to llarp/util/thread/threading.hpp
diff --git a/llarp/util/threadpool.cpp b/llarp/util/thread/threadpool.cpp
similarity index 96%
rename from llarp/util/threadpool.cpp
rename to llarp/util/thread/threadpool.cpp
index 041264c96..3e8c3c740 100644
--- a/llarp/util/threadpool.cpp
+++ b/llarp/util/thread/threadpool.cpp
@@ -1,7 +1,7 @@
 #include <util/logging/logger.hpp>
 #include <util/time.hpp>
-#include <util/threadpool.h>
-#include <util/thread_pool.hpp>
+#include <util/thread/threadpool.h>
+#include <util/thread/thread_pool.hpp>
 
 #include <cstring>
 #include <functional>
diff --git a/llarp/util/threadpool.h b/llarp/util/thread/threadpool.h
similarity index 95%
rename from llarp/util/threadpool.h
rename to llarp/util/thread/threadpool.h
index bd1103ea4..c8f6e9cee 100644
--- a/llarp/util/threadpool.h
+++ b/llarp/util/thread/threadpool.h
@@ -1,10 +1,10 @@
 #ifndef LLARP_THREADPOOL_H
 #define LLARP_THREADPOOL_H
 
-#include <util/queue.hpp>
 #include <util/string_view.hpp>
-#include <util/thread_pool.hpp>
-#include <util/threading.hpp>
+#include <util/thread/queue.hpp>
+#include <util/thread/thread_pool.hpp>
+#include <util/thread/threading.hpp>
 
 #include <absl/base/thread_annotations.h>
 #include <memory>
diff --git a/llarp/util/timer.cpp b/llarp/util/thread/timer.cpp
similarity index 99%
rename from llarp/util/timer.cpp
rename to llarp/util/thread/timer.cpp
index 6f3d20f48..8741e3ed7 100644
--- a/llarp/util/timer.cpp
+++ b/llarp/util/thread/timer.cpp
@@ -1,5 +1,6 @@
+#include <util/thread/timer.hpp>
+
 #include <util/time.hpp>
-#include <util/timer.hpp>
 
 #include <atomic>
 #include <condition_variable>
diff --git a/llarp/util/timer.hpp b/llarp/util/thread/timer.hpp
similarity index 97%
rename from llarp/util/timer.hpp
rename to llarp/util/thread/timer.hpp
index 62456f023..965aabd15 100644
--- a/llarp/util/timer.hpp
+++ b/llarp/util/thread/timer.hpp
@@ -2,7 +2,7 @@
 #define LLARP_TIMER_HPP
 
 #include <util/common.hpp>
-#include <util/threadpool.h>
+#include <util/thread/threadpool.h>
 #include <util/time.hpp>
 
 #include <functional>
diff --git a/llarp/util/thread/timerqueue.cpp b/llarp/util/thread/timerqueue.cpp
new file mode 100644
index 000000000..8ae4ea4a6
--- /dev/null
+++ b/llarp/util/thread/timerqueue.cpp
@@ -0,0 +1 @@
+#include <util/thread/timerqueue.hpp>
diff --git a/llarp/util/timerqueue.hpp b/llarp/util/thread/timerqueue.hpp
similarity index 99%
rename from llarp/util/timerqueue.hpp
rename to llarp/util/thread/timerqueue.hpp
index bceb38e92..a36e74024 100644
--- a/llarp/util/timerqueue.hpp
+++ b/llarp/util/thread/timerqueue.hpp
@@ -2,7 +2,7 @@
 #define LLARP_UTIL_TIMERQUEUE_HPP
 
 #include <util/meta/object.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 
 #include <atomic>
 #include <absl/time/time.h>
diff --git a/llarp/util/timerqueue.cpp b/llarp/util/timerqueue.cpp
deleted file mode 100644
index a4c59046e..000000000
--- a/llarp/util/timerqueue.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <util/timerqueue.hpp>
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4896e5ff9..b7feec249 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -43,12 +43,12 @@ list(APPEND TEST_SRC
     util/test_llarp_util_bits.cpp
     util/test_llarp_util_encode.cpp
     util/test_llarp_util_printer.cpp
-    util/test_llarp_util_queue_manager.cpp
-    util/test_llarp_util_queue.cpp
-    util/test_llarp_util_thread_pool.cpp
-    util/test_llarp_util_timerqueue.cpp
-    util/test_llarp_utils_scheduler.cpp
     util/test_llarp_utils_str.cpp
+    util/thread/test_llarp_util_queue_manager.cpp
+    util/thread/test_llarp_util_queue.cpp
+    util/thread/test_llarp_util_thread_pool.cpp
+    util/thread/test_llarp_util_timerqueue.cpp
+    util/thread/test_llarp_utils_scheduler.cpp
 )
 
 add_executable(${TEST_EXE}
diff --git a/test/test_libabyss.cpp b/test/test_libabyss.cpp
index 2f8b1b732..c67400e7b 100644
--- a/test/test_libabyss.cpp
+++ b/test/test_libabyss.cpp
@@ -4,7 +4,7 @@
 #include <crypto/crypto_libsodium.hpp>
 #include <ev/ev.h>
 #include <net/net.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 
 #include <gtest/gtest.h>
 
diff --git a/test/test_llarp_dns.cpp b/test/test_llarp_dns.cpp
index f3eccb34b..00e4f2b28 100644
--- a/test/test_llarp_dns.cpp
+++ b/test/test_llarp_dns.cpp
@@ -2,9 +2,9 @@
 
 #include <dns.hpp>
 #include <dnsc.hpp>
-#include <llarp.h>         // for llarp_main_init
-#include <net/net.hpp>     // for llarp::Addr
-#include <util/logic.hpp>  // for threadpool/llarp::Logic
+#include <llarp.h>                // for llarp_main_init
+#include <net/net.hpp>            // for llarp::Addr
+#include <util/thread/logic.hpp>  // for threadpool/llarp::Logic
 
 struct DNSTest : public ::testing::Test
 {
diff --git a/test/test_llarp_dnsd.cpp b/test/test_llarp_dnsd.cpp
index 46bc05e2f..b8679722c 100644
--- a/test/test_llarp_dnsd.cpp
+++ b/test/test_llarp_dnsd.cpp
@@ -2,9 +2,9 @@
 
 #include <dnsd.hpp>
 
-#include <llarp.h>         // for llarp_main_init
-#include <net/net.hpp>     // for llarp::Addr
-#include <util/logic.hpp>  // for threadpool/llarp::Logic
+#include <llarp.h>                // for llarp_main_init
+#include <net/net.hpp>            // for llarp::Addr
+#include <util/thread/logic.hpp>  // for threadpool/llarp::Logic
 
 unsigned int g_length = 0;
 std::string g_result  = "";
diff --git a/test/util/test_llarp_util_queue.cpp b/test/util/thread/test_llarp_util_queue.cpp
similarity index 99%
rename from test/util/test_llarp_util_queue.cpp
rename to test/util/thread/test_llarp_util_queue.cpp
index bf3ee47a4..2aa0849cd 100644
--- a/test/util/test_llarp_util_queue.cpp
+++ b/test/util/thread/test_llarp_util_queue.cpp
@@ -1,10 +1,10 @@
-#include <util/queue.hpp>
-#include <util/threading.hpp>
+#include <util/thread/queue.hpp>
+#include <util/thread/threading.hpp>
 
 #include <array>
+#include <condition_variable>
 #include <functional>
 #include <thread>
-#include <condition_variable>
 
 #include <gtest/gtest.h>
 
diff --git a/test/util/test_llarp_util_queue_manager.cpp b/test/util/thread/test_llarp_util_queue_manager.cpp
similarity index 99%
rename from test/util/test_llarp_util_queue_manager.cpp
rename to test/util/thread/test_llarp_util_queue_manager.cpp
index e5c55dad3..7e4af82a6 100644
--- a/test/util/test_llarp_util_queue_manager.cpp
+++ b/test/util/thread/test_llarp_util_queue_manager.cpp
@@ -1,4 +1,4 @@
-#include <util/queue_manager.hpp>
+#include <util/thread/queue_manager.hpp>
 
 #include <absl/types/optional.h>
 #include <vector>
diff --git a/test/util/test_llarp_util_thread_pool.cpp b/test/util/thread/test_llarp_util_thread_pool.cpp
similarity index 99%
rename from test/util/test_llarp_util_thread_pool.cpp
rename to test/util/thread/test_llarp_util_thread_pool.cpp
index 12db7d776..e66c7c1e8 100644
--- a/test/util/test_llarp_util_thread_pool.cpp
+++ b/test/util/thread/test_llarp_util_thread_pool.cpp
@@ -1,10 +1,9 @@
-#include <util/thread_pool.hpp>
-#include <util/threading.hpp>
-#include <condition_variable>
+#include <util/thread/thread_pool.hpp>
+#include <util/thread/threading.hpp>
 
-#include <thread>
-#include <mutex>
 #include <condition_variable>
+#include <mutex>
+#include <thread>
 
 #include <gtest/gtest.h>
 
diff --git a/test/util/test_llarp_util_timerqueue.cpp b/test/util/thread/test_llarp_util_timerqueue.cpp
similarity index 98%
rename from test/util/test_llarp_util_timerqueue.cpp
rename to test/util/thread/test_llarp_util_timerqueue.cpp
index 55a030e1d..0c78dce06 100644
--- a/test/util/test_llarp_util_timerqueue.cpp
+++ b/test/util/thread/test_llarp_util_timerqueue.cpp
@@ -1,4 +1,4 @@
-#include <util/timerqueue.hpp>
+#include <util/thread/timerqueue.hpp>
 
 #include <thread>
 
@@ -277,7 +277,8 @@ TEST(TimerQueue, ThreadSafety)
           std::vector< StringItem >* vPtr = nfo->second;
 
           // We stagger the removeAll steps among the threads.
-          const unsigned int STEP_REMOVE_ALL = THREAD_ID * NUM_REMOVE_ALL / NUM_THREADS;
+          const unsigned int STEP_REMOVE_ALL =
+              THREAD_ID * NUM_REMOVE_ALL / NUM_THREADS;
 
           std::ostringstream oss;
           oss << THREAD_ID;
diff --git a/test/util/test_llarp_utils_scheduler.cpp b/test/util/thread/test_llarp_utils_scheduler.cpp
similarity index 99%
rename from test/util/test_llarp_utils_scheduler.cpp
rename to test/util/thread/test_llarp_utils_scheduler.cpp
index 34a368122..adb52a166 100644
--- a/test/util/test_llarp_utils_scheduler.cpp
+++ b/test/util/thread/test_llarp_utils_scheduler.cpp
@@ -1,4 +1,4 @@
-#include <util/scheduler.hpp>
+#include <util/thread/scheduler.hpp>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>