diff --git a/ieee1905/Makefile b/ieee1905/Makefile
index 8fe32eddf..21714cda8 100644
--- a/ieee1905/Makefile
+++ b/ieee1905/Makefile
@@ -49,7 +49,7 @@ define Package/ieee1905
 	   +libieee1905 +IEEE1905_PLATFORM_HAS_WIFI:libwifi
 endef
 
-include $(wildcard *.mk)
+include $(wildcard plugins/*.mk)
 
 define Package/ieee1905/description
  This package provides IEEE Std 1905.1 stack.
@@ -65,7 +65,7 @@ plugins := \
 	$(if $(CONFIG_PACKAGE_topology-plugin),topology)
 
 
-ppkg:=$(patsubst %.mk,%-plugin,$(wildcard *.mk))
+ppkg:=$(patsubst plugins/%.mk,%-plugin,$(wildcard plugins/*.mk))
 
 
 TARGET_CFLAGS += \
@@ -81,6 +81,10 @@ ifeq ($(CONFIG_IEEE1905_CMDU_SA_IS_ALMAC),y)
 TARGET_CFLAGS += -DCMDU_SA_IS_ALMAC
 endif
 
+ifeq ($(CONFIG_IEEE1905_WIFI_EASYMESH),y)
+TARGET_CFLAGS += -DWIFI_EASYMESH
+endif
+
 ifeq ($(CONFIG_IEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY),y)
 TARGET_CFLAGS += -DIEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY
 endif
diff --git a/ieee1905/map.mk b/ieee1905/plugins/map.mk
similarity index 100%
rename from ieee1905/map.mk
rename to ieee1905/plugins/map.mk
diff --git a/ieee1905/snoop.mk b/ieee1905/plugins/snoop.mk
similarity index 100%
rename from ieee1905/snoop.mk
rename to ieee1905/plugins/snoop.mk
diff --git a/ieee1905/topology.mk b/ieee1905/plugins/topology.mk
similarity index 100%
rename from ieee1905/topology.mk
rename to ieee1905/plugins/topology.mk