diff --git a/app/meson.build b/app/meson.build
index 1d31a442..b2c0bc55 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -1,8 +1,8 @@
 src = [
     'src/main.c',
-    'src/adb.c',
-    'src/adb_parser.c',
-    'src/adb_tunnel.c',
+    'src/adb/adb.c',
+    'src/adb/adb_parser.c',
+    'src/adb/adb_tunnel.c',
     'src/cli.c',
     'src/clock.c',
     'src/compat.c',
@@ -221,7 +221,7 @@ if get_option('buildtype') == 'debug'
     tests = [
         ['test_adb_parser', [
             'tests/test_adb_parser.c',
-            'src/adb_parser.c',
+            'src/adb/adb_parser.c',
             'src/util/str.c',
             'src/util/strbuf.c',
         ]],
diff --git a/app/src/adb.c b/app/src/adb/adb.c
similarity index 100%
rename from app/src/adb.c
rename to app/src/adb/adb.c
diff --git a/app/src/adb.h b/app/src/adb/adb.h
similarity index 100%
rename from app/src/adb.h
rename to app/src/adb/adb.h
diff --git a/app/src/adb_parser.c b/app/src/adb/adb_parser.c
similarity index 100%
rename from app/src/adb_parser.c
rename to app/src/adb/adb_parser.c
diff --git a/app/src/adb_parser.h b/app/src/adb/adb_parser.h
similarity index 100%
rename from app/src/adb_parser.h
rename to app/src/adb/adb_parser.h
diff --git a/app/src/adb_tunnel.c b/app/src/adb/adb_tunnel.c
similarity index 100%
rename from app/src/adb_tunnel.c
rename to app/src/adb/adb_tunnel.c
diff --git a/app/src/adb_tunnel.h b/app/src/adb/adb_tunnel.h
similarity index 100%
rename from app/src/adb_tunnel.h
rename to app/src/adb/adb_tunnel.h
diff --git a/app/src/file_pusher.c b/app/src/file_pusher.c
index 738e3616..78ea48c2 100644
--- a/app/src/file_pusher.c
+++ b/app/src/file_pusher.c
@@ -3,7 +3,7 @@
 #include <assert.h>
 #include <string.h>
 
-#include "adb.h"
+#include "adb/adb.h"
 #include "util/log.h"
 #include "util/process_intr.h"
 
diff --git a/app/src/file_pusher.h b/app/src/file_pusher.h
index 56b107a0..0d934d6c 100644
--- a/app/src/file_pusher.h
+++ b/app/src/file_pusher.h
@@ -5,7 +5,6 @@
 
 #include <stdbool.h>
 
-#include "adb.h"
 #include "util/cbuf.h"
 #include "util/thread.h"
 #include "util/intr.h"
diff --git a/app/src/server.c b/app/src/server.c
index e5acef95..b7a28949 100644
--- a/app/src/server.c
+++ b/app/src/server.c
@@ -7,7 +7,7 @@
 #include <SDL2/SDL_timer.h>
 #include <SDL2/SDL_platform.h>
 
-#include "adb.h"
+#include "adb/adb.h"
 #include "util/file.h"
 #include "util/log.h"
 #include "util/net_intr.h"
diff --git a/app/src/server.h b/app/src/server.h
index 89cdc2f4..1dff19a7 100644
--- a/app/src/server.h
+++ b/app/src/server.h
@@ -7,8 +7,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "adb.h"
-#include "adb_tunnel.h"
+#include "adb/adb_tunnel.h"
 #include "coords.h"
 #include "options.h"
 #include "util/intr.h"
diff --git a/app/tests/test_adb_parser.c b/app/tests/test_adb_parser.c
index cb3abb0e..51e7d6d2 100644
--- a/app/tests/test_adb_parser.c
+++ b/app/tests/test_adb_parser.c
@@ -2,7 +2,7 @@
 
 #include <assert.h>
 
-#include "adb_parser.h"
+#include "adb/adb_parser.h"
 
 static void test_get_ip_single_line() {
     char ip_route[] = "192.168.1.0/24 dev wlan0  proto kernel  scope link  src "