diff --git a/Cargo.toml b/Cargo.toml
index e72069ae..383d5017 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,58 +1,2 @@
-[package]
-name = "postgres"
-version = "0.13.4"
-authors = ["Steven Fackler <sfackler@gmail.com>"]
-license = "MIT"
-description = "A native PostgreSQL driver"
-repository = "https://github.com/sfackler/rust-postgres"
-documentation = "https://docs.rs/postgres/0.13.4/postgres"
-readme = "README.md"
-keywords = ["database", "postgres", "postgresql", "sql"]
-include = ["src/*", "Cargo.toml", "LICENSE", "README.md", "THIRD_PARTY"]
-
-[lib]
-name = "postgres"
-path = "src/lib.rs"
-test = false
-bench = false
-
-[[test]]
-name = "test"
-path = "tests/test.rs"
-
-[features]
-with-bit-vec = ["bit-vec"]
-with-chrono = ["chrono"]
-with-eui48 = ["eui48"]
-with-openssl = ["openssl"]
-with-native-tls = ["native-tls"]
-with-rustc-serialize = ["rustc-serialize"]
-with-schannel = ["schannel"]
-with-security-framework = ["security-framework"]
-with-serde_json = ["serde_json"]
-with-time = ["time"]
-with-uuid = ["uuid"]
-
-no-logging = []
-
-[dependencies]
-bufstream = "0.1"
-fallible-iterator = "0.1.3"
-hex = "0.2"
-log = "0.3"
-phf = "=0.7.20"
-postgres-protocol = "0.2"
-bit-vec = { version = "0.4", optional = true }
-chrono = { version = "0.2.14", optional = true }
-eui48 = { version = "0.1", optional = true }
-openssl = { version = "0.9", optional = true }
-native-tls = { version = "0.1", optional = true }
-rustc-serialize = { version = "0.3", optional = true }
-schannel = { version = "0.1", optional = true }
-security-framework = { version = "0.1.2", optional = true }
-serde_json = { version = ">= 0.6, < 0.9", optional = true }
-time = { version = "0.1.14", optional = true }
-uuid = { version = ">= 0.1, < 0.4", optional = true }
-
-[dev-dependencies]
-url = "1.0"
+[workspace]
+members = ["postgres", "codegen"]
diff --git a/postgres/Cargo.toml b/postgres/Cargo.toml
new file mode 100644
index 00000000..e72069ae
--- /dev/null
+++ b/postgres/Cargo.toml
@@ -0,0 +1,58 @@
+[package]
+name = "postgres"
+version = "0.13.4"
+authors = ["Steven Fackler <sfackler@gmail.com>"]
+license = "MIT"
+description = "A native PostgreSQL driver"
+repository = "https://github.com/sfackler/rust-postgres"
+documentation = "https://docs.rs/postgres/0.13.4/postgres"
+readme = "README.md"
+keywords = ["database", "postgres", "postgresql", "sql"]
+include = ["src/*", "Cargo.toml", "LICENSE", "README.md", "THIRD_PARTY"]
+
+[lib]
+name = "postgres"
+path = "src/lib.rs"
+test = false
+bench = false
+
+[[test]]
+name = "test"
+path = "tests/test.rs"
+
+[features]
+with-bit-vec = ["bit-vec"]
+with-chrono = ["chrono"]
+with-eui48 = ["eui48"]
+with-openssl = ["openssl"]
+with-native-tls = ["native-tls"]
+with-rustc-serialize = ["rustc-serialize"]
+with-schannel = ["schannel"]
+with-security-framework = ["security-framework"]
+with-serde_json = ["serde_json"]
+with-time = ["time"]
+with-uuid = ["uuid"]
+
+no-logging = []
+
+[dependencies]
+bufstream = "0.1"
+fallible-iterator = "0.1.3"
+hex = "0.2"
+log = "0.3"
+phf = "=0.7.20"
+postgres-protocol = "0.2"
+bit-vec = { version = "0.4", optional = true }
+chrono = { version = "0.2.14", optional = true }
+eui48 = { version = "0.1", optional = true }
+openssl = { version = "0.9", optional = true }
+native-tls = { version = "0.1", optional = true }
+rustc-serialize = { version = "0.3", optional = true }
+schannel = { version = "0.1", optional = true }
+security-framework = { version = "0.1.2", optional = true }
+serde_json = { version = ">= 0.6, < 0.9", optional = true }
+time = { version = "0.1.14", optional = true }
+uuid = { version = ">= 0.1, < 0.4", optional = true }
+
+[dev-dependencies]
+url = "1.0"
diff --git a/benches/bench.rs b/postgres/benches/bench.rs
similarity index 100%
rename from benches/bench.rs
rename to postgres/benches/bench.rs
diff --git a/src/error/mod.rs b/postgres/src/error/mod.rs
similarity index 100%
rename from src/error/mod.rs
rename to postgres/src/error/mod.rs
diff --git a/src/error/sqlstate.rs b/postgres/src/error/sqlstate.rs
similarity index 100%
rename from src/error/sqlstate.rs
rename to postgres/src/error/sqlstate.rs
diff --git a/src/feature_check.rs b/postgres/src/feature_check.rs
similarity index 100%
rename from src/feature_check.rs
rename to postgres/src/feature_check.rs
diff --git a/src/lib.rs b/postgres/src/lib.rs
similarity index 100%
rename from src/lib.rs
rename to postgres/src/lib.rs
diff --git a/src/macros.rs b/postgres/src/macros.rs
similarity index 100%
rename from src/macros.rs
rename to postgres/src/macros.rs
diff --git a/src/notification.rs b/postgres/src/notification.rs
similarity index 100%
rename from src/notification.rs
rename to postgres/src/notification.rs
diff --git a/src/params.rs b/postgres/src/params.rs
similarity index 100%
rename from src/params.rs
rename to postgres/src/params.rs
diff --git a/src/priv_io.rs b/postgres/src/priv_io.rs
similarity index 100%
rename from src/priv_io.rs
rename to postgres/src/priv_io.rs
diff --git a/src/rows.rs b/postgres/src/rows.rs
similarity index 100%
rename from src/rows.rs
rename to postgres/src/rows.rs
diff --git a/src/stmt.rs b/postgres/src/stmt.rs
similarity index 100%
rename from src/stmt.rs
rename to postgres/src/stmt.rs
diff --git a/src/tls/mod.rs b/postgres/src/tls/mod.rs
similarity index 100%
rename from src/tls/mod.rs
rename to postgres/src/tls/mod.rs
diff --git a/src/tls/native_tls.rs b/postgres/src/tls/native_tls.rs
similarity index 100%
rename from src/tls/native_tls.rs
rename to postgres/src/tls/native_tls.rs
diff --git a/src/tls/openssl.rs b/postgres/src/tls/openssl.rs
similarity index 100%
rename from src/tls/openssl.rs
rename to postgres/src/tls/openssl.rs
diff --git a/src/tls/schannel.rs b/postgres/src/tls/schannel.rs
similarity index 100%
rename from src/tls/schannel.rs
rename to postgres/src/tls/schannel.rs
diff --git a/src/tls/security_framework.rs b/postgres/src/tls/security_framework.rs
similarity index 100%
rename from src/tls/security_framework.rs
rename to postgres/src/tls/security_framework.rs
diff --git a/src/transaction.rs b/postgres/src/transaction.rs
similarity index 100%
rename from src/transaction.rs
rename to postgres/src/transaction.rs
diff --git a/src/types/bit_vec.rs b/postgres/src/types/bit_vec.rs
similarity index 100%
rename from src/types/bit_vec.rs
rename to postgres/src/types/bit_vec.rs
diff --git a/src/types/chrono.rs b/postgres/src/types/chrono.rs
similarity index 100%
rename from src/types/chrono.rs
rename to postgres/src/types/chrono.rs
diff --git a/src/types/eui48.rs b/postgres/src/types/eui48.rs
similarity index 100%
rename from src/types/eui48.rs
rename to postgres/src/types/eui48.rs
diff --git a/src/types/mod.rs b/postgres/src/types/mod.rs
similarity index 100%
rename from src/types/mod.rs
rename to postgres/src/types/mod.rs
diff --git a/src/types/rustc_serialize.rs b/postgres/src/types/rustc_serialize.rs
similarity index 100%
rename from src/types/rustc_serialize.rs
rename to postgres/src/types/rustc_serialize.rs
diff --git a/src/types/serde_json.rs b/postgres/src/types/serde_json.rs
similarity index 100%
rename from src/types/serde_json.rs
rename to postgres/src/types/serde_json.rs
diff --git a/src/types/special.rs b/postgres/src/types/special.rs
similarity index 100%
rename from src/types/special.rs
rename to postgres/src/types/special.rs
diff --git a/src/types/time.rs b/postgres/src/types/time.rs
similarity index 100%
rename from src/types/time.rs
rename to postgres/src/types/time.rs
diff --git a/src/types/type_gen.rs b/postgres/src/types/type_gen.rs
similarity index 100%
rename from src/types/type_gen.rs
rename to postgres/src/types/type_gen.rs
diff --git a/src/types/uuid.rs b/postgres/src/types/uuid.rs
similarity index 100%
rename from src/types/uuid.rs
rename to postgres/src/types/uuid.rs
diff --git a/src/url.rs b/postgres/src/url.rs
similarity index 100%
rename from src/url.rs
rename to postgres/src/url.rs
diff --git a/tests/test.rs b/postgres/tests/test.rs
similarity index 100%
rename from tests/test.rs
rename to postgres/tests/test.rs
diff --git a/tests/types/bit_vec.rs b/postgres/tests/types/bit_vec.rs
similarity index 100%
rename from tests/types/bit_vec.rs
rename to postgres/tests/types/bit_vec.rs
diff --git a/tests/types/chrono.rs b/postgres/tests/types/chrono.rs
similarity index 100%
rename from tests/types/chrono.rs
rename to postgres/tests/types/chrono.rs
diff --git a/tests/types/eui48.rs b/postgres/tests/types/eui48.rs
similarity index 100%
rename from tests/types/eui48.rs
rename to postgres/tests/types/eui48.rs
diff --git a/tests/types/mod.rs b/postgres/tests/types/mod.rs
similarity index 100%
rename from tests/types/mod.rs
rename to postgres/tests/types/mod.rs
diff --git a/tests/types/rustc_serialize.rs b/postgres/tests/types/rustc_serialize.rs
similarity index 100%
rename from tests/types/rustc_serialize.rs
rename to postgres/tests/types/rustc_serialize.rs
diff --git a/tests/types/serde_json.rs b/postgres/tests/types/serde_json.rs
similarity index 100%
rename from tests/types/serde_json.rs
rename to postgres/tests/types/serde_json.rs
diff --git a/tests/types/time.rs b/postgres/tests/types/time.rs
similarity index 100%
rename from tests/types/time.rs
rename to postgres/tests/types/time.rs
diff --git a/tests/types/uuid.rs b/postgres/tests/types/uuid.rs
similarity index 100%
rename from tests/types/uuid.rs
rename to postgres/tests/types/uuid.rs