diff --git a/.dockerignore b/.dockerignore
index 567609b12..6f31401f7 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1 +1,2 @@
 build/
+.vscode/
diff --git a/llarp/CMakeLists.txt b/llarp/CMakeLists.txt
index 17698636d..49d24e4fa 100644
--- a/llarp/CMakeLists.txt
+++ b/llarp/CMakeLists.txt
@@ -166,9 +166,9 @@ set(LIB_SRC
   handlers/exit.cpp
   handlers/null.cpp
   handlers/tun.cpp
-  link/iwp_linklayer.cpp
-  link/iwp_outermessage.cpp
-  link/iwp.cpp
+  iwp/linklayer.cpp
+  iwp/outermessage.cpp
+  iwp/iwp.cpp
   link/server.cpp
   link/session.cpp
   messages/dht_immediate.cpp
diff --git a/llarp/link/iwp.cpp b/llarp/iwp/iwp.cpp
similarity index 95%
rename from llarp/link/iwp.cpp
rename to llarp/iwp/iwp.cpp
index b29ad37fb..545170ccc 100644
--- a/llarp/link/iwp.cpp
+++ b/llarp/iwp/iwp.cpp
@@ -1,5 +1,5 @@
-#include <link/iwp.hpp>
-#include <link/iwp_linklayer.hpp>
+#include <iwp/iwp.hpp>
+#include <iwp/linklayer.hpp>
 #include <router/abstractrouter.hpp>
 
 namespace llarp
diff --git a/llarp/link/iwp.hpp b/llarp/iwp/iwp.hpp
similarity index 92%
rename from llarp/link/iwp.hpp
rename to llarp/iwp/iwp.hpp
index c64494126..fd161160a 100644
--- a/llarp/link/iwp.hpp
+++ b/llarp/iwp/iwp.hpp
@@ -1,5 +1,5 @@
-#ifndef LLARP_LINK_IWP_HPP
-#define LLARP_LINK_IWP_HPP
+#ifndef LLARP_IWP_HPP
+#define LLARP_IWP_HPP
 
 #include <link/server.hpp>
 
diff --git a/llarp/link/iwp_linklayer.cpp b/llarp/iwp/linklayer.cpp
similarity index 99%
rename from llarp/link/iwp_linklayer.cpp
rename to llarp/iwp/linklayer.cpp
index e7feaedfb..7a7b9d8b0 100644
--- a/llarp/link/iwp_linklayer.cpp
+++ b/llarp/iwp/linklayer.cpp
@@ -1,4 +1,4 @@
-#include <link/iwp_linklayer.hpp>
+#include <iwp/linklayer.hpp>
 
 namespace llarp
 {
diff --git a/llarp/link/iwp_linklayer.hpp b/llarp/iwp/linklayer.hpp
similarity index 94%
rename from llarp/link/iwp_linklayer.hpp
rename to llarp/iwp/linklayer.hpp
index d8cf37e73..c90242dc3 100644
--- a/llarp/link/iwp_linklayer.hpp
+++ b/llarp/iwp/linklayer.hpp
@@ -1,12 +1,12 @@
-#ifndef LLARP_LINK_IWP_LINKLAYER_HPP
-#define LLARP_LINK_IWP_LINKLAYER_HPP
+#ifndef LLARP_IWP_LINKLAYER_HPP
+#define LLARP_IWP_LINKLAYER_HPP
 
 #include <constants/link_layer.hpp>
 #include <crypto/crypto.hpp>
 #include <crypto/encrypted.hpp>
 #include <crypto/types.hpp>
 #include <link/server.hpp>
-#include <link/iwp_outermessage.hpp>
+#include <iwp/outermessage.hpp>
 
 namespace llarp
 {
diff --git a/llarp/link/iwp_outermessage.cpp b/llarp/iwp/outermessage.cpp
similarity index 99%
rename from llarp/link/iwp_outermessage.cpp
rename to llarp/iwp/outermessage.cpp
index 1e8767645..bb3b9b724 100644
--- a/llarp/link/iwp_outermessage.cpp
+++ b/llarp/iwp/outermessage.cpp
@@ -1,4 +1,4 @@
-#include <link/iwp_outermessage.hpp>
+#include <iwp/outermessage.hpp>
 
 namespace llarp
 {
diff --git a/llarp/link/iwp_outermessage.hpp b/llarp/iwp/outermessage.hpp
similarity index 96%
rename from llarp/link/iwp_outermessage.hpp
rename to llarp/iwp/outermessage.hpp
index 6716ea5f1..eefc05593 100644
--- a/llarp/link/iwp_outermessage.hpp
+++ b/llarp/iwp/outermessage.hpp
@@ -1,5 +1,5 @@
-#ifndef LLARP_LINK_IWP_OUTERMESSAGE_HPP
-#define LLARP_LINK_IWP_OUTERMESSAGE_HPP
+#ifndef LLARP_IWP_OUTERMESSAGE_HPP
+#define LLARP_IWP_OUTERMESSAGE_HPP
 
 #include <crypto/types.hpp>
 #include <router_contact.hpp>
diff --git a/llarp/router/router.cpp b/llarp/router/router.cpp
index a1af8b263..7d5929b92 100644
--- a/llarp/router/router.cpp
+++ b/llarp/router/router.cpp
@@ -6,7 +6,7 @@
 #include <crypto/crypto_libsodium.hpp>
 #include <dht/context.hpp>
 #include <dht/node.hpp>
-#include <link/iwp.hpp>
+#include <iwp/iwp.hpp>
 #include <link/server.hpp>
 #include <messages/link_message.hpp>
 #include <net/net.hpp>
diff --git a/test/link/test_llarp_link.cpp b/test/link/test_llarp_link.cpp
index 3d6b0317b..d06bc6976 100644
--- a/test/link/test_llarp_link.cpp
+++ b/test/link/test_llarp_link.cpp
@@ -1,5 +1,5 @@
-#include <link/iwp.hpp>
 #include <ev/ev.h>
+#include <iwp/iwp.hpp>
 #include <messages/link_intro.hpp>
 #include <messages/discard.hpp>
 #include <utp/utp.hpp>