diff --git a/cmd/sb51/doc.go b/cmd/sb51/doc.go
index 0cd9c36..a9f5ad2 100644
--- a/cmd/sb51/doc.go
+++ b/cmd/sb51/doc.go
@@ -17,7 +17,7 @@
 // errors cause the shell to exit with a non-zero status.
 //
 // To build client:
-//     v23 go install v.io/syncbase/x/ref/syncbase/sb51
+//     v23 go install v.io/x/ref/syncbase/sb51
 //
 // To run client:
 //     $V23_ROOT/roadmap/go/bin/sb51 sh <appname> <dbname>
diff --git a/cmd/sb51/internal/demodb/db.go b/cmd/sb51/internal/demodb/db.go
index 2674361..9c073c1 100644
--- a/cmd/sb51/internal/demodb/db.go
+++ b/cmd/sb51/internal/demodb/db.go
@@ -8,9 +8,9 @@
 	"fmt"
 	"time"
 
-	wire "v.io/syncbase/v23/services/syncbase/nosql"
-	"v.io/syncbase/v23/syncbase/nosql"
 	"v.io/v23/context"
+	wire "v.io/v23/services/syncbase/nosql"
+	"v.io/v23/syncbase/nosql"
 	"v.io/v23/vdl"
 )
 
diff --git a/cmd/sb51/internal/writer/writer.go b/cmd/sb51/internal/writer/writer.go
index c7900b6..92ab1e5 100644
--- a/cmd/sb51/internal/writer/writer.go
+++ b/cmd/sb51/internal/writer/writer.go
@@ -13,7 +13,7 @@
 	"strings"
 	"unicode/utf8"
 
-	"v.io/syncbase/v23/syncbase/nosql"
+	"v.io/v23/syncbase/nosql"
 	"v.io/v23/vdl"
 	vtime "v.io/v23/vdlroot/time"
 )
diff --git a/cmd/sb51/internal/writer/writer_test.go b/cmd/sb51/internal/writer/writer_test.go
index 3d7c1f2..972fed0 100644
--- a/cmd/sb51/internal/writer/writer_test.go
+++ b/cmd/sb51/internal/writer/writer_test.go
@@ -10,10 +10,10 @@
 	"testing"
 	"time"
 
-	"v.io/syncbase/v23/syncbase/nosql"
-	db "v.io/syncbase/x/ref/syncbase/sb51/internal/demodb"
-	"v.io/syncbase/x/ref/syncbase/sb51/internal/writer"
+	"v.io/v23/syncbase/nosql"
 	"v.io/v23/vdl"
+	db "v.io/x/ref/syncbase/sb51/internal/demodb"
+	"v.io/x/ref/syncbase/sb51/internal/writer"
 )
 
 type fakeResultStream struct {
diff --git a/cmd/sb51/shell.go b/cmd/sb51/shell.go
index b5f18c0..b971fcc 100644
--- a/cmd/sb51/shell.go
+++ b/cmd/sb51/shell.go
@@ -15,14 +15,14 @@
 
 	isatty "github.com/mattn/go-isatty"
 
-	"v.io/syncbase/v23/syncbase"
-	"v.io/syncbase/v23/syncbase/nosql"
-	"v.io/syncbase/x/ref/syncbase/sb51/internal/demodb"
-	"v.io/syncbase/x/ref/syncbase/sb51/internal/reader"
-	"v.io/syncbase/x/ref/syncbase/sb51/internal/writer"
 	"v.io/v23/context"
+	"v.io/v23/syncbase"
+	"v.io/v23/syncbase/nosql"
 	"v.io/x/lib/cmdline"
 	"v.io/x/ref/lib/v23cmd"
+	"v.io/x/ref/syncbase/sb51/internal/demodb"
+	"v.io/x/ref/syncbase/sb51/internal/reader"
+	"v.io/x/ref/syncbase/sb51/internal/writer"
 )
 
 var cmdSbShell = &cmdline.Command{
diff --git a/lib/vdl/codegen/java/file_struct.go b/lib/vdl/codegen/java/file_struct.go
index 941b9fa..210890b 100644
--- a/lib/vdl/codegen/java/file_struct.go
+++ b/lib/vdl/codegen/java/file_struct.go
@@ -164,7 +164,7 @@
 			AccessModifier:      accessModifierForName(fld.Name),
 			Class:               javaType(fld.Type, true, env),
 			Doc:                 javaDoc(tdef.FieldDoc[i], tdef.FieldDocSuffix[i]),
-			HashcodeComputation: javaHashCode("this." + vdlutil.FirstRuneToLower(fld.Name), fld.Type, env),
+			HashcodeComputation: javaHashCode("this."+vdlutil.FirstRuneToLower(fld.Name), fld.Type, env),
 			IsClass:             isClass(fld.Type, env),
 			IsArray:             isJavaNativeArray(fld.Type, env),
 			LowercaseName:       vdlutil.FirstRuneToLower(fld.Name),
diff --git a/runtime/internal/flow/conn/types.vdl b/runtime/internal/flow/conn/types.vdl
index de776fa..89cfe9e 100644
--- a/runtime/internal/flow/conn/types.vdl
+++ b/runtime/internal/flow/conn/types.vdl
@@ -15,4 +15,4 @@
      Blessings  security.WireBlessings
      Discharges []security.WireDischarge
      BKey, DKey uint64
-}
\ No newline at end of file
+}
diff --git a/runtime/internal/flow/flowcontrol/errors.vdl b/runtime/internal/flow/flowcontrol/errors.vdl
index ddcab17..fd6ece6 100644
--- a/runtime/internal/flow/flowcontrol/errors.vdl
+++ b/runtime/internal/flow/flowcontrol/errors.vdl
@@ -12,4 +12,4 @@
 error (
   ConcurrentRun() {"en": "Run called concurrently"}
   WrongFlowController() {"en": "Release called for worker from different flow controller"}
-)
\ No newline at end of file
+)
diff --git a/runtime/internal/flow/manager/errors.vdl b/runtime/internal/flow/manager/errors.vdl
index 7598b21..4ea50bc 100644
--- a/runtime/internal/flow/manager/errors.vdl
+++ b/runtime/internal/flow/manager/errors.vdl
@@ -15,4 +15,4 @@
   AcceptFailed(err error) {"en": "accept failed{:err}"}
   CacheClosed() {"en":"cache is closed"}
   ConnKilledToFreeResources() {"en": "Connection killed to free resources."}
-)
\ No newline at end of file
+)
diff --git a/runtime/internal/lib/framer/errors.vdl b/runtime/internal/lib/framer/errors.vdl
index 0c2f74b..1d82b65 100644
--- a/runtime/internal/lib/framer/errors.vdl
+++ b/runtime/internal/lib/framer/errors.vdl
@@ -11,4 +11,4 @@
 // TODO(suharshs,toddw): Allow skipping of {1}{2} in vdl generated errors.
 error (
   LargerThan3ByteUInt() {"en":"integer too large to represent in 3 bytes"}
-)
\ No newline at end of file
+)
diff --git a/runtime/internal/lib/xwebsocket/errors.vdl b/runtime/internal/lib/xwebsocket/errors.vdl
index 5d27eb3..3339785 100644
--- a/runtime/internal/lib/xwebsocket/errors.vdl
+++ b/runtime/internal/lib/xwebsocket/errors.vdl
@@ -7,4 +7,4 @@
 error (
   ListenerClosed() {"en":"listener is already closed."}
   ListenCalledInNaCl() {"en": "Listen cannot be called in NaCl code."}
-)
\ No newline at end of file
+)
diff --git a/services/groups/internal/store/leveldb/store.go b/services/groups/internal/store/leveldb/store.go
index 964883c..e865c35 100644
--- a/services/groups/internal/store/leveldb/store.go
+++ b/services/groups/internal/store/leveldb/store.go
@@ -9,13 +9,13 @@
 import (
 	"strconv"
 
-	istore "v.io/syncbase/x/ref/services/syncbase/store"
-	"v.io/syncbase/x/ref/services/syncbase/store/leveldb"
 	"v.io/v23/context"
 	"v.io/v23/vdl"
 	"v.io/v23/verror"
 	"v.io/v23/vom"
 	"v.io/x/ref/services/groups/internal/store"
+	istore "v.io/x/ref/services/syncbase/store"
+	"v.io/x/ref/services/syncbase/store/leveldb"
 )
 
 type entry struct {
diff --git a/services/mounttable/mounttablelib/mounttable.go b/services/mounttable/mounttablelib/mounttable.go
index 58cb1f2..e2e7743 100644
--- a/services/mounttable/mounttablelib/mounttable.go
+++ b/services/mounttable/mounttablelib/mounttable.go
@@ -495,7 +495,6 @@
 	return nil
 }
 
-
 // Mount a server onto the name in the receiver.
 func (ms *mountContext) Mount(ctx *context.T, call rpc.ServerCall, server string, ttlsecs uint32, flags naming.MountFlag) error {
 	ctx.VI(2).Infof("*********************Mount %q -> %s", ms.name, server)
diff --git a/services/mounttable/mounttablelib/mounttable_test.go b/services/mounttable/mounttablelib/mounttable_test.go
index d72fc39..ae52282 100644
--- a/services/mounttable/mounttablelib/mounttable_test.go
+++ b/services/mounttable/mounttablelib/mounttable_test.go
@@ -248,7 +248,7 @@
 	checkContents(t, rootCtx, naming.JoinAddressName(mtAddr, "stuff/nonexistant"), "falls mainly on the plain", false)
 	checkContents(t, bobCtx, naming.JoinAddressName(mtAddr, "stuff/the/rain"), "the rain", true)
 	checkContents(t, aliceCtx, naming.JoinAddressName(mtAddr, "stuff/the/rain"), "the rain", false)
-	
+
 	// Test name element too long.
 	rootCtx.Infof("Name element too long.")
 	doMount(t, rootCtx, mtAddr, "a/abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnop", collectionName, false)
diff --git a/services/mounttable/mounttablelib/testdata/invalid.perms b/services/mounttable/mounttablelib/testdata/invalid.perms
index 9d68933..1cc80ef 100644
--- a/services/mounttable/mounttablelib/testdata/invalid.perms
+++ b/services/mounttable/mounttablelib/testdata/invalid.perms
@@ -1 +1 @@
-"
\ No newline at end of file
+"
diff --git a/services/syncbase/clock/clockservice.go b/services/syncbase/clock/clockservice.go
index fed9a02..575f83a 100644
--- a/services/syncbase/clock/clockservice.go
+++ b/services/syncbase/clock/clockservice.go
@@ -8,10 +8,10 @@
 	"math"
 	"time"
 
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
 	"v.io/v23/context"
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
+	"v.io/x/ref/services/syncbase/server/util"
 )
 
 // This file contains code related to checking current system clock to see
diff --git a/services/syncbase/clock/ntp.go b/services/syncbase/clock/ntp.go
index ba55322..090cc96 100644
--- a/services/syncbase/clock/ntp.go
+++ b/services/syncbase/clock/ntp.go
@@ -9,7 +9,7 @@
 	"net"
 	"time"
 
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/server/util"
 )
 
 const (
diff --git a/services/syncbase/clock/ntpservice.go b/services/syncbase/clock/ntpservice.go
index 79045f3..7bf47c1 100644
--- a/services/syncbase/clock/ntpservice.go
+++ b/services/syncbase/clock/ntpservice.go
@@ -7,10 +7,10 @@
 import (
 	"math"
 
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
 	"v.io/v23/context"
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
+	"v.io/x/ref/services/syncbase/server/util"
 )
 
 // runNtpCheck talks to an NTP server, fetches the current UTC time from it
@@ -39,7 +39,7 @@
 	// Update clock skew if the difference between offset and skew is larger
 	// than NtpDiffThreshold. NtpDiffThreshold helps avoid constant tweaking of
 	// the syncbase clock.
-	if math.Abs(float64(offset.Nanoseconds() - data.Skew)) > util.NtpDiffThreshold {
+	if math.Abs(float64(offset.Nanoseconds()-data.Skew)) > util.NtpDiffThreshold {
 		writeNewClockData(ctx, c, offset)
 	}
 	return nil
diff --git a/services/syncbase/clock/storage_adapter.go b/services/syncbase/clock/storage_adapter.go
index 33b4cda..11f6d6b 100644
--- a/services/syncbase/clock/storage_adapter.go
+++ b/services/syncbase/clock/storage_adapter.go
@@ -5,9 +5,9 @@
 package clock
 
 import (
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/context"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 var _ StorageAdapter = (*storageAdapterImpl)(nil)
diff --git a/services/syncbase/clock/test_util.go b/services/syncbase/clock/test_util.go
index 6027f49..32673d1 100644
--- a/services/syncbase/clock/test_util.go
+++ b/services/syncbase/clock/test_util.go
@@ -57,7 +57,7 @@
 
 func MockSystemClock(now time.Time, elapsedTime time.Duration) *systemClockMockImpl {
 	return &systemClockMockImpl{
-		now: now,
+		now:         now,
 		elapsedTime: elapsedTime,
 	}
 }
diff --git a/services/syncbase/clock/types.go b/services/syncbase/clock/types.go
index 6934f11..4642397 100644
--- a/services/syncbase/clock/types.go
+++ b/services/syncbase/clock/types.go
@@ -44,7 +44,7 @@
 
 	// Delay is the round trip network delay experienced while talking to NTP
 	// server. The smaller the delay, the more accurate the offset is.
-	delay  time.Duration
+	delay time.Duration
 }
 
 func (cd *ClockData) SystemBootTime() time.Time {
diff --git a/services/syncbase/clock/types.vdl b/services/syncbase/clock/types.vdl
index b12f8f9..de02a5a 100644
--- a/services/syncbase/clock/types.vdl
+++ b/services/syncbase/clock/types.vdl
@@ -17,4 +17,4 @@
 	// This is used to determine if the device rebooted since the last run of
 	// clockservice.
 	ElapsedTimeSinceBoot int64
-}
\ No newline at end of file
+}
diff --git a/services/syncbase/clock/vclock.go b/services/syncbase/clock/vclock.go
index 95719f4..876e45b 100644
--- a/services/syncbase/clock/vclock.go
+++ b/services/syncbase/clock/vclock.go
@@ -7,10 +7,10 @@
 import (
 	"time"
 
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/context"
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // VClock holds data required to provide an estimate of the UTC time at any
diff --git a/services/syncbase/localblobstore/blobmap/blobmap.go b/services/syncbase/localblobstore/blobmap/blobmap.go
index c674f68..bc7906e 100644
--- a/services/syncbase/localblobstore/blobmap/blobmap.go
+++ b/services/syncbase/localblobstore/blobmap/blobmap.go
@@ -10,12 +10,12 @@
 import "encoding/binary"
 import "sync"
 
-import "v.io/syncbase/x/ref/services/syncbase/store"
-import "v.io/syncbase/x/ref/services/syncbase/store/leveldb"
+import "v.io/x/ref/services/syncbase/store"
+import "v.io/x/ref/services/syncbase/store/leveldb"
 import "v.io/v23/context"
 import "v.io/v23/verror"
 
-const pkgPath = "v.io/syncbase/x/ref/services/syncbase/localblobstore/blobmap"
+const pkgPath = "v.io/x/ref/services/syncbase/localblobstore/blobmap"
 
 var (
 	errBadBlobIDLen        = verror.Register(pkgPath+".errBadBlobIDLen", verror.NoRetry, "{1:}{2:} blobmap {3}: bad blob length {4} should be {5}{:_}")
diff --git a/services/syncbase/localblobstore/blobmap/blobmap_test.go b/services/syncbase/localblobstore/blobmap/blobmap_test.go
index 450049a..b765536 100644
--- a/services/syncbase/localblobstore/blobmap/blobmap_test.go
+++ b/services/syncbase/localblobstore/blobmap/blobmap_test.go
@@ -12,7 +12,7 @@
 import "runtime"
 import "testing"
 
-import "v.io/syncbase/x/ref/services/syncbase/localblobstore/blobmap"
+import "v.io/x/ref/services/syncbase/localblobstore/blobmap"
 import "v.io/v23/context"
 
 import "v.io/x/ref/test"
diff --git a/services/syncbase/localblobstore/chunker/chunker.go b/services/syncbase/localblobstore/chunker/chunker.go
index cb07533..2c7a264 100644
--- a/services/syncbase/localblobstore/chunker/chunker.go
+++ b/services/syncbase/localblobstore/chunker/chunker.go
@@ -32,11 +32,11 @@
 import "io"
 import "sync"
 
-import "v.io/syncbase/x/ref/services/syncbase/localblobstore/crc64window"
+import "v.io/x/ref/services/syncbase/localblobstore/crc64window"
 import "v.io/v23/context"
 import "v.io/v23/verror"
 
-const pkgPath = "v.io/syncbase/x/ref/services/syncbase/localblobstore/chunker"
+const pkgPath = "v.io/x/ref/services/syncbase/localblobstore/chunker"
 
 var (
 	errStreamCancelled = verror.Register(pkgPath+".errStreamCancelled", verror.NoRetry, "{1:}{2:} Advance() called on cancelled stream{:_}")
diff --git a/services/syncbase/localblobstore/chunker/chunker_test.go b/services/syncbase/localblobstore/chunker/chunker_test.go
index 57c6fed..ddbc8ac 100644
--- a/services/syncbase/localblobstore/chunker/chunker_test.go
+++ b/services/syncbase/localblobstore/chunker/chunker_test.go
@@ -11,8 +11,8 @@
 import "io"
 import "testing"
 
-import "v.io/syncbase/x/ref/services/syncbase/localblobstore/chunker"
-import "v.io/syncbase/x/ref/services/syncbase/localblobstore/localblobstore_testlib"
+import "v.io/x/ref/services/syncbase/localblobstore/chunker"
+import "v.io/x/ref/services/syncbase/localblobstore/localblobstore_testlib"
 import "v.io/v23/context"
 import "v.io/x/ref/test"
 import _ "v.io/x/ref/runtime/factories/generic"
diff --git a/services/syncbase/localblobstore/crc64window/crc64window_test.go b/services/syncbase/localblobstore/crc64window/crc64window_test.go
index 9969125..a68fddc 100644
--- a/services/syncbase/localblobstore/crc64window/crc64window_test.go
+++ b/services/syncbase/localblobstore/crc64window/crc64window_test.go
@@ -9,7 +9,7 @@
 import "math/rand"
 import "testing"
 
-import "v.io/syncbase/x/ref/services/syncbase/localblobstore/crc64window"
+import "v.io/x/ref/services/syncbase/localblobstore/crc64window"
 
 // A test for the example given in the package's specification.
 func TestCRC64WindowExample(t *testing.T) {
diff --git a/services/syncbase/localblobstore/fs_cablobstore/fs_cablobstore.go b/services/syncbase/localblobstore/fs_cablobstore/fs_cablobstore.go
index 4fb7500..ae4855f 100644
--- a/services/syncbase/localblobstore/fs_cablobstore/fs_cablobstore.go
+++ b/services/syncbase/localblobstore/fs_cablobstore/fs_cablobstore.go
@@ -49,13 +49,13 @@
 import "sync"
 import "time"
 
-import "v.io/syncbase/x/ref/services/syncbase/localblobstore"
-import "v.io/syncbase/x/ref/services/syncbase/localblobstore/chunker"
-import "v.io/syncbase/x/ref/services/syncbase/localblobstore/blobmap"
+import "v.io/x/ref/services/syncbase/localblobstore"
+import "v.io/x/ref/services/syncbase/localblobstore/chunker"
+import "v.io/x/ref/services/syncbase/localblobstore/blobmap"
 import "v.io/v23/context"
 import "v.io/v23/verror"
 
-const pkgPath = "v.io/syncbase/x/ref/services/syncbase/localblobstore/fs_cablobstore"
+const pkgPath = "v.io/x/ref/services/syncbase/localblobstore/fs_cablobstore"
 
 var (
 	errNotADir                = verror.Register(pkgPath+".errNotADir", verror.NoRetry, "{1:}{2:} Not a directory{:_}")
diff --git a/services/syncbase/localblobstore/fs_cablobstore/fs_cablobstore_test.go b/services/syncbase/localblobstore/fs_cablobstore/fs_cablobstore_test.go
index 0d964c3..5ad7093 100644
--- a/services/syncbase/localblobstore/fs_cablobstore/fs_cablobstore_test.go
+++ b/services/syncbase/localblobstore/fs_cablobstore/fs_cablobstore_test.go
@@ -9,9 +9,9 @@
 import "os"
 import "testing"
 
-import "v.io/syncbase/x/ref/services/syncbase/localblobstore"
-import "v.io/syncbase/x/ref/services/syncbase/localblobstore/fs_cablobstore"
-import "v.io/syncbase/x/ref/services/syncbase/localblobstore/localblobstore_testlib"
+import "v.io/x/ref/services/syncbase/localblobstore"
+import "v.io/x/ref/services/syncbase/localblobstore/fs_cablobstore"
+import "v.io/x/ref/services/syncbase/localblobstore/localblobstore_testlib"
 import "v.io/x/ref/test"
 import _ "v.io/x/ref/runtime/factories/generic"
 
diff --git a/services/syncbase/localblobstore/localblobstore_test.go b/services/syncbase/localblobstore/localblobstore_test.go
index a258c0f..f9ad9fd 100644
--- a/services/syncbase/localblobstore/localblobstore_test.go
+++ b/services/syncbase/localblobstore/localblobstore_test.go
@@ -9,9 +9,9 @@
 import "os"
 import "testing"
 
-import "v.io/syncbase/x/ref/services/syncbase/localblobstore"
-import "v.io/syncbase/x/ref/services/syncbase/localblobstore/fs_cablobstore"
-import "v.io/syncbase/x/ref/services/syncbase/localblobstore/localblobstore_testlib"
+import "v.io/x/ref/services/syncbase/localblobstore"
+import "v.io/x/ref/services/syncbase/localblobstore/fs_cablobstore"
+import "v.io/x/ref/services/syncbase/localblobstore/localblobstore_testlib"
 import "v.io/x/ref/test"
 import _ "v.io/x/ref/runtime/factories/generic"
 
diff --git a/services/syncbase/localblobstore/localblobstore_testlib/localblobstore_testlib.go b/services/syncbase/localblobstore/localblobstore_testlib/localblobstore_testlib.go
index d6c1d9d..19d2a6c 100644
--- a/services/syncbase/localblobstore/localblobstore_testlib/localblobstore_testlib.go
+++ b/services/syncbase/localblobstore/localblobstore_testlib/localblobstore_testlib.go
@@ -13,8 +13,8 @@
 import "path/filepath"
 import "testing"
 
-import "v.io/syncbase/x/ref/services/syncbase/localblobstore"
-import "v.io/syncbase/x/ref/services/syncbase/localblobstore/chunker"
+import "v.io/x/ref/services/syncbase/localblobstore"
+import "v.io/x/ref/services/syncbase/localblobstore/chunker"
 import "v.io/v23/context"
 import "v.io/v23/verror"
 
@@ -204,13 +204,13 @@
 
 					// Check that reads behave as expected.
 					if (whence == -1 || whence == 3) &&
-						verror.ErrorID(err) == "v.io/syncbase/x/ref/services/syncbase/localblobstore/fs_cablobstore.errBadSeekWhence" {
+						verror.ErrorID(err) == "v.io/x/ref/services/syncbase/localblobstore/fs_cablobstore.errBadSeekWhence" {
 						// Expected error from bad "whence" value.
 					} else if expectedPos < 0 &&
-						verror.ErrorID(err) == "v.io/syncbase/x/ref/services/syncbase/localblobstore/fs_cablobstore.errNegativeSeekPosition" {
+						verror.ErrorID(err) == "v.io/x/ref/services/syncbase/localblobstore/fs_cablobstore.errNegativeSeekPosition" {
 						// Expected error from negative Seek position.
 					} else if expectedPos > dataLen &&
-						verror.ErrorID(err) == "v.io/syncbase/x/ref/services/syncbase/localblobstore/fs_cablobstore.errIllegalPositionForRead" {
+						verror.ErrorID(err) == "v.io/x/ref/services/syncbase/localblobstore/fs_cablobstore.errIllegalPositionForRead" {
 						// Expected error from too high a Seek position.
 					} else if 0 <= expectedPos && expectedPos+expectedSize <= int64(len(data)) &&
 						bytes.Compare(data[expectedPos:expectedPos+expectedSize], content) == 0 && err == io.EOF &&
@@ -444,11 +444,11 @@
 	// -------------------------------------------------
 	// Ensure that deleting non-existent blobs fails.
 	err = bs.DeleteBlob(ctx, "../../../../etc/passwd")
-	if verror.ErrorID(err) != "v.io/syncbase/x/ref/services/syncbase/localblobstore/fs_cablobstore.errInvalidBlobName" {
+	if verror.ErrorID(err) != "v.io/x/ref/services/syncbase/localblobstore/fs_cablobstore.errInvalidBlobName" {
 		t.Errorf("DeleteBlob attempted to delete a bogus blob name")
 	}
 	err = bs.DeleteBlob(ctx, "foo/00/00/00/00000000000000000000000000")
-	if verror.ErrorID(err) != "v.io/syncbase/x/ref/services/syncbase/localblobstore/fs_cablobstore.errInvalidBlobName" {
+	if verror.ErrorID(err) != "v.io/x/ref/services/syncbase/localblobstore/fs_cablobstore.errInvalidBlobName" {
 		t.Errorf("DeleteBlob attempted to delete a bogus blob name")
 	}
 
diff --git a/services/syncbase/localblobstore/localblobstore_transfer_test.go b/services/syncbase/localblobstore/localblobstore_transfer_test.go
index b5378ec..5ec296b 100644
--- a/services/syncbase/localblobstore/localblobstore_transfer_test.go
+++ b/services/syncbase/localblobstore/localblobstore_transfer_test.go
@@ -14,8 +14,8 @@
 import "math/rand"
 import "os"
 
-import "v.io/syncbase/x/ref/services/syncbase/localblobstore"
-import "v.io/syncbase/x/ref/services/syncbase/localblobstore/fs_cablobstore"
+import "v.io/x/ref/services/syncbase/localblobstore"
+import "v.io/x/ref/services/syncbase/localblobstore/fs_cablobstore"
 import "v.io/v23/context"
 import "v.io/x/ref/test"
 import _ "v.io/x/ref/runtime/factories/generic"
diff --git a/services/syncbase/server/app.go b/services/syncbase/server/app.go
index c404f77..89469e3 100644
--- a/services/syncbase/server/app.go
+++ b/services/syncbase/server/app.go
@@ -8,18 +8,18 @@
 	"path"
 	"sync"
 
-	wire "v.io/syncbase/v23/services/syncbase"
-	nosqlwire "v.io/syncbase/v23/services/syncbase/nosql"
-	"v.io/syncbase/x/ref/services/syncbase/server/interfaces"
-	"v.io/syncbase/x/ref/services/syncbase/server/nosql"
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/context"
 	"v.io/v23/glob"
 	"v.io/v23/rpc"
 	"v.io/v23/security/access"
+	wire "v.io/v23/services/syncbase"
+	nosqlwire "v.io/v23/services/syncbase/nosql"
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
+	"v.io/x/ref/services/syncbase/server/interfaces"
+	"v.io/x/ref/services/syncbase/server/nosql"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // app is a per-app singleton (i.e. not per-request) that handles App RPCs.
diff --git a/services/syncbase/server/db_info.go b/services/syncbase/server/db_info.go
index f750d57..cc684d0 100644
--- a/services/syncbase/server/db_info.go
+++ b/services/syncbase/server/db_info.go
@@ -14,9 +14,9 @@
 // database's storage engine.
 
 import (
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/context"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 func dbInfoStKey(a *app, dbName string) string {
diff --git a/services/syncbase/server/dispatcher.go b/services/syncbase/server/dispatcher.go
index 4b51a00..dac3d34 100644
--- a/services/syncbase/server/dispatcher.go
+++ b/services/syncbase/server/dispatcher.go
@@ -7,15 +7,15 @@
 import (
 	"strings"
 
-	wire "v.io/syncbase/v23/services/syncbase"
-	pubutil "v.io/syncbase/v23/syncbase/util"
-	"v.io/syncbase/x/ref/services/syncbase/server/interfaces"
-	"v.io/syncbase/x/ref/services/syncbase/server/nosql"
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
 	"v.io/v23/context"
 	"v.io/v23/rpc"
 	"v.io/v23/security"
+	wire "v.io/v23/services/syncbase"
+	pubutil "v.io/v23/syncbase/util"
 	"v.io/v23/verror"
+	"v.io/x/ref/services/syncbase/server/interfaces"
+	"v.io/x/ref/services/syncbase/server/nosql"
+	"v.io/x/ref/services/syncbase/server/util"
 )
 
 type dispatcher struct {
diff --git a/services/syncbase/server/interfaces/app.go b/services/syncbase/server/interfaces/app.go
index e990b29..f9d0323 100644
--- a/services/syncbase/server/interfaces/app.go
+++ b/services/syncbase/server/interfaces/app.go
@@ -5,10 +5,10 @@
 package interfaces
 
 import (
-	wire "v.io/syncbase/v23/services/syncbase/nosql"
 	"v.io/v23/context"
 	"v.io/v23/rpc"
 	"v.io/v23/security/access"
+	wire "v.io/v23/services/syncbase/nosql"
 )
 
 // App is an internal interface to the app layer.
diff --git a/services/syncbase/server/interfaces/database.go b/services/syncbase/server/interfaces/database.go
index 8be30d8..01fa56f 100644
--- a/services/syncbase/server/interfaces/database.go
+++ b/services/syncbase/server/interfaces/database.go
@@ -5,10 +5,10 @@
 package interfaces
 
 import (
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/context"
 	"v.io/v23/rpc"
 	"v.io/v23/security/access"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // Database is an internal interface to the database layer.
diff --git a/services/syncbase/server/interfaces/service.go b/services/syncbase/server/interfaces/service.go
index ce665e2..60eb932 100644
--- a/services/syncbase/server/interfaces/service.go
+++ b/services/syncbase/server/interfaces/service.go
@@ -5,9 +5,9 @@
 package interfaces
 
 import (
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/context"
 	"v.io/v23/rpc"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // Service is an internal interface to the service layer.
diff --git a/services/syncbase/server/interfaces/sync.vdl b/services/syncbase/server/interfaces/sync.vdl
index b97e845..a3d7f7f 100644
--- a/services/syncbase/server/interfaces/sync.vdl
+++ b/services/syncbase/server/interfaces/sync.vdl
@@ -5,7 +5,7 @@
 package interfaces
 
 import (
-	wire "v.io/syncbase/v23/services/syncbase/nosql"
+	wire "v.io/v23/services/syncbase/nosql"
 	"v.io/v23/security/access"
 )
 
diff --git a/services/syncbase/server/interfaces/sync.vdl.go b/services/syncbase/server/interfaces/sync.vdl.go
index 4ec1eea..a281543 100644
--- a/services/syncbase/server/interfaces/sync.vdl.go
+++ b/services/syncbase/server/interfaces/sync.vdl.go
@@ -16,8 +16,8 @@
 	"v.io/v23/vdl"
 
 	// VDL user imports
-	"v.io/syncbase/v23/services/syncbase/nosql"
 	"v.io/v23/security/access"
+	"v.io/v23/services/syncbase/nosql"
 )
 
 // SyncClientMethods is the client interface
diff --git a/services/syncbase/server/interfaces/sync_types.vdl b/services/syncbase/server/interfaces/sync_types.vdl
index 324928b..692a731 100644
--- a/services/syncbase/server/interfaces/sync_types.vdl
+++ b/services/syncbase/server/interfaces/sync_types.vdl
@@ -7,7 +7,7 @@
 import (
 	"time"
 
-	wire "v.io/syncbase/v23/services/syncbase/nosql"
+	wire "v.io/v23/services/syncbase/nosql"
 )
 
 const (
diff --git a/services/syncbase/server/interfaces/sync_types.vdl.go b/services/syncbase/server/interfaces/sync_types.vdl.go
index 7d43af8..1fb1396 100644
--- a/services/syncbase/server/interfaces/sync_types.vdl.go
+++ b/services/syncbase/server/interfaces/sync_types.vdl.go
@@ -14,7 +14,7 @@
 
 	// VDL user imports
 	"time"
-	"v.io/syncbase/v23/services/syncbase/nosql"
+	"v.io/v23/services/syncbase/nosql"
 	_ "v.io/v23/vdlroot/time"
 )
 
diff --git a/services/syncbase/server/mojo_impl.go b/services/syncbase/server/mojo_impl.go
index 973bf7d..603f954 100644
--- a/services/syncbase/server/mojo_impl.go
+++ b/services/syncbase/server/mojo_impl.go
@@ -19,12 +19,12 @@
 	"mojo/public/go/bindings"
 
 	mojom "mojom/syncbase"
-	wire "v.io/syncbase/v23/services/syncbase"
-	nosqlwire "v.io/syncbase/v23/services/syncbase/nosql"
 	"v.io/v23/context"
 	"v.io/v23/rpc"
 	"v.io/v23/security/access"
 	"v.io/v23/services/permissions"
+	wire "v.io/v23/services/syncbase"
+	nosqlwire "v.io/v23/services/syncbase/nosql"
 	"v.io/v23/verror"
 	"v.io/v23/vtrace"
 )
diff --git a/services/syncbase/server/nosql/database.go b/services/syncbase/server/nosql/database.go
index a9f503f..e006fb3 100644
--- a/services/syncbase/server/nosql/database.go
+++ b/services/syncbase/server/nosql/database.go
@@ -12,22 +12,22 @@
 	"sync"
 	"time"
 
-	wire "v.io/syncbase/v23/services/syncbase/nosql"
-	"v.io/syncbase/v23/syncbase/nosql/query_db"
-	"v.io/syncbase/v23/syncbase/nosql/query_exec"
-	"v.io/syncbase/x/ref/services/syncbase/clock"
-	"v.io/syncbase/x/ref/services/syncbase/server/interfaces"
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/server/watchable"
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/context"
 	"v.io/v23/glob"
 	"v.io/v23/rpc"
 	"v.io/v23/security/access"
+	wire "v.io/v23/services/syncbase/nosql"
+	"v.io/v23/syncbase/nosql/query_db"
+	"v.io/v23/syncbase/nosql/query_exec"
 	"v.io/v23/vdl"
 	"v.io/v23/verror"
 	"v.io/v23/vom"
 	"v.io/x/lib/vlog"
+	"v.io/x/ref/services/syncbase/clock"
+	"v.io/x/ref/services/syncbase/server/interfaces"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/server/watchable"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // database is a per-database singleton (i.e. not per-request). It does not
diff --git a/services/syncbase/server/nosql/database_bm.go b/services/syncbase/server/nosql/database_bm.go
index e646c42..cc46eca 100644
--- a/services/syncbase/server/nosql/database_bm.go
+++ b/services/syncbase/server/nosql/database_bm.go
@@ -5,10 +5,10 @@
 package nosql
 
 import (
-	wire "v.io/syncbase/v23/services/syncbase/nosql"
-	"v.io/syncbase/x/ref/services/syncbase/vsync"
 	"v.io/v23/context"
 	"v.io/v23/rpc"
+	wire "v.io/v23/services/syncbase/nosql"
+	"v.io/x/ref/services/syncbase/vsync"
 )
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/services/syncbase/server/nosql/database_crm.go b/services/syncbase/server/nosql/database_crm.go
index e1135a9..611f542 100644
--- a/services/syncbase/server/nosql/database_crm.go
+++ b/services/syncbase/server/nosql/database_crm.go
@@ -5,8 +5,8 @@
 package nosql
 
 import (
-	wire "v.io/syncbase/v23/services/syncbase/nosql"
 	"v.io/v23/context"
+	wire "v.io/v23/services/syncbase/nosql"
 )
 
 ////////////////////////////////////////
diff --git a/services/syncbase/server/nosql/database_sgm.go b/services/syncbase/server/nosql/database_sgm.go
index cc1a73d..7a7611d 100644
--- a/services/syncbase/server/nosql/database_sgm.go
+++ b/services/syncbase/server/nosql/database_sgm.go
@@ -5,11 +5,11 @@
 package nosql
 
 import (
-	wire "v.io/syncbase/v23/services/syncbase/nosql"
-	"v.io/syncbase/x/ref/services/syncbase/vsync"
 	"v.io/v23/context"
 	"v.io/v23/rpc"
+	wire "v.io/v23/services/syncbase/nosql"
 	"v.io/v23/verror"
+	"v.io/x/ref/services/syncbase/vsync"
 )
 
 ////////////////////////////////////////
diff --git a/services/syncbase/server/nosql/database_sm.go b/services/syncbase/server/nosql/database_sm.go
index 3c87a6b..1551fbf 100644
--- a/services/syncbase/server/nosql/database_sm.go
+++ b/services/syncbase/server/nosql/database_sm.go
@@ -5,12 +5,12 @@
 package nosql
 
 import (
-	wire "v.io/syncbase/v23/services/syncbase/nosql"
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/context"
 	"v.io/v23/rpc"
+	wire "v.io/v23/services/syncbase/nosql"
 	"v.io/v23/verror"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 ////////////////////////////////////////
diff --git a/services/syncbase/server/nosql/database_watch.go b/services/syncbase/server/nosql/database_watch.go
index 35228e6..e201987 100644
--- a/services/syncbase/server/nosql/database_watch.go
+++ b/services/syncbase/server/nosql/database_watch.go
@@ -8,16 +8,16 @@
 	"bytes"
 	"strings"
 
-	wire "v.io/syncbase/v23/services/syncbase/nosql"
-	pubutil "v.io/syncbase/v23/syncbase/util"
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/server/watchable"
 	"v.io/v23/context"
 	"v.io/v23/naming"
 	"v.io/v23/rpc"
+	wire "v.io/v23/services/syncbase/nosql"
 	"v.io/v23/services/watch"
+	pubutil "v.io/v23/syncbase/util"
 	"v.io/v23/vdl"
 	"v.io/v23/verror"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/server/watchable"
 )
 
 // GetResumeMarker implements the wire.DatabaseWatcher interface.
diff --git a/services/syncbase/server/nosql/dispatcher.go b/services/syncbase/server/nosql/dispatcher.go
index 284f939..269a7cd 100644
--- a/services/syncbase/server/nosql/dispatcher.go
+++ b/services/syncbase/server/nosql/dispatcher.go
@@ -8,16 +8,16 @@
 	"strconv"
 	"strings"
 
-	wire "v.io/syncbase/v23/services/syncbase"
-	nosqlWire "v.io/syncbase/v23/services/syncbase/nosql"
-	pubutil "v.io/syncbase/v23/syncbase/util"
-	"v.io/syncbase/x/ref/services/syncbase/server/interfaces"
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
 	"v.io/v23/context"
 	"v.io/v23/rpc"
 	"v.io/v23/security"
+	wire "v.io/v23/services/syncbase"
+	nosqlWire "v.io/v23/services/syncbase/nosql"
+	pubutil "v.io/v23/syncbase/util"
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
+	"v.io/x/ref/services/syncbase/server/interfaces"
+	"v.io/x/ref/services/syncbase/server/util"
 )
 
 type dispatcher struct {
diff --git a/services/syncbase/server/nosql/row.go b/services/syncbase/server/nosql/row.go
index a6fbf9d..758c58a 100644
--- a/services/syncbase/server/nosql/row.go
+++ b/services/syncbase/server/nosql/row.go
@@ -5,12 +5,12 @@
 package nosql
 
 import (
-	wire "v.io/syncbase/v23/services/syncbase/nosql"
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/context"
 	"v.io/v23/rpc"
+	wire "v.io/v23/services/syncbase/nosql"
 	"v.io/v23/verror"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // rowReq is a per-request object that handles Row RPCs.
diff --git a/services/syncbase/server/nosql/table.go b/services/syncbase/server/nosql/table.go
index 8cf744e..797be78 100644
--- a/services/syncbase/server/nosql/table.go
+++ b/services/syncbase/server/nosql/table.go
@@ -7,15 +7,15 @@
 import (
 	"strings"
 
-	wire "v.io/syncbase/v23/services/syncbase/nosql"
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/context"
 	"v.io/v23/glob"
 	"v.io/v23/rpc"
 	"v.io/v23/security/access"
+	wire "v.io/v23/services/syncbase/nosql"
 	"v.io/v23/verror"
 	"v.io/v23/vom"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // tableReq is a per-request object that handles Table RPCs.
diff --git a/services/syncbase/server/nosql/types.go b/services/syncbase/server/nosql/types.go
index 7a87916..71ac9f7 100644
--- a/services/syncbase/server/nosql/types.go
+++ b/services/syncbase/server/nosql/types.go
@@ -5,8 +5,8 @@
 package nosql
 
 import (
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
 	"v.io/v23/security/access"
+	"v.io/x/ref/services/syncbase/server/util"
 )
 
 var (
diff --git a/services/syncbase/server/nosql/types.vdl b/services/syncbase/server/nosql/types.vdl
index 8ede239..f6c65fd 100644
--- a/services/syncbase/server/nosql/types.vdl
+++ b/services/syncbase/server/nosql/types.vdl
@@ -6,7 +6,7 @@
 
 import (
 	"v.io/v23/security/access"
-	"v.io/syncbase/v23/services/syncbase/nosql"
+	"v.io/v23/services/syncbase/nosql"
 )
 
 // databaseData represents the persistent state of a Database.
diff --git a/services/syncbase/server/nosql/types.vdl.go b/services/syncbase/server/nosql/types.vdl.go
index 00791d0..80b3b3b 100644
--- a/services/syncbase/server/nosql/types.vdl.go
+++ b/services/syncbase/server/nosql/types.vdl.go
@@ -12,8 +12,8 @@
 	"v.io/v23/vdl"
 
 	// VDL user imports
-	"v.io/syncbase/v23/services/syncbase/nosql"
 	"v.io/v23/security/access"
+	"v.io/v23/services/syncbase/nosql"
 )
 
 // databaseData represents the persistent state of a Database.
diff --git a/services/syncbase/server/server_test.go b/services/syncbase/server/server_test.go
index d6b51ad..66c1f41 100644
--- a/services/syncbase/server/server_test.go
+++ b/services/syncbase/server/server_test.go
@@ -11,7 +11,7 @@
 import (
 	"testing"
 
-	tu "v.io/syncbase/v23/syncbase/testutil"
+	tu "v.io/v23/syncbase/testutil"
 	_ "v.io/x/ref/runtime/factories/generic"
 )
 
diff --git a/services/syncbase/server/service.go b/services/syncbase/server/service.go
index 180692f..2d36455 100644
--- a/services/syncbase/server/service.go
+++ b/services/syncbase/server/service.go
@@ -12,18 +12,18 @@
 	"path"
 	"sync"
 
-	wire "v.io/syncbase/v23/services/syncbase"
-	"v.io/syncbase/x/ref/services/syncbase/server/interfaces"
-	"v.io/syncbase/x/ref/services/syncbase/server/nosql"
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/store"
-	"v.io/syncbase/x/ref/services/syncbase/vsync"
 	"v.io/v23/context"
 	"v.io/v23/glob"
 	"v.io/v23/rpc"
 	"v.io/v23/security/access"
+	wire "v.io/v23/services/syncbase"
 	"v.io/v23/verror"
 	"v.io/v23/vom"
+	"v.io/x/ref/services/syncbase/server/interfaces"
+	"v.io/x/ref/services/syncbase/server/nosql"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/store"
+	"v.io/x/ref/services/syncbase/vsync"
 )
 
 // service is a singleton (i.e. not per-request) that handles Service RPCs.
diff --git a/services/syncbase/server/types.go b/services/syncbase/server/types.go
index 2879d56..f81b3ac 100644
--- a/services/syncbase/server/types.go
+++ b/services/syncbase/server/types.go
@@ -5,8 +5,8 @@
 package server
 
 import (
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
 	"v.io/v23/security/access"
+	"v.io/x/ref/services/syncbase/server/util"
 )
 
 var (
diff --git a/services/syncbase/server/util/glob.go b/services/syncbase/server/util/glob.go
index 4a73870..c483347 100644
--- a/services/syncbase/server/util/glob.go
+++ b/services/syncbase/server/util/glob.go
@@ -5,12 +5,12 @@
 package util
 
 import (
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/context"
 	"v.io/v23/glob"
 	"v.io/v23/naming"
 	"v.io/v23/rpc"
 	"v.io/x/lib/vlog"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // NOTE(nlacasse): Syncbase handles Glob requests by implementing
diff --git a/services/syncbase/server/util/key_util.go b/services/syncbase/server/util/key_util.go
index 80a8a6d..0ac6686 100644
--- a/services/syncbase/server/util/key_util.go
+++ b/services/syncbase/server/util/key_util.go
@@ -7,7 +7,7 @@
 import (
 	"strings"
 
-	"v.io/syncbase/v23/syncbase/util"
+	"v.io/v23/syncbase/util"
 )
 
 // JoinKeyParts builds keys for accessing data in the storage engine.
diff --git a/services/syncbase/server/util/key_util_test.go b/services/syncbase/server/util/key_util_test.go
index 2240531..69db9fa 100644
--- a/services/syncbase/server/util/key_util_test.go
+++ b/services/syncbase/server/util/key_util_test.go
@@ -8,7 +8,7 @@
 	"reflect"
 	"testing"
 
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/server/util"
 )
 
 type kpt struct {
diff --git a/services/syncbase/server/util/store_util.go b/services/syncbase/server/util/store_util.go
index b8f1905..b3d96d4 100644
--- a/services/syncbase/server/util/store_util.go
+++ b/services/syncbase/server/util/store_util.go
@@ -8,14 +8,14 @@
 	"os"
 	"strconv"
 
-	"v.io/syncbase/x/ref/services/syncbase/store"
-	"v.io/syncbase/x/ref/services/syncbase/store/leveldb"
-	"v.io/syncbase/x/ref/services/syncbase/store/memstore"
 	"v.io/v23/context"
 	"v.io/v23/rpc"
 	"v.io/v23/security/access"
 	"v.io/v23/verror"
 	"v.io/v23/vom"
+	"v.io/x/ref/services/syncbase/store"
+	"v.io/x/ref/services/syncbase/store/leveldb"
+	"v.io/x/ref/services/syncbase/store/memstore"
 )
 
 func FormatVersion(version uint64) string {
diff --git a/services/syncbase/server/watchable/snapshot.go b/services/syncbase/server/watchable/snapshot.go
index 37af4e1..a4ecd0a 100644
--- a/services/syncbase/server/watchable/snapshot.go
+++ b/services/syncbase/server/watchable/snapshot.go
@@ -5,7 +5,7 @@
 package watchable
 
 import (
-	"v.io/syncbase/x/ref/services/syncbase/store"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 type snapshot struct {
diff --git a/services/syncbase/server/watchable/store.go b/services/syncbase/server/watchable/store.go
index 0b19678..06162a2 100644
--- a/services/syncbase/server/watchable/store.go
+++ b/services/syncbase/server/watchable/store.go
@@ -21,9 +21,9 @@
 	"strings"
 	"sync"
 
-	pubutil "v.io/syncbase/v23/syncbase/util"
-	"v.io/syncbase/x/ref/services/syncbase/clock"
-	"v.io/syncbase/x/ref/services/syncbase/store"
+	pubutil "v.io/v23/syncbase/util"
+	"v.io/x/ref/services/syncbase/clock"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // Store is a store.Store that provides versioned storage and a watchable oplog.
diff --git a/services/syncbase/server/watchable/store_test.go b/services/syncbase/server/watchable/store_test.go
index 8c1c370..d44cc08 100644
--- a/services/syncbase/server/watchable/store_test.go
+++ b/services/syncbase/server/watchable/store_test.go
@@ -8,9 +8,9 @@
 	"runtime"
 	"testing"
 
-	"v.io/syncbase/x/ref/services/syncbase/clock"
-	"v.io/syncbase/x/ref/services/syncbase/store"
-	"v.io/syncbase/x/ref/services/syncbase/store/test"
+	"v.io/x/ref/services/syncbase/clock"
+	"v.io/x/ref/services/syncbase/store"
+	"v.io/x/ref/services/syncbase/store/test"
 )
 
 func init() {
diff --git a/services/syncbase/server/watchable/stream.go b/services/syncbase/server/watchable/stream.go
index 26502e1..3448c02 100644
--- a/services/syncbase/server/watchable/stream.go
+++ b/services/syncbase/server/watchable/stream.go
@@ -7,7 +7,7 @@
 import (
 	"sync"
 
-	"v.io/syncbase/x/ref/services/syncbase/store"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // stream streams keys and values for versioned records.
diff --git a/services/syncbase/server/watchable/test_util.go b/services/syncbase/server/watchable/test_util.go
index e14854a..0c879b8 100644
--- a/services/syncbase/server/watchable/test_util.go
+++ b/services/syncbase/server/watchable/test_util.go
@@ -10,11 +10,11 @@
 	"math"
 	"time"
 
-	"v.io/syncbase/x/ref/services/syncbase/clock"
-	"v.io/syncbase/x/ref/services/syncbase/store"
-	"v.io/syncbase/x/ref/services/syncbase/store/leveldb"
-	"v.io/syncbase/x/ref/services/syncbase/store/memstore"
 	"v.io/v23/vom"
+	"v.io/x/ref/services/syncbase/clock"
+	"v.io/x/ref/services/syncbase/store"
+	"v.io/x/ref/services/syncbase/store/leveldb"
+	"v.io/x/ref/services/syncbase/store/memstore"
 )
 
 // This file provides utility methods for tests related to watchable store.
diff --git a/services/syncbase/server/watchable/transaction.go b/services/syncbase/server/watchable/transaction.go
index 8a67f8f..22b53f4 100644
--- a/services/syncbase/server/watchable/transaction.go
+++ b/services/syncbase/server/watchable/transaction.go
@@ -9,10 +9,10 @@
 	"math"
 	"sync"
 
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/context"
 	"v.io/v23/verror"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 type transaction struct {
diff --git a/services/syncbase/server/watchable/transaction_test.go b/services/syncbase/server/watchable/transaction_test.go
index 5fcdf94..681b3f7 100644
--- a/services/syncbase/server/watchable/transaction_test.go
+++ b/services/syncbase/server/watchable/transaction_test.go
@@ -12,8 +12,8 @@
 	"testing"
 	"time"
 
-	"v.io/syncbase/x/ref/services/syncbase/clock"
-	"v.io/syncbase/x/ref/services/syncbase/store"
+	"v.io/x/ref/services/syncbase/clock"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 type testData struct {
diff --git a/services/syncbase/server/watchable/util.go b/services/syncbase/server/watchable/util.go
index 8eb606e..f106f22 100644
--- a/services/syncbase/server/watchable/util.go
+++ b/services/syncbase/server/watchable/util.go
@@ -18,9 +18,9 @@
 	"sync"
 	"time"
 
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/verror"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 var (
diff --git a/services/syncbase/server/watchable/util_test.go b/services/syncbase/server/watchable/util_test.go
index 193c06d..e0db4ac 100644
--- a/services/syncbase/server/watchable/util_test.go
+++ b/services/syncbase/server/watchable/util_test.go
@@ -7,7 +7,7 @@
 import (
 	"testing"
 
-	"v.io/syncbase/x/ref/services/syncbase/clock"
+	"v.io/x/ref/services/syncbase/clock"
 )
 
 // TestGetNextLogSeq tests that the getNextLogSeq helper works on range 0..10.
diff --git a/services/syncbase/server/watchable/watcher.go b/services/syncbase/server/watchable/watcher.go
index fc0481a..b78f86a 100644
--- a/services/syncbase/server/watchable/watcher.go
+++ b/services/syncbase/server/watchable/watcher.go
@@ -9,12 +9,12 @@
 	"strconv"
 	"sync"
 
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/services/watch"
 	"v.io/v23/verror"
 	"v.io/v23/vom"
 	"v.io/x/lib/vlog"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // watcher maintains a state and a condition variable. The watcher sends
diff --git a/services/syncbase/server/watchable/watcher_test.go b/services/syncbase/server/watchable/watcher_test.go
index c978123..11b1633 100644
--- a/services/syncbase/server/watchable/watcher_test.go
+++ b/services/syncbase/server/watchable/watcher_test.go
@@ -9,8 +9,8 @@
 	"fmt"
 	"testing"
 
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/store"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // TestWatchLogBatch tests fetching a batch of log records.
diff --git a/services/syncbase/signing/hashcache/hashcache_test.go b/services/syncbase/signing/hashcache/hashcache_test.go
index 96ba865..5758a82 100644
--- a/services/syncbase/signing/hashcache/hashcache_test.go
+++ b/services/syncbase/signing/hashcache/hashcache_test.go
@@ -9,7 +9,7 @@
 import "testing"
 import "time"
 
-import "v.io/syncbase/x/ref/services/syncbase/signing/hashcache"
+import "v.io/x/ref/services/syncbase/signing/hashcache"
 
 // checkHashesWithNoData() checks that hash[start:] have no data in the cache.
 // (The start index is passed, rather than expecting the caller to sub-slice,
diff --git a/services/syncbase/signing/krl/krl_test.go b/services/syncbase/signing/krl/krl_test.go
index 73f48ad..260b031 100644
--- a/services/syncbase/signing/krl/krl_test.go
+++ b/services/syncbase/signing/krl/krl_test.go
@@ -9,7 +9,7 @@
 import "testing"
 import "time"
 
-import "v.io/syncbase/x/ref/services/syncbase/signing/krl"
+import "v.io/x/ref/services/syncbase/signing/krl"
 
 // checkKeysNotRevoked() checks that key[start:] have not been revoked.  (The
 // start index is passed, rather than expecting the called to sub-slice, so
diff --git a/services/syncbase/signing/signing.go b/services/syncbase/signing/signing.go
index 0115f37..5f860b8 100644
--- a/services/syncbase/signing/signing.go
+++ b/services/syncbase/signing/signing.go
@@ -77,12 +77,12 @@
 import "hash"
 import "time"
 
-import "v.io/syncbase/x/ref/services/syncbase/signing/krl"
+import "v.io/x/ref/services/syncbase/signing/krl"
 import "v.io/v23/context"
 import "v.io/v23/security"
 import "v.io/v23/verror"
 
-const pkgPath = "v.io/syncbase/x/ref/services/syncbase/signing"
+const pkgPath = "v.io/x/ref/services/syncbase/signing"
 
 // These are among the errors may be returned by Check(), and indicate that the
 // operation should be retried when new data has been added to the
diff --git a/services/syncbase/signing/signing_test.go b/services/syncbase/signing/signing_test.go
index 96881f3..a91f2e5 100644
--- a/services/syncbase/signing/signing_test.go
+++ b/services/syncbase/signing/signing_test.go
@@ -3,15 +3,15 @@
 // license that can be found in the LICENSE file.
 
 // Package signing_test implements a test for the package
-// v.io/syncbase/x/ref/services/syncbase/signing
+// v.io/x/ref/services/syncbase/signing
 package signing_test
 
 import "crypto/sha256"
 import "testing"
 import "time"
 
-import "v.io/syncbase/x/ref/services/syncbase/signing"
-import "v.io/syncbase/x/ref/services/syncbase/signing/krl"
+import "v.io/x/ref/services/syncbase/signing"
+import "v.io/x/ref/services/syncbase/signing/krl"
 import "v.io/v23/naming"
 import "v.io/v23/security"
 import "v.io/v23/vdl"
diff --git a/services/syncbase/signing/validationcache.go b/services/syncbase/signing/validationcache.go
index 1c95bd0..8120cff 100644
--- a/services/syncbase/signing/validationcache.go
+++ b/services/syncbase/signing/validationcache.go
@@ -14,7 +14,7 @@
 import "encoding/binary"
 import "time"
 
-import "v.io/syncbase/x/ref/services/syncbase/signing/hashcache"
+import "v.io/x/ref/services/syncbase/signing/hashcache"
 import "v.io/v23/context"
 import "v.io/v23/security"
 import "v.io/v23/vom"
diff --git a/services/syncbase/signing/validationcache_test.go b/services/syncbase/signing/validationcache_test.go
index a45835b..2f6f68a 100644
--- a/services/syncbase/signing/validationcache_test.go
+++ b/services/syncbase/signing/validationcache_test.go
@@ -10,7 +10,7 @@
 import "testing"
 import "time"
 
-import "v.io/syncbase/x/ref/services/syncbase/signing"
+import "v.io/x/ref/services/syncbase/signing"
 import "v.io/v23/security"
 import "v.io/x/ref/test"
 import _ "v.io/x/ref/runtime/factories/generic"
diff --git a/services/syncbase/store/benchmark/benchmark.go b/services/syncbase/store/benchmark/benchmark.go
index c794fa9..9e365ee 100644
--- a/services/syncbase/store/benchmark/benchmark.go
+++ b/services/syncbase/store/benchmark/benchmark.go
@@ -9,7 +9,7 @@
 	"math/rand"
 	"testing"
 
-	"v.io/syncbase/x/ref/services/syncbase/store"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // RandomGenerator is a helper for generating random data.
diff --git a/services/syncbase/store/leveldb/benchmark_test.go b/services/syncbase/store/leveldb/benchmark_test.go
index 7de0062..686ca0a 100644
--- a/services/syncbase/store/leveldb/benchmark_test.go
+++ b/services/syncbase/store/leveldb/benchmark_test.go
@@ -7,8 +7,8 @@
 import (
 	"testing"
 
-	"v.io/syncbase/x/ref/services/syncbase/store"
-	"v.io/syncbase/x/ref/services/syncbase/store/benchmark"
+	"v.io/x/ref/services/syncbase/store"
+	"v.io/x/ref/services/syncbase/store/benchmark"
 )
 
 func testConfig(db store.Store) *benchmark.Config {
diff --git a/services/syncbase/store/leveldb/db.go b/services/syncbase/store/leveldb/db.go
index 0430561..4b96b2c 100644
--- a/services/syncbase/store/leveldb/db.go
+++ b/services/syncbase/store/leveldb/db.go
@@ -15,9 +15,9 @@
 	"sync"
 	"unsafe"
 
-	"v.io/syncbase/x/ref/services/syncbase/store"
-	"v.io/syncbase/x/ref/services/syncbase/store/transactions"
 	"v.io/v23/verror"
+	"v.io/x/ref/services/syncbase/store"
+	"v.io/x/ref/services/syncbase/store/transactions"
 )
 
 // db is a wrapper around LevelDB that implements the transactions.BatchStore
diff --git a/services/syncbase/store/leveldb/db_test.go b/services/syncbase/store/leveldb/db_test.go
index 88cddc2..75c3cc7 100644
--- a/services/syncbase/store/leveldb/db_test.go
+++ b/services/syncbase/store/leveldb/db_test.go
@@ -10,8 +10,8 @@
 	"runtime"
 	"testing"
 
-	"v.io/syncbase/x/ref/services/syncbase/store"
-	"v.io/syncbase/x/ref/services/syncbase/store/test"
+	"v.io/x/ref/services/syncbase/store"
+	"v.io/x/ref/services/syncbase/store/test"
 )
 
 func init() {
diff --git a/services/syncbase/store/leveldb/snapshot.go b/services/syncbase/store/leveldb/snapshot.go
index a403127..5b7c493 100644
--- a/services/syncbase/store/leveldb/snapshot.go
+++ b/services/syncbase/store/leveldb/snapshot.go
@@ -9,8 +9,8 @@
 import (
 	"sync"
 
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/verror"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // snapshot is a wrapper around LevelDB snapshot that implements
diff --git a/services/syncbase/store/leveldb/stream.go b/services/syncbase/store/leveldb/stream.go
index 2d592b4..98c3c2f 100644
--- a/services/syncbase/store/leveldb/stream.go
+++ b/services/syncbase/store/leveldb/stream.go
@@ -11,8 +11,8 @@
 	"bytes"
 	"sync"
 
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/verror"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // stream is a wrapper around LevelDB iterator that implements
diff --git a/services/syncbase/store/memstore/snapshot.go b/services/syncbase/store/memstore/snapshot.go
index 310f6e2..557b4dd 100644
--- a/services/syncbase/store/memstore/snapshot.go
+++ b/services/syncbase/store/memstore/snapshot.go
@@ -7,8 +7,8 @@
 import (
 	"sync"
 
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/verror"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 type snapshot struct {
diff --git a/services/syncbase/store/memstore/store.go b/services/syncbase/store/memstore/store.go
index 15a2988..699c2c5 100644
--- a/services/syncbase/store/memstore/store.go
+++ b/services/syncbase/store/memstore/store.go
@@ -10,9 +10,9 @@
 	"fmt"
 	"sync"
 
-	"v.io/syncbase/x/ref/services/syncbase/store"
-	"v.io/syncbase/x/ref/services/syncbase/store/transactions"
 	"v.io/v23/verror"
+	"v.io/x/ref/services/syncbase/store"
+	"v.io/x/ref/services/syncbase/store/transactions"
 )
 
 type memstore struct {
diff --git a/services/syncbase/store/memstore/store_test.go b/services/syncbase/store/memstore/store_test.go
index 0b04032..b6c9966 100644
--- a/services/syncbase/store/memstore/store_test.go
+++ b/services/syncbase/store/memstore/store_test.go
@@ -8,8 +8,8 @@
 	"runtime"
 	"testing"
 
-	"v.io/syncbase/x/ref/services/syncbase/store"
-	"v.io/syncbase/x/ref/services/syncbase/store/test"
+	"v.io/x/ref/services/syncbase/store"
+	"v.io/x/ref/services/syncbase/store/test"
 )
 
 func init() {
diff --git a/services/syncbase/store/memstore/stream.go b/services/syncbase/store/memstore/stream.go
index 345ea93..5f776d9 100644
--- a/services/syncbase/store/memstore/stream.go
+++ b/services/syncbase/store/memstore/stream.go
@@ -8,8 +8,8 @@
 	"sort"
 	"sync"
 
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/verror"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 type stream struct {
diff --git a/services/syncbase/store/test/snapshot.go b/services/syncbase/store/test/snapshot.go
index 04dee18..0670a6f 100644
--- a/services/syncbase/store/test/snapshot.go
+++ b/services/syncbase/store/test/snapshot.go
@@ -7,8 +7,8 @@
 import (
 	"testing"
 
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/verror"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // RunSnapshotTest verifies store.Snapshot operations.
diff --git a/services/syncbase/store/test/store.go b/services/syncbase/store/test/store.go
index 48022f9..69caa57 100644
--- a/services/syncbase/store/test/store.go
+++ b/services/syncbase/store/test/store.go
@@ -9,8 +9,8 @@
 	"math/rand"
 	"testing"
 
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/verror"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 type operation int
diff --git a/services/syncbase/store/test/stream.go b/services/syncbase/store/test/stream.go
index e058fc0..2d68bc3 100644
--- a/services/syncbase/store/test/stream.go
+++ b/services/syncbase/store/test/stream.go
@@ -8,8 +8,8 @@
 	"bytes"
 	"testing"
 
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/verror"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // RunStreamTest verifies store.Stream operations.
diff --git a/services/syncbase/store/test/transaction.go b/services/syncbase/store/test/transaction.go
index 6cf26e8..02f655c 100644
--- a/services/syncbase/store/test/transaction.go
+++ b/services/syncbase/store/test/transaction.go
@@ -12,8 +12,8 @@
 	"sync"
 	"testing"
 
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/verror"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // RunTransactionStateTest verifies operations that modify the state of a
diff --git a/services/syncbase/store/test/util.go b/services/syncbase/store/test/util.go
index 55b886a..bec193a 100644
--- a/services/syncbase/store/test/util.go
+++ b/services/syncbase/store/test/util.go
@@ -10,8 +10,8 @@
 	"strings"
 	"testing"
 
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/verror"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // verifyGet verifies that st.Get(key) == value. If value is nil, verifies that
diff --git a/services/syncbase/store/transactions/manager.go b/services/syncbase/store/transactions/manager.go
index 254812f..2e0641c 100644
--- a/services/syncbase/store/transactions/manager.go
+++ b/services/syncbase/store/transactions/manager.go
@@ -8,8 +8,8 @@
 	"container/list"
 	"sync"
 
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/verror"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // BatchStore is a CRUD-capable storage engine that supports atomic batch
diff --git a/services/syncbase/store/transactions/merged_stream.go b/services/syncbase/store/transactions/merged_stream.go
index 4ab10be..8c96bef 100644
--- a/services/syncbase/store/transactions/merged_stream.go
+++ b/services/syncbase/store/transactions/merged_stream.go
@@ -7,7 +7,7 @@
 import (
 	"sort"
 
-	"v.io/syncbase/x/ref/services/syncbase/store"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 //////////////////////////////////////////////////////////////
diff --git a/services/syncbase/store/transactions/transaction.go b/services/syncbase/store/transactions/transaction.go
index dcf7569..6331a8f 100644
--- a/services/syncbase/store/transactions/transaction.go
+++ b/services/syncbase/store/transactions/transaction.go
@@ -9,9 +9,9 @@
 	"container/list"
 	"sync"
 
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // transaction is a wrapper on top of a BatchWriter and a store.Snapshot that
diff --git a/services/syncbase/syncbased/main.go b/services/syncbase/syncbased/main.go
index 8def540..1b84118 100644
--- a/services/syncbase/syncbased/main.go
+++ b/services/syncbase/syncbased/main.go
@@ -7,7 +7,6 @@
 import (
 	"flag"
 
-	"v.io/syncbase/x/ref/services/syncbase/server"
 	"v.io/v23"
 	"v.io/v23/context"
 	"v.io/v23/rpc"
@@ -16,6 +15,7 @@
 	"v.io/x/lib/vlog"
 	"v.io/x/ref/lib/security/securityflag"
 	_ "v.io/x/ref/runtime/factories/roaming"
+	"v.io/x/ref/services/syncbase/server"
 )
 
 var (
diff --git a/services/syncbase/syncbased/mojo_main.go b/services/syncbase/syncbased/mojo_main.go
index 74a247f..fc1dccc 100644
--- a/services/syncbase/syncbased/mojo_main.go
+++ b/services/syncbase/syncbased/mojo_main.go
@@ -19,10 +19,10 @@
 
 	"mojom/syncbase"
 
-	"v.io/syncbase/x/ref/services/syncbase/server"
 	"v.io/v23"
 	"v.io/v23/context"
 	"v.io/v23/rpc"
+	"v.io/x/ref/services/syncbase/server"
 )
 
 //#include "mojo/public/c/system/types.h"
diff --git a/services/syncbase/vsync/blob.go b/services/syncbase/vsync/blob.go
index ff04066..51a8f7c 100644
--- a/services/syncbase/vsync/blob.go
+++ b/services/syncbase/vsync/blob.go
@@ -7,15 +7,15 @@
 import (
 	"io"
 
-	wire "v.io/syncbase/v23/services/syncbase/nosql"
-	blob "v.io/syncbase/x/ref/services/syncbase/localblobstore"
-	"v.io/syncbase/x/ref/services/syncbase/server/interfaces"
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
 	"v.io/v23/context"
 	"v.io/v23/naming"
 	"v.io/v23/rpc"
+	wire "v.io/v23/services/syncbase/nosql"
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
+	blob "v.io/x/ref/services/syncbase/localblobstore"
+	"v.io/x/ref/services/syncbase/server/interfaces"
+	"v.io/x/ref/services/syncbase/server/util"
 )
 
 const (
diff --git a/services/syncbase/vsync/dag.go b/services/syncbase/vsync/dag.go
index 121f594..40ef3b3 100644
--- a/services/syncbase/vsync/dag.go
+++ b/services/syncbase/vsync/dag.go
@@ -98,11 +98,11 @@
 	"container/list"
 	"fmt"
 
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/context"
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 const (
diff --git a/services/syncbase/vsync/dag_test.go b/services/syncbase/vsync/dag_test.go
index 9ef43f7..2644655 100644
--- a/services/syncbase/vsync/dag_test.go
+++ b/services/syncbase/vsync/dag_test.go
@@ -13,9 +13,9 @@
 	"strconv"
 	"testing"
 
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/context"
 	_ "v.io/x/ref/runtime/factories/generic"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // TestSetNode tests setting and getting a DAG node.
diff --git a/services/syncbase/vsync/initiator.go b/services/syncbase/vsync/initiator.go
index cccf217..9fa297f 100644
--- a/services/syncbase/vsync/initiator.go
+++ b/services/syncbase/vsync/initiator.go
@@ -15,17 +15,17 @@
 	"strings"
 	"time"
 
-	"v.io/syncbase/v23/services/syncbase/nosql"
-	"v.io/syncbase/x/ref/services/syncbase/server/interfaces"
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/server/watchable"
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/context"
 	"v.io/v23/naming"
+	"v.io/v23/services/syncbase/nosql"
 	"v.io/v23/vdl"
 	"v.io/v23/verror"
 	"v.io/v23/vom"
 	"v.io/x/lib/vlog"
+	"v.io/x/ref/services/syncbase/server/interfaces"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/server/watchable"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // Policies to pick a peer to sync with.
diff --git a/services/syncbase/vsync/initiator_test.go b/services/syncbase/vsync/initiator_test.go
index af09ce1..01a63ad 100644
--- a/services/syncbase/vsync/initiator_test.go
+++ b/services/syncbase/vsync/initiator_test.go
@@ -18,13 +18,13 @@
 	"testing"
 	"time"
 
-	"v.io/syncbase/v23/services/syncbase/nosql"
-	"v.io/syncbase/x/ref/services/syncbase/server/interfaces"
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/server/watchable"
+	"v.io/v23/services/syncbase/nosql"
 	"v.io/v23/vdl"
 	"v.io/v23/vom"
 	_ "v.io/x/ref/runtime/factories/generic"
+	"v.io/x/ref/services/syncbase/server/interfaces"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/server/watchable"
 )
 
 func TestExtractBlobRefs(t *testing.T) {
diff --git a/services/syncbase/vsync/replay_test.go b/services/syncbase/vsync/replay_test.go
index 03d6dc6..1a4e2f1 100644
--- a/services/syncbase/vsync/replay_test.go
+++ b/services/syncbase/vsync/replay_test.go
@@ -18,11 +18,11 @@
 	"testing"
 	"time"
 
-	"v.io/syncbase/x/ref/services/syncbase/server/interfaces"
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/server/watchable"
 	"v.io/v23/context"
 	"v.io/v23/vom"
+	"v.io/x/ref/services/syncbase/server/interfaces"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/server/watchable"
 )
 
 const (
diff --git a/services/syncbase/vsync/responder.go b/services/syncbase/vsync/responder.go
index c417eca..0290b41 100644
--- a/services/syncbase/vsync/responder.go
+++ b/services/syncbase/vsync/responder.go
@@ -9,13 +9,13 @@
 	"sort"
 	"strings"
 
-	wire "v.io/syncbase/v23/services/syncbase/nosql"
-	"v.io/syncbase/x/ref/services/syncbase/server/interfaces"
-	"v.io/syncbase/x/ref/services/syncbase/server/watchable"
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/context"
+	wire "v.io/v23/services/syncbase/nosql"
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
+	"v.io/x/ref/services/syncbase/server/interfaces"
+	"v.io/x/ref/services/syncbase/server/watchable"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // GetDeltas implements the responder side of the GetDeltas RPC.
diff --git a/services/syncbase/vsync/responder_test.go b/services/syncbase/vsync/responder_test.go
index 986f9b3..dbd0fea 100644
--- a/services/syncbase/vsync/responder_test.go
+++ b/services/syncbase/vsync/responder_test.go
@@ -11,12 +11,12 @@
 	"testing"
 	"time"
 
-	"v.io/syncbase/x/ref/services/syncbase/server/interfaces"
-	"v.io/syncbase/x/ref/services/syncbase/server/watchable"
 	"v.io/v23/naming"
 	"v.io/v23/rpc"
 	"v.io/v23/security"
 	_ "v.io/x/ref/runtime/factories/generic"
+	"v.io/x/ref/services/syncbase/server/interfaces"
+	"v.io/x/ref/services/syncbase/server/watchable"
 )
 
 // TestDiffPrefixGenVectors tests diffing prefix gen vectors.
diff --git a/services/syncbase/vsync/sync.go b/services/syncbase/vsync/sync.go
index fd65c66..cf3c9f1 100644
--- a/services/syncbase/vsync/sync.go
+++ b/services/syncbase/vsync/sync.go
@@ -18,15 +18,15 @@
 	"sync"
 	"time"
 
-	"v.io/syncbase/v23/services/syncbase/nosql"
-	blob "v.io/syncbase/x/ref/services/syncbase/localblobstore"
-	fsblob "v.io/syncbase/x/ref/services/syncbase/localblobstore/fs_cablobstore"
-	"v.io/syncbase/x/ref/services/syncbase/server/interfaces"
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/context"
 	"v.io/v23/rpc"
+	"v.io/v23/services/syncbase/nosql"
 	"v.io/v23/verror"
+	blob "v.io/x/ref/services/syncbase/localblobstore"
+	fsblob "v.io/x/ref/services/syncbase/localblobstore/fs_cablobstore"
+	"v.io/x/ref/services/syncbase/server/interfaces"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // syncService contains the metadata for the sync module.
diff --git a/services/syncbase/vsync/sync_state.go b/services/syncbase/vsync/sync_state.go
index 8195559..94ab6eb 100644
--- a/services/syncbase/vsync/sync_state.go
+++ b/services/syncbase/vsync/sync_state.go
@@ -34,11 +34,11 @@
 	"fmt"
 	"strconv"
 
-	"v.io/syncbase/x/ref/services/syncbase/server/interfaces"
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/context"
 	"v.io/v23/verror"
+	"v.io/x/ref/services/syncbase/server/interfaces"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // dbSyncStateInMem represents the in-memory sync state of a Database.
diff --git a/services/syncbase/vsync/sync_state_test.go b/services/syncbase/vsync/sync_state_test.go
index 7e9302b..01315a7 100644
--- a/services/syncbase/vsync/sync_state_test.go
+++ b/services/syncbase/vsync/sync_state_test.go
@@ -9,9 +9,9 @@
 	"testing"
 	"time"
 
-	"v.io/syncbase/x/ref/services/syncbase/server/interfaces"
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	_ "v.io/x/ref/runtime/factories/generic"
+	"v.io/x/ref/services/syncbase/server/interfaces"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // Tests for sync state management and storage in Syncbase.
@@ -141,7 +141,7 @@
 //////////////////////////////
 // Helpers
 
-// TODO(hpucha): Look into using v.io/syncbase/v23/syncbase/testutil.Fatalf()
+// TODO(hpucha): Look into using v.io/v23/syncbase/testutil.Fatalf()
 // for getting the stack trace. Right now cannot import the package due to a
 // cycle.
 
diff --git a/services/syncbase/vsync/syncgroup.go b/services/syncbase/vsync/syncgroup.go
index 905a319..c9263f1 100644
--- a/services/syncbase/vsync/syncgroup.go
+++ b/services/syncbase/vsync/syncgroup.go
@@ -18,19 +18,19 @@
 	"strings"
 	"time"
 
-	wire "v.io/syncbase/v23/services/syncbase/nosql"
-	"v.io/syncbase/x/ref/services/syncbase/server/interfaces"
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/server/watchable"
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/context"
 	"v.io/v23/naming"
 	"v.io/v23/rpc"
 	"v.io/v23/security"
 	"v.io/v23/security/access"
+	wire "v.io/v23/services/syncbase/nosql"
 	"v.io/v23/verror"
 	"v.io/v23/vom"
 	"v.io/x/lib/vlog"
+	"v.io/x/ref/services/syncbase/server/interfaces"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/server/watchable"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 var (
diff --git a/services/syncbase/vsync/syncgroup_test.go b/services/syncbase/vsync/syncgroup_test.go
index 6c87ee7..e48e1f6 100644
--- a/services/syncbase/vsync/syncgroup_test.go
+++ b/services/syncbase/vsync/syncgroup_test.go
@@ -11,10 +11,10 @@
 	"testing"
 	"time"
 
-	"v.io/syncbase/v23/services/syncbase/nosql"
-	"v.io/syncbase/x/ref/services/syncbase/server/interfaces"
-	"v.io/syncbase/x/ref/services/syncbase/store"
+	"v.io/v23/services/syncbase/nosql"
 	_ "v.io/x/ref/runtime/factories/generic"
+	"v.io/x/ref/services/syncbase/server/interfaces"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 // checkSGStats verifies SyncGroup stats.
diff --git a/services/syncbase/vsync/test_util.go b/services/syncbase/vsync/test_util.go
index 8328fda..8222caf 100644
--- a/services/syncbase/vsync/test_util.go
+++ b/services/syncbase/vsync/test_util.go
@@ -13,16 +13,16 @@
 	"testing"
 	"time"
 
-	wire "v.io/syncbase/v23/services/syncbase/nosql"
-	"v.io/syncbase/x/ref/services/syncbase/clock"
-	"v.io/syncbase/x/ref/services/syncbase/server/interfaces"
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/server/watchable"
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/context"
 	"v.io/v23/rpc"
 	"v.io/v23/security/access"
+	wire "v.io/v23/services/syncbase/nosql"
 	"v.io/v23/verror"
+	"v.io/x/ref/services/syncbase/clock"
+	"v.io/x/ref/services/syncbase/server/interfaces"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/server/watchable"
+	"v.io/x/ref/services/syncbase/store"
 	"v.io/x/ref/test"
 )
 
diff --git a/services/syncbase/vsync/testdata/remote-init-00.log.sync b/services/syncbase/vsync/testdata/remote-init-00.log.sync
index 2546c47..35b1511 100644
--- a/services/syncbase/vsync/testdata/remote-init-00.log.sync
+++ b/services/syncbase/vsync/testdata/remote-init-00.log.sync
@@ -4,4 +4,4 @@
 addr|foo1|1|||$sync:log:11:1|0|1|false
 addr|foo1|2|1||$sync:log:11:2|0|1|false
 addr|foo1|3|2||$sync:log:11:3|0|1|false
-genvec|foo1|10:0,11:3|bar|11:0
\ No newline at end of file
+genvec|foo1|10:0,11:3|bar|11:0
diff --git a/services/syncbase/vsync/testdata/remote-noconf-00.log.sync b/services/syncbase/vsync/testdata/remote-noconf-00.log.sync
index 6adf5dd..ef52b0a 100644
--- a/services/syncbase/vsync/testdata/remote-noconf-00.log.sync
+++ b/services/syncbase/vsync/testdata/remote-noconf-00.log.sync
@@ -6,4 +6,4 @@
 addr|foo1|4|3||$sync:log:11:1|0|1|false
 addr|foo1|5|4||$sync:log:11:2|0|1|false
 addr|foo1|6|5||$sync:log:11:3|0|1|false
-genvec|foo1|10:0,11:3|bar|11:0
\ No newline at end of file
+genvec|foo1|10:0,11:3|bar|11:0
diff --git a/services/syncbase/vsync/testdata/remote-noconf-link-repeat.log.sync b/services/syncbase/vsync/testdata/remote-noconf-link-repeat.log.sync
index 31e85a9..8388033 100644
--- a/services/syncbase/vsync/testdata/remote-noconf-link-repeat.log.sync
+++ b/services/syncbase/vsync/testdata/remote-noconf-link-repeat.log.sync
@@ -1,4 +1,4 @@
 # Resolve the same conflict on two different devices.
 # The format is: <cmd>|<objid>|<version>|<parent1>|<parent2>|<logrec>|<txid>|<txcount>|<deleted>
 
-linkr|foo1|3|4||$sync:log:12:1
\ No newline at end of file
+linkr|foo1|3|4||$sync:log:12:1
diff --git a/services/syncbase/vsync/types.vdl b/services/syncbase/vsync/types.vdl
index f44468e..f34d415 100644
--- a/services/syncbase/vsync/types.vdl
+++ b/services/syncbase/vsync/types.vdl
@@ -5,7 +5,7 @@
 package vsync
 
 import (
-	"v.io/syncbase/x/ref/services/syncbase/server/interfaces"
+	"v.io/x/ref/services/syncbase/server/interfaces"
 )
 
 // Key prefixes for sync data structures. All these prefixes are prepended with
diff --git a/services/syncbase/vsync/types.vdl.go b/services/syncbase/vsync/types.vdl.go
index f875149..f305083 100644
--- a/services/syncbase/vsync/types.vdl.go
+++ b/services/syncbase/vsync/types.vdl.go
@@ -12,7 +12,7 @@
 	"v.io/v23/vdl"
 
 	// VDL user imports
-	"v.io/syncbase/x/ref/services/syncbase/server/interfaces"
+	"v.io/x/ref/services/syncbase/server/interfaces"
 )
 
 // syncData represents the persistent state of the sync module.
diff --git a/services/syncbase/vsync/util.go b/services/syncbase/vsync/util.go
index 2f15cf8..61b53ab 100644
--- a/services/syncbase/vsync/util.go
+++ b/services/syncbase/vsync/util.go
@@ -9,11 +9,11 @@
 import (
 	"time"
 
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/context"
 	"v.io/v23/rpc"
 	"v.io/x/lib/vlog"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 const (
diff --git a/services/syncbase/vsync/watcher.go b/services/syncbase/vsync/watcher.go
index ae69dc6..2e9e6fc 100644
--- a/services/syncbase/vsync/watcher.go
+++ b/services/syncbase/vsync/watcher.go
@@ -17,14 +17,14 @@
 	"strings"
 	"time"
 
-	"v.io/syncbase/x/ref/services/syncbase/server/interfaces"
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/server/watchable"
-	"v.io/syncbase/x/ref/services/syncbase/store"
 	"v.io/v23/context"
 	"v.io/v23/services/watch"
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
+	"v.io/x/ref/services/syncbase/server/interfaces"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/server/watchable"
+	"v.io/x/ref/services/syncbase/store"
 )
 
 var (
diff --git a/services/syncbase/vsync/watcher_test.go b/services/syncbase/vsync/watcher_test.go
index be77b94..02dc1ff 100644
--- a/services/syncbase/vsync/watcher_test.go
+++ b/services/syncbase/vsync/watcher_test.go
@@ -12,10 +12,10 @@
 	"testing"
 	"time"
 
-	"v.io/syncbase/x/ref/services/syncbase/server/util"
-	"v.io/syncbase/x/ref/services/syncbase/server/watchable"
 	"v.io/v23/vom"
 	_ "v.io/x/ref/runtime/factories/generic"
+	"v.io/x/ref/services/syncbase/server/util"
+	"v.io/x/ref/services/syncbase/server/watchable"
 )
 
 // TestSetResmark tests setting and getting a resume marker.
diff --git a/services/xproxyd/errors.vdl b/services/xproxyd/errors.vdl
index 0a2dbd5..b67b78d 100644
--- a/services/xproxyd/errors.vdl
+++ b/services/xproxyd/errors.vdl
@@ -7,4 +7,4 @@
 error (
   NotListening() {"en": "Proxy is not listening on any endpoints."}
   UnexpectedMessage(msgType string) {"en": "Unexpected message of type{:msgType}"}
-)
\ No newline at end of file
+)