diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index c35f5ba7..cc9b339e 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -246,14 +246,14 @@ libmm_plugin_cinterion_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 # Iridium modem
 libmm_plugin_iridium_la_SOURCES = \
-	mm-plugin-iridium.c \
-	mm-plugin-iridium.h \
-	mm-broadband-modem-iridium.c \
-	mm-broadband-modem-iridium.h \
-	mm-bearer-iridium.c \
-	mm-bearer-iridium.h \
-	mm-sim-iridium.c \
-	mm-sim-iridium.h
+	iridium/mm-plugin-iridium.c \
+	iridium/mm-plugin-iridium.h \
+	iridium/mm-broadband-modem-iridium.c \
+	iridium/mm-broadband-modem-iridium.h \
+	iridium/mm-bearer-iridium.c \
+	iridium/mm-bearer-iridium.h \
+	iridium/mm-sim-iridium.c \
+	iridium/mm-sim-iridium.h
 libmm_plugin_iridium_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
 libmm_plugin_iridium_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
diff --git a/plugins/mm-bearer-iridium.c b/plugins/iridium/mm-bearer-iridium.c
similarity index 100%
rename from plugins/mm-bearer-iridium.c
rename to plugins/iridium/mm-bearer-iridium.c
diff --git a/plugins/mm-bearer-iridium.h b/plugins/iridium/mm-bearer-iridium.h
similarity index 100%
rename from plugins/mm-bearer-iridium.h
rename to plugins/iridium/mm-bearer-iridium.h
diff --git a/plugins/mm-broadband-modem-iridium.c b/plugins/iridium/mm-broadband-modem-iridium.c
similarity index 100%
rename from plugins/mm-broadband-modem-iridium.c
rename to plugins/iridium/mm-broadband-modem-iridium.c
diff --git a/plugins/mm-broadband-modem-iridium.h b/plugins/iridium/mm-broadband-modem-iridium.h
similarity index 100%
rename from plugins/mm-broadband-modem-iridium.h
rename to plugins/iridium/mm-broadband-modem-iridium.h
diff --git a/plugins/mm-plugin-iridium.c b/plugins/iridium/mm-plugin-iridium.c
similarity index 100%
rename from plugins/mm-plugin-iridium.c
rename to plugins/iridium/mm-plugin-iridium.c
diff --git a/plugins/mm-plugin-iridium.h b/plugins/iridium/mm-plugin-iridium.h
similarity index 100%
rename from plugins/mm-plugin-iridium.h
rename to plugins/iridium/mm-plugin-iridium.h
diff --git a/plugins/mm-sim-iridium.c b/plugins/iridium/mm-sim-iridium.c
similarity index 100%
rename from plugins/mm-sim-iridium.c
rename to plugins/iridium/mm-sim-iridium.c
diff --git a/plugins/mm-sim-iridium.h b/plugins/iridium/mm-sim-iridium.h
similarity index 100%
rename from plugins/mm-sim-iridium.h
rename to plugins/iridium/mm-sim-iridium.h