diff --git a/.gitignore b/.gitignore
index 042c1129..b71287e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /build/
 /doc/
 /Makefile
-/target
+/phf/target/
+/phf_mac/target/
diff --git a/Makefile.in b/Makefile.in
index da04a16c..ab4f0bb6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,11 +3,11 @@ BUILDDIR := build
 RUSTFLAGS := -O --cfg ndebug
 INSTALL_DIR := %PREFIX%
 
-PHF_LIB := src/phf.rs
+PHF_LIB := phf/src/lib.rs
 PHF := $(foreach file,$(shell $(RUSTC) --crate-file-name $(PHF_LIB)),$(BUILDDIR)/$(file))
-PHF_MAC_LIB := src/phf_mac.rs
+PHF_MAC_LIB := phf_mac/src/lib.rs
 PHF_MAC := $(BUILDDIR)/$(shell $(RUSTC) --crate-file-name $(PHF_MAC_LIB))
-PHF_TEST_MAIN := src/test.rs
+PHF_TEST_MAIN := phf/src/test.rs
 PHF_TEST := $(BUILDDIR)/$(shell $(RUSTC) --crate-file-name $(PHF_TEST_MAIN))
 
 all: $(PHF) $(PHF_MAC)
diff --git a/phf_cargo_hack/Cargo.toml b/phf/Cargo.toml
similarity index 83%
rename from phf_cargo_hack/Cargo.toml
rename to phf/Cargo.toml
index b231f540..b0249b8a 100644
--- a/phf_cargo_hack/Cargo.toml
+++ b/phf/Cargo.toml
@@ -7,4 +7,4 @@ version = "0.0.0"
 [[lib]]
 
 name = "phf"
-path = "../src/phf.rs"
+path = "src/lib.rs"
diff --git a/src/phf.rs b/phf/src/lib.rs
similarity index 100%
rename from src/phf.rs
rename to phf/src/lib.rs
diff --git a/src/test.rs b/phf/src/test.rs
similarity index 100%
rename from src/test.rs
rename to phf/src/test.rs
diff --git a/Cargo.toml b/phf_mac/Cargo.toml
similarity index 77%
rename from Cargo.toml
rename to phf_mac/Cargo.toml
index 041dc6f6..00f56a97 100644
--- a/Cargo.toml
+++ b/phf_mac/Cargo.toml
@@ -7,9 +7,9 @@ version = "0.0.0"
 [[lib]]
 
 name = "phf_mac"
-path = "src/phf_mac.rs"
+path = "src/lib.rs"
 crate_type = ["dylib"]
 
 [dependencies.phf]
 
-path = "phf_cargo_hack"
+path = "../phf"
diff --git a/src/phf_mac.rs b/phf_mac/src/lib.rs
similarity index 100%
rename from src/phf_mac.rs
rename to phf_mac/src/lib.rs