diff --git a/.gitmodules b/.gitmodules
index 12f5cd4..959a2b2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,61 +5,61 @@
 # sky130_fd_pr
 [submodule "libraries/sky130_fd_pr/latest"]
 	path = libraries/sky130_fd_pr/latest
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_pr.git
 	branch = master
 	shallow = true
 	fetchRecurseSubmodules = false
 [submodule "libraries/sky130_fd_pr/v0.20.1"]
 	path = libraries/sky130_fd_pr/v0.20.1
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_pr.git
 	branch = branch-0.20.1
 	shallow = true
 	fetchRecurseSubmodules = false
 [submodule "libraries/sky130_fd_pr/v0.20.0"]
 	path = libraries/sky130_fd_pr/v0.20.0
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_pr.git
 	branch = branch-0.20.0
 	shallow = true
 	fetchRecurseSubmodules = false
 [submodule "libraries/sky130_fd_pr/v0.13.0"]
 	path = libraries/sky130_fd_pr/v0.13.0
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_pr.git
 	branch = branch-0.13.0
 	shallow = true
 	fetchRecurseSubmodules = false
 [submodule "libraries/sky130_fd_pr/v0.12.1"]
 	path = libraries/sky130_fd_pr/v0.12.1
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_pr.git
 	branch = branch-0.12.1
 	shallow = true
 	fetchRecurseSubmodules = false
 [submodule "libraries/sky130_fd_pr/v0.12.0"]
 	path = libraries/sky130_fd_pr/v0.12.0
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_pr.git
 	branch = branch-0.12.0
 	shallow = true
 	fetchRecurseSubmodules = false
 [submodule "libraries/sky130_fd_pr/v0.11.0"]
 	path = libraries/sky130_fd_pr/v0.11.0
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_pr.git
 	branch = branch-0.11.0
 	shallow = true
 	fetchRecurseSubmodules = false
 [submodule "libraries/sky130_fd_pr/v0.10.1"]
 	path = libraries/sky130_fd_pr/v0.10.1
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_pr.git
 	branch = branch-0.10.1
 	shallow = true
 	fetchRecurseSubmodules = false
 [submodule "libraries/sky130_fd_pr/v0.10.0"]
 	path = libraries/sky130_fd_pr/v0.10.0
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_pr.git
 	branch = branch-0.10.0
 	shallow = true
 	fetchRecurseSubmodules = false
 [submodule "libraries/sky130_fd_pr/v0.0.9"]
 	path = libraries/sky130_fd_pr/v0.0.9
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_pr.git
 	branch = branch-0.0.9
 	shallow = true
 	fetchRecurseSubmodules = false
@@ -67,36 +67,36 @@
 # sky130_fd_sc_hd
 [submodule "libraries/sky130_fd_sc_hd/latest"]
 	path = libraries/sky130_fd_sc_hd/latest
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_sc_hd.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_sc_hd.git
 	branch = master
 	shallow = true
 [submodule "libraries/sky130_fd_sc_hd/v0.0.2"]
 	path = libraries/sky130_fd_sc_hd/v0.0.2
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_sc_hd.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_sc_hd.git
 	branch = branch-0.0.2
 	shallow = true
 [submodule "libraries/sky130_fd_sc_hd/v0.0.1"]
 	path = libraries/sky130_fd_sc_hd/v0.0.1
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_sc_hd.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_sc_hd.git
 	branch = branch-0.0.1
 	shallow = true
 
 # sky130_fd_sc_hdll
 [submodule "libraries/sky130_fd_sc_hdll/latest"]
 	path = libraries/sky130_fd_sc_hdll/latest
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_sc_hdll.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_sc_hdll.git
 	branch = master
 	shallow = true
 	fetchRecurseSubmodules = true
 [submodule "libraries/sky130_fd_sc_hdll/v0.1.1"]
 	path = libraries/sky130_fd_sc_hdll/v0.1.1
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_sc_hdll.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_sc_hdll.git
 	branch = branch-0.1.1
 	shallow = true
 	fetchRecurseSubmodules = false
 [submodule "libraries/sky130_fd_sc_hdll/v0.1.0"]
 	path = libraries/sky130_fd_sc_hdll/v0.1.0
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_sc_hdll.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_sc_hdll.git
 	branch = branch-0.1.0
 	shallow = true
 	fetchRecurseSubmodules = false
@@ -104,19 +104,19 @@
 # sky130_fd_sc_hs
 [submodule "libraries/sky130_fd_sc_hs/latest"]
 	path = libraries/sky130_fd_sc_hs/latest
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_sc_hs.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_sc_hs.git
 	branch = master
 	shallow = true
 	fetchRecurseSubmodules = true
 [submodule "libraries/sky130_fd_sc_hs/v0.0.2"]
 	path = libraries/sky130_fd_sc_hs/v0.0.2
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_sc_hs.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_sc_hs.git
 	branch = branch-0.0.2
 	shallow = true
 	fetchRecurseSubmodules = false
 [submodule "libraries/sky130_fd_sc_hs/v0.0.1"]
 	path = libraries/sky130_fd_sc_hs/v0.0.1
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_sc_hs.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_sc_hs.git
 	branch = branch-0.0.1
 	shallow = true
 	fetchRecurseSubmodules = false
@@ -124,19 +124,19 @@
 # sky130_fd_sc_ms
 [submodule "libraries/sky130_fd_sc_ms/latest"]
 	path = libraries/sky130_fd_sc_ms/latest
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_sc_ms.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_sc_ms.git
 	branch = master
 	shallow = true
 	fetchRecurseSubmodules = true
 [submodule "libraries/sky130_fd_sc_ms/v0.0.2"]
 	path = libraries/sky130_fd_sc_ms/v0.0.2
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_sc_ms.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_sc_ms.git
 	branch = branch-0.0.2
 	shallow = true
 	fetchRecurseSubmodules = false
 [submodule "libraries/sky130_fd_sc_ms/v0.0.1"]
 	path = libraries/sky130_fd_sc_ms/v0.0.1
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_sc_ms.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_sc_ms.git
 	branch = branch-0.0.1
 	shallow = true
 	fetchRecurseSubmodules = false
@@ -144,19 +144,19 @@
 # sky130_fd_sc_ls
 [submodule "libraries/sky130_fd_sc_ls/latest"]
 	path = libraries/sky130_fd_sc_ls/latest
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_sc_ls.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_sc_ls.git
 	branch = master
 	shallow = true
 	fetchRecurseSubmodules = true
 [submodule "libraries/sky130_fd_sc_ls/v0.1.1"]
 	path = libraries/sky130_fd_sc_ls/v0.1.1
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_sc_ls.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_sc_ls.git
 	branch = branch-0.1.1
 	shallow = true
 	fetchRecurseSubmodules = false
 [submodule "libraries/sky130_fd_sc_ls/v0.1.0"]
 	path = libraries/sky130_fd_sc_ls/v0.1.0
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_sc_ls.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_sc_ls.git
 	branch = branch-0.1.0
 	shallow = true
 	fetchRecurseSubmodules = false
@@ -164,19 +164,19 @@
 # sky130_fd_sc_lp
 [submodule "libraries/sky130_fd_sc_lp/latest"]
 	path = libraries/sky130_fd_sc_lp/latest
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_sc_lp.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_sc_lp.git
 	branch = master
 	shallow = true
 	fetchRecurseSubmodules = true
 [submodule "libraries/sky130_fd_sc_lp/v0.0.2"]
 	path = libraries/sky130_fd_sc_lp/v0.0.2
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_sc_lp.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_sc_lp.git
 	branch = branch-0.0.2
 	shallow = true
 	fetchRecurseSubmodules = false
 [submodule "libraries/sky130_fd_sc_lp/v0.0.1"]
 	path = libraries/sky130_fd_sc_lp/v0.0.1
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_sc_lp.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_sc_lp.git
 	branch = branch-0.0.1
 	shallow = true
 	fetchRecurseSubmodules = false
@@ -184,25 +184,25 @@
 # sky130_fd_sc_hvl
 [submodule "libraries/sky130_fd_sc_hvl/latest"]
 	path = libraries/sky130_fd_sc_hvl/latest
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_sc_hvl.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_sc_hvl.git
 	branch = master
 	shallow = true
 	fetchRecurseSubmodules = true
 [submodule "libraries/sky130_fd_sc_hvl/v0.0.3"]
 	path = libraries/sky130_fd_sc_hvl/v0.0.3
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_sc_hvl.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_sc_hvl.git
 	branch = branch-0.0.3
 	shallow = true
 	fetchRecurseSubmodules = false
 [submodule "libraries/sky130_fd_sc_hvl/v0.0.2"]
 	path = libraries/sky130_fd_sc_hvl/v0.0.2
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_sc_hvl.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_sc_hvl.git
 	branch = branch-0.0.2
 	shallow = true
 	fetchRecurseSubmodules = false
 [submodule "libraries/sky130_fd_sc_hvl/v0.0.1"]
 	path = libraries/sky130_fd_sc_hvl/v0.0.1
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_sc_hvl.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_sc_hvl.git
 	branch = branch-0.0.1
 	shallow = true
 	fetchRecurseSubmodules = false
@@ -210,37 +210,37 @@
 # sky130_fd_io
 [submodule "libraries/sky130_fd_io/latest"]
 	path = libraries/sky130_fd_io/latest
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_io.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_io.git
 	branch = master
 	shallow = true
 	fetchRecurseSubmodules = true
 [submodule "libraries/sky130_fd_io/v0.2.1"]
 	path = libraries/sky130_fd_io/v0.2.1
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_io.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_io.git
 	branch = branch-0.2.1
 	shallow = true
 	fetchRecurseSubmodules = false
 [submodule "libraries/sky130_fd_io/v0.2.0"]
 	path = libraries/sky130_fd_io/v0.2.0
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_io.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_io.git
 	branch = branch-0.2.0
 	shallow = true
 	fetchRecurseSubmodules = false
 [submodule "libraries/sky130_fd_io/v0.1.0"]
 	path = libraries/sky130_fd_io/v0.1.0
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_io.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_io.git
 	branch = branch-0.1.0
 	shallow = true
 	fetchRecurseSubmodules = false
 [submodule "libraries/sky130_fd_io/v0.0.2"]
 	path = libraries/sky130_fd_io/v0.0.2
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_io.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_io.git
 	branch = branch-0.1.0
 	shallow = true
 	fetchRecurseSubmodules = false
 [submodule "libraries/sky130_fd_io/v0.0.1"]
 	path = libraries/sky130_fd_io/v0.0.1
-	url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_io.git
+	url = https://github.com/google/skywater-pdk-libs-sky130_fd_io.git
 	branch = branch-0.0.1
 	shallow = true
 	fetchRecurseSubmodules = false