@@ -873,7 +873,6 @@ py_library(
     deps = [
         ":framework",
         ":ops",
-        ":server_lib",
         ":session",
         ":training_ops",
     ],
@@ -984,7 +983,6 @@ tf_py_wrap_cc(
     swig_includes = [
         "client/device_lib.i",
         "client/events_writer.i",
-        "client/server_lib.i",
         "client/tf_session.i",
         "framework/python_op_gen.i",
         "lib/core/py_func.i",
@@ -995,6 +993,7 @@ tf_py_wrap_cc(
         "lib/io/py_record_writer.i",
         "platform/base.i",
         "platform/numpy.i",
+        "training/server_lib.i",
         "util/port.i",
         "util/py_checkpoint_reader.i",
     ],
@@ -1032,25 +1031,15 @@ py_library(
     ],
 )
 
-py_library(
-    name = "server_lib",
-    srcs = ["client/server_lib.py"],
-    srcs_version = "PY2AND3",
-    deps = [
-        ":pywrap_tensorflow",
-    ],
-)
-
 py_test(
     name = "server_lib_test",
     size = "small",
-    srcs = ["client/server_lib_test.py"],
+    srcs = ["training/server_lib_test.py"],
     srcs_version = "PY2AND3",
     deps = [
         ":extra_py_tests_deps",
         ":framework",
         ":framework_test_lib",
-        ":server_lib",
         ":session",
     ],
 )
@@ -1261,6 +1250,7 @@ cuda_py_tests(
         ["training/*_test.py"],
         exclude = [
             "training/input_test.py",
+            "training/server_lib_test.py",
             "training/session_manager_test.py",
             "training/supervisor_test.py",
         ],
 
@@ -127,8 +127,6 @@
 # documentation, or remove.
 __all__.extend([
     'AttrValue',
-    'ClusterDef',
-    'ClusterSpec',
     'ConfigProto',
     'Event',
     'GPUOptions',
@@ -137,17 +135,14 @@
     'GRAPH_DEF_VERSION_MIN_PRODUCER',
     'GraphDef',
     'GraphOptions',
-    'GrpcServer',
     'HistogramProto',
-    'JobDef',
     'LogMessage',
     'NameAttrList',
     'NodeDef',
     'OptimizerOptions',
     'PaddingFIFOQueue',
     'RunOptions',
     'RunMetadata',
-    'ServerDef',
     'SessionLog',
     'Summary',
     'arg_max',
 
@@ -51,13 +51,6 @@
 from __future__ import division
 from __future__ import print_function
 
-# NOTE(mrry): Support for `tf.GrpcServer` is currently experimental.
-from tensorflow.core.protobuf.tensorflow_server_pb2 import ClusterDef
-from tensorflow.core.protobuf.tensorflow_server_pb2 import JobDef
-from tensorflow.core.protobuf.tensorflow_server_pb2 import ServerDef
-from tensorflow.python.client.server_lib import ClusterSpec
-from tensorflow.python.client.server_lib import GrpcServer
-
 from tensorflow.python.client.session import InteractiveSession
 from tensorflow.python.client.session import Session
 
 
@@ -29,7 +29,8 @@ limitations under the License.
 %include "tensorflow/python/client/events_writer.i"
 
 %include "tensorflow/python/client/tf_session.i"
-%include "tensorflow/python/client/server_lib.i"
 %include "tensorflow/python/client/device_lib.i"
 
+%include "tensorflow/python/training/server_lib.i"
+
 %include "tensorflow/python/framework/python_op_gen.i"
@@ -18,9 +18,9 @@
 from __future__ import print_function
 
 from tensorflow.core.framework import graph_pb2
-from tensorflow.python.client import server_lib
 from tensorflow.python.framework import device as pydev
 from tensorflow.python.platform import logging
+from tensorflow.python.training import server_lib
 
 
 class _ReplicaDeviceChooser(object):
@@ -146,9 +146,9 @@ def replica_device_setter(ps_tasks=0, ps_device="/job:ps",
   """
   if cluster is not None:
     if isinstance(cluster, server_lib.ClusterSpec):
-      cluster_spec = cluster.as_cluster_spec()
+      cluster_spec = cluster.as_dict()
     else:
-      cluster_spec = server_lib.ClusterSpec(cluster).as_cluster_spec()
+      cluster_spec = server_lib.ClusterSpec(cluster).as_dict()
     # Get ps_job_name from ps_device by striping "/job:".
     ps_job_name = ps_device.lstrip("/job:")
     if ps_job_name not in cluster_spec or cluster_spec[ps_job_name] is None:
 
@@ -22,7 +22,7 @@
 
 class DeviceSetterTest(tf.test.TestCase):
 
-  _cluster_spec = tf.ClusterSpec({
+  _cluster_spec = tf.train.ClusterSpec({
       "ps": ["ps0:2222", "ps1:2222"],
       "worker": ["worker0:2222", "worker1:2222", "worker2:2222"]})
 
@@ -39,7 +39,7 @@ def testPS2TasksWithCluserSpecClass(self):
 
   def testPS2TasksWithClusterSpecDict(self):
     with tf.device(tf.train.replica_device_setter(
-        cluster=self._cluster_spec.as_cluster_spec())):
+        cluster=self._cluster_spec.as_dict())):
       v = tf.Variable([1, 2])
       w = tf.Variable([2, 1])
       a = v + w
@@ -62,7 +62,7 @@ def testPS2TasksWithClusterDef(self):
       self.assertDeviceEqual("/job:worker", a.device)
 
   def testPS2TasksWithDevice(self):
-    cluster_spec = tf.ClusterSpec({
+    cluster_spec = tf.train.ClusterSpec({
         "sun": ["sun0:2222", "sun1:2222", "sun2:2222"],
         "moon": ["moon0:2222", "moon1:2222"]})