diff --git a/.gitignore b/.gitignore
index 1ad9f52..6efe650 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,10 @@
 .swp
 .swo
 *~
-/foboot.bin
-/foboot.dfu
-/foboot.ihex
-/foboot.elf
\ No newline at end of file
+/sw/foboot.bin
+/sw/foboot.dfu
+/sw/foboot.ihex
+/sw/foboot.elf
+build/
+__pycache__/
+.env
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..745c757
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,39 @@
+[submodule "hw/deps/migen"]
+	path = hw/deps/migen
+	url = https://github.com/m-labs/migen.git
+[submodule "hw/deps/litex"]
+	path = hw/deps/litex
+	url = https://github.com/enjoy-digital/litex.git
+[submodule "hw/deps/litescope"]
+	path = hw/deps/litescope
+	url = https://github.com/enjoy-digital/litescope.git
+[submodule "hw/deps/pyserial"]
+	path = hw/deps/pyserial
+	url = https://github.com/pyserial/pyserial.git
+[submodule "hw/deps/liteeth"]
+	path = hw/deps/liteeth
+	url = https://github.com/enjoy-digital/liteeth.git
+[submodule "hw/deps/liteusb"]
+	path = hw/deps/liteusb
+	url = https://github.com/enjoy-digital/liteusb.git
+[submodule "hw/deps/litedram"]
+	path = hw/deps/litedram
+	url = https://github.com/enjoy-digital/litedram.git
+[submodule "hw/deps/litepcie"]
+	path = hw/deps/litepcie
+	url = https://github.com/enjoy-digital/litepcie.git
+[submodule "hw/deps/litesdcard"]
+	path = hw/deps/litesdcard
+	url = https://github.com/enjoy-digital/litesdcard.git
+[submodule "hw/deps/liteiclink"]
+	path = hw/deps/liteiclink
+	url = https://github.com/enjoy-digital/liteiclink.git
+[submodule "hw/deps/litevideo"]
+	path = hw/deps/litevideo
+	url = https://github.com/enjoy-digital/litevideo.git
+[submodule "hw/deps/lxsocsupport"]
+	path = hw/deps/lxsocsupport
+	url = https://github.com/xobs/lxsocsupport.git
+[submodule "hw/deps/valentyusb"]
+	path = hw/deps/valentyusb
+	url = https://github.com/xobs/valentyusb.git
diff --git a/hw/.gitmodules b/hw/.gitmodules
deleted file mode 100644
index a9d43a4..0000000
--- a/hw/.gitmodules
+++ /dev/null
@@ -1,39 +0,0 @@
-[submodule "deps/migen"]
-	path = deps/migen
-	url = https://github.com/m-labs/migen.git
-[submodule "deps/litex"]
-	path = deps/litex
-	url = https://github.com/enjoy-digital/litex.git
-[submodule "deps/litescope"]
-	path = deps/litescope
-	url = https://github.com/enjoy-digital/litescope.git
-[submodule "deps/pyserial"]
-	path = deps/pyserial
-	url = https://github.com/pyserial/pyserial.git
-[submodule "deps/liteeth"]
-	path = deps/liteeth
-	url = https://github.com/enjoy-digital/liteeth.git
-[submodule "deps/liteusb"]
-	path = deps/liteusb
-	url = https://github.com/enjoy-digital/liteusb.git
-[submodule "deps/litedram"]
-	path = deps/litedram
-	url = https://github.com/enjoy-digital/litedram.git
-[submodule "deps/litepcie"]
-	path = deps/litepcie
-	url = https://github.com/enjoy-digital/litepcie.git
-[submodule "deps/litesdcard"]
-	path = deps/litesdcard
-	url = https://github.com/enjoy-digital/litesdcard.git
-[submodule "deps/liteiclink"]
-	path = deps/liteiclink
-	url = https://github.com/enjoy-digital/liteiclink.git
-[submodule "deps/litevideo"]
-	path = deps/litevideo
-	url = https://github.com/enjoy-digital/litevideo.git
-[submodule "deps/lxsocsupport"]
-	path = deps/lxsocsupport
-	url = https://github.com/xobs/lxsocsupport.git
-[submodule "deps/valentyusb"]
-	path = deps/valentyusb
-	url = https://github.com/xobs/valentyusb.git