diff --git a/Cargo.toml b/Cargo.toml
index c198d9f3c..0f384bcaa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,14 +1,20 @@
 [package]
 authors = ["Jorge Aparicio <japaricious@gmail.com>"]
 build = "build.rs"
-name = "rustc_builtins"
-version = "0.1.0"
+name = "compiler_builtins"
+version = "0.0.0"
+
+[lib]
+name = "compiler_builtins"
+path = "lib.rs"
 
 [build-dependencies]
-gcc = "0.3.35"
+gcc = "0.3.27"
 rustc-cfg = "0.2.0"
 
-[dependencies]
+[dependencies.core]
+optional = true
+path = "../libcore"
 
 [dependencies.rlibc]
 git = "https://github.com/alexcrichton/rlibc"
@@ -23,6 +29,8 @@ compiler-rt = { path = "compiler-rt" }
 [features]
 # Build the missing intrinsics from compiler-rt C source code
 c = []
+# for integration into rust-lang/rust
+rustbuild = ["core"]
 weak = ["rlibc/weak"]
 
 [workspace]
diff --git a/src/arm.rs b/arm.rs
similarity index 100%
rename from src/arm.rs
rename to arm.rs
diff --git a/src/bin/intrinsics.rs b/bin/intrinsics.rs
similarity index 100%
rename from src/bin/intrinsics.rs
rename to bin/intrinsics.rs
diff --git a/src/float/add.rs b/float/add.rs
similarity index 100%
rename from src/float/add.rs
rename to float/add.rs
diff --git a/src/float/mod.rs b/float/mod.rs
similarity index 100%
rename from src/float/mod.rs
rename to float/mod.rs
diff --git a/src/float/pow.rs b/float/pow.rs
similarity index 100%
rename from src/float/pow.rs
rename to float/pow.rs
diff --git a/src/int/mod.rs b/int/mod.rs
similarity index 100%
rename from src/int/mod.rs
rename to int/mod.rs
diff --git a/src/int/mul.rs b/int/mul.rs
similarity index 100%
rename from src/int/mul.rs
rename to int/mul.rs
diff --git a/src/int/sdiv.rs b/int/sdiv.rs
similarity index 100%
rename from src/int/sdiv.rs
rename to int/sdiv.rs
diff --git a/src/int/shift.rs b/int/shift.rs
similarity index 100%
rename from src/int/shift.rs
rename to int/shift.rs
diff --git a/src/int/udiv.rs b/int/udiv.rs
similarity index 100%
rename from src/int/udiv.rs
rename to int/udiv.rs
diff --git a/src/lib.rs b/lib.rs
similarity index 93%
rename from src/lib.rs
rename to lib.rs
index acc56c98a..34d786ca7 100644
--- a/src/lib.rs
+++ b/lib.rs
@@ -1,3 +1,5 @@
+#![crate_name = "compiler_builtins"]
+#![crate_type = "rlib"]
 #![feature(asm)]
 #![feature(core_intrinsics)]
 #![feature(linkage)]
diff --git a/src/qc.rs b/qc.rs
similarity index 100%
rename from src/qc.rs
rename to qc.rs
diff --git a/src/x86_64.rs b/x86_64.rs
similarity index 100%
rename from src/x86_64.rs
rename to x86_64.rs