diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 708d7d03..c0ecc56e 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -61,8 +61,8 @@ pkglib_LTLIBRARIES = \
 
 # Generic
 libmm_plugin_generic_la_SOURCES = \
-	mm-plugin-generic.c \
-	mm-plugin-generic.h
+	generic/mm-plugin-generic.c \
+	generic/mm-plugin-generic.h
 libmm_plugin_generic_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
 libmm_plugin_generic_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
diff --git a/plugins/mm-plugin-generic.c b/plugins/generic/mm-plugin-generic.c
similarity index 100%
rename from plugins/mm-plugin-generic.c
rename to plugins/generic/mm-plugin-generic.c
diff --git a/plugins/mm-plugin-generic.h b/plugins/generic/mm-plugin-generic.h
similarity index 100%
rename from plugins/mm-plugin-generic.h
rename to plugins/generic/mm-plugin-generic.h