diff --git a/.gitmodules b/.gitmodules
index ee941a47e..792ed9ab2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
-[submodule "musl"]
-	path = libm/crates/musl-math-sys/musl
+[submodule "crates/musl-math-sys/musl"]
+	path = crates/musl-math-sys/musl
 	url = https://git.musl-libc.org/git/musl
 	shallow = true
diff --git a/crates/musl-math-sys/musl b/crates/musl-math-sys/musl
new file mode 160000
index 000000000..0784374d5
--- /dev/null
+++ b/crates/musl-math-sys/musl
@@ -0,0 +1 @@
+Subproject commit 0784374d561435f7c787a555aeab8ede699ed298
diff --git a/crates/util/Cargo.toml b/crates/util/Cargo.toml
index 4bcb97472..ae37a7238 100644
--- a/crates/util/Cargo.toml
+++ b/crates/util/Cargo.toml
@@ -13,6 +13,6 @@ unstable-float = ["libm/unstable-float", "libm-test/unstable-float", "rug?/night
 [dependencies]
 libm = { path = "../../libm", default-features = false }
 libm-macros = { path = "../libm-macros" }
-libm-test = { path = "../libm-test", default-features = false }
+libm-test = { path = "../../libm-test", default-features = false }
 musl-math-sys = { path = "../musl-math-sys", optional = true }
 rug = { version = "1.27.0", optional = true, default-features = false, features = ["float", "std"] }
diff --git a/libm-test/Cargo.toml b/libm-test/Cargo.toml
index 5d150b4ae..c9b3b7958 100644
--- a/libm-test/Cargo.toml
+++ b/libm-test/Cargo.toml
@@ -32,9 +32,9 @@ anyhow = "1.0.97"
 gmp-mpfr-sys = { version = "1.6.4", optional = true, default-features = false }
 iai-callgrind = { version = "0.14.0", optional = true }
 indicatif = { version = "0.17.11", default-features = false }
-libm = { path = "../../libm", features = ["unstable-public-internals"] }
-libm-macros = { path = "../libm-macros" }
-musl-math-sys = { path = "../musl-math-sys", optional = true }
+libm = { path = "../libm", features = ["unstable-public-internals"] }
+libm-macros = { path = "../crates/libm-macros" }
+musl-math-sys = { path = "../crates/musl-math-sys", optional = true }
 paste = "1.0.15"
 rand = "0.9.0"
 rand_chacha = "0.9.0"
diff --git a/libm-test/build.rs b/libm-test/build.rs
index f75e3dda5..510ba842f 100644
--- a/libm-test/build.rs
+++ b/libm-test/build.rs
@@ -1,9 +1,9 @@
-#[path = "../../libm/configure.rs"]
+#[path = "../libm/configure.rs"]
 mod configure;
 use configure::Config;
 
 fn main() {
-    println!("cargo:rerun-if-changed=../../libm/configure.rs");
+    println!("cargo:rerun-if-changed=../libm/configure.rs");
     let cfg = Config::from_env();
     configure::emit_test_config(&cfg);
 }
diff --git a/libm-test/src/op.rs b/libm-test/src/op.rs
index 47d72ae58..4f251f80d 100644
--- a/libm-test/src/op.rs
+++ b/libm-test/src/op.rs
@@ -16,12 +16,12 @@
 use std::fmt;
 use std::panic::{RefUnwindSafe, UnwindSafe};
 
-pub use shared::{ALL_OPERATIONS, FloatTy, MathOpInfo, Ty};
+pub use shared::{FloatTy, MathOpInfo, Ty, ALL_OPERATIONS};
 
 use crate::{CheckOutput, Float, TupleCall};
 
 mod shared {
-    include!("../../libm-macros/src/shared.rs");
+    include!("../../crates/libm-macros/src/shared.rs");
 }
 
 /// An enum representing each possible symbol name (`sin`, `sinf`, `sinl`, etc).