diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2a66ba7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/Cargo.lock
+/target
+
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 0000000..be78655
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+
+name = "core_foundation"
+version = "0.1.0"
+authors = ["The Servo Project Developers"]
+
+[lib]
+
+name = "core_foundation"
+crate-type = ["rlib"]
diff --git a/Makefile.in b/Makefile.in
index adfb389..75c30a3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,16 +3,16 @@ VPATH=%VPATH%
 RUSTC ?= rustc
 RUSTFLAGS ?=
 
-RUST_SRC=$(shell find $(VPATH)/. -type f -name '*.rs')
+RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
 
 .PHONY: all
 all:    libcore_foundation.dummy
 
-libcore_foundation.dummy: lib.rs $(RUST_SRC)
+libcore_foundation.dummy: src/lib.rs $(RUST_SRC)
 	$(RUSTC) $(RUSTFLAGS) $< --out-dir .
 	touch $@
 
-core_foundation-test: lib.rs $(RUST_SRC)
+core_foundation-test: src/lib.rs $(RUST_SRC)
 	$(RUSTC) $(RUSTFLAGS) $< -o $@ --test
 
 .PHONY: check
diff --git a/array.rs b/src/array.rs
similarity index 100%
rename from array.rs
rename to src/array.rs
diff --git a/base.rs b/src/base.rs
similarity index 100%
rename from base.rs
rename to src/base.rs
diff --git a/boolean.rs b/src/boolean.rs
similarity index 100%
rename from boolean.rs
rename to src/boolean.rs
diff --git a/data.rs b/src/data.rs
similarity index 100%
rename from data.rs
rename to src/data.rs
diff --git a/dictionary.rs b/src/dictionary.rs
similarity index 100%
rename from dictionary.rs
rename to src/dictionary.rs
diff --git a/lib.rs b/src/lib.rs
similarity index 85%
rename from lib.rs
rename to src/lib.rs
index 72975c4..2b328b0 100644
--- a/lib.rs
+++ b/src/lib.rs
@@ -16,16 +16,26 @@ extern crate libc;
 extern crate std;
 extern crate debug;
 
+#[cfg(target_os="macos")]
 pub mod array;
+#[cfg(target_os="macos")]
 pub mod base;
+#[cfg(target_os="macos")]
 pub mod boolean;
+#[cfg(target_os="macos")]
 pub mod data;
+#[cfg(target_os="macos")]
 pub mod dictionary;
+#[cfg(target_os="macos")]
 pub mod number;
+#[cfg(target_os="macos")]
 pub mod set;
+#[cfg(target_os="macos")]
 pub mod string;
+#[cfg(target_os="macos")]
 pub mod url;
 
+#[cfg(target_os="macos")]
 #[cfg(test)]
 pub mod test {
     #[test]
diff --git a/number.rs b/src/number.rs
similarity index 100%
rename from number.rs
rename to src/number.rs
diff --git a/set.rs b/src/set.rs
similarity index 100%
rename from set.rs
rename to src/set.rs
diff --git a/string.rs b/src/string.rs
similarity index 100%
rename from string.rs
rename to src/string.rs
diff --git a/url.rs b/src/url.rs
similarity index 100%
rename from url.rs
rename to src/url.rs