From 1aec0dfa2bdb87da84ac555c3b006372cc7f6436 Mon Sep 17 00:00:00 2001
From: Michael <michael@loki.network>
Date: Sun, 1 Sep 2019 13:10:49 +0100
Subject: [PATCH] Move logging to subdirectory

---
 daemon/main.cpp                              |  2 +-
 daemon/rcutil.cpp                            |  4 ++--
 libabyss/src/client.cpp                      |  2 +-
 libabyss/src/server.cpp                      |  2 +-
 llarp/CMakeLists.txt                         | 22 ++++++++++----------
 llarp/config/config.cpp                      |  4 ++--
 llarp/config/ini.cpp                         |  3 ++-
 llarp/context.cpp                            |  2 +-
 llarp/crypto/encrypted_frame.cpp             |  2 +-
 llarp/dht/localrouterlookup.cpp              |  2 +-
 llarp/dht/localserviceaddresslookup.cpp      |  2 +-
 llarp/dht/tx.hpp                             |  2 +-
 llarp/dht/txholder.hpp                       |  1 -
 llarp/dns.cpp                                |  2 +-
 llarp/dns/message.cpp                        |  2 +-
 llarp/dns/question.cpp                       |  2 +-
 llarp/dns/rr.cpp                             |  2 +-
 llarp/dnsc.cpp                               |  2 +-
 llarp/messages/link_intro.cpp                |  2 +-
 llarp/messages/link_message_parser.cpp       |  2 +-
 llarp/messages/relay_commit.cpp              |  2 +-
 llarp/messages/relay_status.cpp              |  2 +-
 llarp/metrics/metrictank_publisher.cpp       |  2 +-
 llarp/net/net.cpp                            |  2 +-
 llarp/net/net.hpp                            |  1 -
 llarp/nodedb.cpp                             |  2 +-
 llarp/router/router.cpp                      | 14 ++++++-------
 llarp/router_contact.cpp                     |  2 +-
 llarp/rpc/rpc.cpp                            |  2 +-
 llarp/service/endpoint_util.cpp              |  2 +-
 llarp/util/aligned.hpp                       |  2 +-
 llarp/util/bencode.cpp                       |  2 +-
 llarp/util/bencode.hpp                       |  2 +-
 llarp/util/codel.hpp                         |  2 +-
 llarp/util/fs.cpp                            |  2 +-
 llarp/util/{ => logging}/android_logger.cpp  |  6 ++++--
 llarp/util/{ => logging}/android_logger.hpp  |  3 ++-
 llarp/util/{ => logging}/file_logger.cpp     |  5 +++--
 llarp/util/{ => logging}/file_logger.hpp     |  3 ++-
 llarp/util/{ => logging}/json_logger.cpp     |  4 ++--
 llarp/util/{ => logging}/json_logger.hpp     |  4 ++--
 llarp/util/{ => logging}/logger.cpp          | 10 ++++-----
 llarp/util/{ => logging}/logger.h            |  0
 llarp/util/{ => logging}/logger.hpp          |  4 ++--
 llarp/util/{ => logging}/logger_internal.hpp |  0
 llarp/util/{ => logging}/logger_syslog.hpp   |  3 ++-
 llarp/util/{ => logging}/loglevel.cpp        |  4 ++--
 llarp/util/{ => logging}/loglevel.hpp        |  0
 llarp/util/{ => logging}/logstream.hpp       |  6 ++++--
 llarp/util/{ => logging}/ostream_logger.cpp  |  4 ++--
 llarp/util/{ => logging}/ostream_logger.hpp  |  2 +-
 llarp/util/{ => logging}/syslog_logger.cpp   |  6 ++++--
 llarp/util/{ => logging}/win32_logger.cpp    |  4 ++--
 llarp/util/{ => logging}/win32_logger.hpp    |  2 +-
 llarp/util/logic.cpp                         |  2 +-
 llarp/util/threading.cpp                     |  2 +-
 llarp/util/threadpool.cpp                    |  2 +-
 llarp/util/timer.cpp                         |  1 -
 vendor/libtuntap-master/tuntap.cpp           |  2 +-
 vendor/libtuntap-master/tuntap_log.cpp       |  2 +-
 60 files changed, 97 insertions(+), 89 deletions(-)
 rename llarp/util/{ => logging}/android_logger.cpp (94%)
 rename llarp/util/{ => logging}/android_logger.hpp (93%)
 rename llarp/util/{ => logging}/file_logger.cpp (95%)
 rename llarp/util/{ => logging}/file_logger.hpp (96%)
 rename llarp/util/{ => logging}/json_logger.cpp (88%)
 rename llarp/util/{ => logging}/json_logger.hpp (91%)
 rename llarp/util/{ => logging}/logger.cpp (85%)
 rename llarp/util/{ => logging}/logger.h (100%)
 rename llarp/util/{ => logging}/logger.hpp (98%)
 rename llarp/util/{ => logging}/logger_internal.hpp (100%)
 rename llarp/util/{ => logging}/logger_syslog.hpp (93%)
 rename llarp/util/{ => logging}/loglevel.cpp (84%)
 rename llarp/util/{ => logging}/loglevel.hpp (100%)
 rename llarp/util/{ => logging}/logstream.hpp (96%)
 rename llarp/util/{ => logging}/ostream_logger.cpp (92%)
 rename llarp/util/{ => logging}/ostream_logger.hpp (94%)
 rename llarp/util/{ => logging}/syslog_logger.cpp (91%)
 rename llarp/util/{ => logging}/win32_logger.cpp (97%)
 rename llarp/util/{ => logging}/win32_logger.hpp (94%)

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/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..11f85bc64 100644
--- a/llarp/CMakeLists.txt
+++ b/llarp/CMakeLists.txt
@@ -17,25 +17,25 @@ 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/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/logic.cpp
-  util/loglevel.cpp
   util/mem.cpp
-  util/memfn_traits.cpp
   util/memfn.cpp
+  util/memfn_traits.cpp
+  util/metrics.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/printer.cpp
-  util/queue_manager.cpp
   util/queue.cpp
+  util/queue_manager.cpp
   util/scheduler.cpp
   util/status.cpp
   util/stopwatch.cpp
diff --git a/llarp/config/config.cpp b/llarp/config/config.cpp
index 78f5e3a94..2d863a7d7 100644
--- a/llarp/config/config.cpp
+++ b/llarp/config/config.cpp
@@ -6,8 +6,8 @@
 #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/str.hpp>
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..6c92bb5b7 100644
--- a/llarp/context.cpp
+++ b/llarp/context.cpp
@@ -12,7 +12,7 @@
 #include <metrics/stream_publisher.hpp>
 #include <nodedb.hpp>
 #include <router/router.hpp>
-#include <util/logger.h>
+#include <util/logging/logger.h>
 #include <util/memfn.hpp>
 #include <util/metrics.hpp>
 #include <util/scheduler.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/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/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/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..802ab1f57 100644
--- a/llarp/messages/link_message_parser.cpp
+++ b/llarp/messages/link_message_parser.cpp
@@ -9,7 +9,7 @@
 #include <messages/relay.hpp>
 #include <router_contact.hpp>
 #include <util/buffer.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/metrics.hpp>
 
 #include <memory>
diff --git a/llarp/messages/relay_commit.cpp b/llarp/messages/relay_commit.cpp
index a269590be..d6e30a0fc 100644
--- a/llarp/messages/relay_commit.cpp
+++ b/llarp/messages/relay_commit.cpp
@@ -10,7 +10,7 @@
 #include <routing/path_confirm_message.hpp>
 #include <util/bencode.hpp>
 #include <util/buffer.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/logic.hpp>
 #include <util/memfn.hpp>
 
diff --git a/llarp/messages/relay_status.cpp b/llarp/messages/relay_status.cpp
index d72e41d87..9450b265c 100644
--- a/llarp/messages/relay_status.cpp
+++ b/llarp/messages/relay_status.cpp
@@ -7,7 +7,7 @@
 #include <routing/path_confirm_message.hpp>
 #include <util/bencode.hpp>
 #include <util/buffer.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/logic.hpp>
 #include <util/memfn.hpp>
 
diff --git a/llarp/metrics/metrictank_publisher.cpp b/llarp/metrics/metrictank_publisher.cpp
index 751d2cecb..661584645 100644
--- a/llarp/metrics/metrictank_publisher.cpp
+++ b/llarp/metrics/metrictank_publisher.cpp
@@ -1,6 +1,6 @@
 #include <metrics/metrictank_publisher.hpp>
 
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/variant.hpp>
 
 #include <cstdio>
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..2c79f62c6 100644
--- a/llarp/nodedb.cpp
+++ b/llarp/nodedb.cpp
@@ -5,7 +5,7 @@
 #include <util/buffer.hpp>
 #include <util/encode.hpp>
 #include <util/fs.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/logic.hpp>
 #include <util/mem.hpp>
 #include <util/thread_pool.hpp>
diff --git a/llarp/router/router.cpp b/llarp/router/router.cpp
index a7475cfc8..952273324 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/logging/file_logger.hpp>
+#include <util/logging/json_logger.hpp>
+#include <util/logging/logger_syslog.hpp>
+#include <util/logging/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/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_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..9ca034a2d 100644
--- a/llarp/rpc/rpc.cpp
+++ b/llarp/rpc/rpc.cpp
@@ -2,7 +2,7 @@
 
 #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>
 
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/util/aligned.hpp b/llarp/util/aligned.hpp
index fafd99a95..403df1cae 100644
--- a/llarp/util/aligned.hpp
+++ b/llarp/util/aligned.hpp
@@ -3,7 +3,7 @@
 
 #include <util/bencode.h>
 #include <util/encode.hpp>
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/printer.hpp>
 #include <util/traits.hpp>
 
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..9e67a7bb8 100644
--- a/llarp/util/codel.hpp
+++ b/llarp/util/codel.hpp
@@ -1,7 +1,7 @@
 #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/time.hpp>
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 96%
rename from llarp/util/file_logger.hpp
rename to llarp/util/logging/file_logger.hpp
index 463b987bf..fef0626ed 100644
--- a/llarp/util/file_logger.hpp
+++ b/llarp/util/logging/file_logger.hpp
@@ -1,7 +1,8 @@
 #ifndef LLARP_UTIL_FILE_LOGGER_HPP
 #define LLARP_UTIL_FILE_LOGGER_HPP
 
-#include <util/logstream.hpp>
+#include <util/logging/logstream.hpp>
+
 #include <util/thread_pool.hpp>
 #include <util/time.hpp>
 
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/logic.cpp b/llarp/util/logic.cpp
index 8e2398ce8..5773143cf 100644
--- a/llarp/util/logic.cpp
+++ b/llarp/util/logic.cpp
@@ -1,6 +1,6 @@
 #include <util/logic.hpp>
 
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/mem.h>
 
 namespace llarp
diff --git a/llarp/util/threading.cpp b/llarp/util/threading.cpp
index 77d687011..24ec5d9d6 100644
--- a/llarp/util/threading.cpp
+++ b/llarp/util/threading.cpp
@@ -1,6 +1,6 @@
 #include <util/threading.hpp>
 
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 
 #ifdef POSIX
 #include <pthread.h>
diff --git a/llarp/util/threadpool.cpp b/llarp/util/threadpool.cpp
index 01897847f..041264c96 100644
--- a/llarp/util/threadpool.cpp
+++ b/llarp/util/threadpool.cpp
@@ -1,4 +1,4 @@
-#include <util/logger.hpp>
+#include <util/logging/logger.hpp>
 #include <util/time.hpp>
 #include <util/threadpool.h>
 #include <util/thread_pool.hpp>
diff --git a/llarp/util/timer.cpp b/llarp/util/timer.cpp
index c9278b5af..6f3d20f48 100644
--- a/llarp/util/timer.cpp
+++ b/llarp/util/timer.cpp
@@ -1,4 +1,3 @@
-#include <util/logger.hpp>
 #include <util/time.hpp>
 #include <util/timer.hpp>
 
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"
 {