mv x/ref/lib/testutil -> x/ref/test and lib/modules to test/modules
MultiPart: 4/7

Change-Id: I53b484826e71b735fe86fbef35bdc6e51f5d51c9
diff --git a/vlog/flags_test.go b/vlog/flags_test.go
index 1904b9c..8c2477f 100644
--- a/vlog/flags_test.go
+++ b/vlog/flags_test.go
@@ -8,9 +8,9 @@
 	"path/filepath"
 	"testing"
 
-	"v.io/x/ref/lib/modules"
-
 	"v.io/x/lib/vlog"
+
+	"v.io/x/ref/test/modules"
 )
 
 //go:generate v23 test generate
diff --git a/vlog/v23_test.go b/vlog/v23_test.go
index 5de1cfe..129e96d 100644
--- a/vlog/v23_test.go
+++ b/vlog/v23_test.go
@@ -10,15 +10,15 @@
 import "testing"
 import "os"
 
-import "v.io/x/ref/lib/modules"
-import "v.io/x/ref/lib/testutil"
+import "v.io/x/ref/test"
+import "v.io/x/ref/test/modules"
 
 func init() {
 	modules.RegisterChild("child", ``, child)
 }
 
 func TestMain(m *testing.M) {
-	testutil.Init()
+	test.Init()
 	if modules.IsModulesChildProcess() {
 		if err := modules.Dispatch(); err != nil {
 			fmt.Fprintf(os.Stderr, "modules.Dispatch failed: %v\n", err)