pg/wspr: reflecting the move of wsprd

Change-Id: Id1d09455865fff091df26d4e86db049ee6b9cb78
diff --git a/client/lib/shell/pg_test_util.sh b/client/lib/shell/pg_test_util.sh
index 2f5f021..57eaf22 100755
--- a/client/lib/shell/pg_test_util.sh
+++ b/client/lib/shell/pg_test_util.sh
@@ -48,8 +48,8 @@
   shell_test::build_go_binary 'v.io/core/veyron/tools/principal'
   shell_test::build_go_binary 'v.io/core/veyron/services/proxy/proxyd'
   shell_test::build_go_binary 'v.io/core/veyron/services/mounttable/mounttabled'
+  shell_test::build_go_binary 'v.io/core/veyron/services/wsprd'
   shell_test::build_go_binary 'v.io/core/veyron/tools/vdl'
-  shell_test::build_go_binary 'v.io/wspr/veyron/services/wsprd'
   shell_test::build_go_binary 'playground/builder'
 }
 
diff --git a/go/src/playground/Dockerfile b/go/src/playground/Dockerfile
index bec57d6..1ba3e54 100644
--- a/go/src/playground/Dockerfile
+++ b/go/src/playground/Dockerfile
@@ -42,7 +42,6 @@
 WORKDIR /usr/local/vanadium/release
 ENV PATH $VANADIUM_ROOT/release/go/bin:$VANADIUM_ROOT/release/projects/playground/go/bin:$VANADIUM_ROOT/bin:$PATH
 RUN v23 go install v.io/core/...
-RUN v23 go install v.io/wspr/...
 RUN v23 go install playground/...
 
 # Uncomment the following lines to install a version of the builder tool using
diff --git a/go/src/playground/playground_v23_test.go b/go/src/playground/playground_v23_test.go
index feb8018..fb7b916 100644
--- a/go/src/playground/playground_v23_test.go
+++ b/go/src/playground/playground_v23_test.go
@@ -83,7 +83,7 @@
 	i.BuildGoPkg("v.io/core/veyron/tools/principal")
 	i.BuildGoPkg("v.io/core/veyron/tools/vdl")
 	i.BuildGoPkg("v.io/core/veyron/services/proxy/proxyd")
-	i.BuildGoPkg("v.io/wspr/veyron/services/wsprd")
+	i.BuildGoPkg("v.io/core/veyron/services/wsprd")
 
 	playgroundPkg := golist(i, "playground")
 	// strip last three directory components, much easier to read in