playground: Restructure services/wspr

MultiPart: 3/3
Change-Id: Ib13dc7de40a9360b0a56cfe7d82593f70ed4cffe
diff --git a/client/lib/shell/pg_test_util.sh b/client/lib/shell/pg_test_util.sh
index 53f0b79..2722adc 100755
--- a/client/lib/shell/pg_test_util.sh
+++ b/client/lib/shell/pg_test_util.sh
@@ -44,7 +44,7 @@
   shell_test::build_go_binary 'v.io/x/ref/cmd/principal'
   shell_test::build_go_binary 'v.io/x/ref/services/proxy/proxyd'
   shell_test::build_go_binary 'v.io/x/ref/services/mounttable/mounttabled'
-  shell_test::build_go_binary 'v.io/x/ref/services/wsprd'
+  shell_test::build_go_binary 'v.io/x/ref/services/wspr/wsprd'
   shell_test::build_go_binary 'v.io/x/ref/cmd/vdl'
   shell_test::build_go_binary 'playground/builder'
 }
diff --git a/go/src/playground/Makefile b/go/src/playground/Makefile
index b3107de..abab1c3 100644
--- a/go/src/playground/Makefile
+++ b/go/src/playground/Makefile
@@ -20,7 +20,7 @@
 	v23 go install v.io/x/ref/services/identity/identityd
 	v23 go install v.io/x/ref/services/mounttable/mounttabled
 	v23 go install v.io/x/ref/services/proxy/proxyd
-	v23 go install v.io/x/ref/services/wsprd
+	v23 go install v.io/x/ref/services/wspr/wsprd
 
 .PHONY: builder
 builder: builder-deps
diff --git a/go/src/playground/playground_v23_test.go b/go/src/playground/playground_v23_test.go
index faeeb1b..f105a00 100644
--- a/go/src/playground/playground_v23_test.go
+++ b/go/src/playground/playground_v23_test.go
@@ -85,7 +85,7 @@
 	i.BuildGoPkg("v.io/x/ref/cmd/principal")
 	i.BuildGoPkg("v.io/x/ref/cmd/vdl")
 	i.BuildGoPkg("v.io/x/ref/services/proxy/proxyd")
-	i.BuildGoPkg("v.io/x/ref/services/wsprd")
+	i.BuildGoPkg("v.io/x/ref/services/wspr/wsprd")
 
 	playgroundPkg := golist(i, "playground")
 	// strip last three directory components, much easier to read in