diff --git a/project/Project.scala b/project/Project.scala
index 90afa92101a..7973d7af8dd 100644
--- a/project/Project.scala
+++ b/project/Project.scala
@@ -113,6 +113,8 @@ object Zipkin extends Build {
         "com.twitter" % "ostrich"           % OSTRICH_VERSION,
         "com.twitter" % "util-core"         % UTIL_VERSION,
 
+        "com.twitter.common.zookeeper" % "client"    % "0.0.6",
+
         /* Test dependencies */
         "org.scala-tools.testing" % "specs_2.9.1"  % "1.6.9" % "test",
         "org.jmock"               % "jmock"        % "2.4.0" % "test",
@@ -185,7 +187,6 @@ object Zipkin extends Build {
         "com.twitter" % "util-zk"           % UTIL_VERSION,
         "com.twitter" % "util-zk-common"    % UTIL_VERSION,
 
-        "com.twitter.common.zookeeper" % "client"    % "0.0.6",
         "com.twitter.common.zookeeper" % "candidate" % "0.0.9",
         "com.twitter.common.zookeeper" % "group"     % "0.0.9",
 
diff --git a/zipkin-server/src/main/scala/com/twitter/zipkin/common/ZooKeeperClientService.scala b/zipkin-common/src/main/scala/com/twitter/zipkin/common/ZooKeeperClientService.scala
similarity index 98%
rename from zipkin-server/src/main/scala/com/twitter/zipkin/common/ZooKeeperClientService.scala
rename to zipkin-common/src/main/scala/com/twitter/zipkin/common/ZooKeeperClientService.scala
index cb210c1b8a1..0d7b852c00a 100644
--- a/zipkin-server/src/main/scala/com/twitter/zipkin/common/ZooKeeperClientService.scala
+++ b/zipkin-common/src/main/scala/com/twitter/zipkin/common/ZooKeeperClientService.scala
@@ -1,12 +1,12 @@
 /*
  * Copyright 2012 Twitter Inc.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/zipkin-server/src/main/scala/com/twitter/zipkin/config/zookeeper/ZooKeeperClientConfig.scala b/zipkin-common/src/main/scala/com/twitter/zipkin/config/zookeeper/ZooKeeperClientConfig.scala
similarity index 100%
rename from zipkin-server/src/main/scala/com/twitter/zipkin/config/zookeeper/ZooKeeperClientConfig.scala
rename to zipkin-common/src/main/scala/com/twitter/zipkin/config/zookeeper/ZooKeeperClientConfig.scala
diff --git a/zipkin-server/src/main/scala/com/twitter/zipkin/config/zookeeper/ZooKeeperConfig.scala b/zipkin-common/src/main/scala/com/twitter/zipkin/config/zookeeper/ZooKeeperConfig.scala
similarity index 100%
rename from zipkin-server/src/main/scala/com/twitter/zipkin/config/zookeeper/ZooKeeperConfig.scala
rename to zipkin-common/src/main/scala/com/twitter/zipkin/config/zookeeper/ZooKeeperConfig.scala