diff --git a/.travis.yml b/.travis.yml
index 4384fb8..2fecfe4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,13 +15,21 @@ before_script:
   - rustup component add rustfmt
 
 script:
-  - cd aeron_driver-sys
+  - cargo test --no-run
   - cargo test
+  - cargo test --release --no-run
   - cargo test --release
+
+  - cd aeron_driver-sys/
   - cargo test --features "static"
 
   - cd ..
-  - cargo test
-  - cargo test --release
   - cargo clippy --all
   - cargo fmt --all -- --check
+
+branches:
+  only:
+    - master
+    - staging
+    - trying
+    
diff --git a/Cargo.toml b/Cargo.toml
index b999168..31811c5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,22 +1,5 @@
-[package]
-name = "aeron-rs"
-version = "0.1.0"
-authors = ["Bradlee Speice <bradlee@speice.io>"]
-edition = "2018"
-repository = "https://github.com/bspeice/aeron-rs"
-readme = "README.md"
-license = "Apache-2.0"
-
-[badges]
-travis-ci = { repository = "bspeice/aeron-rs", branch = "master" }
-maintenance = { status = "actively-developed" }
-
-[dependencies]
-aeron_driver-sys = { path = "./aeron_driver-sys" }
-memmap = "0.7"
-num = "0.2"
-
-[dev-dependencies]
-clap = "2.33"
-ctrlc = "3.1.3"
-tempfile = "3.1"
+[workspace]
+members = [
+    "aeron_driver-sys",
+    "aeron-rs"
+]
diff --git a/aeron-rs/Cargo.toml b/aeron-rs/Cargo.toml
new file mode 100644
index 0000000..c08e48b
--- /dev/null
+++ b/aeron-rs/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "aeron-rs"
+version = "0.1.0"
+authors = ["Bradlee Speice <bradlee@speice.io>"]
+edition = "2018"
+repository = "https://github.com/bspeice/aeron-rs"
+readme = "README.md"
+license = "Apache-2.0"
+
+[badges]
+travis-ci = { repository = "bspeice/aeron-rs", branch = "master" }
+maintenance = { status = "actively-developed" }
+
+[dependencies]
+aeron_driver-sys = { path = "../aeron_driver-sys" }
+memmap = "0.7"
+num = "0.2"
+
+[dev-dependencies]
+clap = "2.33"
+ctrlc = "3.1.3"
+tempfile = "3.1"
diff --git a/examples/aeronmd.rs b/aeron-rs/examples/aeronmd.rs
similarity index 100%
rename from examples/aeronmd.rs
rename to aeron-rs/examples/aeronmd.rs
diff --git a/examples/aeronmd_sys.rs b/aeron-rs/examples/aeronmd_sys.rs
similarity index 100%
rename from examples/aeronmd_sys.rs
rename to aeron-rs/examples/aeronmd_sys.rs
diff --git a/src/client/cnc_descriptor.rs b/aeron-rs/src/client/cnc_descriptor.rs
similarity index 100%
rename from src/client/cnc_descriptor.rs
rename to aeron-rs/src/client/cnc_descriptor.rs
diff --git a/src/client/concurrent/atomic_buffer.rs b/aeron-rs/src/client/concurrent/atomic_buffer.rs
similarity index 100%
rename from src/client/concurrent/atomic_buffer.rs
rename to aeron-rs/src/client/concurrent/atomic_buffer.rs
diff --git a/src/client/concurrent/mod.rs b/aeron-rs/src/client/concurrent/mod.rs
similarity index 100%
rename from src/client/concurrent/mod.rs
rename to aeron-rs/src/client/concurrent/mod.rs
diff --git a/src/client/concurrent/ring_buffer.rs b/aeron-rs/src/client/concurrent/ring_buffer.rs
similarity index 100%
rename from src/client/concurrent/ring_buffer.rs
rename to aeron-rs/src/client/concurrent/ring_buffer.rs
diff --git a/src/client/context.rs b/aeron-rs/src/client/context.rs
similarity index 100%
rename from src/client/context.rs
rename to aeron-rs/src/client/context.rs
diff --git a/src/client/driver_proxy.rs b/aeron-rs/src/client/driver_proxy.rs
similarity index 100%
rename from src/client/driver_proxy.rs
rename to aeron-rs/src/client/driver_proxy.rs
diff --git a/src/client/mod.rs b/aeron-rs/src/client/mod.rs
similarity index 100%
rename from src/client/mod.rs
rename to aeron-rs/src/client/mod.rs
diff --git a/src/control_protocol.rs b/aeron-rs/src/control_protocol.rs
similarity index 100%
rename from src/control_protocol.rs
rename to aeron-rs/src/control_protocol.rs
diff --git a/src/driver.rs b/aeron-rs/src/driver.rs
similarity index 100%
rename from src/driver.rs
rename to aeron-rs/src/driver.rs
diff --git a/src/lib.rs b/aeron-rs/src/lib.rs
similarity index 100%
rename from src/lib.rs
rename to aeron-rs/src/lib.rs
diff --git a/src/util.rs b/aeron-rs/src/util.rs
similarity index 100%
rename from src/util.rs
rename to aeron-rs/src/util.rs
diff --git a/tests/cnc_terminate.rs b/aeron-rs/tests/cnc_terminate.rs
similarity index 100%
rename from tests/cnc_terminate.rs
rename to aeron-rs/tests/cnc_terminate.rs
diff --git a/bors.toml b/bors.toml
new file mode 100644
index 0000000..574c563
--- /dev/null
+++ b/bors.toml
@@ -0,0 +1,4 @@
+status = [
+  "continuous-integration/travis-ci/push",
+]
+delete_merged_branches = true