diff --git a/daemon/main.cpp b/daemon/main.cpp
index 7ef10e051..cbac238dd 100644
--- a/daemon/main.cpp
+++ b/daemon/main.cpp
@@ -1,7 +1,7 @@
 #include <config/config.hpp>  // for ensure_config
 #include <llarp.h>
 #include <util/fs.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 #include <csignal>
 
diff --git a/daemon/rcutil.cpp b/daemon/rcutil.cpp
index 7759032e7..2b8b11618 100644
--- a/daemon/rcutil.cpp
+++ b/daemon/rcutil.cpp
@@ -1,6 +1,6 @@
 #include <router_contact.hpp>
-#include <util/logger.hpp>
-#include <util/ostream_logger.hpp>
+#include <util/logging/logger.hpp>
+#include <util/logging/ostream_logger.hpp>
 
 #include <absl/synchronization/mutex.h>
 #include <cxxopts.hpp>
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/libabyss/src/client.cpp b/libabyss/src/client.cpp
index 7352e5dca..c13190ace 100644
--- a/libabyss/src/client.cpp
+++ b/libabyss/src/client.cpp
@@ -3,7 +3,7 @@
 #include <abyss/md5.hpp>
 #include <crypto/crypto.hpp>
 #include <util/buffer.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 namespace abyss
 {
diff --git a/libabyss/src/server.cpp b/libabyss/src/server.cpp
index 739c72dfa..03cbb0fa1 100644
--- a/libabyss/src/server.cpp
+++ b/libabyss/src/server.cpp
@@ -2,7 +2,7 @@
 
 #include <abyss/http.hpp>
 #include <util/buffer.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/time.hpp>
 
 #include <algorithm>
diff --git a/llarp/CMakeLists.txt b/llarp/CMakeLists.txt
index fd6a36fbc..b4157f283 100644
--- a/llarp/CMakeLists.txt
+++ b/llarp/CMakeLists.txt
@@ -17,39 +17,42 @@ set(LIB_UTIL_SRC
   util/endian.cpp
   util/fs.cpp
   util/json.cpp
-  util/logger.cpp
-  util/android_logger.cpp
-  util/file_logger.cpp
-  util/logic.cpp
-  util/loglevel.cpp
+  util/logging/android_logger.cpp
+  util/logging/file_logger.cpp
+  util/logging/json_logger.cpp
+  util/logging/logger.cpp
+  util/logging/loglevel.cpp
+  util/logging/ostream_logger.cpp
+  util/logging/syslog_logger.cpp
+  util/logging/win32_logger.cpp
   util/mem.cpp
-  util/memfn_traits.cpp
-  util/memfn.cpp
-  util/metrics_core.cpp
-  util/metrics_types.cpp
-  util/json_logger.cpp
-  util/ostream_logger.cpp
-  util/syslog_logger.cpp
-  util/win32_logger.cpp
-  util/metrics.cpp
-  util/object.cpp
+  util/meta/memfn_traits.cpp
+  util/meta/memfn.cpp
+  util/meta/object.cpp
+  util/meta/traits.cpp
+  util/meta/variant.cpp
+  util/metrics/core.cpp
+  util/metrics/json_publisher.cpp
+  util/metrics/metrics.cpp
+  util/metrics/metrictank_publisher.cpp
+  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/traits.cpp
   util/types.cpp
-  util/variant.cpp
 )
 
 add_library(${UTIL_LIB} STATIC ${LIB_UTIL_SRC})
@@ -75,9 +78,6 @@ set(LIB_PLATFORM_SRC
 # for networking
   ev/ev.cpp
   ev/pipe.cpp
-  metrics/metrictank_publisher.cpp
-  metrics/json_publisher.cpp
-  metrics/stream_publisher.cpp
   net/ip.cpp
   net/net.cpp
   net/net_addr.cpp
diff --git a/llarp/config/config.cpp b/llarp/config/config.cpp
index 78f5e3a94..0d6b85d48 100644
--- a/llarp/config/config.cpp
+++ b/llarp/config/config.cpp
@@ -6,10 +6,10 @@
 #include <net/net.hpp>
 #include <router_contact.hpp>
 #include <util/fs.hpp>
-#include <util/logger_syslog.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger_syslog.hpp>
+#include <util/logging/logger.hpp>
 #include <util/mem.hpp>
-#include <util/memfn.hpp>
+#include <util/meta/memfn.hpp>
 #include <util/str.hpp>
 
 #include <absl/strings/strip.h>
diff --git a/llarp/config/ini.cpp b/llarp/config/ini.cpp
index c83c325ac..e2c0d0245 100644
--- a/llarp/config/ini.cpp
+++ b/llarp/config/ini.cpp
@@ -1,5 +1,6 @@
 #include <config/ini.hpp>
-#include <util/logger.hpp>
+
+#include <util/logging/logger.hpp>
 
 #include <cctype>
 #include <fstream>
diff --git a/llarp/context.cpp b/llarp/context.cpp
index ab989ec53..509902a4d 100644
--- a/llarp/context.cpp
+++ b/llarp/context.cpp
@@ -7,15 +7,15 @@
 #include <dht/context.hpp>
 #include <dnsd.hpp>
 #include <ev/ev.hpp>
-#include <metrics/metrictank_publisher.hpp>
-#include <metrics/json_publisher.hpp>
-#include <metrics/stream_publisher.hpp>
 #include <nodedb.hpp>
 #include <router/router.hpp>
-#include <util/logger.h>
-#include <util/memfn.hpp>
-#include <util/metrics.hpp>
-#include <util/scheduler.hpp>
+#include <util/logging/logger.h>
+#include <util/meta/memfn.hpp>
+#include <util/metrics/json_publisher.hpp>
+#include <util/metrics/metrics.hpp>
+#include <util/metrics/metrictank_publisher.hpp>
+#include <util/metrics/stream_publisher.hpp>
+#include <util/thread/scheduler.hpp>
 
 #include <absl/strings/str_split.h>
 #include <cxxopts.hpp>
diff --git a/llarp/crypto/encrypted_frame.cpp b/llarp/crypto/encrypted_frame.cpp
index 009e10c5f..e980a889b 100644
--- a/llarp/crypto/encrypted_frame.cpp
+++ b/llarp/crypto/encrypted_frame.cpp
@@ -1,7 +1,7 @@
 #include <crypto/encrypted_frame.hpp>
 
 #include <crypto/crypto.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/mem.hpp>
 
 namespace llarp
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/dht/localrouterlookup.cpp b/llarp/dht/localrouterlookup.cpp
index 717834d33..7ab3955df 100644
--- a/llarp/dht/localrouterlookup.cpp
+++ b/llarp/dht/localrouterlookup.cpp
@@ -6,7 +6,7 @@
 #include <path/path_context.hpp>
 #include <router/abstractrouter.hpp>
 #include <routing/dht_message.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 namespace llarp
 {
diff --git a/llarp/dht/localserviceaddresslookup.cpp b/llarp/dht/localserviceaddresslookup.cpp
index 31e193895..7940e9faf 100644
--- a/llarp/dht/localserviceaddresslookup.cpp
+++ b/llarp/dht/localserviceaddresslookup.cpp
@@ -5,7 +5,7 @@
 #include <path/path_context.hpp>
 #include <router/abstractrouter.hpp>
 #include <routing/dht_message.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 namespace llarp
 {
diff --git a/llarp/dht/tx.hpp b/llarp/dht/tx.hpp
index 8fc89c7cd..83ad20873 100644
--- a/llarp/dht/tx.hpp
+++ b/llarp/dht/tx.hpp
@@ -3,7 +3,7 @@
 
 #include <dht/key.hpp>
 #include <dht/txowner.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/status.hpp>
 
 #include <set>
diff --git a/llarp/dht/txholder.hpp b/llarp/dht/txholder.hpp
index 77d672f46..d2904a783 100644
--- a/llarp/dht/txholder.hpp
+++ b/llarp/dht/txholder.hpp
@@ -3,7 +3,6 @@
 
 #include <dht/tx.hpp>
 #include <dht/txowner.hpp>
-#include <util/logger.hpp>
 #include <util/time.hpp>
 #include <util/status.hpp>
 
diff --git a/llarp/dns.cpp b/llarp/dns.cpp
index 0fb3abd4f..2b2c77df9 100644
--- a/llarp/dns.cpp
+++ b/llarp/dns.cpp
@@ -2,7 +2,7 @@
 
 #include <util/buffer.hpp>
 #include <util/endian.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 void
 hexDump(const char *buffer, uint16_t size)
diff --git a/llarp/dns/message.cpp b/llarp/dns/message.cpp
index 2514dec44..f1f628fd7 100644
--- a/llarp/dns/message.cpp
+++ b/llarp/dns/message.cpp
@@ -3,7 +3,7 @@
 #include <dns/dns.hpp>
 #include <util/buffer.hpp>
 #include <util/endian.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/printer.hpp>
 #include <net/ip.hpp>
 
diff --git a/llarp/dns/question.cpp b/llarp/dns/question.cpp
index e4db7a303..3378531a7 100644
--- a/llarp/dns/question.cpp
+++ b/llarp/dns/question.cpp
@@ -1,6 +1,6 @@
 #include <dns/question.hpp>
 
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/printer.hpp>
 
 namespace llarp
diff --git a/llarp/dns/rr.cpp b/llarp/dns/rr.cpp
index 645709ffd..94795dc6b 100644
--- a/llarp/dns/rr.cpp
+++ b/llarp/dns/rr.cpp
@@ -1,6 +1,6 @@
 #include <dns/rr.hpp>
 
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/printer.hpp>
 
 namespace llarp
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/dnsc.cpp b/llarp/dnsc.cpp
index 37cf990eb..5408d56ee 100644
--- a/llarp/dnsc.cpp
+++ b/llarp/dnsc.cpp
@@ -1,6 +1,6 @@
 #include <dnsc.hpp>
 #include <net/net.hpp>  // for llarp::Addr
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 #ifndef _WIN32
 #include <arpa/inet.h>
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/ev/ev_win32.cpp b/llarp/ev/ev_win32.cpp
index 1768dc243..cff227486 100644
--- a/llarp/ev/ev_win32.cpp
+++ b/llarp/ev/ev_win32.cpp
@@ -2,6 +2,8 @@
 
 #ifdef _WIN32
 
+#include <util/logging/logger.hpp>
+
 // a single event queue for the TUN interface
 static HANDLE tun_event_queue = INVALID_HANDLE_VALUE;
 
diff --git a/llarp/ev/ev_win32.hpp b/llarp/ev/ev_win32.hpp
index d09712b7b..a111627be 100644
--- a/llarp/ev/ev_win32.hpp
+++ b/llarp/ev/ev_win32.hpp
@@ -5,7 +5,6 @@
 #include <net/net.h>
 #include <net/net.hpp>
 #include <util/buffer.hpp>
-#include <util/logger.hpp>
 
 #include <windows.h>
 #include <process.h>
diff --git a/llarp/exit/session.cpp b/llarp/exit/session.cpp
index 2a0ecba36..b43d9cdc8 100644
--- a/llarp/exit/session.cpp
+++ b/llarp/exit/session.cpp
@@ -5,7 +5,7 @@
 #include <path/path_context.hpp>
 #include <path/path.hpp>
 #include <router/abstractrouter.hpp>
-#include <util/memfn.hpp>
+#include <util/meta/memfn.hpp>
 #include <utility>
 
 namespace llarp
diff --git a/llarp/handlers/tun.cpp b/llarp/handlers/tun.cpp
index ca54318e6..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/memfn.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/iwp/iwp.cpp b/llarp/iwp/iwp.cpp
index eae5384be..00d33bc0f 100644
--- a/llarp/iwp/iwp.cpp
+++ b/llarp/iwp/iwp.cpp
@@ -1,7 +1,7 @@
 #include <iwp/iwp.hpp>
 #include <iwp/linklayer.hpp>
 #include <router/abstractrouter.hpp>
-#include <util/memfn.hpp>
+#include <util/meta/memfn.hpp>
 
 namespace llarp
 {
diff --git a/llarp/iwp/session.cpp b/llarp/iwp/session.cpp
index e14ccc2fb..8efab90e1 100644
--- a/llarp/iwp/session.cpp
+++ b/llarp/iwp/session.cpp
@@ -1,7 +1,8 @@
 #include <iwp/session.hpp>
-#include <util/memfn.hpp>
+
 #include <messages/link_intro.hpp>
 #include <messages/discard.hpp>
+#include <util/meta/memfn.hpp>
 
 namespace llarp
 {
@@ -682,4 +683,4 @@ namespace llarp
       }
     }
   }  // namespace iwp
-}  // namespace llarp
\ No newline at end of file
+}  // namespace llarp
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/link_intro.cpp b/llarp/messages/link_intro.cpp
index a4f3c8d1c..1ab078a24 100644
--- a/llarp/messages/link_intro.cpp
+++ b/llarp/messages/link_intro.cpp
@@ -4,7 +4,7 @@
 #include <router_contact.hpp>
 #include <router/abstractrouter.hpp>
 #include <util/bencode.h>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 namespace llarp
 {
diff --git a/llarp/messages/link_message_parser.cpp b/llarp/messages/link_message_parser.cpp
index e7fd1b16b..9327051c5 100644
--- a/llarp/messages/link_message_parser.cpp
+++ b/llarp/messages/link_message_parser.cpp
@@ -9,8 +9,8 @@
 #include <messages/relay.hpp>
 #include <router_contact.hpp>
 #include <util/buffer.hpp>
-#include <util/logger.hpp>
-#include <util/metrics.hpp>
+#include <util/logging/logger.hpp>
+#include <util/metrics/metrics.hpp>
 
 #include <memory>
 
diff --git a/llarp/messages/relay_commit.cpp b/llarp/messages/relay_commit.cpp
index a269590be..51a08cfb9 100644
--- a/llarp/messages/relay_commit.cpp
+++ b/llarp/messages/relay_commit.cpp
@@ -10,9 +10,9 @@
 #include <routing/path_confirm_message.hpp>
 #include <util/bencode.hpp>
 #include <util/buffer.hpp>
-#include <util/logger.hpp>
-#include <util/logic.hpp>
-#include <util/memfn.hpp>
+#include <util/logging/logger.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 d72e41d87..a7869a1d5 100644
--- a/llarp/messages/relay_status.cpp
+++ b/llarp/messages/relay_status.cpp
@@ -7,9 +7,9 @@
 #include <routing/path_confirm_message.hpp>
 #include <util/bencode.hpp>
 #include <util/buffer.hpp>
-#include <util/logger.hpp>
-#include <util/logic.hpp>
-#include <util/memfn.hpp>
+#include <util/logging/logger.hpp>
+#include <util/meta/memfn.hpp>
+#include <util/thread/logic.hpp>
 
 #include <functional>
 #include <utility>
diff --git a/llarp/net/net.cpp b/llarp/net/net.cpp
index f55916912..01e2a3cd6 100644
--- a/llarp/net/net.cpp
+++ b/llarp/net/net.cpp
@@ -14,7 +14,7 @@
 
 #include <net/net_addr.hpp>
 #include <net/ip.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/str.hpp>
 
 #include <cstdio>
diff --git a/llarp/net/net.hpp b/llarp/net/net.hpp
index 044e512f6..252fade50 100644
--- a/llarp/net/net.hpp
+++ b/llarp/net/net.hpp
@@ -5,7 +5,6 @@
 #include <net/address_info.hpp>
 #include <net/net_int.hpp>
 #include <net/net.h>
-#include <util/logger.hpp>
 #include <util/mem.hpp>
 #include <util/string_view.hpp>
 #include <util/bits.hpp>
diff --git a/llarp/nodedb.cpp b/llarp/nodedb.cpp
index 9490f37e7..ea0fd9a2c 100644
--- a/llarp/nodedb.cpp
+++ b/llarp/nodedb.cpp
@@ -5,10 +5,10 @@
 #include <util/buffer.hpp>
 #include <util/encode.hpp>
 #include <util/fs.hpp>
-#include <util/logger.hpp>
-#include <util/logic.hpp>
+#include <util/logging/logger.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 a1026cca7..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/memfn.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.cpp b/llarp/router/outbound_message_handler.cpp
index 99782de55..7964fbe5b 100644
--- a/llarp/router/outbound_message_handler.cpp
+++ b/llarp/router/outbound_message_handler.cpp
@@ -4,7 +4,7 @@
 #include <router/i_outbound_session_maker.hpp>
 #include <link/i_link_manager.hpp>
 #include <constants/link_layer.hpp>
-#include <util/memfn.hpp>
+#include <util/meta/memfn.hpp>
 #include <util/status.hpp>
 
 #include <algorithm>
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 fd64990ce..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/memfn.hpp>
-#include <util/threading.hpp>
+#include <util/meta/memfn.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 2f4b05322..8cf76c334 100644
--- a/llarp/router/rc_lookup_handler.cpp
+++ b/llarp/router/rc_lookup_handler.cpp
@@ -5,9 +5,9 @@
 #include <crypto/crypto.hpp>
 #include <service/context.hpp>
 #include <router_contact.hpp>
-#include <util/memfn.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.cpp b/llarp/router/router.cpp
index a7475cfc8..9a72d542b 100644
--- a/llarp/router/router.cpp
+++ b/llarp/router/router.cpp
@@ -1,10 +1,10 @@
 #include <router/router.hpp>
 
 #include <config/config.hpp>
-#include <constants/proto.hpp>
 #include <constants/limits.hpp>
-#include <crypto/crypto.hpp>
+#include <constants/proto.hpp>
 #include <crypto/crypto_libsodium.hpp>
+#include <crypto/crypto.hpp>
 #include <dht/context.hpp>
 #include <dht/node.hpp>
 #include <iwp/iwp.hpp>
@@ -14,20 +14,20 @@
 #include <rpc/rpc.hpp>
 #include <util/buffer.hpp>
 #include <util/encode.hpp>
-#include <util/logger.hpp>
-#include <util/memfn.hpp>
-#include <util/file_logger.hpp>
-#include <util/json_logger.hpp>
-#include <util/logger_syslog.hpp>
-#include <util/metrics.hpp>
+#include <util/logging/file_logger.hpp>
+#include <util/logging/json_logger.hpp>
+#include <util/logging/logger_syslog.hpp>
+#include <util/logging/logger.hpp>
+#include <util/meta/memfn.hpp>
+#include <util/metrics/metrics.hpp>
 #include <util/str.hpp>
-#include <utility>
 #include <utp/utp.hpp>
 
 #include <fstream>
 #include <cstdlib>
 #include <iterator>
 #include <unordered_map>
+#include <utility>
 #if defined(RPI) || defined(ANDROID)
 #include <unistd.h>
 #endif
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/router_contact.cpp b/llarp/router_contact.cpp
index 8930a609a..a0e7210b7 100644
--- a/llarp/router_contact.cpp
+++ b/llarp/router_contact.cpp
@@ -5,7 +5,7 @@
 #include <net/net.hpp>
 #include <util/bencode.hpp>
 #include <util/buffer.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/mem.hpp>
 #include <util/printer.hpp>
 #include <util/time.hpp>
diff --git a/llarp/rpc/rpc.cpp b/llarp/rpc/rpc.cpp
index c7cb7a1b8..e2830389b 100644
--- a/llarp/rpc/rpc.cpp
+++ b/llarp/rpc/rpc.cpp
@@ -2,12 +2,12 @@
 
 #include <router/abstractrouter.hpp>
 #include <service/context.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <router_id.hpp>
 #include <exit/context.hpp>
 
 #include <util/encode.hpp>
-#include <util/memfn.hpp>
+#include <util/meta/memfn.hpp>
 #include <libabyss.hpp>
 #include <utility>
 
diff --git a/llarp/service/async_key_exchange.cpp b/llarp/service/async_key_exchange.cpp
index 660277c95..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/memfn.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 a30bf1fca..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/memfn.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/endpoint_util.cpp b/llarp/service/endpoint_util.cpp
index 058de16f9..ecf41f45b 100644
--- a/llarp/service/endpoint_util.cpp
+++ b/llarp/service/endpoint_util.cpp
@@ -3,7 +3,7 @@
 #include <exit/session.hpp>
 #include <service/outbound_context.hpp>
 #include <service/lookup.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 namespace llarp
 {
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/outbound_context.cpp b/llarp/service/outbound_context.cpp
index 9849921a2..36d7e4cd7 100644
--- a/llarp/service/outbound_context.cpp
+++ b/llarp/service/outbound_context.cpp
@@ -6,7 +6,7 @@
 #include <service/endpoint.hpp>
 #include <nodedb.hpp>
 #include <profiling.hpp>
-#include <util/memfn.hpp>
+#include <util/meta/memfn.hpp>
 
 namespace llarp
 {
diff --git a/llarp/service/protocol.cpp b/llarp/service/protocol.cpp
index 09fb02d82..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/memfn.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/aligned.hpp b/llarp/util/aligned.hpp
index fafd99a95..3837ad7d5 100644
--- a/llarp/util/aligned.hpp
+++ b/llarp/util/aligned.hpp
@@ -3,9 +3,9 @@
 
 #include <util/bencode.h>
 #include <util/encode.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
+#include <util/meta/traits.hpp>
 #include <util/printer.hpp>
-#include <util/traits.hpp>
 
 #include <array>
 #include <cstddef>
diff --git a/llarp/util/bencode.cpp b/llarp/util/bencode.cpp
index 25e46238f..200c7666a 100644
--- a/llarp/util/bencode.cpp
+++ b/llarp/util/bencode.cpp
@@ -1,5 +1,5 @@
 #include <util/bencode.h>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <cstdlib>
 #include <cinttypes>
 #include <cstdio>
diff --git a/llarp/util/bencode.hpp b/llarp/util/bencode.hpp
index c03b71f5a..46c7be3b1 100644
--- a/llarp/util/bencode.hpp
+++ b/llarp/util/bencode.hpp
@@ -4,7 +4,7 @@
 #include <util/buffer.hpp>
 #include <util/bencode.h>
 #include <util/fs.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/mem.hpp>
 
 #include <fstream>
diff --git a/llarp/util/codel.hpp b/llarp/util/codel.hpp
index 2d9e5d0bd..c0c257c19 100644
--- a/llarp/util/codel.hpp
+++ b/llarp/util/codel.hpp
@@ -1,9 +1,9 @@
 #ifndef LLARP_CODEL_QUEUE_HPP
 #define LLARP_CODEL_QUEUE_HPP
 
-#include <util/logger.hpp>
+#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/fs.cpp b/llarp/util/fs.cpp
index fd1c5597f..e0c2b5657 100644
--- a/llarp/util/fs.cpp
+++ b/llarp/util/fs.cpp
@@ -1,6 +1,6 @@
 #include <util/fs.hpp>
 
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 #include <fcntl.h>
 #include <sys/stat.h>
diff --git a/llarp/util/android_logger.cpp b/llarp/util/logging/android_logger.cpp
similarity index 94%
rename from llarp/util/android_logger.cpp
rename to llarp/util/logging/android_logger.cpp
index a342b98e7..439a99036 100644
--- a/llarp/util/android_logger.cpp
+++ b/llarp/util/logging/android_logger.cpp
@@ -1,6 +1,8 @@
 #if defined(ANDROID)
-#include <util/android_logger.hpp>
-#include <util/logger_internal.hpp>
+
+#include <util/logging/android_logger.hpp>
+#include <util/logging/logger_internal.hpp>
+
 #include <android/log.h>
 namespace llarp
 {
diff --git a/llarp/util/android_logger.hpp b/llarp/util/logging/android_logger.hpp
similarity index 93%
rename from llarp/util/android_logger.hpp
rename to llarp/util/logging/android_logger.hpp
index 2e52bb853..ddde13b5d 100644
--- a/llarp/util/android_logger.hpp
+++ b/llarp/util/logging/android_logger.hpp
@@ -1,7 +1,8 @@
 #ifndef LLARP_UTIL_ANDROID_LOGGER_HPP
 #define LLARP_UTIL_ANDROID_LOGGER_HPP
 
-#include <util/logstream.hpp>
+#include <util/logging/logstream.hpp>
+
 #include <iostream>
 
 namespace llarp
diff --git a/llarp/util/file_logger.cpp b/llarp/util/logging/file_logger.cpp
similarity index 95%
rename from llarp/util/file_logger.cpp
rename to llarp/util/logging/file_logger.cpp
index 0b0bcbf4e..b02d9c2a3 100644
--- a/llarp/util/file_logger.cpp
+++ b/llarp/util/logging/file_logger.cpp
@@ -1,5 +1,6 @@
-#include <util/file_logger.hpp>
-#include <util/logger_internal.hpp>
+#include <util/logging/file_logger.hpp>
+#include <util/logging/logger_internal.hpp>
+
 #include <utility>
 
 namespace llarp
diff --git a/llarp/util/file_logger.hpp b/llarp/util/logging/file_logger.hpp
similarity index 93%
rename from llarp/util/file_logger.hpp
rename to llarp/util/logging/file_logger.hpp
index 463b987bf..c8db68689 100644
--- a/llarp/util/file_logger.hpp
+++ b/llarp/util/logging/file_logger.hpp
@@ -1,8 +1,9 @@
 #ifndef LLARP_UTIL_FILE_LOGGER_HPP
 #define LLARP_UTIL_FILE_LOGGER_HPP
 
-#include <util/logstream.hpp>
-#include <util/thread_pool.hpp>
+#include <util/logging/logstream.hpp>
+
+#include <util/thread/thread_pool.hpp>
 #include <util/time.hpp>
 
 #include <deque>
diff --git a/llarp/util/json_logger.cpp b/llarp/util/logging/json_logger.cpp
similarity index 88%
rename from llarp/util/json_logger.cpp
rename to llarp/util/logging/json_logger.cpp
index 9b523cedb..71ed8bd99 100644
--- a/llarp/util/json_logger.cpp
+++ b/llarp/util/logging/json_logger.cpp
@@ -1,4 +1,4 @@
-#include <util/json_logger.hpp>
+#include <util/logging/json_logger.hpp>
 #include <util/json.hpp>
 
 namespace llarp
@@ -17,4 +17,4 @@ namespace llarp
     m_Lines.emplace_back(obj.dump());
   }
 
-}  // namespace llarp
\ No newline at end of file
+}  // namespace llarp
diff --git a/llarp/util/json_logger.hpp b/llarp/util/logging/json_logger.hpp
similarity index 91%
rename from llarp/util/json_logger.hpp
rename to llarp/util/logging/json_logger.hpp
index 839d8246d..978400df3 100644
--- a/llarp/util/json_logger.hpp
+++ b/llarp/util/logging/json_logger.hpp
@@ -1,7 +1,7 @@
 #ifndef LLARP_UTIL_JSON_LOGGER
 #define LLARP_UTIL_JSON_LOGGER
 
-#include <util/file_logger.hpp>
+#include <util/logging/file_logger.hpp>
 
 namespace llarp
 {
@@ -19,4 +19,4 @@ namespace llarp
   };
 }  // namespace llarp
 
-#endif
\ No newline at end of file
+#endif
diff --git a/llarp/util/logger.cpp b/llarp/util/logging/logger.cpp
similarity index 85%
rename from llarp/util/logger.cpp
rename to llarp/util/logging/logger.cpp
index 4e094bd4a..b2c507c2a 100644
--- a/llarp/util/logger.cpp
+++ b/llarp/util/logging/logger.cpp
@@ -1,11 +1,11 @@
-#include <util/logger.hpp>
-#include <util/logger.h>
-#include <util/ostream_logger.hpp>
+#include <util/logging/logger.hpp>
+#include <util/logging/logger.h>
+#include <util/logging/ostream_logger.hpp>
 #if defined(_WIN32)
-#include <util/win32_logger.hpp>
+#include <util/logging/win32_logger.hpp>
 #endif
 #if defined(ANDROID)
-#include <util/android_logger.hpp>
+#include <util/logging/android_logger.hpp>
 #endif
 
 namespace llarp
diff --git a/llarp/util/logger.h b/llarp/util/logging/logger.h
similarity index 100%
rename from llarp/util/logger.h
rename to llarp/util/logging/logger.h
diff --git a/llarp/util/logger.hpp b/llarp/util/logging/logger.hpp
similarity index 98%
rename from llarp/util/logger.hpp
rename to llarp/util/logging/logger.hpp
index 9cd630d30..300cc8684 100644
--- a/llarp/util/logger.hpp
+++ b/llarp/util/logging/logger.hpp
@@ -2,8 +2,8 @@
 #define LLARP_UTIL_LOGGER_HPP
 
 #include <util/time.hpp>
-#include <util/logstream.hpp>
-#include <util/logger_internal.hpp>
+#include <util/logging/logstream.hpp>
+#include <util/logging/logger_internal.hpp>
 /*
 #ifdef _WIN32
 #define VC_EXTRALEAN
diff --git a/llarp/util/logger_internal.hpp b/llarp/util/logging/logger_internal.hpp
similarity index 100%
rename from llarp/util/logger_internal.hpp
rename to llarp/util/logging/logger_internal.hpp
diff --git a/llarp/util/logger_syslog.hpp b/llarp/util/logging/logger_syslog.hpp
similarity index 93%
rename from llarp/util/logger_syslog.hpp
rename to llarp/util/logging/logger_syslog.hpp
index d5a946b55..378b84f1a 100644
--- a/llarp/util/logger_syslog.hpp
+++ b/llarp/util/logging/logger_syslog.hpp
@@ -1,6 +1,7 @@
 #ifndef LLARP_UTIL_LOGGER_SYSLOG_HPP
 #define LLARP_UTIL_LOGGER_SYSLOG_HPP
-#include <util/logstream.hpp>
+
+#include <util/logging/logstream.hpp>
 #include <iostream>
 
 namespace llarp
diff --git a/llarp/util/loglevel.cpp b/llarp/util/logging/loglevel.cpp
similarity index 84%
rename from llarp/util/loglevel.cpp
rename to llarp/util/logging/loglevel.cpp
index e0518f8ef..e01acaa8a 100644
--- a/llarp/util/loglevel.cpp
+++ b/llarp/util/logging/loglevel.cpp
@@ -1,4 +1,4 @@
-#include <util/loglevel.hpp>
+#include <util/logging/loglevel.hpp>
 
 namespace llarp
 {
@@ -19,4 +19,4 @@ namespace llarp
         return "???";
     }
   }
-}  // namespace llarp
\ No newline at end of file
+}  // namespace llarp
diff --git a/llarp/util/loglevel.hpp b/llarp/util/logging/loglevel.hpp
similarity index 100%
rename from llarp/util/loglevel.hpp
rename to llarp/util/logging/loglevel.hpp
diff --git a/llarp/util/logstream.hpp b/llarp/util/logging/logstream.hpp
similarity index 96%
rename from llarp/util/logstream.hpp
rename to llarp/util/logging/logstream.hpp
index d66178157..949fd1835 100644
--- a/llarp/util/logstream.hpp
+++ b/llarp/util/logging/logstream.hpp
@@ -1,10 +1,12 @@
 #ifndef LLARP_UTIL_LOG_STREAM_HPP
 #define LLARP_UTIL_LOG_STREAM_HPP
+#include <util/logging/loglevel.hpp>
+
+#include <util/time.hpp>
+
 #include <memory>
 #include <string>
-#include <util/loglevel.hpp>
 #include <sstream>
-#include <util/time.hpp>
 
 namespace llarp
 {
diff --git a/llarp/util/ostream_logger.cpp b/llarp/util/logging/ostream_logger.cpp
similarity index 92%
rename from llarp/util/ostream_logger.cpp
rename to llarp/util/logging/ostream_logger.cpp
index f5653f35d..a9220b0f0 100644
--- a/llarp/util/ostream_logger.cpp
+++ b/llarp/util/logging/ostream_logger.cpp
@@ -1,5 +1,5 @@
-#include <util/ostream_logger.hpp>
-#include <util/logger_internal.hpp>
+#include <util/logging/ostream_logger.hpp>
+#include <util/logging/logger_internal.hpp>
 
 namespace llarp
 {
diff --git a/llarp/util/ostream_logger.hpp b/llarp/util/logging/ostream_logger.hpp
similarity index 94%
rename from llarp/util/ostream_logger.hpp
rename to llarp/util/logging/ostream_logger.hpp
index f423d8cc4..74532a59b 100644
--- a/llarp/util/ostream_logger.hpp
+++ b/llarp/util/logging/ostream_logger.hpp
@@ -1,7 +1,7 @@
 #ifndef LLARP_UTIL_OSTREAM_LOGGER_HPP
 #define LLARP_UTIL_OSTREAM_LOGGER_HPP
 
-#include <util/logstream.hpp>
+#include <util/logging/logstream.hpp>
 #include <iostream>
 
 namespace llarp
diff --git a/llarp/util/syslog_logger.cpp b/llarp/util/logging/syslog_logger.cpp
similarity index 91%
rename from llarp/util/syslog_logger.cpp
rename to llarp/util/logging/syslog_logger.cpp
index 952e561e1..7ce3b533f 100644
--- a/llarp/util/syslog_logger.cpp
+++ b/llarp/util/logging/syslog_logger.cpp
@@ -1,6 +1,8 @@
 #ifndef _WIN32
-#include <util/logger_syslog.hpp>
-#include <util/logger_internal.hpp>
+#include <util/logging/logger_syslog.hpp>
+
+#include <util/logging/logger_internal.hpp>
+
 #include <syslog.h>
 namespace llarp
 {
diff --git a/llarp/util/win32_logger.cpp b/llarp/util/logging/win32_logger.cpp
similarity index 97%
rename from llarp/util/win32_logger.cpp
rename to llarp/util/logging/win32_logger.cpp
index 2f9fd4afe..9012626f2 100644
--- a/llarp/util/win32_logger.cpp
+++ b/llarp/util/logging/win32_logger.cpp
@@ -1,6 +1,6 @@
 #if defined(_WIN32)
-#include <util/win32_logger.hpp>
-#include <util/logger_internal.hpp>
+#include <util/logging/win32_logger.hpp>
+#include <util/logging/logger_internal.hpp>
 
 static CONSOLE_SCREEN_BUFFER_INFO consoleInfo;
 static short old_attrs;
diff --git a/llarp/util/win32_logger.hpp b/llarp/util/logging/win32_logger.hpp
similarity index 94%
rename from llarp/util/win32_logger.hpp
rename to llarp/util/logging/win32_logger.hpp
index 3a9cb6342..852704c77 100644
--- a/llarp/util/win32_logger.hpp
+++ b/llarp/util/logging/win32_logger.hpp
@@ -1,7 +1,7 @@
 #ifndef LLARP_UTIL_WIN32_LOGGER_HPP
 #define LLARP_UTIL_WIN32_LOGGER_HPP
 #if defined(_WIN32)
-#include <util/ostream_logger.hpp>
+#include <util/logging/ostream_logger.hpp>
 #define VC_EXTRALEAN
 #include <windows.h>
 
diff --git a/llarp/util/memfn.cpp b/llarp/util/memfn.cpp
deleted file mode 100644
index 38d8de530..000000000
--- a/llarp/util/memfn.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <util/memfn.hpp>
diff --git a/llarp/util/memfn_traits.cpp b/llarp/util/memfn_traits.cpp
deleted file mode 100644
index ff0bd49e6..000000000
--- a/llarp/util/memfn_traits.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <util/memfn_traits.hpp>
diff --git a/llarp/util/meta/memfn.cpp b/llarp/util/meta/memfn.cpp
new file mode 100644
index 000000000..7e29bdd32
--- /dev/null
+++ b/llarp/util/meta/memfn.cpp
@@ -0,0 +1 @@
+#include <util/meta/memfn.hpp>
diff --git a/llarp/util/memfn.hpp b/llarp/util/meta/memfn.hpp
similarity index 95%
rename from llarp/util/memfn.hpp
rename to llarp/util/meta/memfn.hpp
index 4245c5488..3ce1b1646 100644
--- a/llarp/util/memfn.hpp
+++ b/llarp/util/meta/memfn.hpp
@@ -1,9 +1,9 @@
 #ifndef LLARP_UTIL_MEMFN
 #define LLARP_UTIL_MEMFN
 
-#include <util/memfn_traits.hpp>
-#include <util/object.hpp>
-#include <util/traits.hpp>
+#include <util/meta/memfn_traits.hpp>
+#include <util/meta/object.hpp>
+#include <util/meta/traits.hpp>
 
 #include <functional>
 #include <utility>
diff --git a/llarp/util/meta/memfn_traits.cpp b/llarp/util/meta/memfn_traits.cpp
new file mode 100644
index 000000000..da17eccde
--- /dev/null
+++ b/llarp/util/meta/memfn_traits.cpp
@@ -0,0 +1 @@
+#include <util/meta/memfn_traits.hpp>
diff --git a/llarp/util/memfn_traits.hpp b/llarp/util/meta/memfn_traits.hpp
similarity index 98%
rename from llarp/util/memfn_traits.hpp
rename to llarp/util/meta/memfn_traits.hpp
index 613d0bf63..8cdd96801 100644
--- a/llarp/util/memfn_traits.hpp
+++ b/llarp/util/meta/memfn_traits.hpp
@@ -1,8 +1,8 @@
 #ifndef LLARP_UTIL_MEMFN_TRAITS
 #define LLARP_UTIL_MEMFN_TRAITS
 
-#include <util/object.hpp>
-#include <util/traits.hpp>
+#include <util/meta/object.hpp>
+#include <util/meta/traits.hpp>
 
 #include <functional>
 #include <utility>
diff --git a/llarp/util/meta/object.cpp b/llarp/util/meta/object.cpp
new file mode 100644
index 000000000..962108c18
--- /dev/null
+++ b/llarp/util/meta/object.cpp
@@ -0,0 +1 @@
+#include <util/meta/object.hpp>
diff --git a/llarp/util/object.hpp b/llarp/util/meta/object.hpp
similarity index 99%
rename from llarp/util/object.hpp
rename to llarp/util/meta/object.hpp
index 71b3d8871..c53872997 100644
--- a/llarp/util/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/meta/traits.cpp b/llarp/util/meta/traits.cpp
new file mode 100644
index 000000000..5fa9cac9d
--- /dev/null
+++ b/llarp/util/meta/traits.cpp
@@ -0,0 +1 @@
+#include <util/meta/traits.hpp>
diff --git a/llarp/util/traits.hpp b/llarp/util/meta/traits.hpp
similarity index 100%
rename from llarp/util/traits.hpp
rename to llarp/util/meta/traits.hpp
diff --git a/llarp/util/meta/variant.cpp b/llarp/util/meta/variant.cpp
new file mode 100644
index 000000000..8a2a04643
--- /dev/null
+++ b/llarp/util/meta/variant.cpp
@@ -0,0 +1 @@
+#include <util/meta/variant.hpp>
diff --git a/llarp/util/variant.hpp b/llarp/util/meta/variant.hpp
similarity index 100%
rename from llarp/util/variant.hpp
rename to llarp/util/meta/variant.hpp
diff --git a/llarp/util/metrics.cpp b/llarp/util/metrics.cpp
deleted file mode 100644
index 786ead528..000000000
--- a/llarp/util/metrics.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <util/metrics.hpp>
diff --git a/llarp/util/metrics_core.cpp b/llarp/util/metrics/core.cpp
similarity index 99%
rename from llarp/util/metrics_core.cpp
rename to llarp/util/metrics/core.cpp
index e58b63dbc..a7fceeaba 100644
--- a/llarp/util/metrics_core.cpp
+++ b/llarp/util/metrics/core.cpp
@@ -1,4 +1,4 @@
-#include <util/metrics_core.hpp>
+#include <util/metrics/core.hpp>
 
 #include <iostream>
 
diff --git a/llarp/util/metrics_core.hpp b/llarp/util/metrics/core.hpp
similarity index 99%
rename from llarp/util/metrics_core.hpp
rename to llarp/util/metrics/core.hpp
index 512fa18ac..ba7006364 100644
--- a/llarp/util/metrics_core.hpp
+++ b/llarp/util/metrics/core.hpp
@@ -1,10 +1,10 @@
 #ifndef LLARP_METRICS_CORE_HPP
 #define LLARP_METRICS_CORE_HPP
 
-#include <util/metrics_types.hpp>
-#include <util/scheduler.hpp>
+#include <util/metrics/types.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/metrics/json_publisher.cpp b/llarp/util/metrics/json_publisher.cpp
similarity index 99%
rename from llarp/metrics/json_publisher.cpp
rename to llarp/util/metrics/json_publisher.cpp
index 24c052f8b..ef25374e5 100644
--- a/llarp/metrics/json_publisher.cpp
+++ b/llarp/util/metrics/json_publisher.cpp
@@ -1,4 +1,4 @@
-#include <metrics/json_publisher.hpp>
+#include <util/metrics/json_publisher.hpp>
 
 #include <fstream>
 #include <iomanip>
diff --git a/llarp/metrics/json_publisher.hpp b/llarp/util/metrics/json_publisher.hpp
similarity index 96%
rename from llarp/metrics/json_publisher.hpp
rename to llarp/util/metrics/json_publisher.hpp
index b684a2495..bc2722fe0 100644
--- a/llarp/metrics/json_publisher.hpp
+++ b/llarp/util/metrics/json_publisher.hpp
@@ -2,7 +2,7 @@
 #define LLARP_METRICS_JSON_PUBLISHER_HPP
 
 #include <util/fs.hpp>
-#include <util/metrics_core.hpp>
+#include <util/metrics/core.hpp>
 
 #include <nlohmann/json.hpp>
 
diff --git a/llarp/util/metrics/metrics.cpp b/llarp/util/metrics/metrics.cpp
new file mode 100644
index 000000000..c0df453ae
--- /dev/null
+++ b/llarp/util/metrics/metrics.cpp
@@ -0,0 +1 @@
+#include <util/metrics/metrics.hpp>
diff --git a/llarp/util/metrics.hpp b/llarp/util/metrics/metrics.hpp
similarity index 97%
rename from llarp/util/metrics.hpp
rename to llarp/util/metrics/metrics.hpp
index 2a885dc01..07dfbf7cd 100644
--- a/llarp/util/metrics.hpp
+++ b/llarp/util/metrics/metrics.hpp
@@ -1,8 +1,8 @@
 #ifndef LLARP_METRICS_HPP
 #define LLARP_METRICS_HPP
 
-#include <util/metrics_types.hpp>
-#include <util/metrics_core.hpp>
+#include <util/metrics/types.hpp>
+#include <util/metrics/core.hpp>
 #include <util/string_view.hpp>
 
 namespace llarp
diff --git a/llarp/metrics/metrictank_publisher.cpp b/llarp/util/metrics/metrictank_publisher.cpp
similarity index 98%
rename from llarp/metrics/metrictank_publisher.cpp
rename to llarp/util/metrics/metrictank_publisher.cpp
index 751d2cecb..58410843f 100644
--- a/llarp/metrics/metrictank_publisher.cpp
+++ b/llarp/util/metrics/metrictank_publisher.cpp
@@ -1,7 +1,7 @@
-#include <metrics/metrictank_publisher.hpp>
+#include <util/metrics/metrictank_publisher.hpp>
 
-#include <util/logger.hpp>
-#include <util/variant.hpp>
+#include <util/logging/logger.hpp>
+#include <util/meta/variant.hpp>
 
 #include <cstdio>
 #include <absl/strings/str_cat.h>
diff --git a/llarp/metrics/metrictank_publisher.hpp b/llarp/util/metrics/metrictank_publisher.hpp
similarity index 96%
rename from llarp/metrics/metrictank_publisher.hpp
rename to llarp/util/metrics/metrictank_publisher.hpp
index 044b4ec87..a8a4e4a4f 100644
--- a/llarp/metrics/metrictank_publisher.hpp
+++ b/llarp/util/metrics/metrictank_publisher.hpp
@@ -1,9 +1,9 @@
 #ifndef LLARP_METRICS_METRICTANK_PUBLISHER_HPP
 #define LLARP_METRICS_METRICTANK_PUBLISHER_HPP
 
-#include <util/metrics_core.hpp>
+#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/metrics/stream_publisher.cpp b/llarp/util/metrics/stream_publisher.cpp
similarity index 99%
rename from llarp/metrics/stream_publisher.cpp
rename to llarp/util/metrics/stream_publisher.cpp
index 5608b36ad..917a1b446 100644
--- a/llarp/metrics/stream_publisher.cpp
+++ b/llarp/util/metrics/stream_publisher.cpp
@@ -1,4 +1,4 @@
-#include <metrics/stream_publisher.hpp>
+#include <util/metrics/stream_publisher.hpp>
 
 #include <fstream>
 #include <iostream>
diff --git a/llarp/metrics/stream_publisher.hpp b/llarp/util/metrics/stream_publisher.hpp
similarity index 93%
rename from llarp/metrics/stream_publisher.hpp
rename to llarp/util/metrics/stream_publisher.hpp
index 4fbb9ff7a..1fc9cd8df 100644
--- a/llarp/metrics/stream_publisher.hpp
+++ b/llarp/util/metrics/stream_publisher.hpp
@@ -1,7 +1,7 @@
 #ifndef LLARP_METRICS_STREAM_PUBLISHER_HPP
 #define LLARP_METRICS_STREAM_PUBLISHER_HPP
 
-#include <util/metrics_core.hpp>
+#include <util/metrics/core.hpp>
 
 #include <iosfwd>
 
diff --git a/llarp/util/metrics_types.cpp b/llarp/util/metrics/types.cpp
similarity index 98%
rename from llarp/util/metrics_types.cpp
rename to llarp/util/metrics/types.cpp
index a918440a5..facb33817 100644
--- a/llarp/util/metrics_types.cpp
+++ b/llarp/util/metrics/types.cpp
@@ -1,4 +1,4 @@
-#include <util/metrics_types.hpp>
+#include <util/metrics/types.hpp>
 
 #include <util/printer.hpp>
 
diff --git a/llarp/util/metrics_types.hpp b/llarp/util/metrics/types.hpp
similarity index 99%
rename from llarp/util/metrics_types.hpp
rename to llarp/util/metrics/types.hpp
index 6a9d9dfe6..d00b30e89 100644
--- a/llarp/util/metrics_types.hpp
+++ b/llarp/util/metrics/types.hpp
@@ -3,9 +3,9 @@
 
 #include <util/printer.hpp>
 #include <util/string_view.hpp>
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 #include <util/types.hpp>
-#include <util/variant.hpp>
+#include <util/meta/variant.hpp>
 
 #include <absl/container/flat_hash_map.h>
 #include <absl/container/flat_hash_set.h>
diff --git a/llarp/util/object.cpp b/llarp/util/object.cpp
deleted file mode 100644
index d614f5f2f..000000000
--- a/llarp/util/object.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <util/object.hpp>
diff --git a/llarp/util/printer.hpp b/llarp/util/printer.hpp
index 5d128bc83..ffa69763b 100644
--- a/llarp/util/printer.hpp
+++ b/llarp/util/printer.hpp
@@ -2,8 +2,8 @@
 #define LLARP_PRINTER_HPP
 
 #include <util/string_view.hpp>
-#include <util/traits.hpp>
-#include <util/variant.hpp>
+#include <util/meta/traits.hpp>
+#include <util/meta/variant.hpp>
 
 #include <absl/types/variant.h>
 #include <functional>
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 96%
rename from llarp/util/logic.cpp
rename to llarp/util/thread/logic.cpp
index 8e2398ce8..4ff30debd 100644
--- a/llarp/util/logic.cpp
+++ b/llarp/util/thread/logic.cpp
@@ -1,6 +1,6 @@
-#include <util/logic.hpp>
+#include <util/thread/logic.hpp>
 
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/mem.h>
 
 namespace llarp
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 98%
rename from llarp/util/scheduler.hpp
rename to llarp/util/thread/scheduler.hpp
index 970ecfda1..5daa559cf 100644
--- a/llarp/util/scheduler.hpp
+++ b/llarp/util/thread/scheduler.hpp
@@ -1,8 +1,8 @@
 #ifndef LLARP_SCHEDULER_HPP
 #define LLARP_SCHEDULER_HPP
 
-#include <util/object.hpp>
-#include <util/timerqueue.hpp>
+#include <util/meta/object.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 95%
rename from llarp/util/threading.cpp
rename to llarp/util/thread/threading.cpp
index 77d687011..285e3cd0b 100644
--- a/llarp/util/threading.cpp
+++ b/llarp/util/thread/threading.cpp
@@ -1,6 +1,6 @@
-#include <util/threading.hpp>
+#include <util/thread/threading.hpp>
 
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 #ifdef POSIX
 #include <pthread.h>
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 94%
rename from llarp/util/threadpool.cpp
rename to llarp/util/thread/threadpool.cpp
index 01897847f..3e8c3c740 100644
--- a/llarp/util/threadpool.cpp
+++ b/llarp/util/thread/threadpool.cpp
@@ -1,7 +1,7 @@
-#include <util/logger.hpp>
+#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 c9278b5af..8741e3ed7 100644
--- a/llarp/util/timer.cpp
+++ b/llarp/util/thread/timer.cpp
@@ -1,6 +1,6 @@
-#include <util/logger.hpp>
+#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 5dd283748..a36e74024 100644
--- a/llarp/util/timerqueue.hpp
+++ b/llarp/util/thread/timerqueue.hpp
@@ -1,8 +1,8 @@
 #ifndef LLARP_UTIL_TIMERQUEUE_HPP
 #define LLARP_UTIL_TIMERQUEUE_HPP
 
-#include <util/object.hpp>
-#include <util/threading.hpp>
+#include <util/meta/object.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/llarp/util/traits.cpp b/llarp/util/traits.cpp
deleted file mode 100644
index c4109dc0c..000000000
--- a/llarp/util/traits.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <util/traits.hpp>
diff --git a/llarp/util/variant.cpp b/llarp/util/variant.cpp
deleted file mode 100644
index b0a824228..000000000
--- a/llarp/util/variant.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include <util/variant.hpp>
diff --git a/llarp/utp/linklayer.hpp b/llarp/utp/linklayer.hpp
index cb7f6929f..cf74df8a5 100644
--- a/llarp/utp/linklayer.hpp
+++ b/llarp/utp/linklayer.hpp
@@ -75,7 +75,7 @@ namespace llarp
 
       /// stop link layer
       void
-      Stop();
+      Stop() override;
 
       /// regenerate transport keypair
       bool
diff --git a/llarp/utp/session.cpp b/llarp/utp/session.cpp
index 1be1c16ff..8c48383af 100644
--- a/llarp/utp/session.cpp
+++ b/llarp/utp/session.cpp
@@ -3,8 +3,8 @@
 #include <utp/linklayer.hpp>
 #include <messages/discard.hpp>
 #include <messages/link_intro.hpp>
-#include <util/metrics.hpp>
-#include <util/memfn.hpp>
+#include <util/metrics/metrics.hpp>
+#include <util/meta/memfn.hpp>
 
 namespace llarp
 {
diff --git a/llarp/utp/utp.cpp b/llarp/utp/utp.cpp
index 911fdc309..ab11c79e8 100644
--- a/llarp/utp/utp.cpp
+++ b/llarp/utp/utp.cpp
@@ -1,7 +1,7 @@
 #include <utp/utp.hpp>
 
 #include <router/abstractrouter.hpp>
-#include <util/memfn.hpp>
+#include <util/meta/memfn.hpp>
 #include <utp/linklayer.hpp>
 
 namespace llarp
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c7b5e846a..b7feec249 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -18,8 +18,6 @@ list(APPEND TEST_SRC
     exit/test_llarp_exit_context.cpp
     link/test_llarp_link.cpp
     llarp_test.cpp
-    metrics/test_llarp_metrics_metricktank.cpp
-    metrics/test_llarp_metrics_publisher.cpp
     net/test_llarp_net_inaddr.cpp
     net/test_llarp_net.cpp
     routing/llarp_routing_transfer_traffic.cpp
@@ -33,22 +31,24 @@ list(APPEND TEST_SRC
     test_llarp_router_contact.cpp
     test_llarp_router.cpp
     test_md5.cpp
+    util/meta/test_llarp_util_memfn.cpp
+    util/meta/test_llarp_util_object.cpp
+    util/meta/test_llarp_util_traits.cpp
+    util/metrics/test_llarp_metrics_metricktank.cpp
+    util/metrics/test_llarp_metrics_publisher.cpp
+    util/metrics/test_llarp_util_metrics_core.cpp
+    util/metrics/test_llarp_util_metrics_types.cpp
     util/test_llarp_util_aligned.cpp
     util/test_llarp_util_bencode.cpp
     util/test_llarp_util_bits.cpp
     util/test_llarp_util_encode.cpp
-    util/test_llarp_util_metrics_core.cpp
-    util/test_llarp_util_metrics_types.cpp
-    util/test_llarp_util_memfn.cpp
-    util/test_llarp_util_object.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_util_traits.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_memfn.cpp b/test/util/meta/test_llarp_util_memfn.cpp
similarity index 97%
rename from test/util/test_llarp_util_memfn.cpp
rename to test/util/meta/test_llarp_util_memfn.cpp
index 0f31df2ad..22ff0fe96 100644
--- a/test/util/test_llarp_util_memfn.cpp
+++ b/test/util/meta/test_llarp_util_memfn.cpp
@@ -1,4 +1,4 @@
-#include <util/memfn.hpp>
+#include <util/meta/memfn.hpp>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
diff --git a/test/util/test_llarp_util_object.cpp b/test/util/meta/test_llarp_util_object.cpp
similarity index 99%
rename from test/util/test_llarp_util_object.cpp
rename to test/util/meta/test_llarp_util_object.cpp
index 7f4b46321..ef11f7006 100644
--- a/test/util/test_llarp_util_object.cpp
+++ b/test/util/meta/test_llarp_util_object.cpp
@@ -1,4 +1,4 @@
-#include <util/object.hpp>
+#include <util/meta/object.hpp>
 
 #include <array>
 #include <thread>
diff --git a/test/util/test_llarp_util_traits.cpp b/test/util/meta/test_llarp_util_traits.cpp
similarity index 99%
rename from test/util/test_llarp_util_traits.cpp
rename to test/util/meta/test_llarp_util_traits.cpp
index 0d234e770..64c2cd141 100644
--- a/test/util/test_llarp_util_traits.cpp
+++ b/test/util/meta/test_llarp_util_traits.cpp
@@ -1,4 +1,4 @@
-#include <util/traits.hpp>
+#include <util/meta/traits.hpp>
 
 #include <list>
 
diff --git a/test/metrics/test_llarp_metrics_metricktank.cpp b/test/util/metrics/test_llarp_metrics_metricktank.cpp
similarity index 89%
rename from test/metrics/test_llarp_metrics_metricktank.cpp
rename to test/util/metrics/test_llarp_metrics_metricktank.cpp
index 5a17a1bb9..00ca47bcd 100644
--- a/test/metrics/test_llarp_metrics_metricktank.cpp
+++ b/test/util/metrics/test_llarp_metrics_metricktank.cpp
@@ -1,4 +1,4 @@
-#include <metrics/metrictank_publisher.hpp>
+#include <util/metrics/metrictank_publisher.hpp>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
diff --git a/test/metrics/test_llarp_metrics_publisher.cpp b/test/util/metrics/test_llarp_metrics_publisher.cpp
similarity index 95%
rename from test/metrics/test_llarp_metrics_publisher.cpp
rename to test/util/metrics/test_llarp_metrics_publisher.cpp
index 89bdfc3a4..83a34b41d 100644
--- a/test/metrics/test_llarp_metrics_publisher.cpp
+++ b/test/util/metrics/test_llarp_metrics_publisher.cpp
@@ -1,4 +1,4 @@
-#include <metrics/stream_publisher.hpp>
+#include <util/metrics/stream_publisher.hpp>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
diff --git a/test/util/test_llarp_util_metrics_core.cpp b/test/util/metrics/test_llarp_util_metrics_core.cpp
similarity index 99%
rename from test/util/test_llarp_util_metrics_core.cpp
rename to test/util/metrics/test_llarp_util_metrics_core.cpp
index 6a00e5ad0..e67b16603 100644
--- a/test/util/test_llarp_util_metrics_core.cpp
+++ b/test/util/metrics/test_llarp_util_metrics_core.cpp
@@ -1,4 +1,4 @@
-#include <util/metrics_core.hpp>
+#include <util/metrics/core.hpp>
 
 #include <array>
 #include <thread>
diff --git a/test/util/test_llarp_util_metrics_types.cpp b/test/util/metrics/test_llarp_util_metrics_types.cpp
similarity index 99%
rename from test/util/test_llarp_util_metrics_types.cpp
rename to test/util/metrics/test_llarp_util_metrics_types.cpp
index 60304e12d..bc8be449d 100644
--- a/test/util/test_llarp_util_metrics_types.cpp
+++ b/test/util/metrics/test_llarp_util_metrics_types.cpp
@@ -1,4 +1,4 @@
-#include <util/metrics_types.hpp>
+#include <util/metrics/types.hpp>
 
 #include <array>
 
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>
diff --git a/vendor/libtuntap-master/tuntap.cpp b/vendor/libtuntap-master/tuntap.cpp
index dbff74c12..a7a7d12b3 100644
--- a/vendor/libtuntap-master/tuntap.cpp
+++ b/vendor/libtuntap-master/tuntap.cpp
@@ -50,7 +50,7 @@ inet_ntop(int af, const void *src, char *dst, size_t size);
 
 #include <stdarg.h>
 
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 #include "tuntap.h"
 
diff --git a/vendor/libtuntap-master/tuntap_log.cpp b/vendor/libtuntap-master/tuntap_log.cpp
index be425cbdc..10c4d9a95 100644
--- a/vendor/libtuntap-master/tuntap_log.cpp
+++ b/vendor/libtuntap-master/tuntap_log.cpp
@@ -24,7 +24,7 @@
 #include <string.h>
 
 #include <tuntap.h>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 extern "C"
 {