diff --git a/.gitmodules b/.gitmodules
index a32d2fa..4c01893 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,18 +1,18 @@
 [submodule "ardupilot-solo"]
-	path = ardupilot-solo
+	path = modules/ardupilot-solo
 	url = https://github.com/OpenSolo/ardupilot-solo.git
 [submodule "mavlink-solo"]
-	path = mavlink-solo
+	path = modules/mavlink-solo
 	url = https://github.com/OpenSolo/mavlink-solo.git
 [submodule "dronekit-python-solo"]
-	path = dronekit-python-solo
+	path = modules/dronekit-python-solo
 	url = https://github.com/dronekit/dronekit-python-solo.git
 [submodule "imx6-linux"]
-	path = imx6-linux
+	path = modules/imx6-linux
 	url = https://github.com/OpenSolo/imx6-linux.git
 [submodule "imx6-uboot"]
-	path = imx6-uboot
+	path = modules/imx6-uboot
 	url = https://github.com/OpenSolo/imx6-uboot.git
 [submodule "MAVProxy"]
-	path = MAVProxy
+	path = modules/MAVProxy
 	url = https://github.com/OpenSolo/MAVProxy.git
diff --git a/dronekit-python-solo b/dronekit-python-solo
deleted file mode 160000
index 08194d7..0000000
--- a/dronekit-python-solo
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 08194d73e01160a2565d71be593e23fbff0cde3b
diff --git a/mavlink-solo b/mavlink-solo
deleted file mode 160000
index 504713b..0000000
--- a/mavlink-solo
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 504713b771e716760c0165d2cbde3eee3863d6aa
diff --git a/MAVProxy b/modules/MAVProxy
similarity index 100%
rename from MAVProxy
rename to modules/MAVProxy
diff --git a/ardupilot-solo b/modules/ardupilot-solo
similarity index 100%
rename from ardupilot-solo
rename to modules/ardupilot-solo
diff --git a/modules/dronekit-python-solo b/modules/dronekit-python-solo
new file mode 160000
index 0000000..c7df21e
--- /dev/null
+++ b/modules/dronekit-python-solo
@@ -0,0 +1 @@
+Subproject commit c7df21ec053c7ca70d56d10382effac737d68b33
diff --git a/imx6-linux b/modules/imx6-linux
similarity index 100%
rename from imx6-linux
rename to modules/imx6-linux
diff --git a/imx6-uboot b/modules/imx6-uboot
similarity index 100%
rename from imx6-uboot
rename to modules/imx6-uboot
diff --git a/modules/mavlink-solo b/modules/mavlink-solo
new file mode 160000
index 0000000..811c28d
--- /dev/null
+++ b/modules/mavlink-solo
@@ -0,0 +1 @@
+Subproject commit 811c28d66ee5e3f33e56372ff9dc9e3ce92ade86