diff --git a/llarp/CMakeLists.txt b/llarp/CMakeLists.txt
index 40920d23d..f74c741c1 100644
--- a/llarp/CMakeLists.txt
+++ b/llarp/CMakeLists.txt
@@ -163,6 +163,7 @@ set(LIB_SRC
   dnsd.cpp
   exit/context.cpp
   exit/endpoint.cpp
+  exit/exit_messages.cpp
   exit/policy.cpp
   exit/session.cpp
   handlers/exit.cpp
@@ -176,7 +177,6 @@ set(LIB_SRC
   link/session.cpp
   messages/dht_immediate.cpp
   messages/discard.cpp
-  messages/exit.cpp
   messages/link_intro.cpp
   messages/link_message_parser.cpp
   messages/link_message.cpp
diff --git a/llarp/messages/exit.cpp b/llarp/exit/exit_messages.cpp
similarity index 99%
rename from llarp/messages/exit.cpp
rename to llarp/exit/exit_messages.cpp
index bd2c634d7..0693b036b 100644
--- a/llarp/messages/exit.cpp
+++ b/llarp/exit/exit_messages.cpp
@@ -1,4 +1,4 @@
-#include <messages/exit.hpp>
+#include <exit/exit_messages.hpp>
 
 #include <crypto/crypto.hpp>
 #include <routing/handler.hpp>
diff --git a/llarp/messages/exit.hpp b/llarp/exit/exit_messages.hpp
similarity index 98%
rename from llarp/messages/exit.hpp
rename to llarp/exit/exit_messages.hpp
index 22c0a032e..168c3833e 100644
--- a/llarp/messages/exit.hpp
+++ b/llarp/exit/exit_messages.hpp
@@ -1,5 +1,5 @@
-#ifndef LLARP_MESSAGES_EXIT_HPP
-#define LLARP_MESSAGES_EXIT_HPP
+#ifndef LLARP_EXIT_MESSAGES_HPP
+#define LLARP_EXIT_MESSAGES_HPP
 
 #include <crypto/types.hpp>
 #include <exit/policy.hpp>
diff --git a/llarp/exit/session.hpp b/llarp/exit/session.hpp
index ed8f7dda8..c974e468c 100644
--- a/llarp/exit/session.hpp
+++ b/llarp/exit/session.hpp
@@ -1,7 +1,7 @@
 #ifndef LLARP_EXIT_SESSION_HPP
 #define LLARP_EXIT_SESSION_HPP
 
-#include <messages/exit.hpp>
+#include <exit/exit_messages.hpp>
 #include <net/ip.hpp>
 #include <path/pathbuilder.hpp>
 #include <routing/transfer_traffic.hpp>
diff --git a/llarp/messages/dht_immediate.hpp b/llarp/messages/dht_immediate.hpp
index e808bab3c..88f4e765d 100644
--- a/llarp/messages/dht_immediate.hpp
+++ b/llarp/messages/dht_immediate.hpp
@@ -10,10 +10,7 @@ namespace llarp
 {
   struct DHTImmediateMessage final : public ILinkMessage
   {
-    DHTImmediateMessage() : ILinkMessage()
-    {
-    }
-
+    DHTImmediateMessage()  = default;
     ~DHTImmediateMessage() = default;
 
     std::vector< std::unique_ptr< dht::IMessage > > msgs;
diff --git a/llarp/path/path.cpp b/llarp/path/path.cpp
index 1cafbb5e0..57e002936 100644
--- a/llarp/path/path.cpp
+++ b/llarp/path/path.cpp
@@ -1,7 +1,7 @@
 #include <path/path.hpp>
 
+#include <exit/exit_messages.hpp>
 #include <messages/discard.hpp>
-#include <messages/exit.hpp>
 #include <messages/path_latency.hpp>
 #include <messages/relay_commit.hpp>
 #include <path/pathbuilder.hpp>
diff --git a/llarp/path/transit_hop.cpp b/llarp/path/transit_hop.cpp
index 9ed7aefda..532dbeb23 100644
--- a/llarp/path/transit_hop.cpp
+++ b/llarp/path/transit_hop.cpp
@@ -2,8 +2,8 @@
 
 #include <dht/context.hpp>
 #include <exit/context.hpp>
+#include <exit/exit_messages.hpp>
 #include <messages/discard.hpp>
-#include <messages/exit.hpp>
 #include <messages/path_latency.hpp>
 #include <messages/path_transfer.hpp>
 #include <messages/relay_commit.hpp>
diff --git a/llarp/routing/message_parser.cpp b/llarp/routing/message_parser.cpp
index f6a42c9cf..b6e421769 100644
--- a/llarp/routing/message_parser.cpp
+++ b/llarp/routing/message_parser.cpp
@@ -1,7 +1,7 @@
 #include <routing/message_parser.hpp>
 
+#include <exit/exit_messages.hpp>
 #include <messages/discard.hpp>
-#include <messages/exit.hpp>
 #include <messages/path_confirm.hpp>
 #include <messages/path_latency.hpp>
 #include <messages/path_transfer.hpp>
diff --git a/test/routing/test_llarp_routing_obtainexitmessage.cpp b/test/routing/test_llarp_routing_obtainexitmessage.cpp
index 17a62910f..a6decdf53 100644
--- a/test/routing/test_llarp_routing_obtainexitmessage.cpp
+++ b/test/routing/test_llarp_routing_obtainexitmessage.cpp
@@ -1,4 +1,4 @@
-#include <messages/exit.hpp>
+#include <exit/exit_messages.hpp>
 
 #include <crypto/crypto.hpp>
 #include <crypto/crypto_libsodium.hpp>