diff --git a/benches/support/mod.rs b/benches/support.rs
similarity index 100%
rename from benches/support/mod.rs
rename to benches/support.rs
diff --git a/src/core/mod.rs b/src/core.rs
similarity index 100%
rename from src/core/mod.rs
rename to src/core.rs
diff --git a/src/core/scalar/mod.rs b/src/core/scalar.rs
similarity index 100%
rename from src/core/scalar/mod.rs
rename to src/core/scalar.rs
diff --git a/src/core/sse2/mod.rs b/src/core/sse2.rs
similarity index 100%
rename from src/core/sse2/mod.rs
rename to src/core/sse2.rs
diff --git a/src/core/traits/mod.rs b/src/core/traits.rs
similarity index 100%
rename from src/core/traits/mod.rs
rename to src/core/traits.rs
diff --git a/src/core/wasm32/mod.rs b/src/core/wasm32.rs
similarity index 100%
rename from src/core/wasm32/mod.rs
rename to src/core/wasm32.rs
diff --git a/src/features/mod.rs b/src/features.rs
similarity index 100%
rename from src/features/mod.rs
rename to src/features.rs
diff --git a/src/swizzles/mod.rs b/src/swizzles.rs
similarity index 100%
rename from src/swizzles/mod.rs
rename to src/swizzles.rs
diff --git a/tests/support/mod.rs b/tests/support.rs
similarity index 99%
rename from tests/support/mod.rs
rename to tests/support.rs
index 865aa5e7..a2c56af9 100644
--- a/tests/support/mod.rs
+++ b/tests/support.rs
@@ -1,3 +1,4 @@
+#[path = "support/macros.rs"]
 #[macro_use]
 mod macros;