diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 2523cfb5..de085652 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -77,10 +77,10 @@ libmm_plugin_generic_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 # Gobi
 libmm_plugin_gobi_la_SOURCES = \
-	mm-plugin-gobi.c \
-	mm-plugin-gobi.h \
-	mm-broadband-modem-gobi.c \
-	mm-broadband-modem-gobi.h
+	gobi/mm-plugin-gobi.c \
+	gobi/mm-plugin-gobi.h \
+	gobi/mm-broadband-modem-gobi.c \
+	gobi/mm-broadband-modem-gobi.h
 libmm_plugin_gobi_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
 libmm_plugin_gobi_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
diff --git a/plugins/mm-broadband-modem-gobi.c b/plugins/gobi/mm-broadband-modem-gobi.c
similarity index 100%
rename from plugins/mm-broadband-modem-gobi.c
rename to plugins/gobi/mm-broadband-modem-gobi.c
diff --git a/plugins/mm-broadband-modem-gobi.h b/plugins/gobi/mm-broadband-modem-gobi.h
similarity index 100%
rename from plugins/mm-broadband-modem-gobi.h
rename to plugins/gobi/mm-broadband-modem-gobi.h
diff --git a/plugins/mm-plugin-gobi.c b/plugins/gobi/mm-plugin-gobi.c
similarity index 100%
rename from plugins/mm-plugin-gobi.c
rename to plugins/gobi/mm-plugin-gobi.c
diff --git a/plugins/mm-plugin-gobi.h b/plugins/gobi/mm-plugin-gobi.h
similarity index 100%
rename from plugins/mm-plugin-gobi.h
rename to plugins/gobi/mm-plugin-gobi.h