diff --git a/paddle/go/pserver/lib/client/.gitignore b/paddle/go/cclient/.gitignore
similarity index 100%
rename from paddle/go/pserver/lib/client/.gitignore
rename to paddle/go/cclient/.gitignore
diff --git a/paddle/go/pserver/lib/CMakeLists.txt b/paddle/go/cclient/CMakeLists.txt
similarity index 86%
rename from paddle/go/pserver/lib/CMakeLists.txt
rename to paddle/go/cclient/CMakeLists.txt
index eb98f4b0b6795c144cfbf903d895097f6dceae58..29a2089fb10baf24ca4ab77675987c41cbea1c37 100644
--- a/paddle/go/pserver/lib/CMakeLists.txt
+++ b/paddle/go/cclient/CMakeLists.txt
@@ -10,7 +10,6 @@ else()
   # find cmake directory modules
   get_filename_component(PARENT_DIR ${PARENT_DIR} DIRECTORY)
   get_filename_component(PARENT_DIR ${PARENT_DIR} DIRECTORY)
-  get_filename_component(PARENT_DIR ${PARENT_DIR} DIRECTORY)
 
   set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PARENT_DIR}/cmake")
 
@@ -30,4 +29,6 @@ project(cxx_go CXX C Go)
 include(cmake/golang.cmake)
 include(cmake/flags.cmake)
 
-add_subdirectory(client)
+ExternalGoProject_Add(pserver github.com/PaddlePaddle/Paddle/paddle/go/pserver)
+add_go_library(client STATIC pserver)
+add_subdirectory(test)
diff --git a/paddle/go/pserver/lib/client/main.go b/paddle/go/cclient/cclient.go
similarity index 100%
rename from paddle/go/pserver/lib/client/main.go
rename to paddle/go/cclient/cclient.go
diff --git a/paddle/go/pserver/lib/cmake/CMakeDetermineGoCompiler.cmake b/paddle/go/cclient/cmake/CMakeDetermineGoCompiler.cmake
similarity index 100%
rename from paddle/go/pserver/lib/cmake/CMakeDetermineGoCompiler.cmake
rename to paddle/go/cclient/cmake/CMakeDetermineGoCompiler.cmake
diff --git a/paddle/go/pserver/lib/cmake/CMakeGoCompiler.cmake.in b/paddle/go/cclient/cmake/CMakeGoCompiler.cmake.in
similarity index 100%
rename from paddle/go/pserver/lib/cmake/CMakeGoCompiler.cmake.in
rename to paddle/go/cclient/cmake/CMakeGoCompiler.cmake.in
diff --git a/paddle/go/pserver/lib/cmake/CMakeGoInformation.cmake b/paddle/go/cclient/cmake/CMakeGoInformation.cmake
similarity index 100%
rename from paddle/go/pserver/lib/cmake/CMakeGoInformation.cmake
rename to paddle/go/cclient/cmake/CMakeGoInformation.cmake
diff --git a/paddle/go/pserver/lib/cmake/CMakeTestGoCompiler.cmake b/paddle/go/cclient/cmake/CMakeTestGoCompiler.cmake
similarity index 100%
rename from paddle/go/pserver/lib/cmake/CMakeTestGoCompiler.cmake
rename to paddle/go/cclient/cmake/CMakeTestGoCompiler.cmake
diff --git a/paddle/go/pserver/lib/cmake/flags.cmake b/paddle/go/cclient/cmake/flags.cmake
similarity index 100%
rename from paddle/go/pserver/lib/cmake/flags.cmake
rename to paddle/go/cclient/cmake/flags.cmake
diff --git a/paddle/go/pserver/lib/cmake/golang.cmake b/paddle/go/cclient/cmake/golang.cmake
similarity index 100%
rename from paddle/go/pserver/lib/cmake/golang.cmake
rename to paddle/go/cclient/cmake/golang.cmake
diff --git a/paddle/go/pserver/lib/client/test/CMakeLists.txt b/paddle/go/cclient/test/CMakeLists.txt
similarity index 68%
rename from paddle/go/pserver/lib/client/test/CMakeLists.txt
rename to paddle/go/cclient/test/CMakeLists.txt
index 895f0f66c9028f120be8c8ba782f19b8e3a95912..c899bd275d37bc28d4aefb2476310581a57e5bb4 100644
--- a/paddle/go/pserver/lib/client/test/CMakeLists.txt
+++ b/paddle/go/cclient/test/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.0)
 
-include_directories(/env/gopath/src/github.com/PaddlePaddle/Paddle/paddle/go/pserver/lib/build/client)
+include_directories(/env/gopath/src/github.com/PaddlePaddle/Paddle/paddle/go/cclient/build/)
 
 add_executable(main main.c)
 add_dependencies(main client)
 set (CMAKE_EXE_LINKER_FLAGS "-pthread")
-target_link_libraries(main /env/gopath/src/github.com/PaddlePaddle/Paddle/paddle/go/pserver/lib/build/client/libclient.a) # ${GTEST_LIBRARIES})
+target_link_libraries(main /env/gopath/src/github.com/PaddlePaddle/Paddle/paddle/go/cclient/build/libclient.a) # ${GTEST_LIBRARIES})
diff --git a/paddle/go/pserver/lib/client/test/main.c b/paddle/go/cclient/test/main.c
similarity index 100%
rename from paddle/go/pserver/lib/client/test/main.c
rename to paddle/go/cclient/test/main.c
diff --git a/paddle/go/pserver/lib/client/CMakeLists.txt b/paddle/go/pserver/lib/client/CMakeLists.txt
deleted file mode 100644
index 0f6d47f27c17d270ed79eda77f1b65f369e6d6d5..0000000000000000000000000000000000000000
--- a/paddle/go/pserver/lib/client/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-
-ExternalGoProject_Add(pserver github.com/PaddlePaddle/Paddle/paddle/go/pserver)
-add_go_library(client STATIC pserver)
-add_subdirectory(test)