diff --git a/.gitmodules b/.gitmodules
index fb38564e..360e5c00 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
-[submodule "hw/rtl/fp_cores/fpnew"]
-	path = hw/rtl/fp_cores/fpnew
-	url = https://github.com/pulp-platform/fpnew.git
-[submodule "sim/common/softfloat"]
-	path = sim/common/softfloat
-	url = https://github.com/ucb-bar/berkeley-softfloat-3.git
 [submodule "third_party/cocogfx"]
 	path = third_party/cocogfx
 	url = https://github.com/gtcasl/cocogfx.git
+[submodule "third_party/fpnew"]
+	path = third_party/fpnew
+	url = https://github.com/pulp-platform/fpnew.git
+[submodule "third_party/softfloat"]
+	path = third_party/softfloat
+	url = https://github.com/ucb-bar/berkeley-softfloat-3.git
diff --git a/hw/rtl/fp_cores/fpnew b/hw/rtl/fp_cores/fpnew
deleted file mode 160000
index 1def7bb6..00000000
--- a/hw/rtl/fp_cores/fpnew
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1def7bb630ceae2ebc58921f6b5ee3e686fb6d5a
diff --git a/third_party/fpnew b/third_party/fpnew
new file mode 160000
index 00000000..0bfbeede
--- /dev/null
+++ b/third_party/fpnew
@@ -0,0 +1 @@
+Subproject commit 0bfbeede0e01b2e44e41bb14c70a80efeffa1bbd
diff --git a/sim/common/softfloat b/third_party/softfloat
similarity index 100%
rename from sim/common/softfloat
rename to third_party/softfloat