diff --git a/.gitmodules b/.gitmodules
index 966907a..5181e24 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "gems/whittle"]
-	path = gems/whittle
-	url = https://github.com/d11wtq/whittle
+	path = lib/cxl/whittle
+	url = https://github.com/d11wtq/whittle.git
 [submodule "gems/yawpa"]
-	path = gems/yawpa
-	url = https://github.com/holtrop/yawpa
+	path = lib/cxl/yawpa
+	url = https://github.com/holtrop/yawpa.git
diff --git a/gems/whittle b/lib/cxl/whittle
similarity index 100%
rename from gems/whittle
rename to lib/cxl/whittle
diff --git a/gems/yawpa b/lib/cxl/yawpa
similarity index 100%
rename from gems/yawpa
rename to lib/cxl/yawpa