diff --git a/Cargo.toml b/Cargo.toml
index 730cdaa..70ac187 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,6 @@
 [package]
 name = "sqlite-wasm-rs"
+links = "wsqlite3"
 version = "0.5.1"
 authors = ["Spxg <unsafe@outlook.es>"]
 repository = "https://github.com/Spxg/sqlite-wasm-rs"
@@ -15,15 +16,17 @@ include.workspace = true
 [dependencies]
 wasm-bindgen = { version = "0.2.104", default-features = false }
 js-sys = { version = "0.3.81", default-features = false }
-wsqlite3-sys = { path = "crates/wsqlite3-sys" }
 rsqlite-vfs = { path = "crates/rsqlite-vfs" }
 
 [features]
 # SQLite3MultipleCiphers
 # <https://github.com/utelle/SQLite3MultipleCiphers>
 # <https://utelle.github.io/SQLite3MultipleCiphers>
-sqlite3mc = ["wsqlite3-sys/sqlite3mc"]
-bindgen = ["wsqlite3-sys/bindgen"]
+sqlite3mc = []
+
+[build-dependencies]
+cc = "1.2.27"
+bindgen = { version = "0.72", optional = true }
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3.54"
@@ -35,10 +38,9 @@ targets = ["wasm32-unknown-unknown"]
 resolver = "2"
 members = [
   "tests",
+  "crates/rsqlite-vfs",
   "crates/sqlite-wasm-libc",
   "crates/sqlite-wasm-vfs",
-  "crates/rsqlite-vfs", 
-  "crates/wsqlite3-sys",
   "extensions/sqlite-vec",
   "examples/implement-a-vfs",
   "examples/nodejs",
diff --git a/crates/wsqlite3-sys/build.rs b/build.rs
similarity index 98%
rename from crates/wsqlite3-sys/build.rs
rename to build.rs
index ba98e2a..96d7cb1 100644
--- a/crates/wsqlite3-sys/build.rs
+++ b/build.rs
@@ -55,9 +55,9 @@ fn main() {
 
         if update_bindgen {
             #[cfg(not(feature = "sqlite3mc"))]
-            const SQLITE3_BINDGEN: &str = "src/sqlite3_bindgen.rs";
+            const SQLITE3_BINDGEN: &str = "src/bindings/sqlite3_bindgen.rs";
             #[cfg(feature = "sqlite3mc")]
-            const SQLITE3_BINDGEN: &str = "src/sqlite3mc_bindgen.rs";
+            const SQLITE3_BINDGEN: &str = "src/bindings/sqlite3mc_bindgen.rs";
             std::fs::copy(&output, SQLITE3_BINDGEN).unwrap();
         }
     }
diff --git a/crates/wsqlite3-sys/Cargo.toml b/crates/wsqlite3-sys/Cargo.toml
deleted file mode 100644
index f18dc93..0000000
--- a/crates/wsqlite3-sys/Cargo.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-[package]
-name = "wsqlite3-sys"
-version = "0.1.0"
-links = "wsqlite3"
-readme.workspace = true
-edition.workspace = true
-license.workspace = true
-rust-version.workspace = true
-include.workspace = true
-
-[dependencies]
-
-[build-dependencies]
-cc = "1.2.27"
-bindgen = { version = "0.72", optional = true }
-
-[package.metadata.docs.rs]
-targets = ["wasm32-unknown-unknown"]
-
-[features]
-# SQLite3MultipleCiphers
-# <https://github.com/utelle/SQLite3MultipleCiphers>
-# <https://utelle.github.io/SQLite3MultipleCiphers>
-sqlite3mc = []
-
diff --git a/extensions/sqlite-vec/cc/shim b/extensions/sqlite-vec/cc/shim
index 7d6197c..5af08cb 120000
--- a/extensions/sqlite-vec/cc/shim
+++ b/extensions/sqlite-vec/cc/shim
@@ -1 +1 @@
-../../../crates/wsqlite3-sys/shim
\ No newline at end of file
+../../../shim
\ No newline at end of file
diff --git a/extensions/sqlite-vec/cc/sqlite3.h b/extensions/sqlite-vec/cc/sqlite3.h
index 93f9f21..198b188 120000
--- a/extensions/sqlite-vec/cc/sqlite3.h
+++ b/extensions/sqlite-vec/cc/sqlite3.h
@@ -1 +1 @@
-../../../crates/wsqlite3-sys/sqlite3/sqlite3.h
\ No newline at end of file
+../../../sqlite3/sqlite3.h
\ No newline at end of file
diff --git a/script/printf.sh b/script/printf.sh
index 87afb3f..0dc1d83 100755
--- a/script/printf.sh
+++ b/script/printf.sh
@@ -1,5 +1,5 @@
 TAG=6.3.0
 curl -L https://github.com/eyalroz/printf/archive/refs/tags/v$TAG.zip > $TAG.zip
-unzip -p "$TAG.zip" "printf-$TAG/src/printf/printf.c" > "crates/wsqlite3-sys/shim/printf/printf.c"
-unzip -p "$TAG.zip" "printf-$TAG/src/printf/printf.h" > "crates/wsqlite3-sys/shim/printf/printf.h"
+unzip -p "$TAG.zip" "printf-$TAG/src/printf/printf.c" > "shim/printf/printf.c"
+unzip -p "$TAG.zip" "printf-$TAG/src/printf/printf.h" > "shim/printf/printf.h"
 rm $TAG.zip
diff --git a/script/sqlite3_upgrade.sh b/script/sqlite3_upgrade.sh
index abdc069..cfd95c6 100755
--- a/script/sqlite3_upgrade.sh
+++ b/script/sqlite3_upgrade.sh
@@ -1,6 +1,6 @@
 SQLITE=sqlite-amalgamation-3510100
 curl -O https://sqlite.org/2025/$SQLITE.zip
-unzip -p "$SQLITE.zip" "$SQLITE/sqlite3.c" > "crates/wsqlite3-sys/sqlite3/sqlite3.c"
-unzip -p "$SQLITE.zip" "$SQLITE/sqlite3.h" > "crates/wsqlite3-sys/sqlite3/sqlite3.h"
-unzip -p "$SQLITE.zip" "$SQLITE/sqlite3ext.h" > "crates/wsqlite3-sys/sqlite3/sqlite3ext.h"
+unzip -p "$SQLITE.zip" "$SQLITE/sqlite3.c" > "sqlite3/sqlite3.c"
+unzip -p "$SQLITE.zip" "$SQLITE/sqlite3.h" > "sqlite3/sqlite3.h"
+unzip -p "$SQLITE.zip" "$SQLITE/sqlite3ext.h" > "sqlite3/sqlite3ext.h"
 rm -f "$SQLITE.zip"
diff --git a/script/sqlite3mc_upgrade.sh b/script/sqlite3mc_upgrade.sh
index f969c69..92edd47 100755
--- a/script/sqlite3mc_upgrade.sh
+++ b/script/sqlite3mc_upgrade.sh
@@ -1,5 +1,5 @@
 SQLITE=sqlite3mc-2.2.6-sqlite-3.51.1-amalgamation
 curl -L https://github.com/utelle/SQLite3MultipleCiphers/releases/latest/download/$SQLITE.zip > $SQLITE.zip
-unzip -p "$SQLITE.zip" "sqlite3mc_amalgamation.c" > "crates/wsqlite3-sys/sqlite3mc/sqlite3mc_amalgamation.c"
-unzip -p "$SQLITE.zip" "sqlite3mc_amalgamation.h" > "crates/wsqlite3-sys/sqlite3mc/sqlite3mc_amalgamation.h"
+unzip -p "$SQLITE.zip" "sqlite3mc_amalgamation.c" > "sqlite3mc/sqlite3mc_amalgamation.c"
+unzip -p "$SQLITE.zip" "sqlite3mc_amalgamation.h" > "sqlite3mc/sqlite3mc_amalgamation.h"
 rm -f "$SQLITE.zip"
diff --git a/crates/wsqlite3-sys/shim/musl/README.md b/shim/musl/README.md
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/README.md
rename to shim/musl/README.md
diff --git a/crates/wsqlite3-sys/shim/musl/arch/generic/bits/alltypes.h b/shim/musl/arch/generic/bits/alltypes.h
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/arch/generic/bits/alltypes.h
rename to shim/musl/arch/generic/bits/alltypes.h
diff --git a/crates/wsqlite3-sys/shim/musl/arch/generic/bits/errno.h b/shim/musl/arch/generic/bits/errno.h
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/arch/generic/bits/errno.h
rename to shim/musl/arch/generic/bits/errno.h
diff --git a/crates/wsqlite3-sys/shim/musl/errno/__errno_location.c b/shim/musl/errno/__errno_location.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/errno/__errno_location.c
rename to shim/musl/errno/__errno_location.c
diff --git a/crates/wsqlite3-sys/shim/musl/include/alloca.h b/shim/musl/include/alloca.h
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/include/alloca.h
rename to shim/musl/include/alloca.h
diff --git a/crates/wsqlite3-sys/shim/musl/include/assert.h b/shim/musl/include/assert.h
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/include/assert.h
rename to shim/musl/include/assert.h
diff --git a/crates/wsqlite3-sys/shim/musl/include/ctype.h b/shim/musl/include/ctype.h
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/include/ctype.h
rename to shim/musl/include/ctype.h
diff --git a/crates/wsqlite3-sys/shim/musl/include/errno.h b/shim/musl/include/errno.h
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/include/errno.h
rename to shim/musl/include/errno.h
diff --git a/crates/wsqlite3-sys/shim/musl/include/features.h b/shim/musl/include/features.h
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/include/features.h
rename to shim/musl/include/features.h
diff --git a/crates/wsqlite3-sys/shim/musl/include/inttypes.h b/shim/musl/include/inttypes.h
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/include/inttypes.h
rename to shim/musl/include/inttypes.h
diff --git a/crates/wsqlite3-sys/shim/musl/include/math.h b/shim/musl/include/math.h
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/include/math.h
rename to shim/musl/include/math.h
diff --git a/crates/wsqlite3-sys/shim/musl/include/stdio.h b/shim/musl/include/stdio.h
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/include/stdio.h
rename to shim/musl/include/stdio.h
diff --git a/crates/wsqlite3-sys/shim/musl/include/stdlib.h b/shim/musl/include/stdlib.h
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/include/stdlib.h
rename to shim/musl/include/stdlib.h
diff --git a/crates/wsqlite3-sys/shim/musl/include/string.h b/shim/musl/include/string.h
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/include/string.h
rename to shim/musl/include/string.h
diff --git a/crates/wsqlite3-sys/shim/musl/include/strings.h b/shim/musl/include/strings.h
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/include/strings.h
rename to shim/musl/include/strings.h
diff --git a/crates/wsqlite3-sys/shim/musl/include/time.h b/shim/musl/include/time.h
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/include/time.h
rename to shim/musl/include/time.h
diff --git a/crates/wsqlite3-sys/shim/musl/internal/floatscan.c b/shim/musl/internal/floatscan.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/internal/floatscan.c
rename to shim/musl/internal/floatscan.c
diff --git a/crates/wsqlite3-sys/shim/musl/internal/floatscan.h b/shim/musl/internal/floatscan.h
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/internal/floatscan.h
rename to shim/musl/internal/floatscan.h
diff --git a/crates/wsqlite3-sys/shim/musl/internal/libm.h b/shim/musl/internal/libm.h
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/internal/libm.h
rename to shim/musl/internal/libm.h
diff --git a/crates/wsqlite3-sys/shim/musl/internal/shgetc.c b/shim/musl/internal/shgetc.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/internal/shgetc.c
rename to shim/musl/internal/shgetc.c
diff --git a/crates/wsqlite3-sys/shim/musl/internal/shgetc.h b/shim/musl/internal/shgetc.h
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/internal/shgetc.h
rename to shim/musl/internal/shgetc.h
diff --git a/crates/wsqlite3-sys/shim/musl/internal/stdio_impl.h b/shim/musl/internal/stdio_impl.h
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/internal/stdio_impl.h
rename to shim/musl/internal/stdio_impl.h
diff --git a/crates/wsqlite3-sys/shim/musl/internal/stdlib.h b/shim/musl/internal/stdlib.h
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/internal/stdlib.h
rename to shim/musl/internal/stdlib.h
diff --git a/crates/wsqlite3-sys/shim/musl/internal/string.h b/shim/musl/internal/string.h
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/internal/string.h
rename to shim/musl/internal/string.h
diff --git a/crates/wsqlite3-sys/shim/musl/math/__fpclassifyl.c b/shim/musl/math/__fpclassifyl.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/math/__fpclassifyl.c
rename to shim/musl/math/__fpclassifyl.c
diff --git a/crates/wsqlite3-sys/shim/musl/math/acosh.c b/shim/musl/math/acosh.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/math/acosh.c
rename to shim/musl/math/acosh.c
diff --git a/crates/wsqlite3-sys/shim/musl/math/asinh.c b/shim/musl/math/asinh.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/math/asinh.c
rename to shim/musl/math/asinh.c
diff --git a/crates/wsqlite3-sys/shim/musl/math/atanh.c b/shim/musl/math/atanh.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/math/atanh.c
rename to shim/musl/math/atanh.c
diff --git a/crates/wsqlite3-sys/shim/musl/math/fmodl.c b/shim/musl/math/fmodl.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/math/fmodl.c
rename to shim/musl/math/fmodl.c
diff --git a/crates/wsqlite3-sys/shim/musl/math/scalbn.c b/shim/musl/math/scalbn.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/math/scalbn.c
rename to shim/musl/math/scalbn.c
diff --git a/crates/wsqlite3-sys/shim/musl/math/scalbnl.c b/shim/musl/math/scalbnl.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/math/scalbnl.c
rename to shim/musl/math/scalbnl.c
diff --git a/crates/wsqlite3-sys/shim/musl/math/sqrt.c b/shim/musl/math/sqrt.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/math/sqrt.c
rename to shim/musl/math/sqrt.c
diff --git a/crates/wsqlite3-sys/shim/musl/math/trunc.c b/shim/musl/math/trunc.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/math/trunc.c
rename to shim/musl/math/trunc.c
diff --git a/crates/wsqlite3-sys/shim/musl/stdio/__toread.c b/shim/musl/stdio/__toread.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/stdio/__toread.c
rename to shim/musl/stdio/__toread.c
diff --git a/crates/wsqlite3-sys/shim/musl/stdio/__uflow.c b/shim/musl/stdio/__uflow.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/stdio/__uflow.c
rename to shim/musl/stdio/__uflow.c
diff --git a/crates/wsqlite3-sys/shim/musl/stdlib/atoi.c b/shim/musl/stdlib/atoi.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/stdlib/atoi.c
rename to shim/musl/stdlib/atoi.c
diff --git a/crates/wsqlite3-sys/shim/musl/stdlib/bsearch.c b/shim/musl/stdlib/bsearch.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/stdlib/bsearch.c
rename to shim/musl/stdlib/bsearch.c
diff --git a/crates/wsqlite3-sys/shim/musl/stdlib/qsort.c b/shim/musl/stdlib/qsort.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/stdlib/qsort.c
rename to shim/musl/stdlib/qsort.c
diff --git a/crates/wsqlite3-sys/shim/musl/stdlib/qsort_nr.c b/shim/musl/stdlib/qsort_nr.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/stdlib/qsort_nr.c
rename to shim/musl/stdlib/qsort_nr.c
diff --git a/crates/wsqlite3-sys/shim/musl/stdlib/strtod.c b/shim/musl/stdlib/strtod.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/stdlib/strtod.c
rename to shim/musl/stdlib/strtod.c
diff --git a/crates/wsqlite3-sys/shim/musl/stdlib/strtol.c b/shim/musl/stdlib/strtol.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/stdlib/strtol.c
rename to shim/musl/stdlib/strtol.c
diff --git a/crates/wsqlite3-sys/shim/musl/string/memchr.c b/shim/musl/string/memchr.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/string/memchr.c
rename to shim/musl/string/memchr.c
diff --git a/crates/wsqlite3-sys/shim/musl/string/memrchr.c b/shim/musl/string/memrchr.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/string/memrchr.c
rename to shim/musl/string/memrchr.c
diff --git a/crates/wsqlite3-sys/shim/musl/string/stpcpy.c b/shim/musl/string/stpcpy.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/string/stpcpy.c
rename to shim/musl/string/stpcpy.c
diff --git a/crates/wsqlite3-sys/shim/musl/string/stpncpy.c b/shim/musl/string/stpncpy.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/string/stpncpy.c
rename to shim/musl/string/stpncpy.c
diff --git a/crates/wsqlite3-sys/shim/musl/string/strcat.c b/shim/musl/string/strcat.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/string/strcat.c
rename to shim/musl/string/strcat.c
diff --git a/crates/wsqlite3-sys/shim/musl/string/strchr.c b/shim/musl/string/strchr.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/string/strchr.c
rename to shim/musl/string/strchr.c
diff --git a/crates/wsqlite3-sys/shim/musl/string/strchrnul.c b/shim/musl/string/strchrnul.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/string/strchrnul.c
rename to shim/musl/string/strchrnul.c
diff --git a/crates/wsqlite3-sys/shim/musl/string/strcmp.c b/shim/musl/string/strcmp.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/string/strcmp.c
rename to shim/musl/string/strcmp.c
diff --git a/crates/wsqlite3-sys/shim/musl/string/strcpy.c b/shim/musl/string/strcpy.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/string/strcpy.c
rename to shim/musl/string/strcpy.c
diff --git a/crates/wsqlite3-sys/shim/musl/string/strcspn.c b/shim/musl/string/strcspn.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/string/strcspn.c
rename to shim/musl/string/strcspn.c
diff --git a/crates/wsqlite3-sys/shim/musl/string/strlen.c b/shim/musl/string/strlen.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/string/strlen.c
rename to shim/musl/string/strlen.c
diff --git a/crates/wsqlite3-sys/shim/musl/string/strncat.c b/shim/musl/string/strncat.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/string/strncat.c
rename to shim/musl/string/strncat.c
diff --git a/crates/wsqlite3-sys/shim/musl/string/strncmp.c b/shim/musl/string/strncmp.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/string/strncmp.c
rename to shim/musl/string/strncmp.c
diff --git a/crates/wsqlite3-sys/shim/musl/string/strncpy.c b/shim/musl/string/strncpy.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/string/strncpy.c
rename to shim/musl/string/strncpy.c
diff --git a/crates/wsqlite3-sys/shim/musl/string/strrchr.c b/shim/musl/string/strrchr.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/string/strrchr.c
rename to shim/musl/string/strrchr.c
diff --git a/crates/wsqlite3-sys/shim/musl/string/strspn.c b/shim/musl/string/strspn.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/musl/string/strspn.c
rename to shim/musl/string/strspn.c
diff --git a/crates/wsqlite3-sys/shim/printf/README.md b/shim/printf/README.md
similarity index 100%
rename from crates/wsqlite3-sys/shim/printf/README.md
rename to shim/printf/README.md
diff --git a/crates/wsqlite3-sys/shim/printf/printf.c b/shim/printf/printf.c
similarity index 100%
rename from crates/wsqlite3-sys/shim/printf/printf.c
rename to shim/printf/printf.c
diff --git a/crates/wsqlite3-sys/shim/printf/printf.h b/shim/printf/printf.h
similarity index 100%
rename from crates/wsqlite3-sys/shim/printf/printf.h
rename to shim/printf/printf.h
diff --git a/crates/wsqlite3-sys/shim/wasm-shim.h b/shim/wasm-shim.h
similarity index 100%
rename from crates/wsqlite3-sys/shim/wasm-shim.h
rename to shim/wasm-shim.h
diff --git a/crates/wsqlite3-sys/sqlite3/sqlite3.c b/sqlite3/sqlite3.c
similarity index 100%
rename from crates/wsqlite3-sys/sqlite3/sqlite3.c
rename to sqlite3/sqlite3.c
diff --git a/crates/wsqlite3-sys/sqlite3/sqlite3.h b/sqlite3/sqlite3.h
similarity index 100%
rename from crates/wsqlite3-sys/sqlite3/sqlite3.h
rename to sqlite3/sqlite3.h
diff --git a/crates/wsqlite3-sys/sqlite3/sqlite3ext.h b/sqlite3/sqlite3ext.h
similarity index 100%
rename from crates/wsqlite3-sys/sqlite3/sqlite3ext.h
rename to sqlite3/sqlite3ext.h
diff --git a/crates/wsqlite3-sys/sqlite3mc/sqlite3mc_amalgamation.c b/sqlite3mc/sqlite3mc_amalgamation.c
similarity index 100%
rename from crates/wsqlite3-sys/sqlite3mc/sqlite3mc_amalgamation.c
rename to sqlite3mc/sqlite3mc_amalgamation.c
diff --git a/crates/wsqlite3-sys/sqlite3mc/sqlite3mc_amalgamation.h b/sqlite3mc/sqlite3mc_amalgamation.h
similarity index 100%
rename from crates/wsqlite3-sys/sqlite3mc/sqlite3mc_amalgamation.h
rename to sqlite3mc/sqlite3mc_amalgamation.h
diff --git a/crates/wsqlite3-sys/src/error.rs b/src/bindings/error.rs
similarity index 100%
rename from crates/wsqlite3-sys/src/error.rs
rename to src/bindings/error.rs
diff --git a/crates/wsqlite3-sys/src/lib.rs b/src/bindings/mod.rs
similarity index 82%
rename from crates/wsqlite3-sys/src/lib.rs
rename to src/bindings/mod.rs
index d0aaa6c..2c28a13 100644
--- a/crates/wsqlite3-sys/src/lib.rs
+++ b/src/bindings/mod.rs
@@ -1,15 +1,8 @@
 //! This module is codegen from build.rs
-#![no_std]
-#![allow(non_camel_case_types)]
-#![allow(non_snake_case)]
 
-#[rustfmt::skip]
-#[allow(clippy::missing_safety_doc, clippy::type_complexity)]
 #[cfg(all(not(feature = "bindgen"), feature = "sqlite3mc"))]
 mod sqlite3mc_bindgen;
 
-#[rustfmt::skip]
-#[allow(clippy::missing_safety_doc, clippy::type_complexity)]
 #[cfg(all(not(feature = "bindgen"), not(feature = "sqlite3mc")))]
 mod sqlite3_bindgen;
 
diff --git a/crates/wsqlite3-sys/src/sqlite3_bindgen.rs b/src/bindings/sqlite3_bindgen.rs
similarity index 100%
rename from crates/wsqlite3-sys/src/sqlite3_bindgen.rs
rename to src/bindings/sqlite3_bindgen.rs
diff --git a/crates/wsqlite3-sys/src/sqlite3mc_bindgen.rs b/src/bindings/sqlite3mc_bindgen.rs
similarity index 100%
rename from crates/wsqlite3-sys/src/sqlite3mc_bindgen.rs
rename to src/bindings/sqlite3mc_bindgen.rs
diff --git a/src/lib.rs b/src/lib.rs
index 674dcca..6a604ee 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,10 +1,17 @@
 #![doc = include_str!("../README.md")]
 #![no_std]
 #![cfg_attr(target_feature = "atomics", feature(stdarch_wasm_atomic_wait))]
+#![allow(clippy::missing_safety_doc)]
+#![allow(non_upper_case_globals)]
+#![allow(non_camel_case_types)]
+#![allow(non_snake_case)]
 
 extern crate alloc;
 
 mod shim;
+#[rustfmt::skip]
+#[allow(clippy::type_complexity)]
+mod bindings;
 
 /// Low-level utilities, traits, and macros for implementing custom SQLite Virtual File Systems (VFS)
 pub mod utils {
@@ -26,7 +33,7 @@ pub mod utils {
 pub use self::utils::{bail, check_option, check_result};
 
 /// Raw C-style bindings to the underlying `libsqlite3` library.
-pub use wsqlite3_sys::*;
+pub use bindings::*;
 
 /// Wasm platform implementation
 pub use self::shim::WasmOsCallback;
diff --git a/src/shim.rs b/src/shim.rs
index 52a96bd..81750c3 100644
--- a/src/shim.rs
+++ b/src/shim.rs
@@ -257,7 +257,7 @@ pub unsafe extern "C" fn rust_sqlite_wasm_calloc(num: c_size_t, size: c_size_t)
 #[no_mangle]
 pub unsafe extern "C" fn sqlite3_os_init() -> core::ffi::c_int {
     rsqlite_vfs::memvfs::install::<WasmOsCallback>();
-    wsqlite3_sys::SQLITE_OK
+    crate::bindings::SQLITE_OK
 }
 
 /// SQLite OS shutdown entry point.
@@ -267,7 +267,7 @@ pub unsafe extern "C" fn sqlite3_os_init() -> core::ffi::c_int {
 #[no_mangle]
 pub unsafe extern "C" fn sqlite3_os_end() -> core::ffi::c_int {
     rsqlite_vfs::memvfs::uninstall();
-    wsqlite3_sys::SQLITE_OK
+    crate::bindings::SQLITE_OK
 }
 
 #[cfg(test)]