diff --git a/.gitmodules b/.gitmodules
index bd9bd13..b12f621 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "circomlib"]
-	path = circom_circuits/circomlib
+	path = circomlib
 	url = https://github.com/iden3/circomlib.git
 [submodule "rapidsnark"]
-	path = circom_circuits/rapidsnark
-	url = https://github.com/iden3/rapidsnark
+	path = rapidsnark
+	url = https://github.com/iden3/rapidsnark.git
diff --git a/circomlib b/circomlib
new file mode 160000
index 0000000..35e54ea
--- /dev/null
+++ b/circomlib
@@ -0,0 +1 @@
+Subproject commit 35e54ea21da3e8762557234298dbb553c175ea8d
diff --git a/rapidsnark b/rapidsnark
new file mode 160000
index 0000000..9983837
--- /dev/null
+++ b/rapidsnark
@@ -0,0 +1 @@
+Subproject commit 998383787ee86bcb6bfb8741e9a638d203c08eae