diff --git a/.gitignore b/.gitignore
index 4127eea20f40125b648bad0bb25d26a82cf482f6..29f7c3a406eefefc9ac0f7300e931570736497ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /doc/
 /target/
+/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
index 7c722c56d876f3b54b3960d4c349ad8461a1a070..8d6329a419fee89e31a4659ebfdac4bd7452e035 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,4 +7,4 @@ authors = ["Steven Fackler <sfackler@gmail.com"]
 [[lib]]
 
 name = "openssl"
-path = "lib.rs"
+path = "src/lib.rs"
diff --git a/bn/mod.rs b/src/bn/mod.rs
similarity index 100%
rename from bn/mod.rs
rename to src/bn/mod.rs
diff --git a/crypto/hash.rs b/src/crypto/hash.rs
similarity index 100%
rename from crypto/hash.rs
rename to src/crypto/hash.rs
diff --git a/crypto/hmac.rs b/src/crypto/hmac.rs
similarity index 100%
rename from crypto/hmac.rs
rename to src/crypto/hmac.rs
diff --git a/crypto/mod.rs b/src/crypto/mod.rs
similarity index 100%
rename from crypto/mod.rs
rename to src/crypto/mod.rs
diff --git a/crypto/pkcs5.rs b/src/crypto/pkcs5.rs
similarity index 100%
rename from crypto/pkcs5.rs
rename to src/crypto/pkcs5.rs
diff --git a/crypto/pkey.rs b/src/crypto/pkey.rs
similarity index 100%
rename from crypto/pkey.rs
rename to src/crypto/pkey.rs
diff --git a/crypto/rand.rs b/src/crypto/rand.rs
similarity index 100%
rename from crypto/rand.rs
rename to src/crypto/rand.rs
diff --git a/crypto/symm.rs b/src/crypto/symm.rs
similarity index 100%
rename from crypto/symm.rs
rename to src/crypto/symm.rs
diff --git a/lib.rs b/src/lib.rs
similarity index 100%
rename from lib.rs
rename to src/lib.rs
diff --git a/ssl/error.rs b/src/ssl/error.rs
similarity index 100%
rename from ssl/error.rs
rename to src/ssl/error.rs
diff --git a/ssl/ffi.rs b/src/ssl/ffi.rs
similarity index 100%
rename from ssl/ffi.rs
rename to src/ssl/ffi.rs
diff --git a/ssl/mod.rs b/src/ssl/mod.rs
similarity index 100%
rename from ssl/mod.rs
rename to src/ssl/mod.rs
diff --git a/ssl/tests.rs b/src/ssl/tests.rs
similarity index 100%
rename from ssl/tests.rs
rename to src/ssl/tests.rs