diff --git a/.gitignore b/.gitignore
index 1609b98..a6e5cf1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,18 @@
-target
+# Generated by Cargo
+# will have compiled files and executables
+debug/
+target/
+
+# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
+# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
 Cargo.lock
 
+# These are backup files generated by rustfmt
+**/*.rs.bk
+
+# MSVC Windows builds of rustc generate these, which store debugging information
+*.pdb
+
+# Can be used for local development to set a custom toolchain
 rust-toolchain
 rust-toolchain.toml
diff --git a/Cargo.toml b/Cargo.toml
index 4cdba32..cc6ef8e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,2 @@
-[package]
-name = "citro3d-sys"
-version = "0.1.0"
-authors = ["panicbit <panicbit.dev@gmail.com>"]
-edition = "2021"
-
-[dependencies]
-libc = "0.2.116"
-ctru-sys = { path = "../ctru-rs/ctru-sys" }
+[workspace]
+members = ["citro3d-sys"]
diff --git a/citro3d-sys/Cargo.toml b/citro3d-sys/Cargo.toml
new file mode 100644
index 0000000..c1f1ee0
--- /dev/null
+++ b/citro3d-sys/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "citro3d-sys"
+version = "0.1.0"
+authors = ["panicbit <panicbit.dev@gmail.com>"] # TODO update author?
+edition = "2021"
+
+[dependencies]
+libc = "0.2.116"
+ctru-sys = { path = "../../ctru-rs/ctru-sys" }
diff --git a/bindgen.sh b/citro3d-sys/bindgen.sh
similarity index 100%
rename from bindgen.sh
rename to citro3d-sys/bindgen.sh
diff --git a/build.rs b/citro3d-sys/build.rs
similarity index 100%
rename from build.rs
rename to citro3d-sys/build.rs
diff --git a/src/base.rs b/citro3d-sys/src/base.rs
similarity index 100%
rename from src/base.rs
rename to citro3d-sys/src/base.rs
diff --git a/src/bindings.rs b/citro3d-sys/src/bindings.rs
similarity index 100%
rename from src/bindings.rs
rename to citro3d-sys/src/bindings.rs
diff --git a/src/lib.rs b/citro3d-sys/src/lib.rs
similarity index 100%
rename from src/lib.rs
rename to citro3d-sys/src/lib.rs
diff --git a/src/texenv.rs b/citro3d-sys/src/texenv.rs
similarity index 100%
rename from src/texenv.rs
rename to citro3d-sys/src/texenv.rs
diff --git a/src/uniforms.rs b/citro3d-sys/src/uniforms.rs
similarity index 100%
rename from src/uniforms.rs
rename to citro3d-sys/src/uniforms.rs