diff --git a/paddle/go/cmake/CMakeDetermineGoCompiler.cmake b/go/cmake/CMakeDetermineGoCompiler.cmake
similarity index 100%
rename from paddle/go/cmake/CMakeDetermineGoCompiler.cmake
rename to go/cmake/CMakeDetermineGoCompiler.cmake
diff --git a/paddle/go/cmake/CMakeGoCompiler.cmake.in b/go/cmake/CMakeGoCompiler.cmake.in
similarity index 100%
rename from paddle/go/cmake/CMakeGoCompiler.cmake.in
rename to go/cmake/CMakeGoCompiler.cmake.in
diff --git a/paddle/go/cmake/CMakeGoInformation.cmake b/go/cmake/CMakeGoInformation.cmake
similarity index 100%
rename from paddle/go/cmake/CMakeGoInformation.cmake
rename to go/cmake/CMakeGoInformation.cmake
diff --git a/paddle/go/cmake/CMakeTestGoCompiler.cmake b/go/cmake/CMakeTestGoCompiler.cmake
similarity index 100%
rename from paddle/go/cmake/CMakeTestGoCompiler.cmake
rename to go/cmake/CMakeTestGoCompiler.cmake
diff --git a/paddle/go/cmake/flags.cmake b/go/cmake/flags.cmake
similarity index 100%
rename from paddle/go/cmake/flags.cmake
rename to go/cmake/flags.cmake
diff --git a/paddle/go/cmake/golang.cmake b/go/cmake/golang.cmake
similarity index 100%
rename from paddle/go/cmake/golang.cmake
rename to go/cmake/golang.cmake
diff --git a/paddle/go/cmd/master/master.go b/go/cmd/master/master.go
similarity index 94%
rename from paddle/go/cmd/master/master.go
rename to go/cmd/master/master.go
index ef1f87c2dd53b701810c82ae90eaf3f94ea15e47..cc6e45049a3a730426b451b309aa876717196619 100644
--- a/paddle/go/cmd/master/master.go
+++ b/go/cmd/master/master.go
@@ -13,8 +13,8 @@ import (
 
 	"github.com/namsral/flag"
 
-	"github.com/PaddlePaddle/Paddle/paddle/go/master"
-	"github.com/PaddlePaddle/Paddle/paddle/go/recordio"
+	"github.com/PaddlePaddle/Paddle/go/master"
+	"github.com/PaddlePaddle/Paddle/go/recordio"
 )
 
 func main() {
diff --git a/paddle/go/cmd/pserver/.gitignore b/go/cmd/pserver/.gitignore
similarity index 100%
rename from paddle/go/cmd/pserver/.gitignore
rename to go/cmd/pserver/.gitignore
diff --git a/paddle/go/cmd/pserver/pserver.go b/go/cmd/pserver/pserver.go
similarity index 89%
rename from paddle/go/cmd/pserver/pserver.go
rename to go/cmd/pserver/pserver.go
index bd4bfc7028302df1c3e6ecd3cc9ebb11b158df01..f0be251c2471cc9ddc069f040417b5181a78c058 100644
--- a/paddle/go/cmd/pserver/pserver.go
+++ b/go/cmd/pserver/pserver.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/namsral/flag"
 
-	"github.com/PaddlePaddle/Paddle/paddle/go/pserver"
+	"github.com/PaddlePaddle/Paddle/go/pserver"
 )
 
 func main() {
diff --git a/paddle/go/master/service.go b/go/master/service.go
similarity index 98%
rename from paddle/go/master/service.go
rename to go/master/service.go
index 75266482870c448fcde7359640bc4773c200fecb..50e646b01f08c8e16fc46dd0be33402751c26c35 100644
--- a/paddle/go/master/service.go
+++ b/go/master/service.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/PaddlePaddle/Paddle/paddle/go/recordio"
+	"github.com/PaddlePaddle/Paddle/go/recordio"
 )
 
 const (
diff --git a/paddle/go/master/service_internal_test.go b/go/master/service_internal_test.go
similarity index 100%
rename from paddle/go/master/service_internal_test.go
rename to go/master/service_internal_test.go
diff --git a/paddle/go/cclient/CMakeLists.txt b/go/pserver/cclient/CMakeLists.txt
similarity index 82%
rename from paddle/go/cclient/CMakeLists.txt
rename to go/pserver/cclient/CMakeLists.txt
index dfd104fb589203e31ff183f134735fd302b263ab..c017d7465611373309c6c60141fed864f5ccfb5d 100644
--- a/paddle/go/cclient/CMakeLists.txt
+++ b/go/pserver/cclient/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
 
 get_filename_component(PARENT_DIR ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
+get_filename_component(PARENT_DIR ${PARENT_DIR} DIRECTORY)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PARENT_DIR}/cmake")
 
 project(cxx_go C Go)
diff --git a/paddle/go/cclient/cclient.go b/go/pserver/cclient/cclient.go
similarity index 99%
rename from paddle/go/cclient/cclient.go
rename to go/pserver/cclient/cclient.go
index ee2d9d24fd82fffd8b77210c6c167c3364cc6da2..1b5560451a89056dd71939a072d809bf7f00fc3f 100644
--- a/paddle/go/cclient/cclient.go
+++ b/go/pserver/cclient/cclient.go
@@ -42,7 +42,7 @@ import (
 	"sync"
 	"unsafe"
 
-	"github.com/PaddlePaddle/Paddle/paddle/go/pserver"
+	"github.com/PaddlePaddle/Paddle/go/pserver"
 )
 
 var nullPtr = unsafe.Pointer(uintptr(0))
diff --git a/paddle/go/cclient/test/CMakeLists.txt b/go/pserver/cclient/test/CMakeLists.txt
similarity index 100%
rename from paddle/go/cclient/test/CMakeLists.txt
rename to go/pserver/cclient/test/CMakeLists.txt
diff --git a/paddle/go/cclient/test/main.c b/go/pserver/cclient/test/main.c
similarity index 100%
rename from paddle/go/cclient/test/main.c
rename to go/pserver/cclient/test/main.c
diff --git a/paddle/go/pserver/client.go b/go/pserver/client.go
similarity index 100%
rename from paddle/go/pserver/client.go
rename to go/pserver/client.go
diff --git a/paddle/go/pserver/optimizer.c b/go/pserver/optimizer.c
similarity index 100%
rename from paddle/go/pserver/optimizer.c
rename to go/pserver/optimizer.c
diff --git a/paddle/go/pserver/optimizer.go b/go/pserver/optimizer.go
similarity index 100%
rename from paddle/go/pserver/optimizer.go
rename to go/pserver/optimizer.go
diff --git a/paddle/go/pserver/optimizer.h b/go/pserver/optimizer.h
similarity index 100%
rename from paddle/go/pserver/optimizer.h
rename to go/pserver/optimizer.h
diff --git a/paddle/go/pserver/optimizer_test.go b/go/pserver/optimizer_test.go
similarity index 100%
rename from paddle/go/pserver/optimizer_test.go
rename to go/pserver/optimizer_test.go
diff --git a/paddle/go/pserver/service.go b/go/pserver/service.go
similarity index 100%
rename from paddle/go/pserver/service.go
rename to go/pserver/service.go
diff --git a/paddle/go/pserver/service_test.go b/go/pserver/service_test.go
similarity index 98%
rename from paddle/go/pserver/service_test.go
rename to go/pserver/service_test.go
index 10185bd0f2096bd85ff7d0fb688a4aa820e5308c..c58ccf9231d5d2d0bbfaf1e583f7b1ecc79e11cd 100644
--- a/paddle/go/pserver/service_test.go
+++ b/go/pserver/service_test.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/PaddlePaddle/Paddle/paddle/go/pserver"
+	"github.com/PaddlePaddle/Paddle/go/pserver"
 )
 
 func TestFull(t *testing.T) {
diff --git a/paddle/go/recordio/README.md b/go/recordio/README.md
similarity index 100%
rename from paddle/go/recordio/README.md
rename to go/recordio/README.md
diff --git a/paddle/go/crecordio/CMakeLists.txt b/go/recordio/c/CMakeLists.txt
similarity index 82%
rename from paddle/go/crecordio/CMakeLists.txt
rename to go/recordio/c/CMakeLists.txt
index c395fe0b4a483c5a7db282d9f02c19bb143c5aeb..c300c091f8710a0c0c978f051370224c6de1a5c6 100644
--- a/paddle/go/crecordio/CMakeLists.txt
+++ b/go/recordio/c/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
 
 get_filename_component(PARENT_DIR ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
+get_filename_component(PARENT_DIR ${PARENT_DIR} DIRECTORY)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PARENT_DIR}/cmake")
 
 project(cxx_go C Go)
diff --git a/paddle/go/crecordio/crecordio.go b/go/recordio/c/crecordio.go
similarity index 97%
rename from paddle/go/crecordio/crecordio.go
rename to go/recordio/c/crecordio.go
index 33f97de8cf73be01313e0a8b27815489dbaceb64..e5cc30299285adfa4eeec814e7b52577caf1631f 100644
--- a/paddle/go/crecordio/crecordio.go
+++ b/go/recordio/c/crecordio.go
@@ -14,7 +14,7 @@ import (
 	"strings"
 	"unsafe"
 
-	"github.com/PaddlePaddle/Paddle/paddle/go/recordio"
+	"github.com/PaddlePaddle/Paddle/go/recordio"
 )
 
 var nullPtr = unsafe.Pointer(uintptr(0))
diff --git a/paddle/go/crecordio/register.go b/go/recordio/c/register.go
similarity index 100%
rename from paddle/go/crecordio/register.go
rename to go/recordio/c/register.go
diff --git a/paddle/go/crecordio/test/CMakeLists.txt b/go/recordio/c/test/CMakeLists.txt
similarity index 100%
rename from paddle/go/crecordio/test/CMakeLists.txt
rename to go/recordio/c/test/CMakeLists.txt
diff --git a/paddle/go/crecordio/test/test.c b/go/recordio/c/test/test.c
similarity index 100%
rename from paddle/go/crecordio/test/test.c
rename to go/recordio/c/test/test.c
diff --git a/paddle/go/recordio/chunk.go b/go/recordio/chunk.go
similarity index 100%
rename from paddle/go/recordio/chunk.go
rename to go/recordio/chunk.go
diff --git a/paddle/go/recordio/header.go b/go/recordio/header.go
similarity index 100%
rename from paddle/go/recordio/header.go
rename to go/recordio/header.go
diff --git a/paddle/go/recordio/range_scanner.go b/go/recordio/range_scanner.go
similarity index 100%
rename from paddle/go/recordio/range_scanner.go
rename to go/recordio/range_scanner.go
diff --git a/paddle/go/recordio/recordio_internal_test.go b/go/recordio/recordio_internal_test.go
similarity index 100%
rename from paddle/go/recordio/recordio_internal_test.go
rename to go/recordio/recordio_internal_test.go
diff --git a/paddle/go/recordio/recordio_test.go b/go/recordio/recordio_test.go
similarity index 96%
rename from paddle/go/recordio/recordio_test.go
rename to go/recordio/recordio_test.go
index ab117d2050e6ac18ef63021081a684f259299803..e4ef835afa6b4cc0e2bf24e9cbc544565ff8ca50 100644
--- a/paddle/go/recordio/recordio_test.go
+++ b/go/recordio/recordio_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/PaddlePaddle/Paddle/paddle/go/recordio"
+	"github.com/PaddlePaddle/Paddle/go/recordio"
 )
 
 func TestWriteRead(t *testing.T) {
diff --git a/paddle/go/recordio/scanner.go b/go/recordio/scanner.go
similarity index 100%
rename from paddle/go/recordio/scanner.go
rename to go/recordio/scanner.go
diff --git a/paddle/go/recordio/writer.go b/go/recordio/writer.go
similarity index 100%
rename from paddle/go/recordio/writer.go
rename to go/recordio/writer.go