Moving wsprd back to core.

Change-Id: I6e96bcdd49edd36b78b286cbdac9046560e9e221
diff --git a/lib/modules/core/wspr.go b/lib/modules/core/wspr.go
index 8388f48..9027d2a 100644
--- a/lib/modules/core/wspr.go
+++ b/lib/modules/core/wspr.go
@@ -6,7 +6,7 @@
 	"io"
 
 	"v.io/core/veyron/lib/modules"
-	"v.io/wspr/veyron/services/wsprd/wspr"
+	"v.io/core/veyron/services/wsprd/wspr"
 
 	"v.io/v23"
 )
diff --git a/services/wsprd/account/account.go b/services/wsprd/account/account.go
index 6c6066c..0ab0df3 100644
--- a/services/wsprd/account/account.go
+++ b/services/wsprd/account/account.go
@@ -11,7 +11,7 @@
 	"v.io/v23/ipc"
 	"v.io/v23/security"
 	"v.io/v23/vlog"
-	"v.io/wspr/veyron/services/wsprd/principal"
+	"v.io/core/veyron/services/wsprd/principal"
 )
 
 type BlesserService interface {
diff --git a/services/wsprd/account/account.vdl.go b/services/wsprd/account/account.vdl.go
index d76345f..c613456 100644
--- a/services/wsprd/account/account.vdl.go
+++ b/services/wsprd/account/account.vdl.go
@@ -15,7 +15,7 @@
 }
 
 func (Caveat) __VDLReflect(struct {
-	Name string "v.io/wspr/veyron/services/wsprd/account.Caveat"
+	Name string "v.io/core/veyron/services/wsprd/account.Caveat"
 }) {
 }
 
diff --git a/services/wsprd/app/app.go b/services/wsprd/app/app.go
index 62bf236..3ddbf3c 100644
--- a/services/wsprd/app/app.go
+++ b/services/wsprd/app/app.go
@@ -25,10 +25,10 @@
 	"v.io/v23/vlog"
 	"v.io/v23/vom"
 	"v.io/v23/vtrace"
-	"v.io/wspr/veyron/services/wsprd/ipc/server"
-	"v.io/wspr/veyron/services/wsprd/lib"
-	"v.io/wspr/veyron/services/wsprd/namespace"
-	"v.io/wspr/veyron/services/wsprd/principal"
+	"v.io/core/veyron/services/wsprd/ipc/server"
+	"v.io/core/veyron/services/wsprd/lib"
+	"v.io/core/veyron/services/wsprd/namespace"
+	"v.io/core/veyron/services/wsprd/principal"
 )
 
 // pkgPath is the prefix os errors in this package.
diff --git a/services/wsprd/app/app.vdl.go b/services/wsprd/app/app.vdl.go
index 6a5d454..ededee2 100644
--- a/services/wsprd/app/app.vdl.go
+++ b/services/wsprd/app/app.vdl.go
@@ -24,7 +24,7 @@
 }
 
 func (VeyronRPCRequest) __VDLReflect(struct {
-	Name string "v.io/wspr/veyron/services/wsprd/app.VeyronRPCRequest"
+	Name string "v.io/core/veyron/services/wsprd/app.VeyronRPCRequest"
 }) {
 }
 
@@ -34,7 +34,7 @@
 }
 
 func (VeyronRPCResponse) __VDLReflect(struct {
-	Name string "v.io/wspr/veyron/services/wsprd/app.VeyronRPCResponse"
+	Name string "v.io/core/veyron/services/wsprd/app.VeyronRPCResponse"
 }) {
 }
 
diff --git a/services/wsprd/app/app_test.go b/services/wsprd/app/app_test.go
index 1ab29aa..e072dd5 100644
--- a/services/wsprd/app/app_test.go
+++ b/services/wsprd/app/app_test.go
@@ -25,9 +25,9 @@
 	"v.io/v23/verror"
 	"v.io/v23/vom"
 	"v.io/v23/vtrace"
-	"v.io/wspr/veyron/services/wsprd/ipc/server"
-	"v.io/wspr/veyron/services/wsprd/lib"
-	"v.io/wspr/veyron/services/wsprd/lib/testwriter"
+	"v.io/core/veyron/services/wsprd/ipc/server"
+	"v.io/core/veyron/services/wsprd/lib"
+	"v.io/core/veyron/services/wsprd/lib/testwriter"
 )
 
 var (
diff --git a/services/wsprd/app/controller.vdl.go b/services/wsprd/app/controller.vdl.go
index 37e4526..c3c5391 100644
--- a/services/wsprd/app/controller.vdl.go
+++ b/services/wsprd/app/controller.vdl.go
@@ -261,7 +261,7 @@
 // descController hides the desc to keep godoc clean.
 var descController = ipc.InterfaceDesc{
 	Name:    "Controller",
-	PkgPath: "v.io/wspr/veyron/services/wsprd/app",
+	PkgPath: "v.io/core/veyron/services/wsprd/app",
 	Methods: []ipc.MethodDesc{
 		{
 			Name: "Serve",
diff --git a/services/wsprd/app/messaging.go b/services/wsprd/app/messaging.go
index 657603e..5aa69ef 100644
--- a/services/wsprd/app/messaging.go
+++ b/services/wsprd/app/messaging.go
@@ -10,11 +10,11 @@
 	"v.io/v23/vlog"
 	"v.io/v23/vom"
 	"v.io/v23/vtrace"
-	"v.io/wspr/veyron/services/wsprd/lib"
+	"v.io/core/veyron/services/wsprd/lib"
 )
 
 const (
-	verrorPkgPath = "v.io/wspr/veyron/services/wsprd/app"
+	verrorPkgPath = "v.io/core/veyron/services/wsprd/app"
 )
 
 var (
diff --git a/services/wsprd/app/mock_jsServer_test.go b/services/wsprd/app/mock_jsServer_test.go
index 4ebd69f..a92cd45 100644
--- a/services/wsprd/app/mock_jsServer_test.go
+++ b/services/wsprd/app/mock_jsServer_test.go
@@ -11,9 +11,9 @@
 	"v.io/v23/vdl"
 	"v.io/v23/vdlroot/signature"
 	"v.io/v23/vom"
-	"v.io/wspr/veyron/services/wsprd/ipc/server"
-	"v.io/wspr/veyron/services/wsprd/lib"
-	"v.io/wspr/veyron/services/wsprd/principal"
+	"v.io/core/veyron/services/wsprd/ipc/server"
+	"v.io/core/veyron/services/wsprd/lib"
+	"v.io/core/veyron/services/wsprd/principal"
 )
 
 type mockJSServer struct {
diff --git a/services/wsprd/app/stream.go b/services/wsprd/app/stream.go
index 9cb1764..6916e31 100644
--- a/services/wsprd/app/stream.go
+++ b/services/wsprd/app/stream.go
@@ -4,7 +4,7 @@
 	"fmt"
 
 	"v.io/v23/ipc"
-	"v.io/wspr/veyron/services/wsprd/lib"
+	"v.io/core/veyron/services/wsprd/lib"
 )
 
 type initConfig struct {
diff --git a/services/wsprd/browspr/browspr.go b/services/wsprd/browspr/browspr.go
index 7ed156d..0284984 100644
--- a/services/wsprd/browspr/browspr.go
+++ b/services/wsprd/browspr/browspr.go
@@ -12,8 +12,8 @@
 	"v.io/v23/vdl"
 	"v.io/v23/vlog"
 	"v.io/v23/vtrace"
-	"v.io/wspr/veyron/services/wsprd/account"
-	"v.io/wspr/veyron/services/wsprd/principal"
+	"v.io/core/veyron/services/wsprd/account"
+	"v.io/core/veyron/services/wsprd/principal"
 )
 
 // Browspr is an intermediary between our javascript code and the veyron
diff --git a/services/wsprd/browspr/browspr.vdl b/services/wsprd/browspr/browspr.vdl
index 1f38d99..ef14e64 100644
--- a/services/wsprd/browspr/browspr.vdl
+++ b/services/wsprd/browspr/browspr.vdl
@@ -1,7 +1,7 @@
 package browspr
 
 import(
-  "v.io/wspr/veyron/services/wsprd/account"
+  "v.io/core/veyron/services/wsprd/account"
 )
 
 type StartMessage struct {
@@ -39,4 +39,4 @@
   Origin string
 }
 
-type GetAccountsMessage struct {}
\ No newline at end of file
+type GetAccountsMessage struct {}
diff --git a/services/wsprd/browspr/browspr.vdl.go b/services/wsprd/browspr/browspr.vdl.go
index 179c1c7..15db29e 100644
--- a/services/wsprd/browspr/browspr.vdl.go
+++ b/services/wsprd/browspr/browspr.vdl.go
@@ -8,7 +8,7 @@
 	"v.io/v23/vdl"
 
 	// VDL user imports
-	"v.io/wspr/veyron/services/wsprd/account"
+	"v.io/core/veyron/services/wsprd/account"
 )
 
 type StartMessage struct {
@@ -21,7 +21,7 @@
 }
 
 func (StartMessage) __VDLReflect(struct {
-	Name string "v.io/wspr/veyron/services/wsprd/browspr.StartMessage"
+	Name string "v.io/core/veyron/services/wsprd/browspr.StartMessage"
 }) {
 }
 
@@ -34,7 +34,7 @@
 }
 
 func (blessingRoot) __VDLReflect(struct {
-	Name string "v.io/wspr/veyron/services/wsprd/browspr.blessingRoot"
+	Name string "v.io/core/veyron/services/wsprd/browspr.blessingRoot"
 }) {
 }
 
@@ -45,7 +45,7 @@
 }
 
 func (AssociateAccountMessage) __VDLReflect(struct {
-	Name string "v.io/wspr/veyron/services/wsprd/browspr.AssociateAccountMessage"
+	Name string "v.io/core/veyron/services/wsprd/browspr.AssociateAccountMessage"
 }) {
 }
 
@@ -54,7 +54,7 @@
 }
 
 func (CreateAccountMessage) __VDLReflect(struct {
-	Name string "v.io/wspr/veyron/services/wsprd/browspr.CreateAccountMessage"
+	Name string "v.io/core/veyron/services/wsprd/browspr.CreateAccountMessage"
 }) {
 }
 
@@ -63,7 +63,7 @@
 }
 
 func (CleanupMessage) __VDLReflect(struct {
-	Name string "v.io/wspr/veyron/services/wsprd/browspr.CleanupMessage"
+	Name string "v.io/core/veyron/services/wsprd/browspr.CleanupMessage"
 }) {
 }
 
@@ -72,7 +72,7 @@
 }
 
 func (OriginHasAccountMessage) __VDLReflect(struct {
-	Name string "v.io/wspr/veyron/services/wsprd/browspr.OriginHasAccountMessage"
+	Name string "v.io/core/veyron/services/wsprd/browspr.OriginHasAccountMessage"
 }) {
 }
 
@@ -80,7 +80,7 @@
 }
 
 func (GetAccountsMessage) __VDLReflect(struct {
-	Name string "v.io/wspr/veyron/services/wsprd/browspr.GetAccountsMessage"
+	Name string "v.io/core/veyron/services/wsprd/browspr.GetAccountsMessage"
 }) {
 }
 
diff --git a/services/wsprd/browspr/browspr_test.go b/services/wsprd/browspr/browspr_test.go
index c5fcd98..5370832 100644
--- a/services/wsprd/browspr/browspr_test.go
+++ b/services/wsprd/browspr/browspr_test.go
@@ -20,8 +20,8 @@
 	_ "v.io/core/veyron/profiles"
 	"v.io/core/veyron/runtimes/google/ipc/stream/proxy"
 	mounttable "v.io/core/veyron/services/mounttable/lib"
-	"v.io/wspr/veyron/services/wsprd/app"
-	"v.io/wspr/veyron/services/wsprd/lib"
+	"v.io/core/veyron/services/wsprd/app"
+	"v.io/core/veyron/services/wsprd/lib"
 )
 
 func startProxy() (*proxy.Proxy, error) {
diff --git a/services/wsprd/browspr/main/main_nacl.go b/services/wsprd/browspr/main/main_nacl.go
index 4a321e6..683a4f9 100644
--- a/services/wsprd/browspr/main/main_nacl.go
+++ b/services/wsprd/browspr/main/main_nacl.go
@@ -15,8 +15,8 @@
 	"v.io/v23/security"
 	"v.io/v23/vdl"
 	"v.io/v23/vlog"
-	"v.io/wspr/veyron/services/wsprd/browspr"
-	"v.io/wspr/veyron/services/wsprd/channel/channel_nacl"
+	"v.io/core/veyron/services/wsprd/browspr"
+	"v.io/core/veyron/services/wsprd/channel/channel_nacl"
 )
 
 func main() {
diff --git a/services/wsprd/browspr/pipe.go b/services/wsprd/browspr/pipe.go
index b88e401..04cfff2 100644
--- a/services/wsprd/browspr/pipe.go
+++ b/services/wsprd/browspr/pipe.go
@@ -5,8 +5,8 @@
 	"fmt"
 
 	"v.io/v23/vlog"
-	"v.io/wspr/veyron/services/wsprd/app"
-	"v.io/wspr/veyron/services/wsprd/lib"
+	"v.io/core/veyron/services/wsprd/app"
+	"v.io/core/veyron/services/wsprd/lib"
 )
 
 // pipe controls the flow of messages for a specific instance (corresponding to a specific tab).
diff --git a/services/wsprd/browspr/writer.go b/services/wsprd/browspr/writer.go
index b956ce6..6278583 100644
--- a/services/wsprd/browspr/writer.go
+++ b/services/wsprd/browspr/writer.go
@@ -1,8 +1,8 @@
 package browspr
 
 import (
-	"v.io/wspr/veyron/services/wsprd/app"
-	"v.io/wspr/veyron/services/wsprd/lib"
+	"v.io/core/veyron/services/wsprd/app"
+	"v.io/core/veyron/services/wsprd/lib"
 )
 
 // postMessageWriter is a lib.ClientWriter that handles sending messages over postMessage to the extension.
diff --git a/services/wsprd/channel/channel.vdl.go b/services/wsprd/channel/channel.vdl.go
index 1025bdc..5988c5f 100644
--- a/services/wsprd/channel/channel.vdl.go
+++ b/services/wsprd/channel/channel.vdl.go
@@ -15,7 +15,7 @@
 }
 
 func (Request) __VDLReflect(struct {
-	Name string "v.io/wspr/veyron/services/wsprd/channel.Request"
+	Name string "v.io/core/veyron/services/wsprd/channel.Request"
 }) {
 }
 
@@ -26,7 +26,7 @@
 }
 
 func (Response) __VDLReflect(struct {
-	Name string "v.io/wspr/veyron/services/wsprd/channel.Response"
+	Name string "v.io/core/veyron/services/wsprd/channel.Response"
 }) {
 }
 
@@ -48,7 +48,7 @@
 	MessageResponse struct{ Value Response }
 	// __MessageReflect describes the Message union type.
 	__MessageReflect struct {
-		Name  string "v.io/wspr/veyron/services/wsprd/channel.Message"
+		Name  string "v.io/core/veyron/services/wsprd/channel.Message"
 		Type  Message
 		Union struct {
 			Request  MessageRequest
diff --git a/services/wsprd/channel/channel_nacl/channel_nacl.go b/services/wsprd/channel/channel_nacl/channel_nacl.go
index cab05ba..781e65f 100644
--- a/services/wsprd/channel/channel_nacl/channel_nacl.go
+++ b/services/wsprd/channel/channel_nacl/channel_nacl.go
@@ -7,7 +7,7 @@
 
 	"v.io/v23/vdl"
 	"v.io/v23/vom"
-	"v.io/wspr/veyron/services/wsprd/channel" // contains most of the logic, factored out for testing
+	"v.io/core/veyron/services/wsprd/channel" // contains most of the logic, factored out for testing
 )
 
 type Channel struct {
diff --git a/services/wsprd/channel/channel_test.go b/services/wsprd/channel/channel_test.go
index 86f4ac9..2273d07 100644
--- a/services/wsprd/channel/channel_test.go
+++ b/services/wsprd/channel/channel_test.go
@@ -6,7 +6,7 @@
 	"testing"
 
 	"v.io/v23/vdl"
-	"v.io/wspr/veyron/services/wsprd/channel"
+	"v.io/core/veyron/services/wsprd/channel"
 )
 
 func TestChannelRpcs(t *testing.T) {
diff --git a/services/wsprd/ipc/server/dispatcher.go b/services/wsprd/ipc/server/dispatcher.go
index 5b8687f..93c81f5 100644
--- a/services/wsprd/ipc/server/dispatcher.go
+++ b/services/wsprd/ipc/server/dispatcher.go
@@ -6,7 +6,7 @@
 	"fmt"
 	"sync"
 
-	"v.io/wspr/veyron/services/wsprd/lib"
+	"v.io/core/veyron/services/wsprd/lib"
 
 	"v.io/v23/ipc"
 	"v.io/v23/security"
diff --git a/services/wsprd/ipc/server/dispatcher_test.go b/services/wsprd/ipc/server/dispatcher_test.go
index 2a101db..554790c 100644
--- a/services/wsprd/ipc/server/dispatcher_test.go
+++ b/services/wsprd/ipc/server/dispatcher_test.go
@@ -9,8 +9,8 @@
 	"v.io/v23/security"
 	"v.io/v23/vdl"
 	"v.io/v23/vdlroot/signature"
-	"v.io/wspr/veyron/services/wsprd/lib"
-	"v.io/wspr/veyron/services/wsprd/lib/testwriter"
+	"v.io/core/veyron/services/wsprd/lib"
+	"v.io/core/veyron/services/wsprd/lib/testwriter"
 )
 
 type mockFlowFactory struct {
diff --git a/services/wsprd/ipc/server/invoker.go b/services/wsprd/ipc/server/invoker.go
index a4229d5..92388c7 100644
--- a/services/wsprd/ipc/server/invoker.go
+++ b/services/wsprd/ipc/server/invoker.go
@@ -11,7 +11,7 @@
 
 var typedNil []int
 
-const pkgPath = "v.io/wspr/veyron/services/wsprd/ipc/server"
+const pkgPath = "v.io/core/veyron/services/wsprd/ipc/server"
 
 // Errors.
 var (
diff --git a/services/wsprd/ipc/server/server.go b/services/wsprd/ipc/server/server.go
index fa6b279..6b9f746 100644
--- a/services/wsprd/ipc/server/server.go
+++ b/services/wsprd/ipc/server/server.go
@@ -8,8 +8,8 @@
 	"sync"
 	"time"
 
-	"v.io/wspr/veyron/services/wsprd/lib"
-	"v.io/wspr/veyron/services/wsprd/principal"
+	"v.io/core/veyron/services/wsprd/lib"
+	"v.io/core/veyron/services/wsprd/principal"
 
 	"v.io/v23"
 	"v.io/v23/context"
diff --git a/services/wsprd/ipc/server/server.vdl b/services/wsprd/ipc/server/server.vdl
index fb0e050..e729d10 100644
--- a/services/wsprd/ipc/server/server.vdl
+++ b/services/wsprd/ipc/server/server.vdl
@@ -1,7 +1,7 @@
 package server
 
 import (
-  "v.io/wspr/veyron/services/wsprd/principal"
+  "v.io/core/veyron/services/wsprd/principal"
   "v.io/v23/security"
 )
 
@@ -29,4 +29,4 @@
 error (
     CaveatValidationTimeout() {"en": "Caveat validation has timed out"}
     InvalidValidationResponseFromJavascript() {"en": "Invalid validation response from javascript"}
-)
\ No newline at end of file
+)
diff --git a/services/wsprd/ipc/server/server.vdl.go b/services/wsprd/ipc/server/server.vdl.go
index 93a26fd..4ad1552 100644
--- a/services/wsprd/ipc/server/server.vdl.go
+++ b/services/wsprd/ipc/server/server.vdl.go
@@ -12,7 +12,7 @@
 
 	// VDL user imports
 	"v.io/v23/security"
-	"v.io/wspr/veyron/services/wsprd/principal"
+	"v.io/core/veyron/services/wsprd/principal"
 )
 
 type SecurityContext struct {
@@ -28,7 +28,7 @@
 }
 
 func (SecurityContext) __VDLReflect(struct {
-	Name string "v.io/wspr/veyron/services/wsprd/ipc/server.SecurityContext"
+	Name string "v.io/core/veyron/services/wsprd/ipc/server.SecurityContext"
 }) {
 }
 
@@ -38,7 +38,7 @@
 }
 
 func (CaveatValidationRequest) __VDLReflect(struct {
-	Name string "v.io/wspr/veyron/services/wsprd/ipc/server.CaveatValidationRequest"
+	Name string "v.io/core/veyron/services/wsprd/ipc/server.CaveatValidationRequest"
 }) {
 }
 
@@ -47,7 +47,7 @@
 }
 
 func (CaveatValidationResponse) __VDLReflect(struct {
-	Name string "v.io/wspr/veyron/services/wsprd/ipc/server.CaveatValidationResponse"
+	Name string "v.io/core/veyron/services/wsprd/ipc/server.CaveatValidationResponse"
 }) {
 }
 
@@ -58,8 +58,8 @@
 }
 
 var (
-	ErrCaveatValidationTimeout                 = verror.Register("v.io/wspr/veyron/services/wsprd/ipc/server.CaveatValidationTimeout", verror.NoRetry, "{1:}{2:} Caveat validation has timed out")
-	ErrInvalidValidationResponseFromJavascript = verror.Register("v.io/wspr/veyron/services/wsprd/ipc/server.InvalidValidationResponseFromJavascript", verror.NoRetry, "{1:}{2:} Invalid validation response from javascript")
+	ErrCaveatValidationTimeout                 = verror.Register("v.io/core/veyron/services/wsprd/ipc/server.CaveatValidationTimeout", verror.NoRetry, "{1:}{2:} Caveat validation has timed out")
+	ErrInvalidValidationResponseFromJavascript = verror.Register("v.io/core/veyron/services/wsprd/ipc/server.InvalidValidationResponseFromJavascript", verror.NoRetry, "{1:}{2:} Invalid validation response from javascript")
 )
 
 func init() {
diff --git a/services/wsprd/lib/signature_manager.go b/services/wsprd/lib/signature_manager.go
index 816ac25..3671f8c 100644
--- a/services/wsprd/lib/signature_manager.go
+++ b/services/wsprd/lib/signature_manager.go
@@ -54,7 +54,7 @@
 	return time.Now().Sub(c.lastAccessed) > ttl
 }
 
-const pkgPath = "v.io/wspr/veyron/services/wsprd/lib"
+const pkgPath = "v.io/core/veyron/services/wsprd/lib"
 
 func (sm *signatureManager) lookupCacheLocked(name string) []signature.Interface {
 	if entry := sm.cache[name]; entry != nil && !entry.expired() {
diff --git a/services/wsprd/lib/testwriter/writer.go b/services/wsprd/lib/testwriter/writer.go
index 06dbe72..b55e954 100644
--- a/services/wsprd/lib/testwriter/writer.go
+++ b/services/wsprd/lib/testwriter/writer.go
@@ -9,7 +9,7 @@
 	"time"
 
 	"v.io/v23/verror"
-	"v.io/wspr/veyron/services/wsprd/lib"
+	"v.io/core/veyron/services/wsprd/lib"
 )
 
 type TestHarness interface {
diff --git a/services/wsprd/lib/writer.vdl.go b/services/wsprd/lib/writer.vdl.go
index 93c230b..2187d50 100644
--- a/services/wsprd/lib/writer.vdl.go
+++ b/services/wsprd/lib/writer.vdl.go
@@ -15,7 +15,7 @@
 }
 
 func (ServerRPCReply) __VDLReflect(struct {
-	Name string "v.io/wspr/veyron/services/wsprd/lib.ServerRPCReply"
+	Name string "v.io/core/veyron/services/wsprd/lib.ServerRPCReply"
 }) {
 }
 
diff --git a/services/wsprd/namespace/namespace.vdl.go b/services/wsprd/namespace/namespace.vdl.go
index d505558..561ff08 100644
--- a/services/wsprd/namespace/namespace.vdl.go
+++ b/services/wsprd/namespace/namespace.vdl.go
@@ -351,7 +351,7 @@
 // descNamespace hides the desc to keep godoc clean.
 var descNamespace = ipc.InterfaceDesc{
 	Name:    "Namespace",
-	PkgPath: "v.io/wspr/veyron/services/wsprd/namespace",
+	PkgPath: "v.io/core/veyron/services/wsprd/namespace",
 	Methods: []ipc.MethodDesc{
 		{
 			Name: "Glob",
diff --git a/services/wsprd/principal/blessings.vdl.go b/services/wsprd/principal/blessings.vdl.go
index a5fbd04..70939be 100644
--- a/services/wsprd/principal/blessings.vdl.go
+++ b/services/wsprd/principal/blessings.vdl.go
@@ -14,7 +14,7 @@
 }
 
 func (BlessingsHandle) __VDLReflect(struct {
-	Name string "v.io/wspr/veyron/services/wsprd/principal.BlessingsHandle"
+	Name string "v.io/core/veyron/services/wsprd/principal.BlessingsHandle"
 }) {
 }
 
diff --git a/services/wsprd/principal/principal.go b/services/wsprd/principal/principal.go
index 29a8be8..23b5fdc 100644
--- a/services/wsprd/principal/principal.go
+++ b/services/wsprd/principal/principal.go
@@ -66,7 +66,7 @@
 	Accounts map[string]security.WireBlessings
 }
 
-const pkgPath = "v.io/wspr/veyron/services/wsprd/principal"
+const pkgPath = "v.io/core/veyron/services/wsprd/principal"
 
 // Errors.
 var (
diff --git a/services/wsprd/wspr.go b/services/wsprd/wspr.go
index b9bef4b..e9b4808 100644
--- a/services/wsprd/wspr.go
+++ b/services/wsprd/wspr.go
@@ -10,7 +10,7 @@
 	"v.io/core/veyron/lib/signals"
 	// TODO(cnicolaou,benj): figure out how to support roaming as a chrome plugin
 	_ "v.io/core/veyron/profiles/roaming"
-	"v.io/wspr/veyron/services/wsprd/wspr"
+	"v.io/core/veyron/services/wsprd/wspr"
 )
 
 func main() {
diff --git a/services/wsprd/wspr/pipe.go b/services/wsprd/wspr/pipe.go
index d32436c..42090ce 100644
--- a/services/wsprd/wspr/pipe.go
+++ b/services/wsprd/wspr/pipe.go
@@ -10,8 +10,8 @@
 
 	"v.io/v23"
 	"v.io/v23/vlog"
-	"v.io/wspr/veyron/services/wsprd/app"
-	"v.io/wspr/veyron/services/wsprd/lib"
+	"v.io/core/veyron/services/wsprd/app"
+	"v.io/core/veyron/services/wsprd/lib"
 
 	"github.com/gorilla/websocket"
 )
diff --git a/services/wsprd/wspr/writer.go b/services/wsprd/wspr/writer.go
index 930e4a6..eaa2e2f 100644
--- a/services/wsprd/wspr/writer.go
+++ b/services/wsprd/wspr/writer.go
@@ -5,11 +5,11 @@
 	"path/filepath"
 	"runtime"
 
-	"v.io/wspr/veyron/services/wsprd/lib"
+	"v.io/core/veyron/services/wsprd/lib"
 
 	"v.io/v23/verror"
 	"v.io/v23/vlog"
-	"v.io/wspr/veyron/services/wsprd/app"
+	"v.io/core/veyron/services/wsprd/app"
 
 	"github.com/gorilla/websocket"
 )
diff --git a/services/wsprd/wspr/wspr.go b/services/wsprd/wspr/wspr.go
index c1db32f..5e08a1b 100644
--- a/services/wsprd/wspr/wspr.go
+++ b/services/wsprd/wspr/wspr.go
@@ -30,8 +30,8 @@
 	"v.io/v23/ipc"
 	"v.io/v23/vlog"
 
-	"v.io/wspr/veyron/services/wsprd/account"
-	"v.io/wspr/veyron/services/wsprd/principal"
+	"v.io/core/veyron/services/wsprd/account"
+	"v.io/core/veyron/services/wsprd/principal"
 )
 
 const (