diff --git a/client/go/LICENSE b/client/LICENSE
similarity index 100%
rename from client/go/LICENSE
rename to client/LICENSE
diff --git a/client/go/ledis/client.go b/client/goledis/client.go
similarity index 100%
rename from client/go/ledis/client.go
rename to client/goledis/client.go
diff --git a/client/go/ledis/conn.go b/client/goledis/conn.go
similarity index 100%
rename from client/go/ledis/conn.go
rename to client/goledis/conn.go
diff --git a/client/go/ledis/doc.go b/client/goledis/doc.go
similarity index 100%
rename from client/go/ledis/doc.go
rename to client/goledis/doc.go
diff --git a/client/go/ledis/garyburd_license b/client/goledis/garyburd_license
similarity index 100%
rename from client/go/ledis/garyburd_license
rename to client/goledis/garyburd_license
diff --git a/client/go/ledis/ledis_test.go b/client/goledis/ledis_test.go
similarity index 100%
rename from client/go/ledis/ledis_test.go
rename to client/goledis/ledis_test.go
diff --git a/client/go/ledis/reply.go b/client/goledis/reply.go
similarity index 100%
rename from client/go/ledis/reply.go
rename to client/goledis/reply.go
diff --git a/cmd/ledis-benchmark/main.go b/cmd/ledis-benchmark/main.go
index 537aeef..2c861c9 100644
--- a/cmd/ledis-benchmark/main.go
+++ b/cmd/ledis-benchmark/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/siddontang/ledisdb/client/go/ledis"
+	"github.com/siddontang/ledisdb/client/goledis"
 	"math/rand"
 	"runtime"
 	"strings"
diff --git a/cmd/ledis-cli/main.go b/cmd/ledis-cli/main.go
index ba97b30..e66fc11 100644
--- a/cmd/ledis-cli/main.go
+++ b/cmd/ledis-cli/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/siddontang/ledisdb/client/go/ledis"
+	"github.com/siddontang/ledisdb/client/goledis"
 	"regexp"
 	"strconv"
 	"strings"
diff --git a/cmd/ledis-dump/main.go b/cmd/ledis-dump/main.go
index c7c8f9e..b6dd99e 100644
--- a/cmd/ledis-dump/main.go
+++ b/cmd/ledis-dump/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/siddontang/ledisdb/client/go/ledis"
+	"github.com/siddontang/ledisdb/client/goledis"
 	"os"
 )
 
diff --git a/server/app.go b/server/app.go
index 6937150..12ef2d7 100644
--- a/server/app.go
+++ b/server/app.go
@@ -1,7 +1,7 @@
 package server
 
 import (
-	goledis "github.com/siddontang/ledisdb/client/go/ledis"
+	goledis "github.com/siddontang/ledisdb/client/goledis"
 	"github.com/siddontang/ledisdb/config"
 	"github.com/siddontang/ledisdb/ledis"
 	"net"
diff --git a/server/app_test.go b/server/app_test.go
index 80c8909..3a23538 100644
--- a/server/app_test.go
+++ b/server/app_test.go
@@ -1,7 +1,7 @@
 package server
 
 import (
-	"github.com/siddontang/ledisdb/client/go/ledis"
+	"github.com/siddontang/ledisdb/client/goledis"
 	"github.com/siddontang/ledisdb/config"
 	"os"
 	"sync"
diff --git a/server/cmd_bit_test.go b/server/cmd_bit_test.go
index a8f84fb..f6344c4 100644
--- a/server/cmd_bit_test.go
+++ b/server/cmd_bit_test.go
@@ -1,7 +1,7 @@
 package server
 
 // import (
-// 	"github.com/siddontang/ledisdb/client/go/ledis"
+// 	"github.com/siddontang/ledisdb/client/goledis"
 // 	"testing"
 // )
 
diff --git a/server/cmd_hash_test.go b/server/cmd_hash_test.go
index 7ff5f40..dbf03db 100644
--- a/server/cmd_hash_test.go
+++ b/server/cmd_hash_test.go
@@ -2,7 +2,7 @@ package server
 
 import (
 	"fmt"
-	"github.com/siddontang/ledisdb/client/go/ledis"
+	"github.com/siddontang/ledisdb/client/goledis"
 	"strconv"
 	"testing"
 )
diff --git a/server/cmd_kv_test.go b/server/cmd_kv_test.go
index e02066f..b4497f9 100644
--- a/server/cmd_kv_test.go
+++ b/server/cmd_kv_test.go
@@ -1,7 +1,7 @@
 package server
 
 import (
-	"github.com/siddontang/ledisdb/client/go/ledis"
+	"github.com/siddontang/ledisdb/client/goledis"
 	"testing"
 )
 
diff --git a/server/cmd_list_test.go b/server/cmd_list_test.go
index 526862b..cb5a1e0 100644
--- a/server/cmd_list_test.go
+++ b/server/cmd_list_test.go
@@ -2,7 +2,7 @@ package server
 
 import (
 	"fmt"
-	"github.com/siddontang/ledisdb/client/go/ledis"
+	"github.com/siddontang/ledisdb/client/goledis"
 	"strconv"
 	"testing"
 )
diff --git a/server/cmd_migrate.go b/server/cmd_migrate.go
index 186c62d..1098e13 100644
--- a/server/cmd_migrate.go
+++ b/server/cmd_migrate.go
@@ -2,7 +2,7 @@ package server
 
 import (
 	"fmt"
-	goledis "github.com/siddontang/ledisdb/client/go/ledis"
+	goledis "github.com/siddontang/ledisdb/client/goledis"
 	"github.com/siddontang/ledisdb/ledis"
 	"strings"
 	"time"
diff --git a/server/cmd_migrate_test.go b/server/cmd_migrate_test.go
index 669043a..0bfc6cb 100644
--- a/server/cmd_migrate_test.go
+++ b/server/cmd_migrate_test.go
@@ -2,7 +2,7 @@ package server
 
 import (
 	"fmt"
-	"github.com/siddontang/ledisdb/client/go/ledis"
+	"github.com/siddontang/ledisdb/client/goledis"
 	"github.com/siddontang/ledisdb/config"
 	"os"
 	"testing"
diff --git a/server/cmd_replication_test.go b/server/cmd_replication_test.go
index f2a47a2..f4c13fc 100644
--- a/server/cmd_replication_test.go
+++ b/server/cmd_replication_test.go
@@ -2,7 +2,7 @@ package server
 
 import (
 	"fmt"
-	goledis "github.com/siddontang/ledisdb/client/go/ledis"
+	goledis "github.com/siddontang/ledisdb/client/goledis"
 	"github.com/siddontang/ledisdb/config"
 	"os"
 	"reflect"
diff --git a/server/cmd_scan_test.go b/server/cmd_scan_test.go
index 7ebb5ba..328ecad 100644
--- a/server/cmd_scan_test.go
+++ b/server/cmd_scan_test.go
@@ -2,7 +2,7 @@ package server
 
 import (
 	"fmt"
-	"github.com/siddontang/ledisdb/client/go/ledis"
+	"github.com/siddontang/ledisdb/client/goledis"
 	"github.com/siddontang/ledisdb/config"
 	"os"
 	"testing"
diff --git a/server/cmd_script_test.go b/server/cmd_script_test.go
index 017e527..88758fd 100644
--- a/server/cmd_script_test.go
+++ b/server/cmd_script_test.go
@@ -4,7 +4,7 @@ package server
 
 import (
 	"fmt"
-	"github.com/siddontang/ledisdb/client/go/ledis"
+	"github.com/siddontang/ledisdb/client/goledis"
 	"reflect"
 	"testing"
 )
diff --git a/server/cmd_set_test.go b/server/cmd_set_test.go
index 03c0702..83b44e9 100644
--- a/server/cmd_set_test.go
+++ b/server/cmd_set_test.go
@@ -1,7 +1,7 @@
 package server
 
 import (
-	"github.com/siddontang/ledisdb/client/go/ledis"
+	"github.com/siddontang/ledisdb/client/goledis"
 	"testing"
 )
 
diff --git a/server/cmd_sort_test.go b/server/cmd_sort_test.go
index 9812611..d70dc05 100644
--- a/server/cmd_sort_test.go
+++ b/server/cmd_sort_test.go
@@ -2,7 +2,7 @@ package server
 
 import (
 	"fmt"
-	goledis "github.com/siddontang/ledisdb/client/go/ledis"
+	goledis "github.com/siddontang/ledisdb/client/goledis"
 	"testing"
 )
 
diff --git a/server/cmd_ttl_test.go b/server/cmd_ttl_test.go
index 5be1347..0b4d161 100644
--- a/server/cmd_ttl_test.go
+++ b/server/cmd_ttl_test.go
@@ -2,7 +2,7 @@ package server
 
 import (
 	"fmt"
-	"github.com/siddontang/ledisdb/client/go/ledis"
+	"github.com/siddontang/ledisdb/client/goledis"
 	"testing"
 	"time"
 )
diff --git a/server/cmd_zset_test.go b/server/cmd_zset_test.go
index 7760e7b..fa5224d 100644
--- a/server/cmd_zset_test.go
+++ b/server/cmd_zset_test.go
@@ -2,7 +2,7 @@ package server
 
 import (
 	"fmt"
-	"github.com/siddontang/ledisdb/client/go/ledis"
+	"github.com/siddontang/ledisdb/client/goledis"
 	"reflect"
 	"strconv"
 	"testing"
diff --git a/server/replication.go b/server/replication.go
index 3cf0eb7..8663203 100644
--- a/server/replication.go
+++ b/server/replication.go
@@ -7,7 +7,7 @@ import (
 	"github.com/siddontang/go/log"
 	"github.com/siddontang/go/num"
 	"github.com/siddontang/go/sync2"
-	goledis "github.com/siddontang/ledisdb/client/go/ledis"
+	goledis "github.com/siddontang/ledisdb/client/goledis"
 	"github.com/siddontang/ledisdb/ledis"
 	"github.com/siddontang/ledisdb/rpl"
 	"net"