diff --git a/conf/modules/gps.xml b/conf/modules/gps.xml
index d41ea13f49..50871facee 100644
--- a/conf/modules/gps.xml
+++ b/conf/modules/gps.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 
-<module name="gps">
+<module name="gps" dir="gps">
   <doc>
     <description>
       Generic GPS functions.
diff --git a/conf/modules/gps_datalink.xml b/conf/modules/gps_datalink.xml
index 651c6f62d8..5987619dd2 100644
--- a/conf/modules/gps_datalink.xml
+++ b/conf/modules/gps_datalink.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 
-<module name="gps_datalink">
+<module name="gps_datalink" dir="gps">
   <doc>
     <description>
       Remote GPS via datalink.
diff --git a/conf/modules/gps_furuno.xml b/conf/modules/gps_furuno.xml
index 4f73ac76c7..fb155050ec 100644
--- a/conf/modules/gps_furuno.xml
+++ b/conf/modules/gps_furuno.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 
-<module name="gps_furuno">
+<module name="gps_furuno" dir="gps">
   <doc>
     <description>
       Furuno GPS (UART)
diff --git a/conf/modules/gps_mediatek_diy.xml b/conf/modules/gps_mediatek_diy.xml
index 52b56525ca..0083a15c82 100644
--- a/conf/modules/gps_mediatek_diy.xml
+++ b/conf/modules/gps_mediatek_diy.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 
-<module name="gps_mediatek">
+<module name="gps_mediatek" dir="gps">
   <doc>
     <description>
       Mediatek MT3329 GPS (UART)
diff --git a/conf/modules/gps_nmea.xml b/conf/modules/gps_nmea.xml
index e41f5d212a..610c3ed42e 100644
--- a/conf/modules/gps_nmea.xml
+++ b/conf/modules/gps_nmea.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 
-<module name="gps_nmea">
+<module name="gps_nmea" dir="gps">
   <doc>
     <description>
       NMEA GPS (UART)
diff --git a/conf/modules/gps_nps.xml b/conf/modules/gps_nps.xml
index e84c2a512a..08fac6a95f 100644
--- a/conf/modules/gps_nps.xml
+++ b/conf/modules/gps_nps.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 
-<module name="gps_nps">
+<module name="gps_nps" dir="gps">
   <doc>
     <description>
       Simulated GPS for NPS.
diff --git a/conf/modules/gps_optitrack.xml b/conf/modules/gps_optitrack.xml
index 790b784a24..8750261049 100644
--- a/conf/modules/gps_optitrack.xml
+++ b/conf/modules/gps_optitrack.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 
-<module name="gps_optitrack">
+<module name="gps_optitrack" dir="gps">
   <doc>
     <description>
       Optitrack used as indoor GPS.
diff --git a/conf/modules/gps_piksi.xml b/conf/modules/gps_piksi.xml
index bf86710fd1..d1379772db 100644
--- a/conf/modules/gps_piksi.xml
+++ b/conf/modules/gps_piksi.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 
-<module name="gps_piksi">
+<module name="gps_piksi" dir="gps">
   <doc>
     <description>
       Swift-Nav Piksi RTK GPS.
diff --git a/conf/modules/gps_sim.xml b/conf/modules/gps_sim.xml
index fdb443770f..dc0ebc8cd0 100644
--- a/conf/modules/gps_sim.xml
+++ b/conf/modules/gps_sim.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 
-<module name="gps_sim">
+<module name="gps_sim" dir="gps">
   <doc>
     <description>
       Simulated GPS
diff --git a/conf/modules/gps_sim_hitl.xml b/conf/modules/gps_sim_hitl.xml
index 3d8e337e8a..021d40eac6 100644
--- a/conf/modules/gps_sim_hitl.xml
+++ b/conf/modules/gps_sim_hitl.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 
-<module name="gps_sim_hitl">
+<module name="gps_sim_hitl" dir="gps">
   <doc>
     <description>
       Sim HITL GPS
diff --git a/conf/modules/gps_sirf.xml b/conf/modules/gps_sirf.xml
index 43a22144ec..0548539f6f 100644
--- a/conf/modules/gps_sirf.xml
+++ b/conf/modules/gps_sirf.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 
-<module name="gps_sirf">
+<module name="gps_sirf" dir="gps">
   <doc>
     <description>
       Sirf GPS (UART)
diff --git a/conf/modules/gps_skytraq.xml b/conf/modules/gps_skytraq.xml
index 8c48b33f2f..ead8a7d8e4 100644
--- a/conf/modules/gps_skytraq.xml
+++ b/conf/modules/gps_skytraq.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 
-<module name="gps_skytraq">
+<module name="gps_skytraq" dir="gps">
   <doc>
     <description>
       Skytraq GPS (UART)
diff --git a/conf/modules/gps_udp.xml b/conf/modules/gps_udp.xml
index 045a66e5af..236689e39d 100644
--- a/conf/modules/gps_udp.xml
+++ b/conf/modules/gps_udp.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 
-<module name="gps_udp">
+<module name="gps_udp" dir="gps">
   <doc>
     <description>
       GPS via UDP.