diff --git a/kmod/Makefile b/kmod/Makefile
new file mode 100644
index 0000000..5a3b403
--- /dev/null
+++ b/kmod/Makefile
@@ -0,0 +1,9 @@
+obj-m += smartcapwap.o
+
+smartcapwap-y := \
+	main.o \
+	netlinkapp.o \
+	capwap.o \
+	capwap_private.o
+
+CFLAGS_capwap.o = -I$(src)
diff --git a/src/kmod/capwap-trace.h b/kmod/capwap-trace.h
similarity index 100%
rename from src/kmod/capwap-trace.h
rename to kmod/capwap-trace.h
diff --git a/src/kmod/capwap.c b/kmod/capwap.c
similarity index 100%
rename from src/kmod/capwap.c
rename to kmod/capwap.c
diff --git a/src/kmod/capwap.h b/kmod/capwap.h
similarity index 100%
rename from src/kmod/capwap.h
rename to kmod/capwap.h
diff --git a/src/kmod/capwap_private.c b/kmod/capwap_private.c
similarity index 100%
rename from src/kmod/capwap_private.c
rename to kmod/capwap_private.c
diff --git a/src/kmod/capwap_private.h b/kmod/capwap_private.h
similarity index 100%
rename from src/kmod/capwap_private.h
rename to kmod/capwap_private.h
diff --git a/src/kmod/capwap_rfc.h b/kmod/capwap_rfc.h
similarity index 100%
rename from src/kmod/capwap_rfc.h
rename to kmod/capwap_rfc.h
diff --git a/src/kmod/config.h b/kmod/config.h
similarity index 100%
rename from src/kmod/config.h
rename to kmod/config.h
diff --git a/src/kmod/main.c b/kmod/main.c
similarity index 100%
rename from src/kmod/main.c
rename to kmod/main.c
diff --git a/src/kmod/netlinkapp.c b/kmod/netlinkapp.c
similarity index 100%
rename from src/kmod/netlinkapp.c
rename to kmod/netlinkapp.c
diff --git a/src/kmod/netlinkapp.h b/kmod/netlinkapp.h
similarity index 100%
rename from src/kmod/netlinkapp.h
rename to kmod/netlinkapp.h
diff --git a/src/kmod/nlsmartcapwap.h b/kmod/nlsmartcapwap.h
similarity index 100%
rename from src/kmod/nlsmartcapwap.h
rename to kmod/nlsmartcapwap.h
diff --git a/openwrt/Makefile b/openwrt/Makefile
index 5f4593e..9589e1c 100644
--- a/openwrt/Makefile
+++ b/openwrt/Makefile
@@ -74,7 +74,7 @@ define Build/Compile/wtp
 endef
 
 NOSTDINC_FLAGS = \
-        -I$(PKG_BUILD_DIR)/src/kmod \
+        -I$(PKG_BUILD_DIR)/kmod \
         -I$(STAGING_DIR)/usr/include/mac80211-backport \
         -I$(STAGING_DIR)/usr/include/mac80211/uapi \
         -I$(STAGING_DIR)/usr/include/mac80211 \
@@ -85,7 +85,7 @@ define Build/Compile/kmod
 	+$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
 		ARCH="$(LINUX_KARCH)" \
 		CROSS_COMPILE="$(KERNEL_CROSS)" \
-		SUBDIRS="$(PKG_BUILD_DIR)/src/kmod" \
+		SUBDIRS="$(PKG_BUILD_DIR)/kmod" \
 		NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
 		modules
 endef
diff --git a/src/Makefile.am b/src/Makefile.am
index 34d9ad6..0fe3314 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,7 @@ endif
 AM_CFLAGS += \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/kmod \
+	-I$(top_srcdir)/kmod \
 	-I$(top_srcdir)/lib/binding/ieee80211 \
 	-I$(top_srcdir)/src/binding/ieee80211