diff --git a/Cargo.toml b/Cargo.toml
index c2e9b3a7..45cb99fa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,13 +7,13 @@ authors = [ "Steven Fackler <sfackler@gmail.com>" ]
 [[lib]]
 
 name = "postgres"
-path = "src/lib/lib.rs"
+path = "src/lib.rs"
 test = false
 
 [[test]]
 
 name = "test"
-path = "src/test/test.rs"
+path = "tests/test.rs"
 
 [dependencies.openssl]
 
diff --git a/src/lib/error.rs b/src/error.rs
similarity index 100%
rename from src/lib/error.rs
rename to src/error.rs
diff --git a/src/lib/io.rs b/src/io.rs
similarity index 100%
rename from src/lib/io.rs
rename to src/io.rs
diff --git a/src/lib/lib.rs b/src/lib.rs
similarity index 100%
rename from src/lib/lib.rs
rename to src/lib.rs
diff --git a/src/lib/macros.rs b/src/macros.rs
similarity index 100%
rename from src/lib/macros.rs
rename to src/macros.rs
diff --git a/src/lib/message.rs b/src/message.rs
similarity index 100%
rename from src/lib/message.rs
rename to src/message.rs
diff --git a/src/lib/pool.rs b/src/pool.rs
similarity index 100%
rename from src/lib/pool.rs
rename to src/pool.rs
diff --git a/src/lib/types/array.rs b/src/types/array.rs
similarity index 100%
rename from src/lib/types/array.rs
rename to src/types/array.rs
diff --git a/src/lib/types/mod.rs b/src/types/mod.rs
similarity index 100%
rename from src/lib/types/mod.rs
rename to src/types/mod.rs
diff --git a/src/lib/types/range.rs b/src/types/range.rs
similarity index 100%
rename from src/lib/types/range.rs
rename to src/types/range.rs
diff --git a/src/test/pool.rs b/tests/pool.rs
similarity index 100%
rename from src/test/pool.rs
rename to tests/pool.rs
diff --git a/src/test/test.rs b/tests/test.rs
similarity index 100%
rename from src/test/test.rs
rename to tests/test.rs
diff --git a/src/test/types/array.rs b/tests/types/array.rs
similarity index 100%
rename from src/test/types/array.rs
rename to tests/types/array.rs
diff --git a/src/test/types/mod.rs b/tests/types/mod.rs
similarity index 100%
rename from src/test/types/mod.rs
rename to tests/types/mod.rs
diff --git a/src/test/types/range.rs b/tests/types/range.rs
similarity index 100%
rename from src/test/types/range.rs
rename to tests/types/range.rs