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