diff --git a/.gitmodules b/.gitmodules
index 9eace41..5b8a397 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "ESP_influxdb"]
-	path = src/ESP_influxdb
-	url = https://github.com/hwwong/ESP_influxdb.git
-[submodule "EmonLib"]
+[submodule "src/EmonLib"]
 	path = src/EmonLib
 	url = https://github.com/openenergymonitor/EmonLib.git
+[submodule "src/ESP_influxdb"]
+	path = src/ESP_influxdb
+	url = https://github.com/hwwong/ESP_influxdb.git
diff --git a/src/ESP_influxdb b/src/ESP_influxdb
new file mode 160000
index 0000000..4c83580
--- /dev/null
+++ b/src/ESP_influxdb
@@ -0,0 +1 @@
+Subproject commit 4c835806326e96784411272c8c35b61b967455c4
diff --git a/src/EmonLib b/src/EmonLib
new file mode 160000
index 0000000..02d21ad
--- /dev/null
+++ b/src/EmonLib
@@ -0,0 +1 @@
+Subproject commit 02d21ad457d4bc42b386c9952e21e552d7847e41