diff --git a/Cargo.toml b/Cargo.toml
index 2d3df006a..03a96d138 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,10 +1,10 @@
 [workspace]
 members = [
     ".",
-    "futures-mpsc-lossy",
-    "metrics",
-    "router",
-    "timeout",
+    "lib/futures-mpsc-lossy",
+    "lib/metrics",
+    "lib/router",
+    "lib/timeout",
 ]
 
 [package]
@@ -19,10 +19,10 @@ default = ["flaky_tests"]
 flaky_tests = []
 
 [dependencies]
-futures-mpsc-lossy    = { path = "./futures-mpsc-lossy" }
-linkerd2-metrics      = { path = "./metrics" }
-linkerd2-proxy-router = { path = "./router" }
-linkerd2-timeout      = { path = "./timeout" }
+futures-mpsc-lossy    = { path = "lib/futures-mpsc-lossy" }
+linkerd2-metrics      = { path = "lib/metrics" }
+linkerd2-proxy-router = { path = "lib/router" }
+linkerd2-timeout      = { path = "lib/timeout" }
 
 linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", tag = "v0.1.1", version = "0.1.1" }
 
@@ -80,7 +80,7 @@ procinfo = "0.4.2"
 [dev-dependencies]
 net2 = "0.2"
 quickcheck = { version = "0.6", default-features = false }
-linkerd2-metrics = { path = "./metrics", features = ["test_util"] }
+linkerd2-metrics = { path = "./lib/metrics", features = ["test_util"] }
 linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", tag = "v0.1.1", version = "0.1.1", features = ["arbitrary"] }
 flate2 = { version = "1.0.1", default-features = false, features = ["rust_backend"] }
 # `tokio-io` is needed for TCP tests, because `tokio::io` doesn't re-export
diff --git a/Dockerfile b/Dockerfile
index 75844566a..6a6157d5d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,21 +19,18 @@ WORKDIR /usr/src/linkerd2-proxy
 #
 # Mock out all local code and fetch external dependencies to ensure that
 # external sources are primarily cached on Cargo.lock.
-RUN for d in . futures-mpsc-lossy router metrics timeout ; \
+RUN for d in . lib/futures-mpsc-lossy lib/router lib/metrics lib/timeout ; \
     do mkdir -p "${d}/src" && touch "${d}/src/lib.rs" ; \
     done
-COPY Cargo.toml Cargo.lock          ./
-COPY futures-mpsc-lossy/Cargo.toml  futures-mpsc-lossy/Cargo.toml
-COPY metrics/Cargo.toml             metrics/Cargo.toml
-COPY router/Cargo.toml              router/Cargo.toml
-COPY timeout/Cargo.toml             timeout/Cargo.toml
+COPY Cargo.toml Cargo.lock ./
+COPY lib/futures-mpsc-lossy/Cargo.toml  lib/futures-mpsc-lossy/Cargo.toml
+COPY lib/metrics/Cargo.toml             lib/metrics/Cargo.toml
+COPY lib/router/Cargo.toml              lib/router/Cargo.toml
+COPY lib/timeout/Cargo.toml             lib/timeout/Cargo.toml
 RUN cargo fetch --locked
 
 # Build libraries, leaving the proxy mocked out.
-COPY futures-mpsc-lossy futures-mpsc-lossy
-COPY router router
-COPY metrics metrics
-COPY timeout timeout
+COPY lib lib
 ARG PROXY_UNOPTIMIZED
 RUN if [ -n "$PROXY_UNOPTIMIZED" ]; \
     then cargo build --frozen ; \
diff --git a/futures-mpsc-lossy/Cargo.toml b/lib/futures-mpsc-lossy/Cargo.toml
similarity index 100%
rename from futures-mpsc-lossy/Cargo.toml
rename to lib/futures-mpsc-lossy/Cargo.toml
diff --git a/futures-mpsc-lossy/src/lib.rs b/lib/futures-mpsc-lossy/src/lib.rs
similarity index 100%
rename from futures-mpsc-lossy/src/lib.rs
rename to lib/futures-mpsc-lossy/src/lib.rs
diff --git a/metrics/Cargo.toml b/lib/metrics/Cargo.toml
similarity index 100%
rename from metrics/Cargo.toml
rename to lib/metrics/Cargo.toml
diff --git a/metrics/src/counter.rs b/lib/metrics/src/counter.rs
similarity index 100%
rename from metrics/src/counter.rs
rename to lib/metrics/src/counter.rs
diff --git a/metrics/src/gauge.rs b/lib/metrics/src/gauge.rs
similarity index 100%
rename from metrics/src/gauge.rs
rename to lib/metrics/src/gauge.rs
diff --git a/metrics/src/histogram.rs b/lib/metrics/src/histogram.rs
similarity index 100%
rename from metrics/src/histogram.rs
rename to lib/metrics/src/histogram.rs
diff --git a/metrics/src/latency.rs b/lib/metrics/src/latency.rs
similarity index 100%
rename from metrics/src/latency.rs
rename to lib/metrics/src/latency.rs
diff --git a/metrics/src/lib.rs b/lib/metrics/src/lib.rs
similarity index 100%
rename from metrics/src/lib.rs
rename to lib/metrics/src/lib.rs
diff --git a/metrics/src/prom.rs b/lib/metrics/src/prom.rs
similarity index 100%
rename from metrics/src/prom.rs
rename to lib/metrics/src/prom.rs
diff --git a/metrics/src/scopes.rs b/lib/metrics/src/scopes.rs
similarity index 100%
rename from metrics/src/scopes.rs
rename to lib/metrics/src/scopes.rs
diff --git a/metrics/src/serve.rs b/lib/metrics/src/serve.rs
similarity index 100%
rename from metrics/src/serve.rs
rename to lib/metrics/src/serve.rs
diff --git a/router/Cargo.toml b/lib/router/Cargo.toml
similarity index 100%
rename from router/Cargo.toml
rename to lib/router/Cargo.toml
diff --git a/router/src/cache.rs b/lib/router/src/cache.rs
similarity index 100%
rename from router/src/cache.rs
rename to lib/router/src/cache.rs
diff --git a/router/src/lib.rs b/lib/router/src/lib.rs
similarity index 100%
rename from router/src/lib.rs
rename to lib/router/src/lib.rs
diff --git a/timeout/Cargo.toml b/lib/timeout/Cargo.toml
similarity index 94%
rename from timeout/Cargo.toml
rename to lib/timeout/Cargo.toml
index 33217de95..95bad23f9 100644
--- a/timeout/Cargo.toml
+++ b/lib/timeout/Cargo.toml
@@ -2,6 +2,7 @@
 name = "linkerd2-timeout"
 version = "0.1.0"
 authors = ["Oliver Gould <ver@buoyant.io>"]
+publish = false
 
 [dependencies]
 futures = "0.1"
diff --git a/timeout/src/lib.rs b/lib/timeout/src/lib.rs
similarity index 100%
rename from timeout/src/lib.rs
rename to lib/timeout/src/lib.rs