diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83ce11c..e1491ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,13 +9,13 @@ add_subdirectory(ipv4)
 add_subdirectory(arp)
 add_subdirectory(icmp)
 add_subdirectory(igmp)
+add_subdirectory(udp)
 
 add_library(limen STATIC
     src/dispatch.cpp
     src/flash.cpp
     src/handlers.cpp
     src/test_handlers.cpp
-    src/udp.cpp
 )
 
 target_include_directories(limen PUBLIC
@@ -34,6 +34,7 @@ target_link_libraries(limen PUBLIC
     arp
     icmp
     igmp
+    udp
     pico_stdlib
     pico_sha256
 )
diff --git a/udp/CMakeLists.txt b/udp/CMakeLists.txt
new file mode 100644
index 0000000..23f68dc
--- /dev/null
+++ b/udp/CMakeLists.txt
@@ -0,0 +1,12 @@
+add_library(udp STATIC udp.cpp)
+
+target_include_directories(udp PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+target_compile_options(udp PRIVATE -Wall -Wextra -Wno-unused-parameter)
+
+target_link_libraries(udp PUBLIC
+    util
+    eth
+    ipv4
+    debug_log
+)
diff --git a/src/udp.cpp b/udp/udp.cpp
similarity index 100%
rename from src/udp.cpp
rename to udp/udp.cpp
diff --git a/include/udp.h b/udp/udp.h
similarity index 100%
rename from include/udp.h
rename to udp/udp.h