ref: Change "profiles" directory to "runtime"

As per vanadium/issues#470

MultiPart: 4/10

Change-Id: I3ac47c1d9c514f7bbe1c80507c2b3db7fcd9f6d4
diff --git a/cmd/mounttable/impl.go b/cmd/mounttable/impl.go
index 04fcc9e..3acb02b 100644
--- a/cmd/mounttable/impl.go
+++ b/cmd/mounttable/impl.go
@@ -22,7 +22,7 @@
 	"v.io/x/lib/cmdline2"
 	"v.io/x/lib/vlog"
 	"v.io/x/ref/lib/v23cmd"
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 func main() {
diff --git a/cmd/mounttable/impl_test.go b/cmd/mounttable/impl_test.go
index 66495a9..8628208 100644
--- a/cmd/mounttable/impl_test.go
+++ b/cmd/mounttable/impl_test.go
@@ -22,7 +22,7 @@
 	"v.io/x/lib/cmdline2"
 	"v.io/x/lib/vlog"
 	"v.io/x/ref/lib/v23cmd"
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/test"
 )
 
diff --git a/cmd/namespace/impl.go b/cmd/namespace/impl.go
index 5e4f1b6..b329b9c 100644
--- a/cmd/namespace/impl.go
+++ b/cmd/namespace/impl.go
@@ -24,7 +24,7 @@
 	"v.io/x/lib/cmdline2"
 	"v.io/x/lib/vlog"
 	"v.io/x/ref/lib/v23cmd"
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 func main() {
diff --git a/cmd/principal/main.go b/cmd/principal/main.go
index 714ec5b..948338a 100644
--- a/cmd/principal/main.go
+++ b/cmd/principal/main.go
@@ -31,7 +31,7 @@
 	"v.io/x/ref/envvar"
 	vsecurity "v.io/x/ref/lib/security"
 	"v.io/x/ref/lib/v23cmd"
-	_ "v.io/x/ref/profiles/static"
+	_ "v.io/x/ref/runtime/factories/static"
 )
 
 var (
diff --git a/cmd/servicerunner/main.go b/cmd/servicerunner/main.go
index 8d243d8..728caa7 100644
--- a/cmd/servicerunner/main.go
+++ b/cmd/servicerunner/main.go
@@ -26,7 +26,7 @@
 
 	"v.io/x/ref/envvar"
 	"v.io/x/ref/lib/signals"
-	"v.io/x/ref/profiles"
+	"v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/services/identity/identitylib"
 	"v.io/x/ref/services/mounttable/mounttablelib"
 	"v.io/x/ref/test/expect"
diff --git a/cmd/vdl/arith_test.go b/cmd/vdl/arith_test.go
index f997fda..4a1e6b5 100644
--- a/cmd/vdl/arith_test.go
+++ b/cmd/vdl/arith_test.go
@@ -23,7 +23,7 @@
 	"v.io/x/ref/lib/vdl/testdata/base"
 	"v.io/x/ref/test"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 var generatedError = errors.New("generated error")
diff --git a/cmd/vomtestgen/generate.go b/cmd/vomtestgen/generate.go
index 34420c2..a6bf53e 100644
--- a/cmd/vomtestgen/generate.go
+++ b/cmd/vomtestgen/generate.go
@@ -23,7 +23,7 @@
 	"v.io/x/ref/lib/vdl/codegen"
 	"v.io/x/ref/lib/vdl/codegen/vdlgen"
 	"v.io/x/ref/lib/vdl/compile"
-	_ "v.io/x/ref/profiles/static"
+	_ "v.io/x/ref/runtime/factories/static"
 )
 
 const (
diff --git a/cmd/vrpc/vrpc.go b/cmd/vrpc/vrpc.go
index 0e25698..b3c654e 100644
--- a/cmd/vrpc/vrpc.go
+++ b/cmd/vrpc/vrpc.go
@@ -28,7 +28,7 @@
 	"v.io/x/ref/lib/vdl/codegen/vdlgen"
 	"v.io/x/ref/lib/vdl/compile"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 var (
diff --git a/cmd/vrpc/vrpc_test.go b/cmd/vrpc/vrpc_test.go
index d8ef7dc..50b86bf 100644
--- a/cmd/vrpc/vrpc_test.go
+++ b/cmd/vrpc/vrpc_test.go
@@ -17,7 +17,7 @@
 	"v.io/x/lib/vlog"
 	"v.io/x/ref/cmd/vrpc/internal"
 	"v.io/x/ref/lib/v23cmd"
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/test"
 )
 
diff --git a/cmd/vrun/vrun.go b/cmd/vrun/vrun.go
index dbcc8df..fb32d20 100644
--- a/cmd/vrun/vrun.go
+++ b/cmd/vrun/vrun.go
@@ -25,7 +25,7 @@
 	"v.io/x/ref/services/agent/keymgr"
 	"v.io/x/ref/services/role"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 var (
diff --git a/examples/rps/rpsbot/main.go b/examples/rps/rpsbot/main.go
index cae0b2f..3206d9a 100644
--- a/examples/rps/rpsbot/main.go
+++ b/examples/rps/rpsbot/main.go
@@ -21,7 +21,7 @@
 	"v.io/x/ref/examples/rps/internal"
 	"v.io/x/ref/lib/signals"
 
-	_ "v.io/x/ref/profiles/roaming"
+	_ "v.io/x/ref/runtime/factories/roaming"
 )
 
 var (
diff --git a/examples/rps/rpsplayer/main.go b/examples/rps/rpsplayer/main.go
index cb01ff4..456bd80 100644
--- a/examples/rps/rpsplayer/main.go
+++ b/examples/rps/rpsplayer/main.go
@@ -25,7 +25,7 @@
 	"v.io/x/ref/examples/rps"
 	"v.io/x/ref/examples/rps/internal"
 
-	_ "v.io/x/ref/profiles/roaming"
+	_ "v.io/x/ref/runtime/factories/roaming"
 )
 
 var (
diff --git a/examples/rps/rpsscorekeeper/main.go b/examples/rps/rpsscorekeeper/main.go
index a70cf21..8348a9d 100644
--- a/examples/rps/rpsscorekeeper/main.go
+++ b/examples/rps/rpsscorekeeper/main.go
@@ -20,7 +20,7 @@
 	"v.io/x/ref/examples/rps"
 	"v.io/x/ref/examples/rps/internal"
 
-	_ "v.io/x/ref/profiles/roaming"
+	_ "v.io/x/ref/runtime/factories/roaming"
 )
 
 var (
diff --git a/examples/tunnel/tunneld/main.go b/examples/tunnel/tunneld/main.go
index f9de51e..2b0900b 100644
--- a/examples/tunnel/tunneld/main.go
+++ b/examples/tunnel/tunneld/main.go
@@ -15,7 +15,7 @@
 	"v.io/x/ref/lib/security/securityflag"
 	"v.io/x/ref/lib/signals"
 
-	_ "v.io/x/ref/profiles/roaming"
+	_ "v.io/x/ref/runtime/factories/roaming"
 )
 
 var (
diff --git a/examples/tunnel/vsh/main.go b/examples/tunnel/vsh/main.go
index c038fc5..94ec21c 100644
--- a/examples/tunnel/vsh/main.go
+++ b/examples/tunnel/vsh/main.go
@@ -22,7 +22,7 @@
 	"v.io/x/ref/examples/tunnel/internal"
 	"v.io/x/ref/lib/signals"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 var (
diff --git a/lib/signals/signals_test.go b/lib/signals/signals_test.go
index e8799b2..fc2f40e 100644
--- a/lib/signals/signals_test.go
+++ b/lib/signals/signals_test.go
@@ -26,7 +26,7 @@
 	"v.io/x/ref/test"
 	"v.io/x/ref/test/modules"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 //go:generate v23 test generate
diff --git a/profiles/doc.go b/runtime/doc.go
similarity index 100%
rename from profiles/doc.go
rename to runtime/doc.go
diff --git a/profiles/chrome/chromeinit.go b/runtime/factories/chrome/chromeinit.go
similarity index 83%
rename from profiles/chrome/chromeinit.go
rename to runtime/factories/chrome/chromeinit.go
index 0baedb3..45032c9 100644
--- a/profiles/chrome/chromeinit.go
+++ b/runtime/factories/chrome/chromeinit.go
@@ -15,11 +15,11 @@
 	"v.io/x/lib/vlog"
 
 	"v.io/x/ref/lib/flags"
-	"v.io/x/ref/profiles/internal"
-	"v.io/x/ref/profiles/internal/lib/websocket"
-	_ "v.io/x/ref/profiles/internal/rpc/protocols/ws"
-	_ "v.io/x/ref/profiles/internal/rpc/protocols/wsh_nacl"
-	grt "v.io/x/ref/profiles/internal/rt"
+	"v.io/x/ref/runtime/internal"
+	"v.io/x/ref/runtime/internal/lib/websocket"
+	_ "v.io/x/ref/runtime/internal/rpc/protocols/ws"
+	_ "v.io/x/ref/runtime/internal/rpc/protocols/wsh_nacl"
+	grt "v.io/x/ref/runtime/internal/rt"
 )
 
 var commonFlags *flags.Flags
diff --git a/profiles/fake/fake.go b/runtime/factories/fake/fake.go
similarity index 88%
rename from profiles/fake/fake.go
rename to runtime/factories/fake/fake.go
index 279f4c4..943cb11 100644
--- a/profiles/fake/fake.go
+++ b/runtime/factories/fake/fake.go
@@ -15,10 +15,10 @@
 	"v.io/v23/context"
 	"v.io/v23/rpc"
 
-	"v.io/x/ref/profiles/internal/lib/websocket"
-	_ "v.io/x/ref/profiles/internal/rpc/protocols/tcp"
-	_ "v.io/x/ref/profiles/internal/rpc/protocols/ws"
-	_ "v.io/x/ref/profiles/internal/rpc/protocols/wsh"
+	"v.io/x/ref/runtime/internal/lib/websocket"
+	_ "v.io/x/ref/runtime/internal/rpc/protocols/tcp"
+	_ "v.io/x/ref/runtime/internal/rpc/protocols/ws"
+	_ "v.io/x/ref/runtime/internal/rpc/protocols/wsh"
 )
 
 var (
diff --git a/profiles/fake/fake_test.go b/runtime/factories/fake/fake_test.go
similarity index 91%
rename from profiles/fake/fake_test.go
rename to runtime/factories/fake/fake_test.go
index b409f0b..07f1732 100644
--- a/profiles/fake/fake_test.go
+++ b/runtime/factories/fake/fake_test.go
@@ -9,7 +9,7 @@
 
 	"v.io/v23"
 
-	_ "v.io/x/ref/profiles/fake"
+	_ "v.io/x/ref/runtime/factories/fake"
 )
 
 // Ensure that the fake profile can be used to initialize a fake runtime.
diff --git a/profiles/fake/naming.go b/runtime/factories/fake/naming.go
similarity index 100%
rename from profiles/fake/naming.go
rename to runtime/factories/fake/naming.go
diff --git a/profiles/fake/rpc.go b/runtime/factories/fake/rpc.go
similarity index 100%
rename from profiles/fake/rpc.go
rename to runtime/factories/fake/rpc.go
diff --git a/profiles/fake/runtime.go b/runtime/factories/fake/runtime.go
similarity index 100%
rename from profiles/fake/runtime.go
rename to runtime/factories/fake/runtime.go
diff --git a/profiles/gce/init.go b/runtime/factories/gce/init.go
similarity index 82%
rename from profiles/gce/init.go
rename to runtime/factories/gce/init.go
index 99651de..cd39339 100644
--- a/profiles/gce/init.go
+++ b/runtime/factories/gce/init.go
@@ -20,14 +20,14 @@
 
 	"v.io/x/lib/netstate"
 	"v.io/x/ref/lib/flags"
-	"v.io/x/ref/profiles/internal"
-	"v.io/x/ref/profiles/internal/gce"
-	"v.io/x/ref/profiles/internal/lib/appcycle"
-	"v.io/x/ref/profiles/internal/lib/websocket"
-	_ "v.io/x/ref/profiles/internal/rpc/protocols/tcp"
-	_ "v.io/x/ref/profiles/internal/rpc/protocols/ws"
-	_ "v.io/x/ref/profiles/internal/rpc/protocols/wsh"
-	grt "v.io/x/ref/profiles/internal/rt"
+	"v.io/x/ref/runtime/internal"
+	"v.io/x/ref/runtime/internal/gce"
+	"v.io/x/ref/runtime/internal/lib/appcycle"
+	"v.io/x/ref/runtime/internal/lib/websocket"
+	_ "v.io/x/ref/runtime/internal/rpc/protocols/tcp"
+	_ "v.io/x/ref/runtime/internal/rpc/protocols/ws"
+	_ "v.io/x/ref/runtime/internal/rpc/protocols/wsh"
+	grt "v.io/x/ref/runtime/internal/rt"
 )
 
 var commonFlags *flags.Flags
diff --git a/profiles/genericinit.go b/runtime/factories/generic/genericinit.go
similarity index 80%
rename from profiles/genericinit.go
rename to runtime/factories/generic/genericinit.go
index 3851947..0b40d36 100644
--- a/profiles/genericinit.go
+++ b/runtime/factories/generic/genericinit.go
@@ -13,13 +13,13 @@
 	"v.io/x/lib/vlog"
 
 	"v.io/x/ref/lib/flags"
-	"v.io/x/ref/profiles/internal"
-	"v.io/x/ref/profiles/internal/lib/appcycle"
-	"v.io/x/ref/profiles/internal/lib/websocket"
-	_ "v.io/x/ref/profiles/internal/rpc/protocols/tcp"
-	_ "v.io/x/ref/profiles/internal/rpc/protocols/ws"
-	_ "v.io/x/ref/profiles/internal/rpc/protocols/wsh"
-	grt "v.io/x/ref/profiles/internal/rt"
+	"v.io/x/ref/runtime/internal"
+	"v.io/x/ref/runtime/internal/lib/appcycle"
+	"v.io/x/ref/runtime/internal/lib/websocket"
+	_ "v.io/x/ref/runtime/internal/rpc/protocols/tcp"
+	_ "v.io/x/ref/runtime/internal/rpc/protocols/ws"
+	_ "v.io/x/ref/runtime/internal/rpc/protocols/wsh"
+	grt "v.io/x/ref/runtime/internal/rt"
 )
 
 var commonFlags *flags.Flags
diff --git a/profiles/proxy.go b/runtime/factories/generic/proxy.go
similarity index 93%
rename from profiles/proxy.go
rename to runtime/factories/generic/proxy.go
index 9b4a350..4e3d500 100644
--- a/profiles/proxy.go
+++ b/runtime/factories/generic/proxy.go
@@ -10,7 +10,7 @@
 	"v.io/v23/rpc"
 	"v.io/v23/security"
 
-	"v.io/x/ref/profiles/internal/rpc/stream/proxy"
+	"v.io/x/ref/runtime/internal/rpc/stream/proxy"
 )
 
 // NewProxy creates a new Proxy that listens for network connections on the provided
diff --git a/profiles/roaming/.api b/runtime/factories/roaming/.api
similarity index 100%
rename from profiles/roaming/.api
rename to runtime/factories/roaming/.api
diff --git a/profiles/roaming/net_watcher.go b/runtime/factories/roaming/net_watcher.go
similarity index 97%
rename from profiles/roaming/net_watcher.go
rename to runtime/factories/roaming/net_watcher.go
index f4880d4..9646b7d 100644
--- a/profiles/roaming/net_watcher.go
+++ b/runtime/factories/roaming/net_watcher.go
@@ -16,7 +16,7 @@
 	"v.io/v23"
 	"v.io/v23/config"
 
-	"v.io/x/ref/profiles/roaming"
+	"v.io/x/ref/runtime/factories/roaming"
 )
 
 func main() {
diff --git a/profiles/roaming/print_addrs.go b/runtime/factories/roaming/print_addrs.go
similarity index 100%
rename from profiles/roaming/print_addrs.go
rename to runtime/factories/roaming/print_addrs.go
diff --git a/profiles/roaming/proxy.go b/runtime/factories/roaming/proxy.go
similarity index 93%
rename from profiles/roaming/proxy.go
rename to runtime/factories/roaming/proxy.go
index 5590a7c..7860a52 100644
--- a/profiles/roaming/proxy.go
+++ b/runtime/factories/roaming/proxy.go
@@ -10,7 +10,7 @@
 	"v.io/v23/rpc"
 	"v.io/v23/security"
 
-	"v.io/x/ref/profiles/internal/rpc/stream/proxy"
+	"v.io/x/ref/runtime/internal/rpc/stream/proxy"
 )
 
 // NewProxy creates a new Proxy that listens for network connections on the provided
diff --git a/profiles/roaming/roaming_server.go b/runtime/factories/roaming/roaming_server.go
similarity index 96%
rename from profiles/roaming/roaming_server.go
rename to runtime/factories/roaming/roaming_server.go
index 7bb4a5d..c3e9a2f 100644
--- a/profiles/roaming/roaming_server.go
+++ b/runtime/factories/roaming/roaming_server.go
@@ -14,7 +14,7 @@
 	"v.io/v23/rpc"
 	"v.io/x/lib/vlog"
 
-	_ "v.io/x/ref/profiles/roaming"
+	_ "v.io/x/ref/runtime/factories/roaming"
 )
 
 func main() {
diff --git a/profiles/roaming/roaminginit.go b/runtime/factories/roaming/roaminginit.go
similarity index 93%
rename from profiles/roaming/roaminginit.go
rename to runtime/factories/roaming/roaminginit.go
index bff4202..00ae923 100644
--- a/profiles/roaming/roaminginit.go
+++ b/runtime/factories/roaming/roaminginit.go
@@ -28,14 +28,14 @@
 
 	"v.io/x/ref/lib/flags"
 	"v.io/x/ref/lib/security/securityflag"
-	"v.io/x/ref/profiles/internal"
-	"v.io/x/ref/profiles/internal/lib/appcycle"
-	"v.io/x/ref/profiles/internal/lib/websocket"
-	irpc "v.io/x/ref/profiles/internal/rpc"
-	_ "v.io/x/ref/profiles/internal/rpc/protocols/tcp"
-	_ "v.io/x/ref/profiles/internal/rpc/protocols/ws"
-	_ "v.io/x/ref/profiles/internal/rpc/protocols/wsh"
-	"v.io/x/ref/profiles/internal/rt"
+	"v.io/x/ref/runtime/internal"
+	"v.io/x/ref/runtime/internal/lib/appcycle"
+	"v.io/x/ref/runtime/internal/lib/websocket"
+	irpc "v.io/x/ref/runtime/internal/rpc"
+	_ "v.io/x/ref/runtime/internal/rpc/protocols/tcp"
+	_ "v.io/x/ref/runtime/internal/rpc/protocols/ws"
+	_ "v.io/x/ref/runtime/internal/rpc/protocols/wsh"
+	"v.io/x/ref/runtime/internal/rt"
 	"v.io/x/ref/services/debug/debuglib"
 )
 
diff --git a/profiles/static/.api b/runtime/factories/static/.api
similarity index 100%
rename from profiles/static/.api
rename to runtime/factories/static/.api
diff --git a/profiles/static/proxy.go b/runtime/factories/static/proxy.go
similarity index 93%
rename from profiles/static/proxy.go
rename to runtime/factories/static/proxy.go
index 8693142..a5aa0b6 100644
--- a/profiles/static/proxy.go
+++ b/runtime/factories/static/proxy.go
@@ -10,7 +10,7 @@
 	"v.io/v23/rpc"
 	"v.io/v23/security"
 
-	"v.io/x/ref/profiles/internal/rpc/stream/proxy"
+	"v.io/x/ref/runtime/internal/rpc/stream/proxy"
 )
 
 // NewProxy creates a new Proxy that listens for network connections on the provided
diff --git a/profiles/static/staticinit.go b/runtime/factories/static/staticinit.go
similarity index 87%
rename from profiles/static/staticinit.go
rename to runtime/factories/static/staticinit.go
index c18a028..de8fc33 100644
--- a/profiles/static/staticinit.go
+++ b/runtime/factories/static/staticinit.go
@@ -17,13 +17,13 @@
 
 	"v.io/x/ref/lib/flags"
 	"v.io/x/ref/lib/security/securityflag"
-	"v.io/x/ref/profiles/internal"
-	"v.io/x/ref/profiles/internal/lib/appcycle"
-	"v.io/x/ref/profiles/internal/lib/websocket"
-	_ "v.io/x/ref/profiles/internal/rpc/protocols/tcp"
-	_ "v.io/x/ref/profiles/internal/rpc/protocols/ws"
-	_ "v.io/x/ref/profiles/internal/rpc/protocols/wsh"
-	"v.io/x/ref/profiles/internal/rt"
+	"v.io/x/ref/runtime/internal"
+	"v.io/x/ref/runtime/internal/lib/appcycle"
+	"v.io/x/ref/runtime/internal/lib/websocket"
+	_ "v.io/x/ref/runtime/internal/rpc/protocols/tcp"
+	_ "v.io/x/ref/runtime/internal/rpc/protocols/ws"
+	_ "v.io/x/ref/runtime/internal/rpc/protocols/wsh"
+	"v.io/x/ref/runtime/internal/rt"
 	"v.io/x/ref/services/debug/debuglib"
 )
 
diff --git a/profiles/internal/README b/runtime/internal/README
similarity index 100%
rename from profiles/internal/README
rename to runtime/internal/README
diff --git a/profiles/internal/gce/gce_android.go b/runtime/internal/gce/gce_android.go
similarity index 100%
rename from profiles/internal/gce/gce_android.go
rename to runtime/internal/gce/gce_android.go
diff --git a/profiles/internal/gce/gce_linux.go b/runtime/internal/gce/gce_linux.go
similarity index 100%
rename from profiles/internal/gce/gce_linux.go
rename to runtime/internal/gce/gce_linux.go
diff --git a/profiles/internal/gce/gce_other.go b/runtime/internal/gce/gce_other.go
similarity index 100%
rename from profiles/internal/gce/gce_other.go
rename to runtime/internal/gce/gce_other.go
diff --git a/profiles/internal/gce/gce_test.go b/runtime/internal/gce/gce_test.go
similarity index 100%
rename from profiles/internal/gce/gce_test.go
rename to runtime/internal/gce/gce_test.go
diff --git a/profiles/internal/gce_linux.go b/runtime/internal/gce_linux.go
similarity index 95%
rename from profiles/internal/gce_linux.go
rename to runtime/internal/gce_linux.go
index 482b53a..2041da9 100644
--- a/profiles/internal/gce_linux.go
+++ b/runtime/internal/gce_linux.go
@@ -11,7 +11,7 @@
 
 	"v.io/x/lib/vlog"
 
-	"v.io/x/ref/profiles/internal/gce"
+	"v.io/x/ref/runtime/internal/gce"
 )
 
 // GCEPublicAddress returns the public IP address of the GCE instance
diff --git a/profiles/internal/gce_other.go b/runtime/internal/gce_other.go
similarity index 100%
rename from profiles/internal/gce_other.go
rename to runtime/internal/gce_other.go
diff --git a/profiles/internal/lib/appcycle/appcycle.go b/runtime/internal/lib/appcycle/appcycle.go
similarity index 100%
rename from profiles/internal/lib/appcycle/appcycle.go
rename to runtime/internal/lib/appcycle/appcycle.go
diff --git a/profiles/internal/lib/bqueue/bqueue.go b/runtime/internal/lib/bqueue/bqueue.go
similarity index 98%
rename from profiles/internal/lib/bqueue/bqueue.go
rename to runtime/internal/lib/bqueue/bqueue.go
index 235a204..ab428cf 100644
--- a/profiles/internal/lib/bqueue/bqueue.go
+++ b/runtime/internal/lib/bqueue/bqueue.go
@@ -37,7 +37,7 @@
 import (
 	"errors"
 
-	"v.io/x/ref/profiles/internal/lib/iobuf"
+	"v.io/x/ref/runtime/internal/lib/iobuf"
 )
 
 // Priority is an integer priority.  Smaller is greater priority.
diff --git a/profiles/internal/lib/bqueue/drrqueue/drrqueue.go b/runtime/internal/lib/bqueue/drrqueue/drrqueue.go
similarity index 98%
rename from profiles/internal/lib/bqueue/drrqueue/drrqueue.go
rename to runtime/internal/lib/bqueue/drrqueue/drrqueue.go
index e07a118..a42731b 100644
--- a/profiles/internal/lib/bqueue/drrqueue/drrqueue.go
+++ b/runtime/internal/lib/bqueue/drrqueue/drrqueue.go
@@ -27,10 +27,10 @@
 	"io"
 	"sync"
 
-	"v.io/x/ref/profiles/internal/lib/bqueue"
-	"v.io/x/ref/profiles/internal/lib/deque"
-	"v.io/x/ref/profiles/internal/lib/iobuf"
-	vsync "v.io/x/ref/profiles/internal/lib/sync"
+	"v.io/x/ref/runtime/internal/lib/bqueue"
+	"v.io/x/ref/runtime/internal/lib/deque"
+	"v.io/x/ref/runtime/internal/lib/iobuf"
+	vsync "v.io/x/ref/runtime/internal/lib/sync"
 )
 
 // T defines the type of round-robin buffer queues.  The queue has multiple
diff --git a/profiles/internal/lib/bqueue/drrqueue/drrqueue_test.go b/runtime/internal/lib/bqueue/drrqueue/drrqueue_test.go
similarity index 98%
rename from profiles/internal/lib/bqueue/drrqueue/drrqueue_test.go
rename to runtime/internal/lib/bqueue/drrqueue/drrqueue_test.go
index aff95e6..dd1d71d 100644
--- a/profiles/internal/lib/bqueue/drrqueue/drrqueue_test.go
+++ b/runtime/internal/lib/bqueue/drrqueue/drrqueue_test.go
@@ -9,8 +9,8 @@
 	"runtime"
 	"testing"
 
-	"v.io/x/ref/profiles/internal/lib/bqueue"
-	"v.io/x/ref/profiles/internal/lib/iobuf"
+	"v.io/x/ref/runtime/internal/lib/bqueue"
+	"v.io/x/ref/runtime/internal/lib/iobuf"
 )
 
 const (
diff --git a/profiles/internal/lib/dependency/dependency.go b/runtime/internal/lib/dependency/dependency.go
similarity index 100%
rename from profiles/internal/lib/dependency/dependency.go
rename to runtime/internal/lib/dependency/dependency.go
diff --git a/profiles/internal/lib/dependency/dependency_test.go b/runtime/internal/lib/dependency/dependency_test.go
similarity index 100%
rename from profiles/internal/lib/dependency/dependency_test.go
rename to runtime/internal/lib/dependency/dependency_test.go
diff --git a/profiles/internal/lib/deque/deque.go b/runtime/internal/lib/deque/deque.go
similarity index 100%
rename from profiles/internal/lib/deque/deque.go
rename to runtime/internal/lib/deque/deque.go
diff --git a/profiles/internal/lib/deque/deque_test.go b/runtime/internal/lib/deque/deque_test.go
similarity index 100%
rename from profiles/internal/lib/deque/deque_test.go
rename to runtime/internal/lib/deque/deque_test.go
diff --git a/profiles/internal/lib/deque/v23_internal_test.go b/runtime/internal/lib/deque/v23_internal_test.go
similarity index 100%
rename from profiles/internal/lib/deque/v23_internal_test.go
rename to runtime/internal/lib/deque/v23_internal_test.go
diff --git a/profiles/internal/lib/iobuf/allocator.go b/runtime/internal/lib/iobuf/allocator.go
similarity index 100%
rename from profiles/internal/lib/iobuf/allocator.go
rename to runtime/internal/lib/iobuf/allocator.go
diff --git a/profiles/internal/lib/iobuf/allocator_test.go b/runtime/internal/lib/iobuf/allocator_test.go
similarity index 100%
rename from profiles/internal/lib/iobuf/allocator_test.go
rename to runtime/internal/lib/iobuf/allocator_test.go
diff --git a/profiles/internal/lib/iobuf/iobuf.go b/runtime/internal/lib/iobuf/iobuf.go
similarity index 100%
rename from profiles/internal/lib/iobuf/iobuf.go
rename to runtime/internal/lib/iobuf/iobuf.go
diff --git a/profiles/internal/lib/iobuf/iobuf_test.go b/runtime/internal/lib/iobuf/iobuf_test.go
similarity index 100%
rename from profiles/internal/lib/iobuf/iobuf_test.go
rename to runtime/internal/lib/iobuf/iobuf_test.go
diff --git a/profiles/internal/lib/iobuf/reader.go b/runtime/internal/lib/iobuf/reader.go
similarity index 100%
rename from profiles/internal/lib/iobuf/reader.go
rename to runtime/internal/lib/iobuf/reader.go
diff --git a/profiles/internal/lib/iobuf/reader_test.go b/runtime/internal/lib/iobuf/reader_test.go
similarity index 100%
rename from profiles/internal/lib/iobuf/reader_test.go
rename to runtime/internal/lib/iobuf/reader_test.go
diff --git a/profiles/internal/lib/iobuf/slice.go b/runtime/internal/lib/iobuf/slice.go
similarity index 100%
rename from profiles/internal/lib/iobuf/slice.go
rename to runtime/internal/lib/iobuf/slice.go
diff --git a/profiles/internal/lib/iobuf/slice_test.go b/runtime/internal/lib/iobuf/slice_test.go
similarity index 100%
rename from profiles/internal/lib/iobuf/slice_test.go
rename to runtime/internal/lib/iobuf/slice_test.go
diff --git a/profiles/internal/lib/pcqueue/pcqueue.go b/runtime/internal/lib/pcqueue/pcqueue.go
similarity index 100%
rename from profiles/internal/lib/pcqueue/pcqueue.go
rename to runtime/internal/lib/pcqueue/pcqueue.go
diff --git a/profiles/internal/lib/pcqueue/pcqueue_test.go b/runtime/internal/lib/pcqueue/pcqueue_test.go
similarity index 100%
rename from profiles/internal/lib/pcqueue/pcqueue_test.go
rename to runtime/internal/lib/pcqueue/pcqueue_test.go
diff --git a/profiles/internal/lib/pcqueue/v23_internal_test.go b/runtime/internal/lib/pcqueue/v23_internal_test.go
similarity index 100%
rename from profiles/internal/lib/pcqueue/v23_internal_test.go
rename to runtime/internal/lib/pcqueue/v23_internal_test.go
diff --git a/profiles/internal/lib/publisher/publisher.go b/runtime/internal/lib/publisher/publisher.go
similarity index 100%
rename from profiles/internal/lib/publisher/publisher.go
rename to runtime/internal/lib/publisher/publisher.go
diff --git a/profiles/internal/lib/publisher/publisher_test.go b/runtime/internal/lib/publisher/publisher_test.go
similarity index 94%
rename from profiles/internal/lib/publisher/publisher_test.go
rename to runtime/internal/lib/publisher/publisher_test.go
index 9505dce..04d272f 100644
--- a/profiles/internal/lib/publisher/publisher_test.go
+++ b/runtime/internal/lib/publisher/publisher_test.go
@@ -16,9 +16,9 @@
 	"v.io/v23/vtrace"
 
 	"v.io/x/ref/lib/flags"
-	"v.io/x/ref/profiles/internal/lib/publisher"
-	tnaming "v.io/x/ref/profiles/internal/testing/mocks/naming"
-	ivtrace "v.io/x/ref/profiles/internal/vtrace"
+	"v.io/x/ref/runtime/internal/lib/publisher"
+	tnaming "v.io/x/ref/runtime/internal/testing/mocks/naming"
+	ivtrace "v.io/x/ref/runtime/internal/vtrace"
 )
 
 //go:generate v23 test generate
diff --git a/profiles/internal/lib/publisher/v23_internal_test.go b/runtime/internal/lib/publisher/v23_internal_test.go
similarity index 100%
rename from profiles/internal/lib/publisher/v23_internal_test.go
rename to runtime/internal/lib/publisher/v23_internal_test.go
diff --git a/profiles/internal/lib/sync/doc.go b/runtime/internal/lib/sync/doc.go
similarity index 100%
rename from profiles/internal/lib/sync/doc.go
rename to runtime/internal/lib/sync/doc.go
diff --git a/profiles/internal/lib/sync/lock.go b/runtime/internal/lib/sync/lock.go
similarity index 100%
rename from profiles/internal/lib/sync/lock.go
rename to runtime/internal/lib/sync/lock.go
diff --git a/profiles/internal/lib/sync/semaphore.go b/runtime/internal/lib/sync/semaphore.go
similarity index 100%
rename from profiles/internal/lib/sync/semaphore.go
rename to runtime/internal/lib/sync/semaphore.go
diff --git a/profiles/internal/lib/sync/semaphore_test.go b/runtime/internal/lib/sync/semaphore_test.go
similarity index 100%
rename from profiles/internal/lib/sync/semaphore_test.go
rename to runtime/internal/lib/sync/semaphore_test.go
diff --git a/profiles/internal/lib/sync/v23_internal_test.go b/runtime/internal/lib/sync/v23_internal_test.go
similarity index 100%
rename from profiles/internal/lib/sync/v23_internal_test.go
rename to runtime/internal/lib/sync/v23_internal_test.go
diff --git a/profiles/internal/lib/sync/wait_group.go b/runtime/internal/lib/sync/wait_group.go
similarity index 100%
rename from profiles/internal/lib/sync/wait_group.go
rename to runtime/internal/lib/sync/wait_group.go
diff --git a/profiles/internal/lib/sync/wait_group_test.go b/runtime/internal/lib/sync/wait_group_test.go
similarity index 100%
rename from profiles/internal/lib/sync/wait_group_test.go
rename to runtime/internal/lib/sync/wait_group_test.go
diff --git a/profiles/internal/lib/tcputil/tcputil.go b/runtime/internal/lib/tcputil/tcputil.go
similarity index 100%
rename from profiles/internal/lib/tcputil/tcputil.go
rename to runtime/internal/lib/tcputil/tcputil.go
diff --git a/profiles/internal/lib/upcqueue/upcqueue.go b/runtime/internal/lib/upcqueue/upcqueue.go
similarity index 97%
rename from profiles/internal/lib/upcqueue/upcqueue.go
rename to runtime/internal/lib/upcqueue/upcqueue.go
index 2a7a60d..fe19778 100644
--- a/profiles/internal/lib/upcqueue/upcqueue.go
+++ b/runtime/internal/lib/upcqueue/upcqueue.go
@@ -19,8 +19,8 @@
 	"errors"
 	"sync"
 
-	"v.io/x/ref/profiles/internal/lib/deque"
-	vsync "v.io/x/ref/profiles/internal/lib/sync"
+	"v.io/x/ref/runtime/internal/lib/deque"
+	vsync "v.io/x/ref/runtime/internal/lib/sync"
 )
 
 var (
diff --git a/profiles/internal/lib/upcqueue/upcqueue_test.go b/runtime/internal/lib/upcqueue/upcqueue_test.go
similarity index 99%
rename from profiles/internal/lib/upcqueue/upcqueue_test.go
rename to runtime/internal/lib/upcqueue/upcqueue_test.go
index c737a67..1b9ea84 100644
--- a/profiles/internal/lib/upcqueue/upcqueue_test.go
+++ b/runtime/internal/lib/upcqueue/upcqueue_test.go
@@ -11,7 +11,7 @@
 	"time"
 
 	"v.io/x/lib/vlog"
-	vsync "v.io/x/ref/profiles/internal/lib/sync"
+	vsync "v.io/x/ref/runtime/internal/lib/sync"
 )
 
 //go:generate v23 test generate
diff --git a/profiles/internal/lib/upcqueue/v23_internal_test.go b/runtime/internal/lib/upcqueue/v23_internal_test.go
similarity index 100%
rename from profiles/internal/lib/upcqueue/v23_internal_test.go
rename to runtime/internal/lib/upcqueue/v23_internal_test.go
diff --git a/profiles/internal/lib/websocket/conn.go b/runtime/internal/lib/websocket/conn.go
similarity index 100%
rename from profiles/internal/lib/websocket/conn.go
rename to runtime/internal/lib/websocket/conn.go
diff --git a/profiles/internal/lib/websocket/conn_nacl.go b/runtime/internal/lib/websocket/conn_nacl.go
similarity index 100%
rename from profiles/internal/lib/websocket/conn_nacl.go
rename to runtime/internal/lib/websocket/conn_nacl.go
diff --git a/profiles/internal/lib/websocket/conn_test.go b/runtime/internal/lib/websocket/conn_test.go
similarity index 100%
rename from profiles/internal/lib/websocket/conn_test.go
rename to runtime/internal/lib/websocket/conn_test.go
diff --git a/profiles/internal/lib/websocket/dialer.go b/runtime/internal/lib/websocket/dialer.go
similarity index 95%
rename from profiles/internal/lib/websocket/dialer.go
rename to runtime/internal/lib/websocket/dialer.go
index a6e7b8c..8e6e173 100644
--- a/profiles/internal/lib/websocket/dialer.go
+++ b/runtime/internal/lib/websocket/dialer.go
@@ -14,7 +14,7 @@
 
 	"github.com/gorilla/websocket"
 
-	"v.io/x/ref/profiles/internal/lib/tcputil"
+	"v.io/x/ref/runtime/internal/lib/tcputil"
 )
 
 func Dial(protocol, address string, timeout time.Duration) (net.Conn, error) {
diff --git a/profiles/internal/lib/websocket/hybrid.go b/runtime/internal/lib/websocket/hybrid.go
similarity index 97%
rename from profiles/internal/lib/websocket/hybrid.go
rename to runtime/internal/lib/websocket/hybrid.go
index 4d8e3a2..1b28892 100644
--- a/profiles/internal/lib/websocket/hybrid.go
+++ b/runtime/internal/lib/websocket/hybrid.go
@@ -8,7 +8,7 @@
 	"net"
 	"time"
 
-	"v.io/x/ref/profiles/internal/lib/tcputil"
+	"v.io/x/ref/runtime/internal/lib/tcputil"
 )
 
 // TODO(jhahn): Figure out a way for this mapping to be shared.
diff --git a/profiles/internal/lib/websocket/listener.go b/runtime/internal/lib/websocket/listener.go
similarity index 98%
rename from profiles/internal/lib/websocket/listener.go
rename to runtime/internal/lib/websocket/listener.go
index 1664604..23af7d7 100644
--- a/profiles/internal/lib/websocket/listener.go
+++ b/runtime/internal/lib/websocket/listener.go
@@ -18,7 +18,7 @@
 
 	"v.io/x/lib/vlog"
 
-	"v.io/x/ref/profiles/internal/lib/tcputil"
+	"v.io/x/ref/runtime/internal/lib/tcputil"
 )
 
 var errListenerIsClosed = errors.New("Listener has been Closed")
diff --git a/profiles/internal/lib/websocket/listener_nacl.go b/runtime/internal/lib/websocket/listener_nacl.go
similarity index 100%
rename from profiles/internal/lib/websocket/listener_nacl.go
rename to runtime/internal/lib/websocket/listener_nacl.go
diff --git a/profiles/internal/lib/websocket/listener_test.go b/runtime/internal/lib/websocket/listener_test.go
similarity index 100%
rename from profiles/internal/lib/websocket/listener_test.go
rename to runtime/internal/lib/websocket/listener_test.go
diff --git a/profiles/internal/lib/websocket/resolver.go b/runtime/internal/lib/websocket/resolver.go
similarity index 100%
rename from profiles/internal/lib/websocket/resolver.go
rename to runtime/internal/lib/websocket/resolver.go
diff --git a/profiles/internal/lib/websocket/util_test.go b/runtime/internal/lib/websocket/util_test.go
similarity index 100%
rename from profiles/internal/lib/websocket/util_test.go
rename to runtime/internal/lib/websocket/util_test.go
diff --git a/profiles/internal/lib/websocket/v23_internal_test.go b/runtime/internal/lib/websocket/v23_internal_test.go
similarity index 100%
rename from profiles/internal/lib/websocket/v23_internal_test.go
rename to runtime/internal/lib/websocket/v23_internal_test.go
diff --git a/profiles/internal/lib/websocket/ws_test.go b/runtime/internal/lib/websocket/ws_test.go
similarity index 98%
rename from profiles/internal/lib/websocket/ws_test.go
rename to runtime/internal/lib/websocket/ws_test.go
index d9371a7..3940d52 100644
--- a/profiles/internal/lib/websocket/ws_test.go
+++ b/runtime/internal/lib/websocket/ws_test.go
@@ -11,7 +11,7 @@
 
 	"v.io/v23/rpc"
 
-	"v.io/x/ref/profiles/internal/lib/websocket"
+	"v.io/x/ref/runtime/internal/lib/websocket"
 )
 
 func packetTester(t *testing.T, dialer rpc.DialerFunc, listener rpc.ListenerFunc, txProtocol, rxProtocol string) {
diff --git a/profiles/internal/naming/doc.go b/runtime/internal/naming/doc.go
similarity index 100%
rename from profiles/internal/naming/doc.go
rename to runtime/internal/naming/doc.go
diff --git a/profiles/internal/naming/endpoint.go b/runtime/internal/naming/endpoint.go
similarity index 100%
rename from profiles/internal/naming/endpoint.go
rename to runtime/internal/naming/endpoint.go
diff --git a/profiles/internal/naming/endpoint_test.go b/runtime/internal/naming/endpoint_test.go
similarity index 100%
rename from profiles/internal/naming/endpoint_test.go
rename to runtime/internal/naming/endpoint_test.go
diff --git a/profiles/internal/naming/namespace/all_test.go b/runtime/internal/naming/namespace/all_test.go
similarity index 99%
rename from profiles/internal/naming/namespace/all_test.go
rename to runtime/internal/naming/namespace/all_test.go
index 07f540a..638577a 100644
--- a/profiles/internal/naming/namespace/all_test.go
+++ b/runtime/internal/naming/namespace/all_test.go
@@ -22,8 +22,8 @@
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
 
-	_ "v.io/x/ref/profiles"
-	inamespace "v.io/x/ref/profiles/internal/naming/namespace"
+	_ "v.io/x/ref/runtime/factories/generic"
+	inamespace "v.io/x/ref/runtime/internal/naming/namespace"
 	"v.io/x/ref/services/mounttable/mounttablelib"
 	"v.io/x/ref/test"
 	"v.io/x/ref/test/testutil"
diff --git a/profiles/internal/naming/namespace/cache.go b/runtime/internal/naming/namespace/cache.go
similarity index 100%
rename from profiles/internal/naming/namespace/cache.go
rename to runtime/internal/naming/namespace/cache.go
diff --git a/profiles/internal/naming/namespace/cache_test.go b/runtime/internal/naming/namespace/cache_test.go
similarity index 100%
rename from profiles/internal/naming/namespace/cache_test.go
rename to runtime/internal/naming/namespace/cache_test.go
diff --git a/profiles/internal/naming/namespace/glob.go b/runtime/internal/naming/namespace/glob.go
similarity index 100%
rename from profiles/internal/naming/namespace/glob.go
rename to runtime/internal/naming/namespace/glob.go
diff --git a/profiles/internal/naming/namespace/glob_test.go b/runtime/internal/naming/namespace/glob_test.go
similarity index 100%
rename from profiles/internal/naming/namespace/glob_test.go
rename to runtime/internal/naming/namespace/glob_test.go
diff --git a/profiles/internal/naming/namespace/mount.go b/runtime/internal/naming/namespace/mount.go
similarity index 100%
rename from profiles/internal/naming/namespace/mount.go
rename to runtime/internal/naming/namespace/mount.go
diff --git a/profiles/internal/naming/namespace/namespace.go b/runtime/internal/naming/namespace/namespace.go
similarity index 97%
rename from profiles/internal/naming/namespace/namespace.go
rename to runtime/internal/naming/namespace/namespace.go
index 96cd1d9..649a2fd 100644
--- a/profiles/internal/naming/namespace/namespace.go
+++ b/runtime/internal/naming/namespace/namespace.go
@@ -8,7 +8,7 @@
 	"sync"
 	"time"
 
-	inaming "v.io/x/ref/profiles/internal/naming"
+	inaming "v.io/x/ref/runtime/internal/naming"
 
 	"v.io/v23/context"
 	"v.io/v23/naming"
@@ -22,7 +22,7 @@
 const defaultMaxResolveDepth = 32
 const defaultMaxRecursiveGlobDepth = 10
 
-const pkgPath = "v.io/x/ref/profiles/internal/naming/namespace"
+const pkgPath = "v.io/x/ref/runtime/internal/naming/namespace"
 
 var (
 	errNotRootedName = verror.Register(pkgPath+".errNotRootedName", verror.NoRetry, "{1:}{2:} At least one root is not a rooted name{:_}")
diff --git a/profiles/internal/naming/namespace/parallelstartcall.go b/runtime/internal/naming/namespace/parallelstartcall.go
similarity index 98%
rename from profiles/internal/naming/namespace/parallelstartcall.go
rename to runtime/internal/naming/namespace/parallelstartcall.go
index ff0fda8..246e4eb 100644
--- a/profiles/internal/naming/namespace/parallelstartcall.go
+++ b/runtime/internal/naming/namespace/parallelstartcall.go
@@ -10,7 +10,7 @@
 	"v.io/v23/options"
 	"v.io/v23/rpc"
 	"v.io/v23/verror"
-	inaming "v.io/x/ref/profiles/internal/naming"
+	inaming "v.io/x/ref/runtime/internal/naming"
 )
 
 type startStatus struct {
diff --git a/profiles/internal/naming/namespace/perms.go b/runtime/internal/naming/namespace/perms.go
similarity index 100%
rename from profiles/internal/naming/namespace/perms.go
rename to runtime/internal/naming/namespace/perms.go
diff --git a/profiles/internal/naming/namespace/perms_test.go b/runtime/internal/naming/namespace/perms_test.go
similarity index 99%
rename from profiles/internal/naming/namespace/perms_test.go
rename to runtime/internal/naming/namespace/perms_test.go
index 0719656..3a0c916 100644
--- a/profiles/internal/naming/namespace/perms_test.go
+++ b/runtime/internal/naming/namespace/perms_test.go
@@ -16,7 +16,7 @@
 	"v.io/v23/security"
 	"v.io/v23/security/access"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/services/mounttable/mounttablelib"
 	"v.io/x/ref/test"
 	"v.io/x/ref/test/testutil"
diff --git a/profiles/internal/naming/namespace/resolve.go b/runtime/internal/naming/namespace/resolve.go
similarity index 100%
rename from profiles/internal/naming/namespace/resolve.go
rename to runtime/internal/naming/namespace/resolve.go
diff --git a/profiles/internal/naming/namespace/stub.go b/runtime/internal/naming/namespace/stub.go
similarity index 100%
rename from profiles/internal/naming/namespace/stub.go
rename to runtime/internal/naming/namespace/stub.go
diff --git a/profiles/internal/naming/namespace/v23_internal_test.go b/runtime/internal/naming/namespace/v23_internal_test.go
similarity index 100%
rename from profiles/internal/naming/namespace/v23_internal_test.go
rename to runtime/internal/naming/namespace/v23_internal_test.go
diff --git a/profiles/internal/platform/platform.go b/runtime/internal/platform/platform.go
similarity index 100%
rename from profiles/internal/platform/platform.go
rename to runtime/internal/platform/platform.go
diff --git a/profiles/internal/platform/platform_darwin.go b/runtime/internal/platform/platform_darwin.go
similarity index 100%
rename from profiles/internal/platform/platform_darwin.go
rename to runtime/internal/platform/platform_darwin.go
diff --git a/profiles/internal/platform/platform_linux.go b/runtime/internal/platform/platform_linux.go
similarity index 100%
rename from profiles/internal/platform/platform_linux.go
rename to runtime/internal/platform/platform_linux.go
diff --git a/profiles/internal/platform/platform_nacl.go b/runtime/internal/platform/platform_nacl.go
similarity index 100%
rename from profiles/internal/platform/platform_nacl.go
rename to runtime/internal/platform/platform_nacl.go
diff --git a/profiles/internal/platform/uts_str_linux_arm.go b/runtime/internal/platform/uts_str_linux_arm.go
similarity index 100%
rename from profiles/internal/platform/uts_str_linux_arm.go
rename to runtime/internal/platform/uts_str_linux_arm.go
diff --git a/profiles/internal/platform/uts_str_linux_nonarm.go b/runtime/internal/platform/uts_str_linux_nonarm.go
similarity index 100%
rename from profiles/internal/platform/uts_str_linux_nonarm.go
rename to runtime/internal/platform/uts_str_linux_nonarm.go
diff --git a/profiles/internal/rpc/benchmark/README.md b/runtime/internal/rpc/benchmark/README.md
similarity index 78%
rename from profiles/internal/rpc/benchmark/README.md
rename to runtime/internal/rpc/benchmark/README.md
index 6adfead..b44ce9f 100644
--- a/profiles/internal/rpc/benchmark/README.md
+++ b/runtime/internal/rpc/benchmark/README.md
@@ -26,7 +26,7 @@
 overhead is excluded.
 
 ```
-$ v23 go test -bench=. -timeout=1h -cpu=1 -benchtime=5s v.io/x/ref/profiles/internal/rpc/benchmark
+$ v23 go test -bench=. -timeout=1h -cpu=1 -benchtime=5s v.io/x/ref/runtime/internal/rpc/benchmark
 PASS
 Benchmark____1B     1000           8301357 ns/op           0.00 MB/s
 --- Histogram (unit: ms)
@@ -34,15 +34,15 @@
         ------------------------------------------------------------
         [  7,   8)   505   50.5%   50.5%  #####
         [  8,   9)   389   38.9%   89.4%  ####
-        [  9,  10)    38    3.8%   93.2%  
-        [ 10,  11)    12    1.2%   94.4%  
-        [ 11,  12)     4    0.4%   94.8%  
-        [ 12,  14)    19    1.9%   96.7%  
-        [ 14,  16)    23    2.3%   99.0%  
-        [ 16,  18)    10    1.0%  100.0%  
-        [ 18,  21)     0    0.0%  100.0%  
-        [ 21,  24)     0    0.0%  100.0%  
-        [ 24, inf)     0    0.0%  100.0%  
+        [  9,  10)    38    3.8%   93.2%
+        [ 10,  11)    12    1.2%   94.4%
+        [ 11,  12)     4    0.4%   94.8%
+        [ 12,  14)    19    1.9%   96.7%
+        [ 14,  16)    23    2.3%   99.0%
+        [ 16,  18)    10    1.0%  100.0%
+        [ 18,  21)     0    0.0%  100.0%
+        [ 21,  24)     0    0.0%  100.0%
+        [ 24, inf)     0    0.0%  100.0%
 Benchmark___10B     1000           8587341 ns/op           0.00 MB/s
 ...
 ```
@@ -85,23 +85,23 @@
 Histogram (unit: ms)
 Count: 100  Min: 7  Max: 94  Avg: 13.17
 ------------------------------------------------------------
-[  7,   8)    1    1.0%    1.0%  
-[  8,   9)    4    4.0%    5.0%  
+[  7,   8)    1    1.0%    1.0%
+[  8,   9)    4    4.0%    5.0%
 [  9,  10)   17   17.0%   22.0%  ##
 [ 10,  12)   24   24.0%   46.0%  ##
 [ 12,  15)   24   24.0%   70.0%  ##
 [ 15,  19)   28   28.0%   98.0%  ###
-[ 19,  24)    1    1.0%   99.0%  
-[ 24,  32)    0    0.0%   99.0%  
-[ 32,  42)    0    0.0%   99.0%  
-[ 42,  56)    0    0.0%   99.0%  
-[ 56,  75)    0    0.0%   99.0%  
-[ 75, 101)    1    1.0%  100.0%  
-[101, 136)    0    0.0%  100.0%  
-[136, 183)    0    0.0%  100.0%  
-[183, 247)    0    0.0%  100.0%  
-[247, 334)    0    0.0%  100.0%  
-[334, inf)    0    0.0%  100.0%  
+[ 19,  24)    1    1.0%   99.0%
+[ 24,  32)    0    0.0%   99.0%
+[ 32,  42)    0    0.0%   99.0%
+[ 42,  56)    0    0.0%   99.0%
+[ 56,  75)    0    0.0%   99.0%
+[ 75, 101)    1    1.0%  100.0%
+[101, 136)    0    0.0%  100.0%
+[136, 183)    0    0.0%  100.0%
+[183, 247)    0    0.0%  100.0%
+[247, 334)    0    0.0%  100.0%
+[334, inf)    0    0.0%  100.0%
 ```
 
 # Raspberry Pi
diff --git a/profiles/internal/rpc/benchmark/RESULTS.txt b/runtime/internal/rpc/benchmark/RESULTS.txt
similarity index 100%
rename from profiles/internal/rpc/benchmark/RESULTS.txt
rename to runtime/internal/rpc/benchmark/RESULTS.txt
diff --git a/profiles/internal/rpc/benchmark/benchmark.vdl b/runtime/internal/rpc/benchmark/benchmark.vdl
similarity index 100%
rename from profiles/internal/rpc/benchmark/benchmark.vdl
rename to runtime/internal/rpc/benchmark/benchmark.vdl
diff --git a/profiles/internal/rpc/benchmark/benchmark.vdl.go b/runtime/internal/rpc/benchmark/benchmark.vdl.go
similarity index 99%
rename from profiles/internal/rpc/benchmark/benchmark.vdl.go
rename to runtime/internal/rpc/benchmark/benchmark.vdl.go
index c67fec4..2a63c41 100644
--- a/profiles/internal/rpc/benchmark/benchmark.vdl.go
+++ b/runtime/internal/rpc/benchmark/benchmark.vdl.go
@@ -232,7 +232,7 @@
 // descBenchmark hides the desc to keep godoc clean.
 var descBenchmark = rpc.InterfaceDesc{
 	Name:    "Benchmark",
-	PkgPath: "v.io/x/ref/profiles/internal/rpc/benchmark",
+	PkgPath: "v.io/x/ref/runtime/internal/rpc/benchmark",
 	Methods: []rpc.MethodDesc{
 		{
 			Name: "Echo",
diff --git a/profiles/internal/rpc/benchmark/benchmark/main.go b/runtime/internal/rpc/benchmark/benchmark/main.go
similarity index 94%
rename from profiles/internal/rpc/benchmark/benchmark/main.go
rename to runtime/internal/rpc/benchmark/benchmark/main.go
index 27992e3..1afe697 100644
--- a/profiles/internal/rpc/benchmark/benchmark/main.go
+++ b/runtime/internal/rpc/benchmark/benchmark/main.go
@@ -12,8 +12,8 @@
 	"testing"
 	"time"
 
-	_ "v.io/x/ref/profiles"
-	"v.io/x/ref/profiles/internal/rpc/benchmark/internal"
+	_ "v.io/x/ref/runtime/factories/generic"
+	"v.io/x/ref/runtime/internal/rpc/benchmark/internal"
 	tbm "v.io/x/ref/test/benchmark"
 
 	"v.io/v23"
diff --git a/profiles/internal/rpc/benchmark/benchmark_test.go b/runtime/internal/rpc/benchmark/benchmark_test.go
similarity index 98%
rename from profiles/internal/rpc/benchmark/benchmark_test.go
rename to runtime/internal/rpc/benchmark/benchmark_test.go
index 4b757a5..fe41273 100644
--- a/profiles/internal/rpc/benchmark/benchmark_test.go
+++ b/runtime/internal/rpc/benchmark/benchmark_test.go
@@ -11,8 +11,8 @@
 	"v.io/v23"
 	"v.io/v23/context"
 
-	"v.io/x/ref/profiles/internal/rpc/benchmark/internal"
-	_ "v.io/x/ref/profiles/static"
+	_ "v.io/x/ref/runtime/factories/static"
+	"v.io/x/ref/runtime/internal/rpc/benchmark/internal"
 	"v.io/x/ref/test"
 	"v.io/x/ref/test/benchmark"
 )
diff --git a/profiles/internal/rpc/benchmark/benchmarkd/main.go b/runtime/internal/rpc/benchmark/benchmarkd/main.go
similarity index 84%
rename from profiles/internal/rpc/benchmark/benchmarkd/main.go
rename to runtime/internal/rpc/benchmark/benchmarkd/main.go
index 52b53fb..a9ce539 100644
--- a/profiles/internal/rpc/benchmark/benchmarkd/main.go
+++ b/runtime/internal/rpc/benchmark/benchmarkd/main.go
@@ -10,8 +10,8 @@
 	"v.io/x/lib/vlog"
 
 	"v.io/x/ref/lib/signals"
-	"v.io/x/ref/profiles/internal/rpc/benchmark/internal"
-	_ "v.io/x/ref/profiles/roaming"
+	_ "v.io/x/ref/runtime/factories/roaming"
+	"v.io/x/ref/runtime/internal/rpc/benchmark/internal"
 )
 
 func main() {
diff --git a/profiles/internal/rpc/benchmark/glob/README.txt b/runtime/internal/rpc/benchmark/glob/README.txt
similarity index 100%
rename from profiles/internal/rpc/benchmark/glob/README.txt
rename to runtime/internal/rpc/benchmark/glob/README.txt
diff --git a/profiles/internal/rpc/benchmark/glob/doc.go b/runtime/internal/rpc/benchmark/glob/doc.go
similarity index 100%
rename from profiles/internal/rpc/benchmark/glob/doc.go
rename to runtime/internal/rpc/benchmark/glob/doc.go
diff --git a/profiles/internal/rpc/benchmark/glob/glob_test.go b/runtime/internal/rpc/benchmark/glob/glob_test.go
similarity index 98%
rename from profiles/internal/rpc/benchmark/glob/glob_test.go
rename to runtime/internal/rpc/benchmark/glob/glob_test.go
index c37e867..44454b9 100644
--- a/profiles/internal/rpc/benchmark/glob/glob_test.go
+++ b/runtime/internal/rpc/benchmark/glob/glob_test.go
@@ -14,7 +14,7 @@
 	"v.io/v23/rpc"
 	"v.io/v23/security"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/test"
 )
 
diff --git a/profiles/internal/rpc/benchmark/internal/client.go b/runtime/internal/rpc/benchmark/internal/client.go
similarity index 98%
rename from profiles/internal/rpc/benchmark/internal/client.go
rename to runtime/internal/rpc/benchmark/internal/client.go
index 0e8f485..95a76e0 100644
--- a/profiles/internal/rpc/benchmark/internal/client.go
+++ b/runtime/internal/rpc/benchmark/internal/client.go
@@ -13,7 +13,7 @@
 	"v.io/v23/context"
 
 	"v.io/x/lib/vlog"
-	"v.io/x/ref/profiles/internal/rpc/benchmark"
+	"v.io/x/ref/runtime/internal/rpc/benchmark"
 	tbm "v.io/x/ref/test/benchmark"
 )
 
diff --git a/profiles/internal/rpc/benchmark/internal/server.go b/runtime/internal/rpc/benchmark/internal/server.go
similarity index 96%
rename from profiles/internal/rpc/benchmark/internal/server.go
rename to runtime/internal/rpc/benchmark/internal/server.go
index 98e2a08..ec3c0f5 100644
--- a/profiles/internal/rpc/benchmark/internal/server.go
+++ b/runtime/internal/rpc/benchmark/internal/server.go
@@ -12,7 +12,7 @@
 
 	"v.io/x/lib/vlog"
 	"v.io/x/ref/lib/security/securityflag"
-	"v.io/x/ref/profiles/internal/rpc/benchmark"
+	"v.io/x/ref/runtime/internal/rpc/benchmark"
 )
 
 type impl struct {
diff --git a/profiles/internal/rpc/benchmark/main/main.go b/runtime/internal/rpc/benchmark/main/main.go
similarity index 95%
rename from profiles/internal/rpc/benchmark/main/main.go
rename to runtime/internal/rpc/benchmark/main/main.go
index dd145e3..47ae752 100644
--- a/profiles/internal/rpc/benchmark/main/main.go
+++ b/runtime/internal/rpc/benchmark/main/main.go
@@ -16,9 +16,9 @@
 	"v.io/v23/naming"
 
 	"v.io/x/lib/vlog"
-	"v.io/x/ref/profiles/internal/rpc/benchmark/internal"
-	"v.io/x/ref/profiles/internal/rpc/stream/manager"
-	_ "v.io/x/ref/profiles/static"
+	_ "v.io/x/ref/runtime/factories/static"
+	"v.io/x/ref/runtime/internal/rpc/benchmark/internal"
+	"v.io/x/ref/runtime/internal/rpc/stream/manager"
 	"v.io/x/ref/test"
 	"v.io/x/ref/test/benchmark"
 	"v.io/x/ref/test/testutil"
diff --git a/profiles/internal/rpc/blessings_cache.go b/runtime/internal/rpc/blessings_cache.go
similarity index 98%
rename from profiles/internal/rpc/blessings_cache.go
rename to runtime/internal/rpc/blessings_cache.go
index 116f638..a6e9d92 100644
--- a/profiles/internal/rpc/blessings_cache.go
+++ b/runtime/internal/rpc/blessings_cache.go
@@ -12,7 +12,7 @@
 	"v.io/v23/security"
 	"v.io/v23/verror"
 
-	"v.io/x/ref/profiles/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/rpc/stream"
 )
 
 var (
diff --git a/profiles/internal/rpc/cancel_test.go b/runtime/internal/rpc/cancel_test.go
similarity index 94%
rename from profiles/internal/rpc/cancel_test.go
rename to runtime/internal/rpc/cancel_test.go
index 0ab201e..716a456 100644
--- a/profiles/internal/rpc/cancel_test.go
+++ b/runtime/internal/rpc/cancel_test.go
@@ -14,9 +14,9 @@
 	"v.io/v23/rpc"
 	"v.io/v23/security"
 	"v.io/x/lib/vlog"
-	"v.io/x/ref/profiles/internal/rpc/stream"
-	"v.io/x/ref/profiles/internal/rpc/stream/manager"
-	tnaming "v.io/x/ref/profiles/internal/testing/mocks/naming"
+	"v.io/x/ref/runtime/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/rpc/stream/manager"
+	tnaming "v.io/x/ref/runtime/internal/testing/mocks/naming"
 )
 
 type canceld struct {
diff --git a/profiles/internal/rpc/client.go b/runtime/internal/rpc/client.go
similarity index 99%
rename from profiles/internal/rpc/client.go
rename to runtime/internal/rpc/client.go
index a032018..ff1ee51 100644
--- a/profiles/internal/rpc/client.go
+++ b/runtime/internal/rpc/client.go
@@ -28,12 +28,12 @@
 	"v.io/v23/vom"
 	"v.io/v23/vtrace"
 
-	inaming "v.io/x/ref/profiles/internal/naming"
-	"v.io/x/ref/profiles/internal/rpc/stream"
-	"v.io/x/ref/profiles/internal/rpc/stream/vc"
+	inaming "v.io/x/ref/runtime/internal/naming"
+	"v.io/x/ref/runtime/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/rpc/stream/vc"
 )
 
-const pkgPath = "v.io/x/ref/profiles/internal/rpc"
+const pkgPath = "v.io/x/ref/runtime/internal/rpc"
 
 func reg(id, msg string) verror.IDAction {
 	// Note: the error action is never used and is instead computed
diff --git a/profiles/internal/rpc/consts.go b/runtime/internal/rpc/consts.go
similarity index 100%
rename from profiles/internal/rpc/consts.go
rename to runtime/internal/rpc/consts.go
diff --git a/profiles/internal/rpc/debug_test.go b/runtime/internal/rpc/debug_test.go
similarity index 96%
rename from profiles/internal/rpc/debug_test.go
rename to runtime/internal/rpc/debug_test.go
index cdae902..6d9445c 100644
--- a/profiles/internal/rpc/debug_test.go
+++ b/runtime/internal/rpc/debug_test.go
@@ -17,8 +17,8 @@
 	"v.io/v23/rpc"
 	"v.io/x/lib/vlog"
 	"v.io/x/ref/lib/stats"
-	"v.io/x/ref/profiles/internal/rpc/stream/manager"
-	tnaming "v.io/x/ref/profiles/internal/testing/mocks/naming"
+	"v.io/x/ref/runtime/internal/rpc/stream/manager"
+	tnaming "v.io/x/ref/runtime/internal/testing/mocks/naming"
 	"v.io/x/ref/services/debug/debuglib"
 	"v.io/x/ref/test/testutil"
 )
diff --git a/profiles/internal/rpc/discharges.go b/runtime/internal/rpc/discharges.go
similarity index 99%
rename from profiles/internal/rpc/discharges.go
rename to runtime/internal/rpc/discharges.go
index a5dd1d9..c67c530 100644
--- a/profiles/internal/rpc/discharges.go
+++ b/runtime/internal/rpc/discharges.go
@@ -10,7 +10,7 @@
 	"sync"
 	"time"
 
-	"v.io/x/ref/profiles/internal/rpc/stream/vc"
+	"v.io/x/ref/runtime/internal/rpc/stream/vc"
 
 	"v.io/v23/context"
 	"v.io/v23/rpc"
diff --git a/profiles/internal/rpc/discharges_test.go b/runtime/internal/rpc/discharges_test.go
similarity index 100%
rename from profiles/internal/rpc/discharges_test.go
rename to runtime/internal/rpc/discharges_test.go
diff --git a/profiles/internal/rpc/errors.vdl b/runtime/internal/rpc/errors.vdl
similarity index 100%
rename from profiles/internal/rpc/errors.vdl
rename to runtime/internal/rpc/errors.vdl
diff --git a/profiles/internal/rpc/errors.vdl.go b/runtime/internal/rpc/errors.vdl.go
similarity index 71%
rename from profiles/internal/rpc/errors.vdl.go
rename to runtime/internal/rpc/errors.vdl.go
index 83c528e..2c543d7 100644
--- a/profiles/internal/rpc/errors.vdl.go
+++ b/runtime/internal/rpc/errors.vdl.go
@@ -16,13 +16,13 @@
 
 var (
 	// Internal errors.
-	errBadRequest        = verror.Register("v.io/x/ref/profiles/internal/rpc.badRequest", verror.NoRetry, "{1:}{2:} failed to decode request: {3}")
-	errBadNumInputArgs   = verror.Register("v.io/x/ref/profiles/internal/rpc.badNumInputArgs", verror.NoRetry, "{1:}{2:} wrong number of input arguments for {3}.{4} (called with {5} args, want {6})")
-	errBadInputArg       = verror.Register("v.io/x/ref/profiles/internal/rpc.badInputArg", verror.NoRetry, "{1:}{2:} failed to decode request {3}.{4} arg #{5}: {6}")
-	errBadBlessings      = verror.Register("v.io/x/ref/profiles/internal/rpc.badBlessings", verror.NoRetry, "{1:}{2:} failed to decode blessings: {3}")
-	errBadBlessingsCache = verror.Register("v.io/x/ref/profiles/internal/rpc.badBlessingsCache", verror.NoRetry, "{1:}{2:} failed to find blessings in cache: {3}")
-	errBadDischarge      = verror.Register("v.io/x/ref/profiles/internal/rpc.badDischarge", verror.NoRetry, "{1:}{2:} failed to decode discharge #{3}: {4}")
-	errBadAuth           = verror.Register("v.io/x/ref/profiles/internal/rpc.badAuth", verror.NoRetry, "{1:}{2:} not authorized to call {3}.{4}: {5}")
+	errBadRequest        = verror.Register("v.io/x/ref/runtime/internal/rpc.badRequest", verror.NoRetry, "{1:}{2:} failed to decode request: {3}")
+	errBadNumInputArgs   = verror.Register("v.io/x/ref/runtime/internal/rpc.badNumInputArgs", verror.NoRetry, "{1:}{2:} wrong number of input arguments for {3}.{4} (called with {5} args, want {6})")
+	errBadInputArg       = verror.Register("v.io/x/ref/runtime/internal/rpc.badInputArg", verror.NoRetry, "{1:}{2:} failed to decode request {3}.{4} arg #{5}: {6}")
+	errBadBlessings      = verror.Register("v.io/x/ref/runtime/internal/rpc.badBlessings", verror.NoRetry, "{1:}{2:} failed to decode blessings: {3}")
+	errBadBlessingsCache = verror.Register("v.io/x/ref/runtime/internal/rpc.badBlessingsCache", verror.NoRetry, "{1:}{2:} failed to find blessings in cache: {3}")
+	errBadDischarge      = verror.Register("v.io/x/ref/runtime/internal/rpc.badDischarge", verror.NoRetry, "{1:}{2:} failed to decode discharge #{3}: {4}")
+	errBadAuth           = verror.Register("v.io/x/ref/runtime/internal/rpc.badAuth", verror.NoRetry, "{1:}{2:} not authorized to call {3}.{4}: {5}")
 )
 
 func init() {
diff --git a/profiles/internal/rpc/full_test.go b/runtime/internal/rpc/full_test.go
similarity index 99%
rename from profiles/internal/rpc/full_test.go
rename to runtime/internal/rpc/full_test.go
index 9b5c277..1fd3ca8 100644
--- a/profiles/internal/rpc/full_test.go
+++ b/runtime/internal/rpc/full_test.go
@@ -38,16 +38,16 @@
 	"v.io/v23/vtrace"
 
 	"v.io/x/ref/lib/stats"
-	"v.io/x/ref/profiles/internal/lib/publisher"
-	"v.io/x/ref/profiles/internal/lib/websocket"
-	inaming "v.io/x/ref/profiles/internal/naming"
-	_ "v.io/x/ref/profiles/internal/rpc/protocols/tcp"
-	_ "v.io/x/ref/profiles/internal/rpc/protocols/ws"
-	_ "v.io/x/ref/profiles/internal/rpc/protocols/wsh"
-	"v.io/x/ref/profiles/internal/rpc/stream"
-	imanager "v.io/x/ref/profiles/internal/rpc/stream/manager"
-	"v.io/x/ref/profiles/internal/rpc/stream/vc"
-	tnaming "v.io/x/ref/profiles/internal/testing/mocks/naming"
+	"v.io/x/ref/runtime/internal/lib/publisher"
+	"v.io/x/ref/runtime/internal/lib/websocket"
+	inaming "v.io/x/ref/runtime/internal/naming"
+	_ "v.io/x/ref/runtime/internal/rpc/protocols/tcp"
+	_ "v.io/x/ref/runtime/internal/rpc/protocols/ws"
+	_ "v.io/x/ref/runtime/internal/rpc/protocols/wsh"
+	"v.io/x/ref/runtime/internal/rpc/stream"
+	imanager "v.io/x/ref/runtime/internal/rpc/stream/manager"
+	"v.io/x/ref/runtime/internal/rpc/stream/vc"
+	tnaming "v.io/x/ref/runtime/internal/testing/mocks/naming"
 	"v.io/x/ref/test/testutil"
 )
 
diff --git a/profiles/internal/rpc/init.go b/runtime/internal/rpc/init.go
similarity index 100%
rename from profiles/internal/rpc/init.go
rename to runtime/internal/rpc/init.go
diff --git a/profiles/internal/rpc/options.go b/runtime/internal/rpc/options.go
similarity index 97%
rename from profiles/internal/rpc/options.go
rename to runtime/internal/rpc/options.go
index f5ab563..16004aa 100644
--- a/profiles/internal/rpc/options.go
+++ b/runtime/internal/rpc/options.go
@@ -12,7 +12,7 @@
 	"v.io/v23/rpc"
 
 	"v.io/x/lib/vlog"
-	"v.io/x/ref/profiles/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/rpc/stream"
 )
 
 // PreferredProtocols instructs the Runtime implementation to select
diff --git a/profiles/internal/rpc/protocols/tcp/init.go b/runtime/internal/rpc/protocols/tcp/init.go
similarity index 97%
rename from profiles/internal/rpc/protocols/tcp/init.go
rename to runtime/internal/rpc/protocols/tcp/init.go
index da259a7..23ec14d 100644
--- a/profiles/internal/rpc/protocols/tcp/init.go
+++ b/runtime/internal/rpc/protocols/tcp/init.go
@@ -12,7 +12,7 @@
 
 	"v.io/v23/rpc"
 
-	"v.io/x/ref/profiles/internal/lib/tcputil"
+	"v.io/x/ref/runtime/internal/lib/tcputil"
 )
 
 func init() {
diff --git a/profiles/internal/rpc/protocols/ws/init.go b/runtime/internal/rpc/protocols/ws/init.go
similarity index 92%
rename from profiles/internal/rpc/protocols/ws/init.go
rename to runtime/internal/rpc/protocols/ws/init.go
index 6167bbf..5aac575 100644
--- a/profiles/internal/rpc/protocols/ws/init.go
+++ b/runtime/internal/rpc/protocols/ws/init.go
@@ -7,7 +7,7 @@
 import (
 	"v.io/v23/rpc"
 
-	"v.io/x/ref/profiles/internal/lib/websocket"
+	"v.io/x/ref/runtime/internal/lib/websocket"
 )
 
 func init() {
diff --git a/profiles/internal/rpc/protocols/wsh/init.go b/runtime/internal/rpc/protocols/wsh/init.go
similarity index 93%
rename from profiles/internal/rpc/protocols/wsh/init.go
rename to runtime/internal/rpc/protocols/wsh/init.go
index ef706d4..26cc680 100644
--- a/profiles/internal/rpc/protocols/wsh/init.go
+++ b/runtime/internal/rpc/protocols/wsh/init.go
@@ -9,7 +9,7 @@
 import (
 	"v.io/v23/rpc"
 
-	"v.io/x/ref/profiles/internal/lib/websocket"
+	"v.io/x/ref/runtime/internal/lib/websocket"
 )
 
 func init() {
diff --git a/profiles/internal/rpc/protocols/wsh_nacl/init.go b/runtime/internal/rpc/protocols/wsh_nacl/init.go
similarity index 93%
rename from profiles/internal/rpc/protocols/wsh_nacl/init.go
rename to runtime/internal/rpc/protocols/wsh_nacl/init.go
index 6540b75..276a567 100644
--- a/profiles/internal/rpc/protocols/wsh_nacl/init.go
+++ b/runtime/internal/rpc/protocols/wsh_nacl/init.go
@@ -9,7 +9,7 @@
 import (
 	"v.io/v23/rpc"
 
-	"v.io/x/ref/profiles/internal/lib/websocket"
+	"v.io/x/ref/runtime/internal/lib/websocket"
 )
 
 func init() {
diff --git a/profiles/internal/rpc/pubsub.go b/runtime/internal/rpc/pubsub.go
similarity index 100%
rename from profiles/internal/rpc/pubsub.go
rename to runtime/internal/rpc/pubsub.go
diff --git a/profiles/internal/rpc/reserved.go b/runtime/internal/rpc/reserved.go
similarity index 100%
rename from profiles/internal/rpc/reserved.go
rename to runtime/internal/rpc/reserved.go
diff --git a/profiles/internal/rpc/resolve_internal_test.go b/runtime/internal/rpc/resolve_internal_test.go
similarity index 100%
rename from profiles/internal/rpc/resolve_internal_test.go
rename to runtime/internal/rpc/resolve_internal_test.go
diff --git a/profiles/internal/rpc/resolve_test.go b/runtime/internal/rpc/resolve_test.go
similarity index 93%
rename from profiles/internal/rpc/resolve_test.go
rename to runtime/internal/rpc/resolve_test.go
index e0f6878..73ace16 100644
--- a/profiles/internal/rpc/resolve_test.go
+++ b/runtime/internal/rpc/resolve_test.go
@@ -19,12 +19,12 @@
 	"v.io/v23/rpc"
 
 	"v.io/x/ref/lib/flags"
-	"v.io/x/ref/profiles/fake"
-	"v.io/x/ref/profiles/internal"
-	"v.io/x/ref/profiles/internal/lib/appcycle"
-	inaming "v.io/x/ref/profiles/internal/naming"
-	irpc "v.io/x/ref/profiles/internal/rpc"
-	grt "v.io/x/ref/profiles/internal/rt"
+	"v.io/x/ref/runtime/factories/fake"
+	"v.io/x/ref/runtime/internal"
+	"v.io/x/ref/runtime/internal/lib/appcycle"
+	inaming "v.io/x/ref/runtime/internal/naming"
+	irpc "v.io/x/ref/runtime/internal/rpc"
+	grt "v.io/x/ref/runtime/internal/rt"
 	"v.io/x/ref/services/mounttable/mounttablelib"
 	"v.io/x/ref/test/expect"
 	"v.io/x/ref/test/modules"
diff --git a/profiles/internal/rpc/results_store.go b/runtime/internal/rpc/results_store.go
similarity index 100%
rename from profiles/internal/rpc/results_store.go
rename to runtime/internal/rpc/results_store.go
diff --git a/profiles/internal/rpc/results_store_test.go b/runtime/internal/rpc/results_store_test.go
similarity index 100%
rename from profiles/internal/rpc/results_store_test.go
rename to runtime/internal/rpc/results_store_test.go
diff --git a/profiles/internal/rpc/server.go b/runtime/internal/rpc/server.go
similarity index 98%
rename from profiles/internal/rpc/server.go
rename to runtime/internal/rpc/server.go
index e1ac0da..3505ef5 100644
--- a/profiles/internal/rpc/server.go
+++ b/runtime/internal/rpc/server.go
@@ -32,11 +32,11 @@
 	"v.io/v23/vtrace"
 
 	"v.io/x/ref/lib/stats"
-	"v.io/x/ref/profiles/internal/lib/publisher"
-	inaming "v.io/x/ref/profiles/internal/naming"
-	"v.io/x/ref/profiles/internal/rpc/stream"
-	"v.io/x/ref/profiles/internal/rpc/stream/manager"
-	"v.io/x/ref/profiles/internal/rpc/stream/vc"
+	"v.io/x/ref/runtime/internal/lib/publisher"
+	inaming "v.io/x/ref/runtime/internal/naming"
+	"v.io/x/ref/runtime/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/rpc/stream/manager"
+	"v.io/x/ref/runtime/internal/rpc/stream/vc"
 )
 
 var (
@@ -49,7 +49,7 @@
 	errFailedToResolveToEndpoint = reg(".errFailedToResolveToEndpoint", "failed to resolve {3} to an endpoint")
 	errFailedToResolveProxy      = reg(".errFailedToResolveProxy", "failed to resolve proxy {3}{:4}")
 	errFailedToListenForProxy    = reg(".errFailedToListenForProxy", "failed to listen on {3}{:4}")
-	errInternalTypeConversion    = reg(".errInternalTypeConversion", "failed to convert {3} to v.io/x/ref/profiles/internal/naming.Endpoint")
+	errInternalTypeConversion    = reg(".errInternalTypeConversion", "failed to convert {3} to v.io/x/ref/runtime/internal/naming.Endpoint")
 	errFailedToParseIP           = reg(".errFailedToParseIP", "failed to parse {3} as an IP host")
 	errUnexpectedSuffix          = reg(".errUnexpectedSuffix", "suffix {3} was not expected because either server has the option IsLeaf set to true or it served an object and not a dispatcher")
 )
@@ -1043,7 +1043,7 @@
 	// TODO(ashankar): Should unread data from the flow be drained?
 	//
 	// Reason to do so:
-	// The common stream.Flow implementation (v.io/x/ref/profiles/internal/rpc/stream/vc/reader.go)
+	// The common stream.Flow implementation (v.io/x/ref/runtime/internal/rpc/stream/vc/reader.go)
 	// uses iobuf.Slices backed by an iobuf.Pool. If the stream is not drained, these
 	// slices will not be returned to the pool leading to possibly increased memory usage.
 	//
diff --git a/profiles/internal/rpc/server_authorizer.go b/runtime/internal/rpc/server_authorizer.go
similarity index 100%
rename from profiles/internal/rpc/server_authorizer.go
rename to runtime/internal/rpc/server_authorizer.go
diff --git a/profiles/internal/rpc/server_authorizer_test.go b/runtime/internal/rpc/server_authorizer_test.go
similarity index 98%
rename from profiles/internal/rpc/server_authorizer_test.go
rename to runtime/internal/rpc/server_authorizer_test.go
index f9625fc..68afdec 100644
--- a/profiles/internal/rpc/server_authorizer_test.go
+++ b/runtime/internal/rpc/server_authorizer_test.go
@@ -10,7 +10,7 @@
 	"v.io/v23"
 	"v.io/v23/options"
 	"v.io/v23/security"
-	"v.io/x/ref/profiles/internal/naming"
+	"v.io/x/ref/runtime/internal/naming"
 
 	"v.io/x/ref/test/testutil"
 )
diff --git a/profiles/internal/rpc/server_test.go b/runtime/internal/rpc/server_test.go
similarity index 98%
rename from profiles/internal/rpc/server_test.go
rename to runtime/internal/rpc/server_test.go
index 0b6f03f..5f2c5c4 100644
--- a/profiles/internal/rpc/server_test.go
+++ b/runtime/internal/rpc/server_test.go
@@ -23,9 +23,9 @@
 	"v.io/x/lib/vlog"
 
 	"v.io/x/lib/netstate"
-	inaming "v.io/x/ref/profiles/internal/naming"
-	imanager "v.io/x/ref/profiles/internal/rpc/stream/manager"
-	tnaming "v.io/x/ref/profiles/internal/testing/mocks/naming"
+	inaming "v.io/x/ref/runtime/internal/naming"
+	imanager "v.io/x/ref/runtime/internal/rpc/stream/manager"
+	tnaming "v.io/x/ref/runtime/internal/testing/mocks/naming"
 	"v.io/x/ref/test/testutil"
 )
 
diff --git a/profiles/internal/rpc/sort_endpoints.go b/runtime/internal/rpc/sort_endpoints.go
similarity index 98%
rename from profiles/internal/rpc/sort_endpoints.go
rename to runtime/internal/rpc/sort_endpoints.go
index 49db0bc..ee7193c 100644
--- a/profiles/internal/rpc/sort_endpoints.go
+++ b/runtime/internal/rpc/sort_endpoints.go
@@ -15,7 +15,7 @@
 	"v.io/v23/verror"
 
 	"v.io/x/lib/netstate"
-	inaming "v.io/x/ref/profiles/internal/naming"
+	inaming "v.io/x/ref/runtime/internal/naming"
 )
 
 var (
diff --git a/profiles/internal/rpc/sort_internal_test.go b/runtime/internal/rpc/sort_internal_test.go
similarity index 100%
rename from profiles/internal/rpc/sort_internal_test.go
rename to runtime/internal/rpc/sort_internal_test.go
diff --git a/profiles/internal/rpc/stats.go b/runtime/internal/rpc/stats.go
similarity index 100%
rename from profiles/internal/rpc/stats.go
rename to runtime/internal/rpc/stats.go
diff --git a/profiles/internal/rpc/stream/benchmark/RESULTS.txt b/runtime/internal/rpc/stream/benchmark/RESULTS.txt
similarity index 98%
rename from profiles/internal/rpc/stream/benchmark/RESULTS.txt
rename to runtime/internal/rpc/stream/benchmark/RESULTS.txt
index b21759e..905f1db 100644
--- a/profiles/internal/rpc/stream/benchmark/RESULTS.txt
+++ b/runtime/internal/rpc/stream/benchmark/RESULTS.txt
@@ -2,7 +2,7 @@
 Platform: Intel(R) Xeon(R) CPU E5-2689 0 @ 2.60GHz,  66114888KB Memory
 
 $ v23 go test -bench=. -cpu=1 -benchtime=5s \
-  v.io/x/ref/profiles/internal/rpc/stream/benchmark
+  v.io/x/ref/runtime/internal/rpc/stream/benchmark
 
 Benchmark_dial_VIF	  500000	     14292 ns/op
 --- Histogram (unit: s)
diff --git a/profiles/internal/rpc/stream/benchmark/benchmark_test.go b/runtime/internal/rpc/stream/benchmark/benchmark_test.go
similarity index 100%
rename from profiles/internal/rpc/stream/benchmark/benchmark_test.go
rename to runtime/internal/rpc/stream/benchmark/benchmark_test.go
diff --git a/profiles/internal/rpc/stream/benchmark/dial_test.go b/runtime/internal/rpc/stream/benchmark/dial_test.go
similarity index 100%
rename from profiles/internal/rpc/stream/benchmark/dial_test.go
rename to runtime/internal/rpc/stream/benchmark/dial_test.go
diff --git a/profiles/internal/rpc/stream/benchmark/dial_vc.go b/runtime/internal/rpc/stream/benchmark/dial_vc.go
similarity index 91%
rename from profiles/internal/rpc/stream/benchmark/dial_vc.go
rename to runtime/internal/rpc/stream/benchmark/dial_vc.go
index a78484f..fd7ed2d 100644
--- a/profiles/internal/rpc/stream/benchmark/dial_vc.go
+++ b/runtime/internal/rpc/stream/benchmark/dial_vc.go
@@ -8,9 +8,9 @@
 	"testing"
 	"time"
 
-	"v.io/x/ref/profiles/internal/rpc/stream/manager"
-	"v.io/x/ref/profiles/internal/rpc/stream/vc"
-	_ "v.io/x/ref/profiles/static"
+	_ "v.io/x/ref/runtime/factories/static"
+	"v.io/x/ref/runtime/internal/rpc/stream/manager"
+	"v.io/x/ref/runtime/internal/rpc/stream/vc"
 	"v.io/x/ref/test/benchmark"
 	"v.io/x/ref/test/testutil"
 
diff --git a/profiles/internal/rpc/stream/benchmark/dial_vif.go b/runtime/internal/rpc/stream/benchmark/dial_vif.go
similarity index 96%
rename from profiles/internal/rpc/stream/benchmark/dial_vif.go
rename to runtime/internal/rpc/stream/benchmark/dial_vif.go
index c67e4a4..2278839 100644
--- a/profiles/internal/rpc/stream/benchmark/dial_vif.go
+++ b/runtime/internal/rpc/stream/benchmark/dial_vif.go
@@ -9,7 +9,7 @@
 	"testing"
 	"time"
 
-	"v.io/x/ref/profiles/internal/rpc/stream/vif"
+	"v.io/x/ref/runtime/internal/rpc/stream/vif"
 	"v.io/x/ref/test/benchmark"
 	"v.io/x/ref/test/testutil"
 
diff --git a/profiles/internal/rpc/stream/benchmark/doc.go b/runtime/internal/rpc/stream/benchmark/doc.go
similarity index 100%
rename from profiles/internal/rpc/stream/benchmark/doc.go
rename to runtime/internal/rpc/stream/benchmark/doc.go
diff --git a/profiles/internal/rpc/stream/benchmark/throughput.go b/runtime/internal/rpc/stream/benchmark/throughput.go
similarity index 100%
rename from profiles/internal/rpc/stream/benchmark/throughput.go
rename to runtime/internal/rpc/stream/benchmark/throughput.go
diff --git a/profiles/internal/rpc/stream/benchmark/throughput_flow.go b/runtime/internal/rpc/stream/benchmark/throughput_flow.go
similarity index 96%
rename from profiles/internal/rpc/stream/benchmark/throughput_flow.go
rename to runtime/internal/rpc/stream/benchmark/throughput_flow.go
index b1413a2..605ebbe 100644
--- a/profiles/internal/rpc/stream/benchmark/throughput_flow.go
+++ b/runtime/internal/rpc/stream/benchmark/throughput_flow.go
@@ -8,12 +8,12 @@
 	"io"
 	"testing"
 
-	"v.io/x/ref/profiles/internal/rpc/stream/manager"
+	"v.io/x/ref/runtime/internal/rpc/stream/manager"
 
 	"v.io/v23/naming"
 	"v.io/v23/options"
 	"v.io/v23/security"
-	"v.io/x/ref/profiles/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/rpc/stream"
 	"v.io/x/ref/test/testutil"
 )
 
diff --git a/profiles/internal/rpc/stream/benchmark/throughput_pipe.go b/runtime/internal/rpc/stream/benchmark/throughput_pipe.go
similarity index 100%
rename from profiles/internal/rpc/stream/benchmark/throughput_pipe.go
rename to runtime/internal/rpc/stream/benchmark/throughput_pipe.go
diff --git a/profiles/internal/rpc/stream/benchmark/throughput_tcp.go b/runtime/internal/rpc/stream/benchmark/throughput_tcp.go
similarity index 100%
rename from profiles/internal/rpc/stream/benchmark/throughput_tcp.go
rename to runtime/internal/rpc/stream/benchmark/throughput_tcp.go
diff --git a/profiles/internal/rpc/stream/benchmark/throughput_test.go b/runtime/internal/rpc/stream/benchmark/throughput_test.go
similarity index 100%
rename from profiles/internal/rpc/stream/benchmark/throughput_test.go
rename to runtime/internal/rpc/stream/benchmark/throughput_test.go
diff --git a/profiles/internal/rpc/stream/benchmark/throughput_tls.go b/runtime/internal/rpc/stream/benchmark/throughput_tls.go
similarity index 96%
rename from profiles/internal/rpc/stream/benchmark/throughput_tls.go
rename to runtime/internal/rpc/stream/benchmark/throughput_tls.go
index 6a41edf..db4e96a 100644
--- a/profiles/internal/rpc/stream/benchmark/throughput_tls.go
+++ b/runtime/internal/rpc/stream/benchmark/throughput_tls.go
@@ -10,7 +10,7 @@
 	"net"
 	"testing"
 
-	"v.io/x/ref/profiles/internal/rpc/stream/crypto"
+	"v.io/x/ref/runtime/internal/rpc/stream/crypto"
 )
 
 func benchmarkTLS(b *testing.B, nConns int) {
diff --git a/profiles/internal/rpc/stream/benchmark/throughput_ws.go b/runtime/internal/rpc/stream/benchmark/throughput_ws.go
similarity index 96%
rename from profiles/internal/rpc/stream/benchmark/throughput_ws.go
rename to runtime/internal/rpc/stream/benchmark/throughput_ws.go
index 503a60a..07babce 100644
--- a/profiles/internal/rpc/stream/benchmark/throughput_ws.go
+++ b/runtime/internal/rpc/stream/benchmark/throughput_ws.go
@@ -9,7 +9,7 @@
 	"net"
 	"testing"
 
-	"v.io/x/ref/profiles/internal/lib/websocket"
+	"v.io/x/ref/runtime/internal/lib/websocket"
 )
 
 // benchmarkWS sets up nConns WS connections and measures throughput.
diff --git a/profiles/internal/rpc/stream/benchmark/throughput_wsh.go b/runtime/internal/rpc/stream/benchmark/throughput_wsh.go
similarity index 97%
rename from profiles/internal/rpc/stream/benchmark/throughput_wsh.go
rename to runtime/internal/rpc/stream/benchmark/throughput_wsh.go
index 4fd3db5..f160184 100644
--- a/profiles/internal/rpc/stream/benchmark/throughput_wsh.go
+++ b/runtime/internal/rpc/stream/benchmark/throughput_wsh.go
@@ -9,7 +9,7 @@
 	"net"
 	"testing"
 
-	"v.io/x/ref/profiles/internal/lib/websocket"
+	"v.io/x/ref/runtime/internal/lib/websocket"
 )
 
 // benchmarkWS sets up nConns WS connections and measures throughput.
diff --git a/profiles/internal/rpc/stream/crypto/box.go b/runtime/internal/rpc/stream/crypto/box.go
similarity index 96%
rename from profiles/internal/rpc/stream/crypto/box.go
rename to runtime/internal/rpc/stream/crypto/box.go
index e16c5ec..eec1bc9 100644
--- a/profiles/internal/rpc/stream/crypto/box.go
+++ b/runtime/internal/rpc/stream/crypto/box.go
@@ -13,11 +13,11 @@
 	"golang.org/x/crypto/nacl/box"
 
 	"v.io/v23/verror"
-	"v.io/x/ref/profiles/internal/lib/iobuf"
-	"v.io/x/ref/profiles/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/lib/iobuf"
+	"v.io/x/ref/runtime/internal/rpc/stream"
 )
 
-const pkgPath = "v.io/x/ref/profiles/internal/rpc/stream/crypto"
+const pkgPath = "v.io/x/ref/runtime/internal/rpc/stream/crypto"
 
 func reg(id, msg string) verror.IDAction {
 	return verror.Register(verror.ID(pkgPath+id), verror.NoRetry, msg)
diff --git a/profiles/internal/rpc/stream/crypto/box_cipher.go b/runtime/internal/rpc/stream/crypto/box_cipher.go
similarity index 98%
rename from profiles/internal/rpc/stream/crypto/box_cipher.go
rename to runtime/internal/rpc/stream/crypto/box_cipher.go
index a5a5f6b..f28757d 100644
--- a/profiles/internal/rpc/stream/crypto/box_cipher.go
+++ b/runtime/internal/rpc/stream/crypto/box_cipher.go
@@ -12,7 +12,7 @@
 
 	"v.io/v23/verror"
 
-	"v.io/x/ref/profiles/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/rpc/stream"
 )
 
 // cbox implements a ControlCipher using go.crypto/nacl/box.
diff --git a/profiles/internal/rpc/stream/crypto/box_cipher_test.go b/runtime/internal/rpc/stream/crypto/box_cipher_test.go
similarity index 98%
rename from profiles/internal/rpc/stream/crypto/box_cipher_test.go
rename to runtime/internal/rpc/stream/crypto/box_cipher_test.go
index dc29318..6727f7d 100644
--- a/profiles/internal/rpc/stream/crypto/box_cipher_test.go
+++ b/runtime/internal/rpc/stream/crypto/box_cipher_test.go
@@ -11,7 +11,7 @@
 
 	"golang.org/x/crypto/nacl/box"
 
-	"v.io/x/ref/profiles/internal/rpc/stream/crypto"
+	"v.io/x/ref/runtime/internal/rpc/stream/crypto"
 )
 
 // Add space for a MAC.
diff --git a/profiles/internal/rpc/stream/crypto/control_cipher.go b/runtime/internal/rpc/stream/crypto/control_cipher.go
similarity index 100%
rename from profiles/internal/rpc/stream/crypto/control_cipher.go
rename to runtime/internal/rpc/stream/crypto/control_cipher.go
diff --git a/profiles/internal/rpc/stream/crypto/crypto.go b/runtime/internal/rpc/stream/crypto/crypto.go
similarity index 96%
rename from profiles/internal/rpc/stream/crypto/crypto.go
rename to runtime/internal/rpc/stream/crypto/crypto.go
index 14d3ca9..bee1726 100644
--- a/profiles/internal/rpc/stream/crypto/crypto.go
+++ b/runtime/internal/rpc/stream/crypto/crypto.go
@@ -6,7 +6,7 @@
 // securing communication over VCs.
 package crypto
 
-import "v.io/x/ref/profiles/internal/lib/iobuf"
+import "v.io/x/ref/runtime/internal/lib/iobuf"
 
 type Encrypter interface {
 	// Encrypt encrypts the provided plaintext data and returns the
diff --git a/profiles/internal/rpc/stream/crypto/crypto_test.go b/runtime/internal/rpc/stream/crypto/crypto_test.go
similarity index 99%
rename from profiles/internal/rpc/stream/crypto/crypto_test.go
rename to runtime/internal/rpc/stream/crypto/crypto_test.go
index f5ef433..fe83db7 100644
--- a/profiles/internal/rpc/stream/crypto/crypto_test.go
+++ b/runtime/internal/rpc/stream/crypto/crypto_test.go
@@ -11,7 +11,7 @@
 	"testing"
 	"testing/quick"
 
-	"v.io/x/ref/profiles/internal/lib/iobuf"
+	"v.io/x/ref/runtime/internal/lib/iobuf"
 )
 
 func quickTest(t *testing.T, e Encrypter, d Decrypter) {
diff --git a/profiles/internal/rpc/stream/crypto/null.go b/runtime/internal/rpc/stream/crypto/null.go
similarity index 92%
rename from profiles/internal/rpc/stream/crypto/null.go
rename to runtime/internal/rpc/stream/crypto/null.go
index ed0735f..036b541 100644
--- a/profiles/internal/rpc/stream/crypto/null.go
+++ b/runtime/internal/rpc/stream/crypto/null.go
@@ -4,7 +4,7 @@
 
 package crypto
 
-import "v.io/x/ref/profiles/internal/lib/iobuf"
+import "v.io/x/ref/runtime/internal/lib/iobuf"
 
 // NewNullCrypter returns a Crypter that does no encryption/decryption.
 func NewNullCrypter() Crypter { return null{} }
diff --git a/profiles/internal/rpc/stream/crypto/null_cipher.go b/runtime/internal/rpc/stream/crypto/null_cipher.go
similarity index 100%
rename from profiles/internal/rpc/stream/crypto/null_cipher.go
rename to runtime/internal/rpc/stream/crypto/null_cipher.go
diff --git a/profiles/internal/rpc/stream/crypto/tls.go b/runtime/internal/rpc/stream/crypto/tls.go
similarity index 98%
rename from profiles/internal/rpc/stream/crypto/tls.go
rename to runtime/internal/rpc/stream/crypto/tls.go
index cdb58de..db8833c 100644
--- a/profiles/internal/rpc/stream/crypto/tls.go
+++ b/runtime/internal/rpc/stream/crypto/tls.go
@@ -17,8 +17,8 @@
 
 	"v.io/v23/verror"
 
-	"v.io/x/ref/profiles/internal/lib/iobuf"
-	"v.io/x/ref/profiles/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/lib/iobuf"
+	"v.io/x/ref/runtime/internal/rpc/stream"
 )
 
 var (
diff --git a/profiles/internal/rpc/stream/doc.go b/runtime/internal/rpc/stream/doc.go
similarity index 100%
rename from profiles/internal/rpc/stream/doc.go
rename to runtime/internal/rpc/stream/doc.go
diff --git a/profiles/internal/rpc/stream/error_test.go b/runtime/internal/rpc/stream/error_test.go
similarity index 95%
rename from profiles/internal/rpc/stream/error_test.go
rename to runtime/internal/rpc/stream/error_test.go
index d576d38..fa0716f 100644
--- a/profiles/internal/rpc/stream/error_test.go
+++ b/runtime/internal/rpc/stream/error_test.go
@@ -10,7 +10,7 @@
 
 	"v.io/v23/verror"
 
-	"v.io/x/ref/profiles/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/rpc/stream"
 )
 
 func TestTimeoutError(t *testing.T) {
diff --git a/profiles/internal/rpc/stream/errors.go b/runtime/internal/rpc/stream/errors.go
similarity index 97%
rename from profiles/internal/rpc/stream/errors.go
rename to runtime/internal/rpc/stream/errors.go
index 2a54607..7ba12b2 100644
--- a/profiles/internal/rpc/stream/errors.go
+++ b/runtime/internal/rpc/stream/errors.go
@@ -11,7 +11,7 @@
 	"v.io/x/lib/vlog"
 )
 
-const pkgPath = "v.io/x/ref/profiles/internal/rpc/stream"
+const pkgPath = "v.io/x/ref/runtime/internal/rpc/stream"
 
 // The stream family of packages guarantee to return one of the verror codes defined
 // here, their messages are constructed so as to avoid embedding a component/method name
diff --git a/profiles/internal/rpc/stream/id/id.go b/runtime/internal/rpc/stream/id/id.go
similarity index 100%
rename from profiles/internal/rpc/stream/id/id.go
rename to runtime/internal/rpc/stream/id/id.go
diff --git a/profiles/internal/rpc/stream/manager/error_test.go b/runtime/internal/rpc/stream/manager/error_test.go
similarity index 92%
rename from profiles/internal/rpc/stream/manager/error_test.go
rename to runtime/internal/rpc/stream/manager/error_test.go
index 545d051..4c61f49 100644
--- a/profiles/internal/rpc/stream/manager/error_test.go
+++ b/runtime/internal/rpc/stream/manager/error_test.go
@@ -14,12 +14,12 @@
 	"v.io/v23/security"
 	"v.io/v23/verror"
 
-	_ "v.io/x/ref/profiles"
-	inaming "v.io/x/ref/profiles/internal/naming"
-	"v.io/x/ref/profiles/internal/rpc/stream"
-	"v.io/x/ref/profiles/internal/rpc/stream/manager"
-	"v.io/x/ref/profiles/internal/rpc/stream/message"
-	"v.io/x/ref/profiles/internal/testing/mocks/mocknet"
+	_ "v.io/x/ref/runtime/factories/generic"
+	inaming "v.io/x/ref/runtime/internal/naming"
+	"v.io/x/ref/runtime/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/rpc/stream/manager"
+	"v.io/x/ref/runtime/internal/rpc/stream/message"
+	"v.io/x/ref/runtime/internal/testing/mocks/mocknet"
 	"v.io/x/ref/test"
 	"v.io/x/ref/test/testutil"
 )
diff --git a/profiles/internal/rpc/stream/manager/listener.go b/runtime/internal/rpc/stream/manager/listener.go
similarity index 97%
rename from profiles/internal/rpc/stream/manager/listener.go
rename to runtime/internal/rpc/stream/manager/listener.go
index 3e0ec5d..387752e 100644
--- a/profiles/internal/rpc/stream/manager/listener.go
+++ b/runtime/internal/rpc/stream/manager/listener.go
@@ -13,18 +13,18 @@
 	"syscall"
 	"time"
 
-	"v.io/x/ref/profiles/internal/lib/upcqueue"
-	inaming "v.io/x/ref/profiles/internal/naming"
-	"v.io/x/ref/profiles/internal/rpc/stream/proxy"
-	"v.io/x/ref/profiles/internal/rpc/stream/vc"
-	"v.io/x/ref/profiles/internal/rpc/stream/vif"
+	"v.io/x/ref/runtime/internal/lib/upcqueue"
+	inaming "v.io/x/ref/runtime/internal/naming"
+	"v.io/x/ref/runtime/internal/rpc/stream/proxy"
+	"v.io/x/ref/runtime/internal/rpc/stream/vc"
+	"v.io/x/ref/runtime/internal/rpc/stream/vif"
 
 	"v.io/v23/naming"
 	"v.io/v23/security"
 	"v.io/v23/verror"
 	"v.io/v23/vom"
 	"v.io/x/lib/vlog"
-	"v.io/x/ref/profiles/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/rpc/stream"
 )
 
 // ProxyAuthenticator is a stream.ListenerOpt that is used when listening via a
@@ -319,7 +319,7 @@
 	if err := vf.StartAccepting(opts...); err != nil {
 		return nil, nil, verror.New(stream.ErrNetwork, nil, verror.New(errAlreadyConnected, nil, vf, err))
 	}
-	// Proxy protocol: See v.io/x/ref/profiles/internal/rpc/stream/proxy/protocol.vdl
+	// Proxy protocol: See v.io/x/ref/runtime/internal/rpc/stream/proxy/protocol.vdl
 	//
 	// We don't need idle timeout for this VC, since one flow will be kept alive.
 	vc, err := vf.Dial(ln.proxyEP, principal, dialOpts...)
diff --git a/profiles/internal/rpc/stream/manager/manager.go b/runtime/internal/rpc/stream/manager/manager.go
similarity index 95%
rename from profiles/internal/rpc/stream/manager/manager.go
rename to runtime/internal/rpc/stream/manager/manager.go
index afa3afa..a297962 100644
--- a/profiles/internal/rpc/stream/manager/manager.go
+++ b/runtime/internal/rpc/stream/manager/manager.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Package manager provides an implementation of the Manager interface defined in v.io/x/ref/profiles/internal/rpc/stream.
+// Package manager provides an implementation of the Manager interface defined in v.io/x/ref/runtime/internal/rpc/stream.
 package manager
 
 import (
@@ -20,13 +20,13 @@
 
 	"v.io/x/ref/lib/stats"
 	"v.io/x/ref/lib/stats/counter"
-	inaming "v.io/x/ref/profiles/internal/naming"
-	"v.io/x/ref/profiles/internal/rpc/stream"
-	"v.io/x/ref/profiles/internal/rpc/stream/vc"
-	"v.io/x/ref/profiles/internal/rpc/stream/vif"
+	inaming "v.io/x/ref/runtime/internal/naming"
+	"v.io/x/ref/runtime/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/rpc/stream/vc"
+	"v.io/x/ref/runtime/internal/rpc/stream/vif"
 )
 
-const pkgPath = "v.io/x/ref/profiles/internal/rpc/stream/manager"
+const pkgPath = "v.io/x/ref/runtime/internal/rpc/stream/manager"
 
 var (
 	// These errors are intended to be used as arguments to higher
@@ -51,8 +51,8 @@
 // process is identified by the provided RoutingID.
 //
 // As the name suggests, this method is intended for use only within packages
-// placed inside v.io/x/ref/profiles/internal. Code outside the
-// v.io/x/ref/profiles/internal/* packages should never call this method.
+// placed inside v.io/x/ref/runtime/internal. Code outside the
+// v.io/x/ref/runtime/internal/* packages should never call this method.
 func InternalNew(rid naming.RoutingID) stream.Manager {
 	statsPrefix := naming.Join("rpc", "stream", "routing-id", rid.String())
 	m := &manager{
diff --git a/profiles/internal/rpc/stream/manager/manager_test.go b/runtime/internal/rpc/stream/manager/manager_test.go
similarity index 98%
rename from profiles/internal/rpc/stream/manager/manager_test.go
rename to runtime/internal/rpc/stream/manager/manager_test.go
index 5042471..bce2bab 100644
--- a/profiles/internal/rpc/stream/manager/manager_test.go
+++ b/runtime/internal/rpc/stream/manager/manager_test.go
@@ -25,12 +25,12 @@
 	"v.io/v23/rpc"
 	"v.io/v23/security"
 
-	inaming "v.io/x/ref/profiles/internal/naming"
-	_ "v.io/x/ref/profiles/internal/rpc/protocols/tcp"
-	_ "v.io/x/ref/profiles/internal/rpc/protocols/ws"
-	"v.io/x/ref/profiles/internal/rpc/stream"
-	"v.io/x/ref/profiles/internal/rpc/stream/vc"
-	"v.io/x/ref/profiles/internal/rpc/stream/vif"
+	inaming "v.io/x/ref/runtime/internal/naming"
+	_ "v.io/x/ref/runtime/internal/rpc/protocols/tcp"
+	_ "v.io/x/ref/runtime/internal/rpc/protocols/ws"
+	"v.io/x/ref/runtime/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/rpc/stream/vc"
+	"v.io/x/ref/runtime/internal/rpc/stream/vif"
 	"v.io/x/ref/test"
 	"v.io/x/ref/test/expect"
 	"v.io/x/ref/test/modules"
diff --git a/profiles/internal/rpc/stream/message/coding.go b/runtime/internal/rpc/stream/message/coding.go
similarity index 97%
rename from profiles/internal/rpc/stream/message/coding.go
rename to runtime/internal/rpc/stream/message/coding.go
index 619ebd3..d8e7c68 100644
--- a/profiles/internal/rpc/stream/message/coding.go
+++ b/runtime/internal/rpc/stream/message/coding.go
@@ -10,10 +10,10 @@
 
 	"v.io/v23/verror"
 
-	"v.io/x/ref/profiles/internal/rpc/stream/id"
+	"v.io/x/ref/runtime/internal/rpc/stream/id"
 )
 
-const pkgPath = "v.io/x/ref/profiles/internal/rpc/stream/message"
+const pkgPath = "v.io/x/ref/runtime/internal/rpc/stream/message"
 
 func reg(id, msg string) verror.IDAction {
 	return verror.Register(verror.ID(pkgPath+id), verror.NoRetry, msg)
diff --git a/profiles/internal/rpc/stream/message/control.go b/runtime/internal/rpc/stream/message/control.go
similarity index 97%
rename from profiles/internal/rpc/stream/message/control.go
rename to runtime/internal/rpc/stream/message/control.go
index 6fdde05..0c33b91 100644
--- a/profiles/internal/rpc/stream/message/control.go
+++ b/runtime/internal/rpc/stream/message/control.go
@@ -12,10 +12,10 @@
 	"v.io/v23/naming"
 	"v.io/v23/verror"
 
-	inaming "v.io/x/ref/profiles/internal/naming"
-	"v.io/x/ref/profiles/internal/rpc/stream/crypto"
-	"v.io/x/ref/profiles/internal/rpc/stream/id"
-	"v.io/x/ref/profiles/internal/rpc/version"
+	inaming "v.io/x/ref/runtime/internal/naming"
+	"v.io/x/ref/runtime/internal/rpc/stream/crypto"
+	"v.io/x/ref/runtime/internal/rpc/stream/id"
+	"v.io/x/ref/runtime/internal/rpc/version"
 )
 
 var (
diff --git a/profiles/internal/rpc/stream/message/counters.go b/runtime/internal/rpc/stream/message/counters.go
similarity index 97%
rename from profiles/internal/rpc/stream/message/counters.go
rename to runtime/internal/rpc/stream/message/counters.go
index af42288..f51074e 100644
--- a/profiles/internal/rpc/stream/message/counters.go
+++ b/runtime/internal/rpc/stream/message/counters.go
@@ -7,7 +7,7 @@
 import (
 	"fmt"
 
-	"v.io/x/ref/profiles/internal/rpc/stream/id"
+	"v.io/x/ref/runtime/internal/rpc/stream/id"
 )
 
 // CounterID encapsulates the VCI and Flow used for flow control counter
diff --git a/profiles/internal/rpc/stream/message/counters_test.go b/runtime/internal/rpc/stream/message/counters_test.go
similarity index 96%
rename from profiles/internal/rpc/stream/message/counters_test.go
rename to runtime/internal/rpc/stream/message/counters_test.go
index 1f16989..d2ea0f5 100644
--- a/profiles/internal/rpc/stream/message/counters_test.go
+++ b/runtime/internal/rpc/stream/message/counters_test.go
@@ -8,7 +8,7 @@
 	"testing"
 	"testing/quick"
 
-	"v.io/x/ref/profiles/internal/rpc/stream/id"
+	"v.io/x/ref/runtime/internal/rpc/stream/id"
 )
 
 func TestCounterID(t *testing.T) {
diff --git a/profiles/internal/rpc/stream/message/data.go b/runtime/internal/rpc/stream/message/data.go
similarity index 91%
rename from profiles/internal/rpc/stream/message/data.go
rename to runtime/internal/rpc/stream/message/data.go
index 3670d6b..784b603 100644
--- a/profiles/internal/rpc/stream/message/data.go
+++ b/runtime/internal/rpc/stream/message/data.go
@@ -7,8 +7,8 @@
 import (
 	"fmt"
 
-	"v.io/x/ref/profiles/internal/lib/iobuf"
-	"v.io/x/ref/profiles/internal/rpc/stream/id"
+	"v.io/x/ref/runtime/internal/lib/iobuf"
+	"v.io/x/ref/runtime/internal/rpc/stream/id"
 )
 
 // Data encapsulates an application data message.
diff --git a/profiles/internal/rpc/stream/message/message.go b/runtime/internal/rpc/stream/message/message.go
similarity index 97%
rename from profiles/internal/rpc/stream/message/message.go
rename to runtime/internal/rpc/stream/message/message.go
index ea425c0..199ba03 100644
--- a/profiles/internal/rpc/stream/message/message.go
+++ b/runtime/internal/rpc/stream/message/message.go
@@ -4,7 +4,7 @@
 
 // Package message provides data structures and serialization/deserialization
 // methods for messages exchanged by the implementation of the
-// v.io/x/ref/profiles/internal/rpc/stream interfaces.
+// v.io/x/ref/runtime/internal/rpc/stream interfaces.
 package message
 
 // This file contains methods to read and write messages sent over the VIF.
@@ -71,9 +71,9 @@
 
 	"v.io/v23/verror"
 
-	"v.io/x/ref/profiles/internal/lib/iobuf"
-	"v.io/x/ref/profiles/internal/rpc/stream/crypto"
-	"v.io/x/ref/profiles/internal/rpc/stream/id"
+	"v.io/x/ref/runtime/internal/lib/iobuf"
+	"v.io/x/ref/runtime/internal/rpc/stream/crypto"
+	"v.io/x/ref/runtime/internal/rpc/stream/id"
 )
 
 const (
diff --git a/profiles/internal/rpc/stream/message/message_test.go b/runtime/internal/rpc/stream/message/message_test.go
similarity index 96%
rename from profiles/internal/rpc/stream/message/message_test.go
rename to runtime/internal/rpc/stream/message/message_test.go
index 8a05efc..aa79604 100644
--- a/profiles/internal/rpc/stream/message/message_test.go
+++ b/runtime/internal/rpc/stream/message/message_test.go
@@ -11,10 +11,10 @@
 	"testing"
 
 	"v.io/v23/naming"
-	"v.io/x/ref/profiles/internal/lib/iobuf"
-	inaming "v.io/x/ref/profiles/internal/naming"
-	"v.io/x/ref/profiles/internal/rpc/stream/crypto"
-	iversion "v.io/x/ref/profiles/internal/rpc/version"
+	"v.io/x/ref/runtime/internal/lib/iobuf"
+	inaming "v.io/x/ref/runtime/internal/naming"
+	"v.io/x/ref/runtime/internal/rpc/stream/crypto"
+	iversion "v.io/x/ref/runtime/internal/rpc/version"
 )
 
 // testControlCipher is a super-simple cipher that xor's each byte of the
diff --git a/profiles/internal/rpc/stream/model.go b/runtime/internal/rpc/stream/model.go
similarity index 100%
rename from profiles/internal/rpc/stream/model.go
rename to runtime/internal/rpc/stream/model.go
diff --git a/profiles/internal/rpc/stream/proxy/debug.go b/runtime/internal/rpc/stream/proxy/debug.go
similarity index 100%
rename from profiles/internal/rpc/stream/proxy/debug.go
rename to runtime/internal/rpc/stream/proxy/debug.go
diff --git a/profiles/internal/rpc/stream/proxy/doc.go b/runtime/internal/rpc/stream/proxy/doc.go
similarity index 96%
rename from profiles/internal/rpc/stream/proxy/doc.go
rename to runtime/internal/rpc/stream/proxy/doc.go
index 8f5220d..2e0d16c 100644
--- a/profiles/internal/rpc/stream/proxy/doc.go
+++ b/runtime/internal/rpc/stream/proxy/doc.go
@@ -6,7 +6,7 @@
 //
 // Each process in vanadium is uniquely identified by a routing id
 // (naming.RoutingID). A proxy routes messages
-// (v.io/x/ref/profiles/internal/rpc/stream/message) it receives on a network connection
+// (v.io/x/ref/runtime/internal/rpc/stream/message) it receives on a network connection
 // (net.Conn) to the network connection on which the destination process
 // (identified by the routing id) is listening.
 //
diff --git a/profiles/internal/rpc/stream/proxy/protocol.vdl b/runtime/internal/rpc/stream/proxy/protocol.vdl
similarity index 100%
rename from profiles/internal/rpc/stream/proxy/protocol.vdl
rename to runtime/internal/rpc/stream/proxy/protocol.vdl
diff --git a/profiles/internal/rpc/stream/proxy/protocol.vdl.go b/runtime/internal/rpc/stream/proxy/protocol.vdl.go
similarity index 89%
rename from profiles/internal/rpc/stream/proxy/protocol.vdl.go
rename to runtime/internal/rpc/stream/proxy/protocol.vdl.go
index 7dae3d9..43f70a0 100644
--- a/profiles/internal/rpc/stream/proxy/protocol.vdl.go
+++ b/runtime/internal/rpc/stream/proxy/protocol.vdl.go
@@ -27,7 +27,7 @@
 }
 
 func (Request) __VDLReflect(struct {
-	Name string `vdl:"v.io/x/ref/profiles/internal/rpc/stream/proxy.Request"`
+	Name string `vdl:"v.io/x/ref/runtime/internal/rpc/stream/proxy.Request"`
 }) {
 }
 
@@ -42,7 +42,7 @@
 }
 
 func (Response) __VDLReflect(struct {
-	Name string `vdl:"v.io/x/ref/profiles/internal/rpc/stream/proxy.Response"`
+	Name string `vdl:"v.io/x/ref/runtime/internal/rpc/stream/proxy.Response"`
 }) {
 }
 
diff --git a/profiles/internal/rpc/stream/proxy/proxy.go b/runtime/internal/rpc/stream/proxy/proxy.go
similarity index 97%
rename from profiles/internal/rpc/stream/proxy/proxy.go
rename to runtime/internal/rpc/stream/proxy/proxy.go
index 4959491..40fec9b 100644
--- a/profiles/internal/rpc/stream/proxy/proxy.go
+++ b/runtime/internal/rpc/stream/proxy/proxy.go
@@ -22,24 +22,24 @@
 	"v.io/v23/vom"
 	"v.io/x/lib/vlog"
 
-	"v.io/x/ref/profiles/internal/lib/bqueue"
-	"v.io/x/ref/profiles/internal/lib/bqueue/drrqueue"
-	"v.io/x/ref/profiles/internal/lib/iobuf"
-	"v.io/x/ref/profiles/internal/lib/publisher"
-	"v.io/x/ref/profiles/internal/lib/upcqueue"
-	inaming "v.io/x/ref/profiles/internal/naming"
-	"v.io/x/ref/profiles/internal/rpc/stream"
-	"v.io/x/ref/profiles/internal/rpc/stream/crypto"
-	"v.io/x/ref/profiles/internal/rpc/stream/id"
-	"v.io/x/ref/profiles/internal/rpc/stream/message"
-	"v.io/x/ref/profiles/internal/rpc/stream/vc"
-	"v.io/x/ref/profiles/internal/rpc/stream/vif"
-	iversion "v.io/x/ref/profiles/internal/rpc/version"
+	"v.io/x/ref/runtime/internal/lib/bqueue"
+	"v.io/x/ref/runtime/internal/lib/bqueue/drrqueue"
+	"v.io/x/ref/runtime/internal/lib/iobuf"
+	"v.io/x/ref/runtime/internal/lib/publisher"
+	"v.io/x/ref/runtime/internal/lib/upcqueue"
+	inaming "v.io/x/ref/runtime/internal/naming"
+	"v.io/x/ref/runtime/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/rpc/stream/crypto"
+	"v.io/x/ref/runtime/internal/rpc/stream/id"
+	"v.io/x/ref/runtime/internal/rpc/stream/message"
+	"v.io/x/ref/runtime/internal/rpc/stream/vc"
+	"v.io/x/ref/runtime/internal/rpc/stream/vif"
+	iversion "v.io/x/ref/runtime/internal/rpc/version"
 
 	"v.io/x/ref/lib/stats"
 )
 
-const pkgPath = "v.io/x/ref/profiles/proxy"
+const pkgPath = "v.io/x/ref/runtime/proxy"
 
 func reg(id, msg string) verror.IDAction {
 	return verror.Register(verror.ID(pkgPath+id), verror.NoRetry, msg)
diff --git a/profiles/internal/rpc/stream/proxy/proxy_test.go b/runtime/internal/rpc/stream/proxy/proxy_test.go
similarity index 97%
rename from profiles/internal/rpc/stream/proxy/proxy_test.go
rename to runtime/internal/rpc/stream/proxy/proxy_test.go
index 44ef293..c325e13 100644
--- a/profiles/internal/rpc/stream/proxy/proxy_test.go
+++ b/runtime/internal/rpc/stream/proxy/proxy_test.go
@@ -19,13 +19,13 @@
 	"v.io/v23/security"
 	"v.io/v23/verror"
 
-	_ "v.io/x/ref/profiles"
-	inaming "v.io/x/ref/profiles/internal/naming"
-	"v.io/x/ref/profiles/internal/rpc/stream"
-	"v.io/x/ref/profiles/internal/rpc/stream/manager"
-	"v.io/x/ref/profiles/internal/rpc/stream/proxy"
-	"v.io/x/ref/profiles/internal/rpc/stream/vc"
-	"v.io/x/ref/profiles/internal/rpc/stream/vif"
+	_ "v.io/x/ref/runtime/factories/generic"
+	inaming "v.io/x/ref/runtime/internal/naming"
+	"v.io/x/ref/runtime/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/rpc/stream/manager"
+	"v.io/x/ref/runtime/internal/rpc/stream/proxy"
+	"v.io/x/ref/runtime/internal/rpc/stream/vc"
+	"v.io/x/ref/runtime/internal/rpc/stream/vif"
 	"v.io/x/ref/test"
 	"v.io/x/ref/test/testutil"
 )
diff --git a/profiles/internal/rpc/stream/proxy/testutil_test.go b/runtime/internal/rpc/stream/proxy/testutil_test.go
similarity index 100%
rename from profiles/internal/rpc/stream/proxy/testutil_test.go
rename to runtime/internal/rpc/stream/proxy/testutil_test.go
diff --git a/profiles/internal/rpc/stream/proxy/v23_internal_test.go b/runtime/internal/rpc/stream/proxy/v23_internal_test.go
similarity index 100%
rename from profiles/internal/rpc/stream/proxy/v23_internal_test.go
rename to runtime/internal/rpc/stream/proxy/v23_internal_test.go
diff --git a/profiles/internal/rpc/stream/vc/auth.go b/runtime/internal/rpc/stream/vc/auth.go
similarity index 97%
rename from profiles/internal/rpc/stream/vc/auth.go
rename to runtime/internal/rpc/stream/vc/auth.go
index ade2e49..ff9ec89 100644
--- a/profiles/internal/rpc/stream/vc/auth.go
+++ b/runtime/internal/rpc/stream/vc/auth.go
@@ -13,9 +13,9 @@
 	"v.io/v23/verror"
 	"v.io/v23/vom"
 
-	"v.io/x/ref/profiles/internal/lib/iobuf"
-	"v.io/x/ref/profiles/internal/rpc/stream"
-	"v.io/x/ref/profiles/internal/rpc/stream/crypto"
+	"v.io/x/ref/runtime/internal/lib/iobuf"
+	"v.io/x/ref/runtime/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/rpc/stream/crypto"
 )
 
 var (
diff --git a/profiles/internal/rpc/stream/vc/data_cache.go b/runtime/internal/rpc/stream/vc/data_cache.go
similarity index 100%
rename from profiles/internal/rpc/stream/vc/data_cache.go
rename to runtime/internal/rpc/stream/vc/data_cache.go
diff --git a/profiles/internal/rpc/stream/vc/doc.go b/runtime/internal/rpc/stream/vc/doc.go
similarity index 82%
rename from profiles/internal/rpc/stream/vc/doc.go
rename to runtime/internal/rpc/stream/vc/doc.go
index 93b9c84..62c34df 100644
--- a/profiles/internal/rpc/stream/vc/doc.go
+++ b/runtime/internal/rpc/stream/vc/doc.go
@@ -2,5 +2,5 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Package vc provides implementations of the VC and Flow interfaces in v.io/x/ref/profiles/internal/rpc/stream.
+// Package vc provides implementations of the VC and Flow interfaces in v.io/x/ref/runtime/internal/rpc/stream.
 package vc
diff --git a/profiles/internal/rpc/stream/vc/flow.go b/runtime/internal/rpc/stream/vc/flow.go
similarity index 96%
rename from profiles/internal/rpc/stream/vc/flow.go
rename to runtime/internal/rpc/stream/vc/flow.go
index 88a6b42..d5f2d2f 100644
--- a/profiles/internal/rpc/stream/vc/flow.go
+++ b/runtime/internal/rpc/stream/vc/flow.go
@@ -8,7 +8,7 @@
 	"v.io/v23/naming"
 	"v.io/v23/security"
 
-	"v.io/x/ref/profiles/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/rpc/stream"
 )
 
 type flow struct {
diff --git a/profiles/internal/rpc/stream/vc/knobs.go b/runtime/internal/rpc/stream/vc/knobs.go
similarity index 100%
rename from profiles/internal/rpc/stream/vc/knobs.go
rename to runtime/internal/rpc/stream/vc/knobs.go
diff --git a/profiles/internal/rpc/stream/vc/listener.go b/runtime/internal/rpc/stream/vc/listener.go
similarity index 93%
rename from profiles/internal/rpc/stream/vc/listener.go
rename to runtime/internal/rpc/stream/vc/listener.go
index 991d776..72479ac 100644
--- a/profiles/internal/rpc/stream/vc/listener.go
+++ b/runtime/internal/rpc/stream/vc/listener.go
@@ -7,8 +7,8 @@
 import (
 	"v.io/v23/verror"
 
-	"v.io/x/ref/profiles/internal/lib/upcqueue"
-	"v.io/x/ref/profiles/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/lib/upcqueue"
+	"v.io/x/ref/runtime/internal/rpc/stream"
 )
 
 var (
diff --git a/profiles/internal/rpc/stream/vc/listener_test.go b/runtime/internal/rpc/stream/vc/listener_test.go
similarity index 97%
rename from profiles/internal/rpc/stream/vc/listener_test.go
rename to runtime/internal/rpc/stream/vc/listener_test.go
index 28d9706..4dbf4ad 100644
--- a/profiles/internal/rpc/stream/vc/listener_test.go
+++ b/runtime/internal/rpc/stream/vc/listener_test.go
@@ -12,7 +12,7 @@
 	"v.io/v23/security"
 	"v.io/v23/verror"
 
-	"v.io/x/ref/profiles/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/rpc/stream"
 )
 
 type noopFlow struct{}
diff --git a/profiles/internal/rpc/stream/vc/reader.go b/runtime/internal/rpc/stream/vc/reader.go
similarity index 93%
rename from profiles/internal/rpc/stream/vc/reader.go
rename to runtime/internal/rpc/stream/vc/reader.go
index c90dbdd..80f1c9b 100644
--- a/profiles/internal/rpc/stream/vc/reader.go
+++ b/runtime/internal/rpc/stream/vc/reader.go
@@ -11,10 +11,10 @@
 
 	"v.io/v23/verror"
 
-	"v.io/x/ref/profiles/internal/lib/iobuf"
-	vsync "v.io/x/ref/profiles/internal/lib/sync"
-	"v.io/x/ref/profiles/internal/lib/upcqueue"
-	"v.io/x/ref/profiles/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/lib/iobuf"
+	vsync "v.io/x/ref/runtime/internal/lib/sync"
+	"v.io/x/ref/runtime/internal/lib/upcqueue"
+	"v.io/x/ref/runtime/internal/rpc/stream"
 )
 
 var (
diff --git a/profiles/internal/rpc/stream/vc/reader_test.go b/runtime/internal/rpc/stream/vc/reader_test.go
similarity index 98%
rename from profiles/internal/rpc/stream/vc/reader_test.go
rename to runtime/internal/rpc/stream/vc/reader_test.go
index 89245ce..7fac16f 100644
--- a/profiles/internal/rpc/stream/vc/reader_test.go
+++ b/runtime/internal/rpc/stream/vc/reader_test.go
@@ -11,7 +11,7 @@
 	"testing"
 	"testing/quick"
 
-	"v.io/x/ref/profiles/internal/lib/iobuf"
+	"v.io/x/ref/runtime/internal/lib/iobuf"
 )
 
 type testReadHandler struct{ items []uint }
diff --git a/profiles/internal/rpc/stream/vc/v23_internal_test.go b/runtime/internal/rpc/stream/vc/v23_internal_test.go
similarity index 100%
rename from profiles/internal/rpc/stream/vc/v23_internal_test.go
rename to runtime/internal/rpc/stream/vc/v23_internal_test.go
diff --git a/profiles/internal/rpc/stream/vc/vc.go b/runtime/internal/rpc/stream/vc/vc.go
similarity index 98%
rename from profiles/internal/rpc/stream/vc/vc.go
rename to runtime/internal/rpc/stream/vc/vc.go
index 46d807f..06f2c58 100644
--- a/profiles/internal/rpc/stream/vc/vc.go
+++ b/runtime/internal/rpc/stream/vc/vc.go
@@ -24,15 +24,15 @@
 	"v.io/v23/vom"
 
 	"v.io/x/lib/vlog"
-	"v.io/x/ref/profiles/internal/lib/bqueue"
-	"v.io/x/ref/profiles/internal/lib/iobuf"
-	vsync "v.io/x/ref/profiles/internal/lib/sync"
-	"v.io/x/ref/profiles/internal/rpc/stream"
-	"v.io/x/ref/profiles/internal/rpc/stream/crypto"
-	"v.io/x/ref/profiles/internal/rpc/stream/id"
+	"v.io/x/ref/runtime/internal/lib/bqueue"
+	"v.io/x/ref/runtime/internal/lib/iobuf"
+	vsync "v.io/x/ref/runtime/internal/lib/sync"
+	"v.io/x/ref/runtime/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/rpc/stream/crypto"
+	"v.io/x/ref/runtime/internal/rpc/stream/id"
 )
 
-const pkgPath = "v.io/x/ref/profiles/internal/rpc/stream/vc"
+const pkgPath = "v.io/x/ref/runtime/internal/rpc/stream/vc"
 
 func reg(id, msg string) verror.IDAction {
 	return verror.Register(verror.ID(pkgPath+id), verror.NoRetry, msg)
@@ -86,7 +86,7 @@
 // manage Flows.
 //
 // stream.Flow objects created by this stream.VC implementation use a buffer
-// queue (v.io/x/ref/profiles/internal/lib/bqueue) to provide flow control on Write
+// queue (v.io/x/ref/runtime/internal/lib/bqueue) to provide flow control on Write
 // operations.
 type VC struct {
 	vci                             id.VC
@@ -216,8 +216,8 @@
 // InternalNew creates a new VC, which implements the stream.VC interface.
 //
 // As the name suggests, this method is intended for use only within packages
-// placed inside v.io/x/ref/profiles/internal. Code outside the
-// v.io/x/ref/profiles/internal/* packages should never call this method.
+// placed inside v.io/x/ref/runtime/internal. Code outside the
+// v.io/x/ref/runtime/internal/* packages should never call this method.
 func InternalNew(p Params) *VC {
 	fidOffset := 1
 	if p.Dialed {
diff --git a/profiles/internal/rpc/stream/vc/vc_cache.go b/runtime/internal/rpc/stream/vc/vc_cache.go
similarity index 100%
rename from profiles/internal/rpc/stream/vc/vc_cache.go
rename to runtime/internal/rpc/stream/vc/vc_cache.go
diff --git a/profiles/internal/rpc/stream/vc/vc_cache_test.go b/runtime/internal/rpc/stream/vc/vc_cache_test.go
similarity index 98%
rename from profiles/internal/rpc/stream/vc/vc_cache_test.go
rename to runtime/internal/rpc/stream/vc/vc_cache_test.go
index 8bfa144..b096e21 100644
--- a/profiles/internal/rpc/stream/vc/vc_cache_test.go
+++ b/runtime/internal/rpc/stream/vc/vc_cache_test.go
@@ -7,7 +7,7 @@
 import (
 	"testing"
 
-	inaming "v.io/x/ref/profiles/internal/naming"
+	inaming "v.io/x/ref/runtime/internal/naming"
 	"v.io/x/ref/test/testutil"
 )
 
diff --git a/profiles/internal/rpc/stream/vc/vc_test.go b/runtime/internal/rpc/stream/vc/vc_test.go
similarity index 97%
rename from profiles/internal/rpc/stream/vc/vc_test.go
rename to runtime/internal/rpc/stream/vc/vc_test.go
index 2fe9918..6f01d63 100644
--- a/profiles/internal/rpc/stream/vc/vc_test.go
+++ b/runtime/internal/rpc/stream/vc/vc_test.go
@@ -27,14 +27,14 @@
 
 	"v.io/x/lib/vlog"
 
-	"v.io/x/ref/profiles/internal/lib/bqueue"
-	"v.io/x/ref/profiles/internal/lib/bqueue/drrqueue"
-	"v.io/x/ref/profiles/internal/lib/iobuf"
-	"v.io/x/ref/profiles/internal/rpc/stream"
-	"v.io/x/ref/profiles/internal/rpc/stream/crypto"
-	"v.io/x/ref/profiles/internal/rpc/stream/id"
-	"v.io/x/ref/profiles/internal/rpc/stream/vc"
-	iversion "v.io/x/ref/profiles/internal/rpc/version"
+	"v.io/x/ref/runtime/internal/lib/bqueue"
+	"v.io/x/ref/runtime/internal/lib/bqueue/drrqueue"
+	"v.io/x/ref/runtime/internal/lib/iobuf"
+	"v.io/x/ref/runtime/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/rpc/stream/crypto"
+	"v.io/x/ref/runtime/internal/rpc/stream/id"
+	"v.io/x/ref/runtime/internal/rpc/stream/vc"
+	iversion "v.io/x/ref/runtime/internal/rpc/version"
 	"v.io/x/ref/test/testutil"
 )
 
diff --git a/profiles/internal/rpc/stream/vc/writer.go b/runtime/internal/rpc/stream/vc/writer.go
similarity index 97%
rename from profiles/internal/rpc/stream/vc/writer.go
rename to runtime/internal/rpc/stream/vc/writer.go
index ab4ccfc..32f51d3 100644
--- a/profiles/internal/rpc/stream/vc/writer.go
+++ b/runtime/internal/rpc/stream/vc/writer.go
@@ -11,10 +11,10 @@
 
 	"v.io/v23/verror"
 
-	"v.io/x/ref/profiles/internal/lib/bqueue"
-	"v.io/x/ref/profiles/internal/lib/iobuf"
-	vsync "v.io/x/ref/profiles/internal/lib/sync"
-	"v.io/x/ref/profiles/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/lib/bqueue"
+	"v.io/x/ref/runtime/internal/lib/iobuf"
+	vsync "v.io/x/ref/runtime/internal/lib/sync"
+	"v.io/x/ref/runtime/internal/rpc/stream"
 )
 
 var (
diff --git a/profiles/internal/rpc/stream/vc/writer_test.go b/runtime/internal/rpc/stream/vc/writer_test.go
similarity index 95%
rename from profiles/internal/rpc/stream/vc/writer_test.go
rename to runtime/internal/rpc/stream/vc/writer_test.go
index a7c84fe..baaebfd 100644
--- a/profiles/internal/rpc/stream/vc/writer_test.go
+++ b/runtime/internal/rpc/stream/vc/writer_test.go
@@ -13,11 +13,11 @@
 
 	"v.io/v23/verror"
 
-	"v.io/x/ref/profiles/internal/lib/bqueue"
-	"v.io/x/ref/profiles/internal/lib/bqueue/drrqueue"
-	"v.io/x/ref/profiles/internal/lib/iobuf"
-	"v.io/x/ref/profiles/internal/lib/sync"
-	"v.io/x/ref/profiles/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/lib/bqueue"
+	"v.io/x/ref/runtime/internal/lib/bqueue/drrqueue"
+	"v.io/x/ref/runtime/internal/lib/iobuf"
+	"v.io/x/ref/runtime/internal/lib/sync"
+	"v.io/x/ref/runtime/internal/rpc/stream"
 )
 
 // TestWrite is a very basic, easy to follow, but not very thorough test of the
diff --git a/profiles/internal/rpc/stream/vif/auth.go b/runtime/internal/rpc/stream/vif/auth.go
similarity index 96%
rename from profiles/internal/rpc/stream/vif/auth.go
rename to runtime/internal/rpc/stream/vif/auth.go
index 65bec0b..c0590f0 100644
--- a/profiles/internal/rpc/stream/vif/auth.go
+++ b/runtime/internal/rpc/stream/vif/auth.go
@@ -14,12 +14,12 @@
 	"v.io/v23/security"
 	"v.io/v23/verror"
 
-	"v.io/x/ref/profiles/internal/lib/iobuf"
-	"v.io/x/ref/profiles/internal/rpc/stream"
-	"v.io/x/ref/profiles/internal/rpc/stream/crypto"
-	"v.io/x/ref/profiles/internal/rpc/stream/message"
-	"v.io/x/ref/profiles/internal/rpc/stream/vc"
-	"v.io/x/ref/profiles/internal/rpc/version"
+	"v.io/x/ref/runtime/internal/lib/iobuf"
+	"v.io/x/ref/runtime/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/rpc/stream/crypto"
+	"v.io/x/ref/runtime/internal/rpc/stream/message"
+	"v.io/x/ref/runtime/internal/rpc/stream/vc"
+	"v.io/x/ref/runtime/internal/rpc/version"
 )
 
 var (
diff --git a/profiles/internal/rpc/stream/vif/doc.go b/runtime/internal/rpc/stream/vif/doc.go
similarity index 87%
rename from profiles/internal/rpc/stream/vif/doc.go
rename to runtime/internal/rpc/stream/vif/doc.go
index 32e2a27..9f00db4 100644
--- a/profiles/internal/rpc/stream/vif/doc.go
+++ b/runtime/internal/rpc/stream/vif/doc.go
@@ -4,5 +4,5 @@
 
 // Package vif implements a virtual network interface that wraps over a
 // net.Conn and provides the ability to Dial and Listen for virtual circuits
-// (v.io/x/ref/profiles/internal/rpc/stream.VC)
+// (v.io/x/ref/runtime/internal/rpc/stream.VC)
 package vif
diff --git a/profiles/internal/rpc/stream/vif/faketimer.go b/runtime/internal/rpc/stream/vif/faketimer.go
similarity index 100%
rename from profiles/internal/rpc/stream/vif/faketimer.go
rename to runtime/internal/rpc/stream/vif/faketimer.go
diff --git a/profiles/internal/rpc/stream/vif/idletimer.go b/runtime/internal/rpc/stream/vif/idletimer.go
similarity index 96%
rename from profiles/internal/rpc/stream/vif/idletimer.go
rename to runtime/internal/rpc/stream/vif/idletimer.go
index 84f9c23..a9910c7 100644
--- a/profiles/internal/rpc/stream/vif/idletimer.go
+++ b/runtime/internal/rpc/stream/vif/idletimer.go
@@ -8,8 +8,8 @@
 	"sync"
 	"time"
 
-	"v.io/x/ref/profiles/internal/rpc/stream/id"
-	"v.io/x/ref/profiles/internal/rpc/stream/vc"
+	"v.io/x/ref/runtime/internal/rpc/stream/id"
+	"v.io/x/ref/runtime/internal/rpc/stream/vc"
 )
 
 // idleTimerMap keeps track of all the flows of each VC and then calls the notify
diff --git a/profiles/internal/rpc/stream/vif/idletimer_test.go b/runtime/internal/rpc/stream/vif/idletimer_test.go
similarity index 96%
rename from profiles/internal/rpc/stream/vif/idletimer_test.go
rename to runtime/internal/rpc/stream/vif/idletimer_test.go
index 0c61fe4..d5bd6f3 100644
--- a/profiles/internal/rpc/stream/vif/idletimer_test.go
+++ b/runtime/internal/rpc/stream/vif/idletimer_test.go
@@ -8,8 +8,8 @@
 	"testing"
 	"time"
 
-	"v.io/x/ref/profiles/internal/rpc/stream/id"
-	"v.io/x/ref/profiles/internal/rpc/stream/vc"
+	"v.io/x/ref/runtime/internal/rpc/stream/id"
+	"v.io/x/ref/runtime/internal/rpc/stream/vc"
 )
 
 func TestIdleTimer(t *testing.T) {
diff --git a/profiles/internal/rpc/stream/vif/set.go b/runtime/internal/rpc/stream/vif/set.go
similarity index 100%
rename from profiles/internal/rpc/stream/vif/set.go
rename to runtime/internal/rpc/stream/vif/set.go
diff --git a/profiles/internal/rpc/stream/vif/set_test.go b/runtime/internal/rpc/stream/vif/set_test.go
similarity index 98%
rename from profiles/internal/rpc/stream/vif/set_test.go
rename to runtime/internal/rpc/stream/vif/set_test.go
index e9e597d..08b8ea8 100644
--- a/profiles/internal/rpc/stream/vif/set_test.go
+++ b/runtime/internal/rpc/stream/vif/set_test.go
@@ -16,8 +16,8 @@
 	"v.io/v23/naming"
 	"v.io/v23/rpc"
 
-	_ "v.io/x/ref/profiles"
-	"v.io/x/ref/profiles/internal/rpc/stream/vif"
+	_ "v.io/x/ref/runtime/factories/generic"
+	"v.io/x/ref/runtime/internal/rpc/stream/vif"
 	"v.io/x/ref/test/testutil"
 )
 
diff --git a/profiles/internal/rpc/stream/vif/setup_conn.go b/runtime/internal/rpc/stream/vif/setup_conn.go
similarity index 89%
rename from profiles/internal/rpc/stream/vif/setup_conn.go
rename to runtime/internal/rpc/stream/vif/setup_conn.go
index 2359cbf..c038ef3 100644
--- a/profiles/internal/rpc/stream/vif/setup_conn.go
+++ b/runtime/internal/rpc/stream/vif/setup_conn.go
@@ -9,10 +9,10 @@
 
 	"v.io/v23/verror"
 
-	"v.io/x/ref/profiles/internal/lib/iobuf"
-	"v.io/x/ref/profiles/internal/rpc/stream"
-	"v.io/x/ref/profiles/internal/rpc/stream/crypto"
-	"v.io/x/ref/profiles/internal/rpc/stream/message"
+	"v.io/x/ref/runtime/internal/lib/iobuf"
+	"v.io/x/ref/runtime/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/rpc/stream/crypto"
+	"v.io/x/ref/runtime/internal/rpc/stream/message"
 )
 
 // setupConn writes the data to the net.Conn using SetupStream messages.
diff --git a/profiles/internal/rpc/stream/vif/setup_conn_test.go b/runtime/internal/rpc/stream/vif/setup_conn_test.go
similarity index 98%
rename from profiles/internal/rpc/stream/vif/setup_conn_test.go
rename to runtime/internal/rpc/stream/vif/setup_conn_test.go
index fe8f0b2..17622a7 100644
--- a/profiles/internal/rpc/stream/vif/setup_conn_test.go
+++ b/runtime/internal/rpc/stream/vif/setup_conn_test.go
@@ -12,7 +12,7 @@
 	"sync"
 	"testing"
 
-	"v.io/x/ref/profiles/internal/lib/iobuf"
+	"v.io/x/ref/runtime/internal/lib/iobuf"
 )
 
 const (
diff --git a/profiles/internal/rpc/stream/vif/testutil_test.go b/runtime/internal/rpc/stream/vif/testutil_test.go
similarity index 100%
rename from profiles/internal/rpc/stream/vif/testutil_test.go
rename to runtime/internal/rpc/stream/vif/testutil_test.go
diff --git a/profiles/internal/rpc/stream/vif/v23_internal_test.go b/runtime/internal/rpc/stream/vif/v23_internal_test.go
similarity index 100%
rename from profiles/internal/rpc/stream/vif/v23_internal_test.go
rename to runtime/internal/rpc/stream/vif/v23_internal_test.go
diff --git a/profiles/internal/rpc/stream/vif/vcmap.go b/runtime/internal/rpc/stream/vif/vcmap.go
similarity index 94%
rename from profiles/internal/rpc/stream/vif/vcmap.go
rename to runtime/internal/rpc/stream/vif/vcmap.go
index 6c8d308..bc6aa28 100644
--- a/profiles/internal/rpc/stream/vif/vcmap.go
+++ b/runtime/internal/rpc/stream/vif/vcmap.go
@@ -8,9 +8,9 @@
 	"sort"
 	"sync"
 
-	"v.io/x/ref/profiles/internal/lib/pcqueue"
-	"v.io/x/ref/profiles/internal/rpc/stream/id"
-	"v.io/x/ref/profiles/internal/rpc/stream/vc"
+	"v.io/x/ref/runtime/internal/lib/pcqueue"
+	"v.io/x/ref/runtime/internal/rpc/stream/id"
+	"v.io/x/ref/runtime/internal/rpc/stream/vc"
 )
 
 // vcMap implements a thread-safe map of vc.VC objects (vcInfo) keyed by their VCI.
diff --git a/profiles/internal/rpc/stream/vif/vcmap_test.go b/runtime/internal/rpc/stream/vif/vcmap_test.go
similarity index 97%
rename from profiles/internal/rpc/stream/vif/vcmap_test.go
rename to runtime/internal/rpc/stream/vif/vcmap_test.go
index 376ac58..83c503f 100644
--- a/profiles/internal/rpc/stream/vif/vcmap_test.go
+++ b/runtime/internal/rpc/stream/vif/vcmap_test.go
@@ -8,7 +8,7 @@
 	"reflect"
 	"testing"
 
-	"v.io/x/ref/profiles/internal/rpc/stream/vc"
+	"v.io/x/ref/runtime/internal/rpc/stream/vc"
 )
 
 func TestVCMap(t *testing.T) {
diff --git a/profiles/internal/rpc/stream/vif/vif.go b/runtime/internal/rpc/stream/vif/vif.go
similarity index 97%
rename from profiles/internal/rpc/stream/vif/vif.go
rename to runtime/internal/rpc/stream/vif/vif.go
index fb206b7..124ce98 100644
--- a/profiles/internal/rpc/stream/vif/vif.go
+++ b/runtime/internal/rpc/stream/vif/vif.go
@@ -25,22 +25,22 @@
 	"v.io/v23/vtrace"
 
 	"v.io/x/lib/vlog"
-	"v.io/x/ref/profiles/internal/lib/bqueue"
-	"v.io/x/ref/profiles/internal/lib/bqueue/drrqueue"
-	"v.io/x/ref/profiles/internal/lib/iobuf"
-	"v.io/x/ref/profiles/internal/lib/pcqueue"
-	vsync "v.io/x/ref/profiles/internal/lib/sync"
-	"v.io/x/ref/profiles/internal/lib/upcqueue"
-	inaming "v.io/x/ref/profiles/internal/naming"
-	"v.io/x/ref/profiles/internal/rpc/stream"
-	"v.io/x/ref/profiles/internal/rpc/stream/crypto"
-	"v.io/x/ref/profiles/internal/rpc/stream/id"
-	"v.io/x/ref/profiles/internal/rpc/stream/message"
-	"v.io/x/ref/profiles/internal/rpc/stream/vc"
-	iversion "v.io/x/ref/profiles/internal/rpc/version"
+	"v.io/x/ref/runtime/internal/lib/bqueue"
+	"v.io/x/ref/runtime/internal/lib/bqueue/drrqueue"
+	"v.io/x/ref/runtime/internal/lib/iobuf"
+	"v.io/x/ref/runtime/internal/lib/pcqueue"
+	vsync "v.io/x/ref/runtime/internal/lib/sync"
+	"v.io/x/ref/runtime/internal/lib/upcqueue"
+	inaming "v.io/x/ref/runtime/internal/naming"
+	"v.io/x/ref/runtime/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/rpc/stream/crypto"
+	"v.io/x/ref/runtime/internal/rpc/stream/id"
+	"v.io/x/ref/runtime/internal/rpc/stream/message"
+	"v.io/x/ref/runtime/internal/rpc/stream/vc"
+	iversion "v.io/x/ref/runtime/internal/rpc/version"
 )
 
-const pkgPath = "v.io/x/ref/profiles/internal/rpc/stream/vif"
+const pkgPath = "v.io/x/ref/runtime/internal/rpc/stream/vif"
 
 func reg(id, msg string) verror.IDAction {
 	return verror.Register(verror.ID(pkgPath+id), verror.NoRetry, msg)
@@ -157,8 +157,8 @@
 // the vif has been closed.
 //
 // As the name suggests, this method is intended for use only within packages
-// placed inside v.io/x/ref/profiles/internal. Code outside the
-// v.io/x/ref/profiles/internal/* packages should never call this method.
+// placed inside v.io/x/ref/runtime/internal. Code outside the
+// v.io/x/ref/runtime/internal/* packages should never call this method.
 func InternalNewDialedVIF(conn net.Conn, rid naming.RoutingID, principal security.Principal, versions *iversion.Range, onClose func(*VIF), opts ...stream.VCOpt) (*VIF, error) {
 	ctx := getDialContext(opts)
 	if ctx != nil {
@@ -203,8 +203,8 @@
 // ListenerOpts.
 //
 // As the name suggests, this method is intended for use only within packages
-// placed inside v.io/x/ref/profiles/internal. Code outside the
-// v.io/x/ref/profiles/internal/* packages should never call this method.
+// placed inside v.io/x/ref/runtime/internal. Code outside the
+// v.io/x/ref/runtime/internal/* packages should never call this method.
 func InternalNewAcceptedVIF(conn net.Conn, rid naming.RoutingID, principal security.Principal, blessings security.Blessings, versions *iversion.Range, onClose func(*VIF), lopts ...stream.ListenerOpt) (*VIF, error) {
 	pool := iobuf.NewPool(0)
 	reader := iobuf.NewReader(pool, conn)
diff --git a/profiles/internal/rpc/stream/vif/vif_test.go b/runtime/internal/rpc/stream/vif/vif_test.go
similarity index 98%
rename from profiles/internal/rpc/stream/vif/vif_test.go
rename to runtime/internal/rpc/stream/vif/vif_test.go
index ba97c3d..fd820ff 100644
--- a/profiles/internal/rpc/stream/vif/vif_test.go
+++ b/runtime/internal/rpc/stream/vif/vif_test.go
@@ -23,11 +23,11 @@
 	"v.io/v23/naming"
 	"v.io/v23/rpc/version"
 
-	inaming "v.io/x/ref/profiles/internal/naming"
-	"v.io/x/ref/profiles/internal/rpc/stream"
-	"v.io/x/ref/profiles/internal/rpc/stream/vc"
-	"v.io/x/ref/profiles/internal/rpc/stream/vif"
-	iversion "v.io/x/ref/profiles/internal/rpc/version"
+	inaming "v.io/x/ref/runtime/internal/naming"
+	"v.io/x/ref/runtime/internal/rpc/stream"
+	"v.io/x/ref/runtime/internal/rpc/stream/vc"
+	"v.io/x/ref/runtime/internal/rpc/stream/vif"
+	iversion "v.io/x/ref/runtime/internal/rpc/version"
 	"v.io/x/ref/test/testutil"
 )
 
diff --git a/profiles/internal/rpc/stress/internal/client.go b/runtime/internal/rpc/stress/internal/client.go
similarity index 98%
rename from profiles/internal/rpc/stress/internal/client.go
rename to runtime/internal/rpc/stress/internal/client.go
index c70715f..d17b1b0 100644
--- a/profiles/internal/rpc/stress/internal/client.go
+++ b/runtime/internal/rpc/stress/internal/client.go
@@ -13,7 +13,7 @@
 	"v.io/v23/context"
 
 	"v.io/x/lib/vlog"
-	"v.io/x/ref/profiles/internal/rpc/stress"
+	"v.io/x/ref/runtime/internal/rpc/stress"
 )
 
 // CallEcho calls 'Echo' method with the given payload size for the given time
diff --git a/profiles/internal/rpc/stress/internal/server.go b/runtime/internal/rpc/stress/internal/server.go
similarity index 98%
rename from profiles/internal/rpc/stress/internal/server.go
rename to runtime/internal/rpc/stress/internal/server.go
index c4a62a1..30b03da 100644
--- a/profiles/internal/rpc/stress/internal/server.go
+++ b/runtime/internal/rpc/stress/internal/server.go
@@ -14,7 +14,7 @@
 	"v.io/v23/security"
 	"v.io/x/lib/vlog"
 
-	"v.io/x/ref/profiles/internal/rpc/stress"
+	"v.io/x/ref/runtime/internal/rpc/stress"
 )
 
 type impl struct {
diff --git a/profiles/internal/rpc/stress/internal/util.go b/runtime/internal/rpc/stress/internal/util.go
similarity index 95%
rename from profiles/internal/rpc/stress/internal/util.go
rename to runtime/internal/rpc/stress/internal/util.go
index 63f8359..adf15e2 100644
--- a/profiles/internal/rpc/stress/internal/util.go
+++ b/runtime/internal/rpc/stress/internal/util.go
@@ -10,7 +10,7 @@
 	"encoding/binary"
 	"math/rand"
 
-	"v.io/x/ref/profiles/internal/rpc/stress"
+	"v.io/x/ref/runtime/internal/rpc/stress"
 )
 
 // newSumArg returns a randomly generated SumArg.
diff --git a/profiles/internal/rpc/stress/mtstress/doc.go b/runtime/internal/rpc/stress/mtstress/doc.go
similarity index 100%
rename from profiles/internal/rpc/stress/mtstress/doc.go
rename to runtime/internal/rpc/stress/mtstress/doc.go
diff --git a/profiles/internal/rpc/stress/mtstress/main.go b/runtime/internal/rpc/stress/mtstress/main.go
similarity index 98%
rename from profiles/internal/rpc/stress/mtstress/main.go
rename to runtime/internal/rpc/stress/mtstress/main.go
index 24ebf44..47a1404 100644
--- a/profiles/internal/rpc/stress/mtstress/main.go
+++ b/runtime/internal/rpc/stress/mtstress/main.go
@@ -20,7 +20,7 @@
 	"v.io/v23/verror"
 	"v.io/x/lib/cmdline2"
 	"v.io/x/ref/lib/v23cmd"
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 func init() {
diff --git a/profiles/internal/rpc/stress/mtstress/run.go b/runtime/internal/rpc/stress/mtstress/run.go
similarity index 100%
rename from profiles/internal/rpc/stress/mtstress/run.go
rename to runtime/internal/rpc/stress/mtstress/run.go
diff --git a/profiles/internal/rpc/stress/stress.vdl b/runtime/internal/rpc/stress/stress.vdl
similarity index 100%
rename from profiles/internal/rpc/stress/stress.vdl
rename to runtime/internal/rpc/stress/stress.vdl
diff --git a/profiles/internal/rpc/stress/stress.vdl.go b/runtime/internal/rpc/stress/stress.vdl.go
similarity index 98%
rename from profiles/internal/rpc/stress/stress.vdl.go
rename to runtime/internal/rpc/stress/stress.vdl.go
index 0918477..15e2787 100644
--- a/profiles/internal/rpc/stress/stress.vdl.go
+++ b/runtime/internal/rpc/stress/stress.vdl.go
@@ -26,7 +26,7 @@
 }
 
 func (SumArg) __VDLReflect(struct {
-	Name string `vdl:"v.io/x/ref/profiles/internal/rpc/stress.SumArg"`
+	Name string `vdl:"v.io/x/ref/runtime/internal/rpc/stress.SumArg"`
 }) {
 }
 
@@ -38,7 +38,7 @@
 }
 
 func (SumStats) __VDLReflect(struct {
-	Name string `vdl:"v.io/x/ref/profiles/internal/rpc/stress.SumStats"`
+	Name string `vdl:"v.io/x/ref/runtime/internal/rpc/stress.SumStats"`
 }) {
 }
 
@@ -303,7 +303,7 @@
 // descStress hides the desc to keep godoc clean.
 var descStress = rpc.InterfaceDesc{
 	Name:    "Stress",
-	PkgPath: "v.io/x/ref/profiles/internal/rpc/stress",
+	PkgPath: "v.io/x/ref/runtime/internal/rpc/stress",
 	Methods: []rpc.MethodDesc{
 		{
 			Name: "Echo",
diff --git a/profiles/internal/rpc/stress/stress/load.go b/runtime/internal/rpc/stress/stress/load.go
similarity index 98%
rename from profiles/internal/rpc/stress/stress/load.go
rename to runtime/internal/rpc/stress/stress/load.go
index e041349..e689f62 100644
--- a/profiles/internal/rpc/stress/stress/load.go
+++ b/runtime/internal/rpc/stress/stress/load.go
@@ -14,7 +14,7 @@
 	"v.io/v23/context"
 	"v.io/x/lib/cmdline2"
 	"v.io/x/ref/lib/v23cmd"
-	"v.io/x/ref/profiles/internal/rpc/stress/internal"
+	"v.io/x/ref/runtime/internal/rpc/stress/internal"
 )
 
 var (
diff --git a/profiles/internal/rpc/stress/stress/main.go b/runtime/internal/rpc/stress/stress/main.go
similarity index 92%
rename from profiles/internal/rpc/stress/stress/main.go
rename to runtime/internal/rpc/stress/stress/main.go
index d269d84..5a2e0e7 100644
--- a/profiles/internal/rpc/stress/stress/main.go
+++ b/runtime/internal/rpc/stress/stress/main.go
@@ -8,8 +8,8 @@
 	"v.io/v23/context"
 	"v.io/x/lib/cmdline2"
 	"v.io/x/ref/lib/v23cmd"
-	"v.io/x/ref/profiles/internal/rpc/stress"
-	_ "v.io/x/ref/profiles/static"
+	_ "v.io/x/ref/runtime/factories/static"
+	"v.io/x/ref/runtime/internal/rpc/stress"
 )
 
 var cmdStopServers = &cmdline2.Command{
diff --git a/profiles/internal/rpc/stress/stress/stress.go b/runtime/internal/rpc/stress/stress/stress.go
similarity index 97%
rename from profiles/internal/rpc/stress/stress/stress.go
rename to runtime/internal/rpc/stress/stress/stress.go
index db1306a..b63dc7a 100644
--- a/profiles/internal/rpc/stress/stress/stress.go
+++ b/runtime/internal/rpc/stress/stress/stress.go
@@ -15,8 +15,8 @@
 	"v.io/v23/context"
 	"v.io/x/lib/cmdline2"
 	"v.io/x/ref/lib/v23cmd"
-	"v.io/x/ref/profiles/internal/rpc/stress"
-	"v.io/x/ref/profiles/internal/rpc/stress/internal"
+	"v.io/x/ref/runtime/internal/rpc/stress"
+	"v.io/x/ref/runtime/internal/rpc/stress/internal"
 )
 
 var (
diff --git a/profiles/internal/rpc/stress/stressd/main.go b/runtime/internal/rpc/stress/stressd/main.go
similarity index 90%
rename from profiles/internal/rpc/stress/stressd/main.go
rename to runtime/internal/rpc/stress/stressd/main.go
index c5fe319..3286e7f 100644
--- a/profiles/internal/rpc/stress/stressd/main.go
+++ b/runtime/internal/rpc/stress/stressd/main.go
@@ -14,8 +14,8 @@
 	"v.io/x/lib/vlog"
 
 	"v.io/x/ref/lib/signals"
-	"v.io/x/ref/profiles/internal/rpc/stress/internal"
-	_ "v.io/x/ref/profiles/static"
+	_ "v.io/x/ref/runtime/factories/static"
+	"v.io/x/ref/runtime/internal/rpc/stress/internal"
 )
 
 var (
diff --git a/profiles/internal/rpc/test/client_test.go b/runtime/internal/rpc/test/client_test.go
similarity index 98%
rename from profiles/internal/rpc/test/client_test.go
rename to runtime/internal/rpc/test/client_test.go
index 9665d0d..0343ad9 100644
--- a/profiles/internal/rpc/test/client_test.go
+++ b/runtime/internal/rpc/test/client_test.go
@@ -24,11 +24,11 @@
 	"v.io/v23/vdlroot/signature"
 	"v.io/v23/verror"
 	"v.io/x/ref/envvar"
-	_ "v.io/x/ref/profiles"
-	inaming "v.io/x/ref/profiles/internal/naming"
-	irpc "v.io/x/ref/profiles/internal/rpc"
-	"v.io/x/ref/profiles/internal/rpc/stream/message"
-	"v.io/x/ref/profiles/internal/testing/mocks/mocknet"
+	_ "v.io/x/ref/runtime/factories/generic"
+	inaming "v.io/x/ref/runtime/internal/naming"
+	irpc "v.io/x/ref/runtime/internal/rpc"
+	"v.io/x/ref/runtime/internal/rpc/stream/message"
+	"v.io/x/ref/runtime/internal/testing/mocks/mocknet"
 	"v.io/x/ref/services/mounttable/mounttablelib"
 	"v.io/x/ref/test"
 	"v.io/x/ref/test/expect"
diff --git a/profiles/internal/rpc/test/doc.go b/runtime/internal/rpc/test/doc.go
similarity index 100%
rename from profiles/internal/rpc/test/doc.go
rename to runtime/internal/rpc/test/doc.go
diff --git a/profiles/internal/rpc/test/glob_test.go b/runtime/internal/rpc/test/glob_test.go
similarity index 99%
rename from profiles/internal/rpc/test/glob_test.go
rename to runtime/internal/rpc/test/glob_test.go
index 9c2ca36..7e5bd43 100644
--- a/profiles/internal/rpc/test/glob_test.go
+++ b/runtime/internal/rpc/test/glob_test.go
@@ -20,7 +20,7 @@
 	"v.io/v23/security"
 	"v.io/v23/verror"
 	"v.io/x/ref/lib/glob"
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/test"
 	"v.io/x/ref/test/testutil"
 )
diff --git a/profiles/internal/rpc/test/proxy_test.go b/runtime/internal/rpc/test/proxy_test.go
similarity index 96%
rename from profiles/internal/rpc/test/proxy_test.go
rename to runtime/internal/rpc/test/proxy_test.go
index 4316f55..05e1c36 100644
--- a/profiles/internal/rpc/test/proxy_test.go
+++ b/runtime/internal/rpc/test/proxy_test.go
@@ -26,14 +26,14 @@
 	"v.io/v23/verror"
 	"v.io/v23/vtrace"
 	"v.io/x/ref/lib/flags"
-	_ "v.io/x/ref/profiles"
-	"v.io/x/ref/profiles/internal/lib/publisher"
-	inaming "v.io/x/ref/profiles/internal/naming"
-	irpc "v.io/x/ref/profiles/internal/rpc"
-	imanager "v.io/x/ref/profiles/internal/rpc/stream/manager"
-	"v.io/x/ref/profiles/internal/rpc/stream/proxy"
-	tnaming "v.io/x/ref/profiles/internal/testing/mocks/naming"
-	ivtrace "v.io/x/ref/profiles/internal/vtrace"
+	_ "v.io/x/ref/runtime/factories/generic"
+	"v.io/x/ref/runtime/internal/lib/publisher"
+	inaming "v.io/x/ref/runtime/internal/naming"
+	irpc "v.io/x/ref/runtime/internal/rpc"
+	imanager "v.io/x/ref/runtime/internal/rpc/stream/manager"
+	"v.io/x/ref/runtime/internal/rpc/stream/proxy"
+	tnaming "v.io/x/ref/runtime/internal/testing/mocks/naming"
+	ivtrace "v.io/x/ref/runtime/internal/vtrace"
 	"v.io/x/ref/test/modules"
 	"v.io/x/ref/test/testutil"
 )
diff --git a/profiles/internal/rpc/test/retry_test.go b/runtime/internal/rpc/test/retry_test.go
similarity index 100%
rename from profiles/internal/rpc/test/retry_test.go
rename to runtime/internal/rpc/test/retry_test.go
diff --git a/profiles/internal/rpc/test/signature_test.go b/runtime/internal/rpc/test/signature_test.go
similarity index 98%
rename from profiles/internal/rpc/test/signature_test.go
rename to runtime/internal/rpc/test/signature_test.go
index 5fc0de9..480bd77 100644
--- a/profiles/internal/rpc/test/signature_test.go
+++ b/runtime/internal/rpc/test/signature_test.go
@@ -17,7 +17,7 @@
 	"v.io/v23/vdl"
 	"v.io/v23/vdlroot/signature"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/test"
 )
 
diff --git a/profiles/internal/rpc/test/simple_test.go b/runtime/internal/rpc/test/simple_test.go
similarity index 100%
rename from profiles/internal/rpc/test/simple_test.go
rename to runtime/internal/rpc/test/simple_test.go
diff --git a/profiles/internal/rpc/test/v23_internal_test.go b/runtime/internal/rpc/test/v23_internal_test.go
similarity index 100%
rename from profiles/internal/rpc/test/v23_internal_test.go
rename to runtime/internal/rpc/test/v23_internal_test.go
diff --git a/profiles/internal/rpc/testutil_test.go b/runtime/internal/rpc/testutil_test.go
similarity index 98%
rename from profiles/internal/rpc/testutil_test.go
rename to runtime/internal/rpc/testutil_test.go
index 921335e..4f298dc 100644
--- a/profiles/internal/rpc/testutil_test.go
+++ b/runtime/internal/rpc/testutil_test.go
@@ -11,7 +11,7 @@
 
 	"v.io/v23/vtrace"
 	"v.io/x/ref/lib/flags"
-	ivtrace "v.io/x/ref/profiles/internal/vtrace"
+	ivtrace "v.io/x/ref/runtime/internal/vtrace"
 	"v.io/x/ref/test"
 
 	"v.io/v23"
diff --git a/profiles/internal/rpc/timer.go b/runtime/internal/rpc/timer.go
similarity index 100%
rename from profiles/internal/rpc/timer.go
rename to runtime/internal/rpc/timer.go
diff --git a/profiles/internal/rpc/timer_test.go b/runtime/internal/rpc/timer_test.go
similarity index 100%
rename from profiles/internal/rpc/timer_test.go
rename to runtime/internal/rpc/timer_test.go
diff --git a/profiles/internal/rpc/v23_test.go b/runtime/internal/rpc/v23_test.go
similarity index 100%
rename from profiles/internal/rpc/v23_test.go
rename to runtime/internal/rpc/v23_test.go
diff --git a/profiles/internal/rpc/version/version.go b/runtime/internal/rpc/version/version.go
similarity index 97%
rename from profiles/internal/rpc/version/version.go
rename to runtime/internal/rpc/version/version.go
index 44cad53..76c8ce9 100644
--- a/profiles/internal/rpc/version/version.go
+++ b/runtime/internal/rpc/version/version.go
@@ -32,7 +32,7 @@
 	metadata.Insert("v23.RPCVersionMin", fmt.Sprint(SupportedRange.Min))
 }
 
-const pkgPath = "v.io/x/ref/profiles/internal/rpc/version"
+const pkgPath = "v.io/x/ref/runtime/internal/rpc/version"
 
 func reg(id, msg string) verror.IDAction {
 	return verror.Register(verror.ID(pkgPath+id), verror.NoRetry, msg)
diff --git a/profiles/internal/rpc/version/version_test.go b/runtime/internal/rpc/version/version_test.go
similarity index 100%
rename from profiles/internal/rpc/version/version_test.go
rename to runtime/internal/rpc/version/version_test.go
diff --git a/profiles/internal/rt/ipc_test.go b/runtime/internal/rt/ipc_test.go
similarity index 98%
rename from profiles/internal/rt/ipc_test.go
rename to runtime/internal/rt/ipc_test.go
index 138826f..0bbd0ef 100644
--- a/profiles/internal/rt/ipc_test.go
+++ b/runtime/internal/rt/ipc_test.go
@@ -19,8 +19,8 @@
 	"v.io/v23/rpc"
 	"v.io/v23/security"
 	"v.io/v23/verror"
-	_ "v.io/x/ref/profiles"
-	"v.io/x/ref/profiles/internal/rpc/stream/vc"
+	_ "v.io/x/ref/runtime/factories/generic"
+	"v.io/x/ref/runtime/internal/rpc/stream/vc"
 	"v.io/x/ref/test"
 	"v.io/x/ref/test/testutil"
 )
diff --git a/profiles/internal/rt/mgmt.go b/runtime/internal/rt/mgmt.go
similarity index 100%
rename from profiles/internal/rt/mgmt.go
rename to runtime/internal/rt/mgmt.go
diff --git a/profiles/internal/rt/mgmt_test.go b/runtime/internal/rt/mgmt_test.go
similarity index 99%
rename from profiles/internal/rt/mgmt_test.go
rename to runtime/internal/rt/mgmt_test.go
index 2462e75..73860e5 100644
--- a/profiles/internal/rt/mgmt_test.go
+++ b/runtime/internal/rt/mgmt_test.go
@@ -25,7 +25,7 @@
 	"v.io/x/ref/test/expect"
 	"v.io/x/ref/test/modules"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 //go:generate v23 test generate
diff --git a/profiles/internal/rt/rt_test.go b/runtime/internal/rt/rt_test.go
similarity index 100%
rename from profiles/internal/rt/rt_test.go
rename to runtime/internal/rt/rt_test.go
diff --git a/profiles/internal/rt/runtime.go b/runtime/internal/rt/runtime.go
similarity index 97%
rename from profiles/internal/rt/runtime.go
rename to runtime/internal/rt/runtime.go
index 475be9b..9ebfbef 100644
--- a/profiles/internal/rt/runtime.go
+++ b/runtime/internal/rt/runtime.go
@@ -30,13 +30,13 @@
 	"v.io/x/ref/lib/flags"
 	"v.io/x/ref/lib/stats"
 	_ "v.io/x/ref/lib/stats/sysstats"
-	"v.io/x/ref/profiles/internal/lib/dependency"
-	inaming "v.io/x/ref/profiles/internal/naming"
-	inamespace "v.io/x/ref/profiles/internal/naming/namespace"
-	irpc "v.io/x/ref/profiles/internal/rpc"
-	"v.io/x/ref/profiles/internal/rpc/stream"
-	imanager "v.io/x/ref/profiles/internal/rpc/stream/manager"
-	ivtrace "v.io/x/ref/profiles/internal/vtrace"
+	"v.io/x/ref/runtime/internal/lib/dependency"
+	inaming "v.io/x/ref/runtime/internal/naming"
+	inamespace "v.io/x/ref/runtime/internal/naming/namespace"
+	irpc "v.io/x/ref/runtime/internal/rpc"
+	"v.io/x/ref/runtime/internal/rpc/stream"
+	imanager "v.io/x/ref/runtime/internal/rpc/stream/manager"
+	ivtrace "v.io/x/ref/runtime/internal/vtrace"
 )
 
 type contextKey int
diff --git a/profiles/internal/rt/runtime_test.go b/runtime/internal/rt/runtime_test.go
similarity index 98%
rename from profiles/internal/rt/runtime_test.go
rename to runtime/internal/rt/runtime_test.go
index f4cded9..cfae57f 100644
--- a/profiles/internal/rt/runtime_test.go
+++ b/runtime/internal/rt/runtime_test.go
@@ -12,7 +12,7 @@
 	"v.io/v23/naming"
 	"v.io/x/lib/vlog"
 	"v.io/x/ref/lib/flags"
-	"v.io/x/ref/profiles/internal/rt"
+	"v.io/x/ref/runtime/internal/rt"
 	"v.io/x/ref/services/debug/debuglib"
 	"v.io/x/ref/test/testutil"
 )
diff --git a/profiles/internal/rt/security.go b/runtime/internal/rt/security.go
similarity index 98%
rename from profiles/internal/rt/security.go
rename to runtime/internal/rt/security.go
index 0488424..9d46d42 100644
--- a/profiles/internal/rt/security.go
+++ b/runtime/internal/rt/security.go
@@ -19,7 +19,7 @@
 	"v.io/x/ref/lib/exec"
 	"v.io/x/ref/lib/mgmt"
 	vsecurity "v.io/x/ref/lib/security"
-	inaming "v.io/x/ref/profiles/internal/naming"
+	inaming "v.io/x/ref/runtime/internal/naming"
 	"v.io/x/ref/services/agent/agentlib"
 )
 
diff --git a/profiles/internal/rt/shutdown_servers_test.go b/runtime/internal/rt/shutdown_servers_test.go
similarity index 99%
rename from profiles/internal/rt/shutdown_servers_test.go
rename to runtime/internal/rt/shutdown_servers_test.go
index 659cefc..1a05535 100644
--- a/profiles/internal/rt/shutdown_servers_test.go
+++ b/runtime/internal/rt/shutdown_servers_test.go
@@ -18,7 +18,7 @@
 	"v.io/v23/rpc"
 	"v.io/x/lib/vlog"
 	"v.io/x/ref/lib/signals"
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/test"
 	"v.io/x/ref/test/modules"
 )
diff --git a/profiles/internal/rt/shutdown_test.go b/runtime/internal/rt/shutdown_test.go
similarity index 100%
rename from profiles/internal/rt/shutdown_test.go
rename to runtime/internal/rt/shutdown_test.go
diff --git a/profiles/internal/rt/signal_test.go b/runtime/internal/rt/signal_test.go
similarity index 97%
rename from profiles/internal/rt/signal_test.go
rename to runtime/internal/rt/signal_test.go
index b9fe8c9..d84455b 100644
--- a/profiles/internal/rt/signal_test.go
+++ b/runtime/internal/rt/signal_test.go
@@ -13,7 +13,7 @@
 	"testing"
 	"time"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/test"
 	"v.io/x/ref/test/modules"
 )
diff --git a/profiles/internal/rt/v23_test.go b/runtime/internal/rt/v23_test.go
similarity index 100%
rename from profiles/internal/rt/v23_test.go
rename to runtime/internal/rt/v23_test.go
diff --git a/profiles/internal/testing/concurrency/choice.go b/runtime/internal/testing/concurrency/choice.go
similarity index 100%
rename from profiles/internal/testing/concurrency/choice.go
rename to runtime/internal/testing/concurrency/choice.go
diff --git a/profiles/internal/testing/concurrency/clock.go b/runtime/internal/testing/concurrency/clock.go
similarity index 100%
rename from profiles/internal/testing/concurrency/clock.go
rename to runtime/internal/testing/concurrency/clock.go
diff --git a/profiles/internal/testing/concurrency/clock_test.go b/runtime/internal/testing/concurrency/clock_test.go
similarity index 100%
rename from profiles/internal/testing/concurrency/clock_test.go
rename to runtime/internal/testing/concurrency/clock_test.go
diff --git a/profiles/internal/testing/concurrency/context.go b/runtime/internal/testing/concurrency/context.go
similarity index 100%
rename from profiles/internal/testing/concurrency/context.go
rename to runtime/internal/testing/concurrency/context.go
diff --git a/profiles/internal/testing/concurrency/doc.go b/runtime/internal/testing/concurrency/doc.go
similarity index 100%
rename from profiles/internal/testing/concurrency/doc.go
rename to runtime/internal/testing/concurrency/doc.go
diff --git a/profiles/internal/testing/concurrency/execution.go b/runtime/internal/testing/concurrency/execution.go
similarity index 100%
rename from profiles/internal/testing/concurrency/execution.go
rename to runtime/internal/testing/concurrency/execution.go
diff --git a/profiles/internal/testing/concurrency/fake.go b/runtime/internal/testing/concurrency/fake.go
similarity index 100%
rename from profiles/internal/testing/concurrency/fake.go
rename to runtime/internal/testing/concurrency/fake.go
diff --git a/profiles/internal/testing/concurrency/mutex_test.go b/runtime/internal/testing/concurrency/mutex_test.go
similarity index 97%
rename from profiles/internal/testing/concurrency/mutex_test.go
rename to runtime/internal/testing/concurrency/mutex_test.go
index 6465d0c..7069526 100644
--- a/profiles/internal/testing/concurrency/mutex_test.go
+++ b/runtime/internal/testing/concurrency/mutex_test.go
@@ -14,8 +14,8 @@
 	"time"
 
 	"v.io/x/lib/vlog"
-	"v.io/x/ref/profiles/internal/testing/concurrency"
-	"v.io/x/ref/profiles/internal/testing/concurrency/sync"
+	"v.io/x/ref/runtime/internal/testing/concurrency"
+	"v.io/x/ref/runtime/internal/testing/concurrency/sync"
 )
 
 var m sync.Mutex
diff --git a/profiles/internal/testing/concurrency/request.go b/runtime/internal/testing/concurrency/request.go
similarity index 100%
rename from profiles/internal/testing/concurrency/request.go
rename to runtime/internal/testing/concurrency/request.go
diff --git a/profiles/internal/testing/concurrency/resource.go b/runtime/internal/testing/concurrency/resource.go
similarity index 100%
rename from profiles/internal/testing/concurrency/resource.go
rename to runtime/internal/testing/concurrency/resource.go
diff --git a/profiles/internal/testing/concurrency/rwmutex_test.go b/runtime/internal/testing/concurrency/rwmutex_test.go
similarity index 98%
rename from profiles/internal/testing/concurrency/rwmutex_test.go
rename to runtime/internal/testing/concurrency/rwmutex_test.go
index 2e0e22f..8d0c2a8 100644
--- a/profiles/internal/testing/concurrency/rwmutex_test.go
+++ b/runtime/internal/testing/concurrency/rwmutex_test.go
@@ -14,8 +14,8 @@
 	"time"
 
 	"v.io/x/lib/vlog"
-	"v.io/x/ref/profiles/internal/testing/concurrency"
-	"v.io/x/ref/profiles/internal/testing/concurrency/sync"
+	"v.io/x/ref/runtime/internal/testing/concurrency"
+	"v.io/x/ref/runtime/internal/testing/concurrency/sync"
 )
 
 var rw sync.RWMutex
diff --git a/profiles/internal/testing/concurrency/stack.go b/runtime/internal/testing/concurrency/stack.go
similarity index 100%
rename from profiles/internal/testing/concurrency/stack.go
rename to runtime/internal/testing/concurrency/stack.go
diff --git a/profiles/internal/testing/concurrency/state.go b/runtime/internal/testing/concurrency/state.go
similarity index 100%
rename from profiles/internal/testing/concurrency/state.go
rename to runtime/internal/testing/concurrency/state.go
diff --git a/profiles/internal/testing/concurrency/state_test.go b/runtime/internal/testing/concurrency/state_test.go
similarity index 100%
rename from profiles/internal/testing/concurrency/state_test.go
rename to runtime/internal/testing/concurrency/state_test.go
diff --git a/profiles/internal/testing/concurrency/sync/sync.go b/runtime/internal/testing/concurrency/sync/sync.go
similarity index 96%
rename from profiles/internal/testing/concurrency/sync/sync.go
rename to runtime/internal/testing/concurrency/sync/sync.go
index 7fe8f27..cf933e3 100644
--- a/profiles/internal/testing/concurrency/sync/sync.go
+++ b/runtime/internal/testing/concurrency/sync/sync.go
@@ -7,7 +7,7 @@
 import (
 	"sync"
 
-	"v.io/x/ref/profiles/internal/testing/concurrency"
+	"v.io/x/ref/runtime/internal/testing/concurrency"
 )
 
 // Mutex is a wrapper around the Go implementation of Mutex.
diff --git a/profiles/internal/testing/concurrency/tester.go b/runtime/internal/testing/concurrency/tester.go
similarity index 100%
rename from profiles/internal/testing/concurrency/tester.go
rename to runtime/internal/testing/concurrency/tester.go
diff --git a/profiles/internal/testing/concurrency/thread.go b/runtime/internal/testing/concurrency/thread.go
similarity index 100%
rename from profiles/internal/testing/concurrency/thread.go
rename to runtime/internal/testing/concurrency/thread.go
diff --git a/profiles/internal/testing/concurrency/transition.go b/runtime/internal/testing/concurrency/transition.go
similarity index 100%
rename from profiles/internal/testing/concurrency/transition.go
rename to runtime/internal/testing/concurrency/transition.go
diff --git a/profiles/internal/testing/concurrency/util_test.go b/runtime/internal/testing/concurrency/util_test.go
similarity index 100%
rename from profiles/internal/testing/concurrency/util_test.go
rename to runtime/internal/testing/concurrency/util_test.go
diff --git a/profiles/internal/testing/concurrency/v23_internal_test.go b/runtime/internal/testing/concurrency/v23_internal_test.go
similarity index 100%
rename from profiles/internal/testing/concurrency/v23_internal_test.go
rename to runtime/internal/testing/concurrency/v23_internal_test.go
diff --git a/profiles/internal/testing/mocks/mocknet/mocknet.go b/runtime/internal/testing/mocks/mocknet/mocknet.go
similarity index 97%
rename from profiles/internal/testing/mocks/mocknet/mocknet.go
rename to runtime/internal/testing/mocks/mocknet/mocknet.go
index 259563c..1132f51 100644
--- a/profiles/internal/testing/mocks/mocknet/mocknet.go
+++ b/runtime/internal/testing/mocks/mocknet/mocknet.go
@@ -17,10 +17,10 @@
 	"v.io/v23"
 	"v.io/v23/naming"
 
-	"v.io/x/ref/profiles/internal/lib/iobuf"
-	inaming "v.io/x/ref/profiles/internal/naming"
-	"v.io/x/ref/profiles/internal/rpc/stream/crypto"
-	"v.io/x/ref/profiles/internal/rpc/stream/message"
+	"v.io/x/ref/runtime/internal/lib/iobuf"
+	inaming "v.io/x/ref/runtime/internal/naming"
+	"v.io/x/ref/runtime/internal/rpc/stream/crypto"
+	"v.io/x/ref/runtime/internal/rpc/stream/message"
 )
 
 // TODO(cnicolaou): consider extending Dialer/Listener API to include a cipher
diff --git a/profiles/internal/testing/mocks/mocknet/mocknet_test.go b/runtime/internal/testing/mocks/mocknet/mocknet_test.go
similarity index 97%
rename from profiles/internal/testing/mocks/mocknet/mocknet_test.go
rename to runtime/internal/testing/mocks/mocknet/mocknet_test.go
index 91c445e..018e3ce 100644
--- a/profiles/internal/testing/mocks/mocknet/mocknet_test.go
+++ b/runtime/internal/testing/mocks/mocknet/mocknet_test.go
@@ -20,9 +20,9 @@
 	"v.io/v23/rpc"
 	"v.io/v23/verror"
 
-	_ "v.io/x/ref/profiles"
-	"v.io/x/ref/profiles/internal/rpc/stream/message"
-	"v.io/x/ref/profiles/internal/testing/mocks/mocknet"
+	_ "v.io/x/ref/runtime/factories/generic"
+	"v.io/x/ref/runtime/internal/rpc/stream/message"
+	"v.io/x/ref/runtime/internal/testing/mocks/mocknet"
 	"v.io/x/ref/test"
 )
 
diff --git a/profiles/internal/testing/mocks/mocknet/v23_internal_test.go b/runtime/internal/testing/mocks/mocknet/v23_internal_test.go
similarity index 100%
rename from profiles/internal/testing/mocks/mocknet/v23_internal_test.go
rename to runtime/internal/testing/mocks/mocknet/v23_internal_test.go
diff --git a/profiles/internal/testing/mocks/naming/namespace.go b/runtime/internal/testing/mocks/naming/namespace.go
similarity index 98%
rename from profiles/internal/testing/mocks/naming/namespace.go
rename to runtime/internal/testing/mocks/naming/namespace.go
index d38a499..2b48c30 100644
--- a/profiles/internal/testing/mocks/naming/namespace.go
+++ b/runtime/internal/testing/mocks/naming/namespace.go
@@ -18,7 +18,7 @@
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
 
-	inamespace "v.io/x/ref/profiles/internal/naming/namespace"
+	inamespace "v.io/x/ref/runtime/internal/naming/namespace"
 )
 
 // NewSimpleNamespace returns a simple implementation of a Namespace
diff --git a/profiles/internal/util.go b/runtime/internal/util.go
similarity index 100%
rename from profiles/internal/util.go
rename to runtime/internal/util.go
diff --git a/profiles/internal/vtrace/store.go b/runtime/internal/vtrace/store.go
similarity index 100%
rename from profiles/internal/vtrace/store.go
rename to runtime/internal/vtrace/store.go
diff --git a/profiles/internal/vtrace/store_test.go b/runtime/internal/vtrace/store_test.go
similarity index 100%
rename from profiles/internal/vtrace/store_test.go
rename to runtime/internal/vtrace/store_test.go
diff --git a/profiles/internal/vtrace/vtrace.go b/runtime/internal/vtrace/vtrace.go
similarity index 100%
rename from profiles/internal/vtrace/vtrace.go
rename to runtime/internal/vtrace/vtrace.go
diff --git a/profiles/internal/vtrace/vtrace_test.go b/runtime/internal/vtrace/vtrace_test.go
similarity index 98%
rename from profiles/internal/vtrace/vtrace_test.go
rename to runtime/internal/vtrace/vtrace_test.go
index 87a1bf8..f407098 100644
--- a/profiles/internal/vtrace/vtrace_test.go
+++ b/runtime/internal/vtrace/vtrace_test.go
@@ -21,8 +21,8 @@
 
 	"v.io/x/ref/lib/flags"
 	_ "v.io/x/ref/lib/security/securityflag"
-	_ "v.io/x/ref/profiles"
-	ivtrace "v.io/x/ref/profiles/internal/vtrace"
+	_ "v.io/x/ref/runtime/factories/generic"
+	ivtrace "v.io/x/ref/runtime/internal/vtrace"
 	"v.io/x/ref/services/mounttable/mounttablelib"
 	"v.io/x/ref/test"
 	"v.io/x/ref/test/testutil"
diff --git a/services/agent/agentd/main.go b/services/agent/agentd/main.go
index 654e4e5..5956c79 100644
--- a/services/agent/agentd/main.go
+++ b/services/agent/agentd/main.go
@@ -27,7 +27,7 @@
 	vsignals "v.io/x/ref/lib/signals"
 	"v.io/x/ref/services/agent/internal/server"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 const childAgentFd = 3
diff --git a/services/agent/agentlib/agent_test.go b/services/agent/agentlib/agent_test.go
index 1a9064a..93621a9 100644
--- a/services/agent/agentlib/agent_test.go
+++ b/services/agent/agentlib/agent_test.go
@@ -22,7 +22,7 @@
 	"v.io/x/ref/test/modules"
 	"v.io/x/ref/test/testutil"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 // As of April 28, 2015, the benchmarks for serving a principal with and
diff --git a/services/agent/internal/pingpong/main.go b/services/agent/internal/pingpong/main.go
index dffb6f3..559d4a1 100644
--- a/services/agent/internal/pingpong/main.go
+++ b/services/agent/internal/pingpong/main.go
@@ -15,7 +15,7 @@
 	"v.io/x/lib/vlog"
 	"v.io/x/ref/lib/signals"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 type pongd struct{}
diff --git a/services/agent/internal/server/sharing_test.go b/services/agent/internal/server/sharing_test.go
index 0c9f0d9..a8ee809 100644
--- a/services/agent/internal/server/sharing_test.go
+++ b/services/agent/internal/server/sharing_test.go
@@ -7,7 +7,7 @@
 import (
 	"testing"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 func doRead(c chan struct{}) string {
diff --git a/services/agent/internal/test_principal/main.go b/services/agent/internal/test_principal/main.go
index 1f27580..3da8db6 100644
--- a/services/agent/internal/test_principal/main.go
+++ b/services/agent/internal/test_principal/main.go
@@ -17,7 +17,7 @@
 	"v.io/v23/security"
 	"v.io/x/ref/envvar"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 func newKey() security.PublicKey {
diff --git a/services/agent/keymgr/keymgr_test.go b/services/agent/keymgr/keymgr_test.go
index e897f65..bbe20be 100644
--- a/services/agent/keymgr/keymgr_test.go
+++ b/services/agent/keymgr/keymgr_test.go
@@ -19,7 +19,7 @@
 	"v.io/x/ref/services/agent/internal/server"
 	"v.io/x/ref/test"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 func createAgent(ctx *context.T, path string) (*Agent, func(), error) {
diff --git a/services/agent/vbecome/vbecome.go b/services/agent/vbecome/vbecome.go
index d4c224b..fb2a28c 100644
--- a/services/agent/vbecome/vbecome.go
+++ b/services/agent/vbecome/vbecome.go
@@ -29,7 +29,7 @@
 	"v.io/x/ref/services/agent/internal/server"
 	"v.io/x/ref/services/role"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 var (
diff --git a/services/agent/vbecome/vbecome_v23_test.go b/services/agent/vbecome/vbecome_v23_test.go
index 298af90..162baa6 100644
--- a/services/agent/vbecome/vbecome_v23_test.go
+++ b/services/agent/vbecome/vbecome_v23_test.go
@@ -10,7 +10,7 @@
 	"path/filepath"
 	"regexp"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/test/v23tests"
 )
 
diff --git a/services/application/application/impl.go b/services/application/application/impl.go
index 605eb6b..d880b58 100644
--- a/services/application/application/impl.go
+++ b/services/application/application/impl.go
@@ -22,7 +22,7 @@
 	"v.io/v23/services/application"
 	"v.io/x/lib/cmdline2"
 	"v.io/x/ref/lib/v23cmd"
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/services/repository"
 )
 
diff --git a/services/application/application/impl_test.go b/services/application/application/impl_test.go
index 7683569..b990094 100644
--- a/services/application/application/impl_test.go
+++ b/services/application/application/impl_test.go
@@ -21,7 +21,7 @@
 	"v.io/x/lib/cmdline2"
 	"v.io/x/lib/vlog"
 	"v.io/x/ref/lib/v23cmd"
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/services/repository"
 	"v.io/x/ref/test"
 )
diff --git a/services/application/applicationd/main.go b/services/application/applicationd/main.go
index 28a4012..1ba1cbf 100644
--- a/services/application/applicationd/main.go
+++ b/services/application/applicationd/main.go
@@ -13,7 +13,7 @@
 	"v.io/x/lib/vlog"
 
 	"v.io/x/ref/lib/signals"
-	_ "v.io/x/ref/profiles/roaming"
+	_ "v.io/x/ref/runtime/factories/roaming"
 )
 
 var (
diff --git a/services/binary/binary/impl.go b/services/binary/binary/impl.go
index 5c35b8e..6231bef 100644
--- a/services/binary/binary/impl.go
+++ b/services/binary/binary/impl.go
@@ -14,7 +14,7 @@
 	"v.io/v23/context"
 	"v.io/x/lib/cmdline2"
 	"v.io/x/ref/lib/v23cmd"
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/services/internal/binarylib"
 )
 
diff --git a/services/binary/binary/impl_test.go b/services/binary/binary/impl_test.go
index deab3df..7854fda 100644
--- a/services/binary/binary/impl_test.go
+++ b/services/binary/binary/impl_test.go
@@ -26,7 +26,7 @@
 	"v.io/x/lib/cmdline2"
 	"v.io/x/lib/vlog"
 	"v.io/x/ref/lib/v23cmd"
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/test"
 )
 
diff --git a/services/binary/binaryd/main.go b/services/binary/binaryd/main.go
index 16cd87c..efb5761 100644
--- a/services/binary/binaryd/main.go
+++ b/services/binary/binaryd/main.go
@@ -17,7 +17,7 @@
 
 	"v.io/x/lib/netstate"
 	"v.io/x/ref/lib/signals"
-	_ "v.io/x/ref/profiles/roaming"
+	_ "v.io/x/ref/runtime/factories/roaming"
 	"v.io/x/ref/services/internal/binarylib"
 )
 
diff --git a/services/build/build/impl.go b/services/build/build/impl.go
index b47f284..22d838a 100644
--- a/services/build/build/impl.go
+++ b/services/build/build/impl.go
@@ -21,7 +21,7 @@
 	vbuild "v.io/v23/services/build"
 	"v.io/x/lib/cmdline2"
 	"v.io/x/ref/lib/v23cmd"
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 func main() {
diff --git a/services/build/build/impl_test.go b/services/build/build/impl_test.go
index 6f35178..f60b3db 100644
--- a/services/build/build/impl_test.go
+++ b/services/build/build/impl_test.go
@@ -19,7 +19,7 @@
 	"v.io/x/lib/cmdline2"
 	"v.io/x/lib/vlog"
 	"v.io/x/ref/lib/v23cmd"
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/test"
 )
 
diff --git a/services/build/buildd/main.go b/services/build/buildd/main.go
index 71edc14..c4dc55c 100644
--- a/services/build/buildd/main.go
+++ b/services/build/buildd/main.go
@@ -15,7 +15,7 @@
 	"v.io/x/ref/lib/security/securityflag"
 	"v.io/x/ref/lib/signals"
 
-	_ "v.io/x/ref/profiles/roaming"
+	_ "v.io/x/ref/runtime/factories/roaming"
 )
 
 var (
diff --git a/services/debug/debug/impl.go b/services/debug/debug/impl.go
index b0b5793..a9a604a 100644
--- a/services/debug/debug/impl.go
+++ b/services/debug/debug/impl.go
@@ -32,7 +32,7 @@
 	"v.io/x/ref/lib/glob"
 	"v.io/x/ref/lib/signals"
 	"v.io/x/ref/lib/v23cmd"
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/services/internal/pproflib"
 )
 
diff --git a/services/debug/debuglib/dispatcher_test.go b/services/debug/debuglib/dispatcher_test.go
index 39e053f..d5879fb 100644
--- a/services/debug/debuglib/dispatcher_test.go
+++ b/services/debug/debuglib/dispatcher_test.go
@@ -28,7 +28,7 @@
 	"v.io/v23/vtrace"
 
 	libstats "v.io/x/ref/lib/stats"
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/test"
 	"v.io/x/ref/test/testutil"
 )
diff --git a/services/device/device/root.go b/services/device/device/root.go
index ec07f48..650838a 100644
--- a/services/device/device/root.go
+++ b/services/device/device/root.go
@@ -8,7 +8,7 @@
 	"regexp"
 
 	"v.io/x/lib/cmdline2"
-	_ "v.io/x/ref/profiles/static"
+	_ "v.io/x/ref/runtime/factories/static"
 )
 
 var CmdRoot = &cmdline2.Command{
diff --git a/services/device/deviced/server.go b/services/device/deviced/server.go
index d90ae68..0f22aa3 100644
--- a/services/device/deviced/server.go
+++ b/services/device/deviced/server.go
@@ -24,7 +24,7 @@
 	vexec "v.io/x/ref/lib/exec"
 	"v.io/x/ref/lib/mgmt"
 	"v.io/x/ref/lib/signals"
-	_ "v.io/x/ref/profiles/roaming"
+	_ "v.io/x/ref/runtime/factories/roaming"
 	"v.io/x/ref/services/device/internal/config"
 	"v.io/x/ref/services/device/internal/starter"
 )
diff --git a/services/device/internal/impl/utiltest/helpers.go b/services/device/internal/impl/utiltest/helpers.go
index 6469493..8e9d88a 100644
--- a/services/device/internal/impl/utiltest/helpers.go
+++ b/services/device/internal/impl/utiltest/helpers.go
@@ -34,7 +34,7 @@
 	"v.io/v23/verror"
 
 	"v.io/x/ref/envvar"
-	_ "v.io/x/ref/profiles/roaming"
+	_ "v.io/x/ref/runtime/factories/roaming"
 	"v.io/x/ref/services/device/internal/impl"
 	"v.io/x/ref/services/internal/binarylib"
 	"v.io/x/ref/services/internal/servicetest"
diff --git a/services/device/internal/starter/starter.go b/services/device/internal/starter/starter.go
index 50a2e9b..e74c1e9 100644
--- a/services/device/internal/starter/starter.go
+++ b/services/device/internal/starter/starter.go
@@ -14,7 +14,7 @@
 	"strconv"
 	"time"
 
-	"v.io/x/ref/profiles/roaming"
+	"v.io/x/ref/runtime/factories/roaming"
 	"v.io/x/ref/services/debug/debuglib"
 	"v.io/x/ref/services/device/internal/config"
 	"v.io/x/ref/services/device/internal/impl"
diff --git a/services/device/mgmt_v23_test.go b/services/device/mgmt_v23_test.go
index b5b9e29..585c57f 100644
--- a/services/device/mgmt_v23_test.go
+++ b/services/device/mgmt_v23_test.go
@@ -48,7 +48,7 @@
 	"time"
 
 	"v.io/x/ref/envvar"
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/test/v23tests"
 )
 
diff --git a/services/identity/identityd/main.go b/services/identity/identityd/main.go
index 1c57547..c483d89 100644
--- a/services/identity/identityd/main.go
+++ b/services/identity/identityd/main.go
@@ -19,7 +19,7 @@
 	"v.io/v23"
 	"v.io/x/lib/vlog"
 
-	_ "v.io/x/ref/profiles/static"
+	_ "v.io/x/ref/runtime/factories/static"
 	"v.io/x/ref/services/identity/internal/auditor"
 	"v.io/x/ref/services/identity/internal/blesser"
 	"v.io/x/ref/services/identity/internal/caveats"
diff --git a/services/identity/internal/identityd_test/main.go b/services/identity/internal/identityd_test/main.go
index f7977de..59e0f0d 100644
--- a/services/identity/internal/identityd_test/main.go
+++ b/services/identity/internal/identityd_test/main.go
@@ -15,7 +15,7 @@
 	"v.io/v23"
 	"v.io/x/lib/vlog"
 
-	_ "v.io/x/ref/profiles/static"
+	_ "v.io/x/ref/runtime/factories/static"
 	"v.io/x/ref/services/identity/internal/auditor"
 	"v.io/x/ref/services/identity/internal/blesser"
 	"v.io/x/ref/services/identity/internal/caveats"
diff --git a/services/identity/internal/revocation/revocation_test.go b/services/identity/internal/revocation/revocation_test.go
index 5755471d..0b07b0c 100644
--- a/services/identity/internal/revocation/revocation_test.go
+++ b/services/identity/internal/revocation/revocation_test.go
@@ -7,7 +7,7 @@
 import (
 	"testing"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/services/discharger"
 	"v.io/x/ref/services/identity/internal/dischargerlib"
 	"v.io/x/ref/test"
diff --git a/services/internal/binarylib/impl_test.go b/services/internal/binarylib/impl_test.go
index e746e3a..21ebb2a 100644
--- a/services/internal/binarylib/impl_test.go
+++ b/services/internal/binarylib/impl_test.go
@@ -21,7 +21,7 @@
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
 
-	_ "v.io/x/ref/profiles/static"
+	_ "v.io/x/ref/runtime/factories/static"
 	"v.io/x/ref/services/internal/binarylib"
 	"v.io/x/ref/services/internal/servicetest"
 	"v.io/x/ref/test"
diff --git a/services/internal/logreaderlib/logfile_test.go b/services/internal/logreaderlib/logfile_test.go
index 6ed1e14..3f74b34 100644
--- a/services/internal/logreaderlib/logfile_test.go
+++ b/services/internal/logreaderlib/logfile_test.go
@@ -20,7 +20,7 @@
 	"v.io/x/ref/services/internal/logreaderlib"
 	"v.io/x/ref/test"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 //go:generate v23 test generate
diff --git a/services/internal/pproflib/proxy_test.go b/services/internal/pproflib/proxy_test.go
index b44a062..b277b89 100644
--- a/services/internal/pproflib/proxy_test.go
+++ b/services/internal/pproflib/proxy_test.go
@@ -15,7 +15,7 @@
 	"v.io/x/ref/services/internal/pproflib"
 	"v.io/x/ref/test"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 //go:generate v23 test generate
diff --git a/services/internal/statslib/stats_test.go b/services/internal/statslib/stats_test.go
index 15adbf3..d8d4ff3 100644
--- a/services/internal/statslib/stats_test.go
+++ b/services/internal/statslib/stats_test.go
@@ -25,7 +25,7 @@
 	"v.io/x/ref/test"
 	"v.io/x/ref/test/testutil"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 //go:generate v23 test generate
diff --git a/services/internal/vtracelib/vtrace_test.go b/services/internal/vtracelib/vtrace_test.go
index 5810caf..93deb05 100644
--- a/services/internal/vtracelib/vtrace_test.go
+++ b/services/internal/vtracelib/vtrace_test.go
@@ -14,7 +14,7 @@
 	"v.io/x/ref/services/internal/vtracelib"
 	"v.io/x/ref/test"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 //go:generate v23 test generate
diff --git a/services/mounttable/mounttabled/mounttable.go b/services/mounttable/mounttabled/mounttable.go
index a95f32a..7616d2b 100644
--- a/services/mounttable/mounttabled/mounttable.go
+++ b/services/mounttable/mounttabled/mounttable.go
@@ -14,7 +14,7 @@
 	"v.io/x/lib/vlog"
 
 	"v.io/x/ref/lib/signals"
-	_ "v.io/x/ref/profiles/roaming"
+	_ "v.io/x/ref/runtime/factories/roaming"
 	"v.io/x/ref/services/mounttable/mounttablelib"
 )
 
diff --git a/services/mounttable/mounttablelib/neighborhood_test.go b/services/mounttable/mounttablelib/neighborhood_test.go
index 75d1b34..a8d67d8 100644
--- a/services/mounttable/mounttablelib/neighborhood_test.go
+++ b/services/mounttable/mounttablelib/neighborhood_test.go
@@ -16,7 +16,7 @@
 	"v.io/v23/options"
 	"v.io/x/lib/vlog"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/test"
 )
 
diff --git a/services/profile/profile/impl.go b/services/profile/profile/impl.go
index e4cb9f3..489f0e2 100644
--- a/services/profile/profile/impl.go
+++ b/services/profile/profile/impl.go
@@ -15,7 +15,7 @@
 	"v.io/v23/services/build"
 	"v.io/x/lib/cmdline2"
 	"v.io/x/ref/lib/v23cmd"
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/services/profile"
 	"v.io/x/ref/services/repository"
 )
diff --git a/services/profile/profile/impl_test.go b/services/profile/profile/impl_test.go
index 9a13e99..4227e5b 100644
--- a/services/profile/profile/impl_test.go
+++ b/services/profile/profile/impl_test.go
@@ -20,7 +20,7 @@
 	"v.io/x/lib/cmdline2"
 	"v.io/x/lib/vlog"
 	"v.io/x/ref/lib/v23cmd"
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/services/profile"
 	"v.io/x/ref/services/repository"
 	"v.io/x/ref/test"
diff --git a/services/profile/profiled/main.go b/services/profile/profiled/main.go
index 381edec..9dd307f 100644
--- a/services/profile/profiled/main.go
+++ b/services/profile/profiled/main.go
@@ -14,7 +14,7 @@
 	"v.io/x/ref/lib/security/securityflag"
 	"v.io/x/ref/lib/signals"
 
-	_ "v.io/x/ref/profiles/roaming"
+	_ "v.io/x/ref/runtime/factories/roaming"
 )
 
 var (
diff --git a/services/proxy/proxyd/main.go b/services/proxy/proxyd/main.go
index a617145..920c7ad 100644
--- a/services/proxy/proxyd/main.go
+++ b/services/proxy/proxyd/main.go
@@ -21,7 +21,7 @@
 	"v.io/x/lib/vlog"
 
 	"v.io/x/ref/lib/signals"
-	"v.io/x/ref/profiles/static"
+	"v.io/x/ref/runtime/factories/static"
 )
 
 var (
diff --git a/services/role/roled/internal/role_test.go b/services/role/roled/internal/role_test.go
index ea40dbb..af42e3b 100644
--- a/services/role/roled/internal/role_test.go
+++ b/services/role/roled/internal/role_test.go
@@ -22,7 +22,7 @@
 	irole "v.io/x/ref/services/role/roled/internal"
 	"v.io/x/ref/test/testutil"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 func TestSeekBlessings(t *testing.T) {
diff --git a/services/role/roled/main.go b/services/role/roled/main.go
index 5e192ad..aea1ab7 100644
--- a/services/role/roled/main.go
+++ b/services/role/roled/main.go
@@ -14,7 +14,7 @@
 
 	"v.io/x/lib/vlog"
 	"v.io/x/ref/lib/signals"
-	_ "v.io/x/ref/profiles/static"
+	_ "v.io/x/ref/runtime/factories/static"
 	irole "v.io/x/ref/services/role/roled/internal"
 )
 
diff --git a/services/wspr/browsprd/main_nacl.go b/services/wspr/browsprd/main_nacl.go
index 5b9db6b..dcc23c3 100644
--- a/services/wspr/browsprd/main_nacl.go
+++ b/services/wspr/browsprd/main_nacl.go
@@ -19,8 +19,8 @@
 	"v.io/v23/vdl"
 	"v.io/x/lib/vlog"
 	vsecurity "v.io/x/ref/lib/security"
-	_ "v.io/x/ref/profiles/chrome"
-	"v.io/x/ref/profiles/internal/lib/websocket"
+	_ "v.io/x/ref/runtime/factories/chrome"
+	"v.io/x/ref/runtime/internal/lib/websocket"
 	"v.io/x/ref/services/wspr/internal/browspr"
 	"v.io/x/ref/services/wspr/internal/channel/channel_nacl"
 	"v.io/x/ref/services/wspr/internal/rpc/server"
diff --git a/services/wspr/internal/app/app_test.go b/services/wspr/internal/app/app_test.go
index 05c02cf..06fec30 100644
--- a/services/wspr/internal/app/app_test.go
+++ b/services/wspr/internal/app/app_test.go
@@ -25,7 +25,7 @@
 	"v.io/v23/vom"
 	"v.io/v23/vtrace"
 	vsecurity "v.io/x/ref/lib/security"
-	"v.io/x/ref/profiles"
+	"v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/services/mounttable/mounttablelib"
 	"v.io/x/ref/services/wspr/internal/lib"
 	"v.io/x/ref/services/wspr/internal/lib/testwriter"
diff --git a/services/wspr/internal/browspr/browspr_account_test.go b/services/wspr/internal/browspr/browspr_account_test.go
index 0155a26..eccef39 100644
--- a/services/wspr/internal/browspr/browspr_account_test.go
+++ b/services/wspr/internal/browspr/browspr_account_test.go
@@ -14,7 +14,7 @@
 	"v.io/v23/security"
 	"v.io/v23/vdl"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/test"
 )
 
diff --git a/services/wspr/internal/browspr/browspr_test.go b/services/wspr/internal/browspr/browspr_test.go
index 3fdf59c..329e385 100644
--- a/services/wspr/internal/browspr/browspr_test.go
+++ b/services/wspr/internal/browspr/browspr_test.go
@@ -22,7 +22,7 @@
 	vdltime "v.io/v23/vdlroot/time"
 	"v.io/v23/vom"
 
-	"v.io/x/ref/profiles"
+	"v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/services/mounttable/mounttablelib"
 	"v.io/x/ref/services/wspr/internal/app"
 	"v.io/x/ref/services/wspr/internal/lib"
diff --git a/services/wspr/internal/lib/signature_manager_test.go b/services/wspr/internal/lib/signature_manager_test.go
index 0f0de0e..94a0b43 100644
--- a/services/wspr/internal/lib/signature_manager_test.go
+++ b/services/wspr/internal/lib/signature_manager_test.go
@@ -13,7 +13,7 @@
 	"v.io/v23/context"
 	"v.io/v23/vdl"
 	"v.io/v23/vdlroot/signature"
-	"v.io/x/ref/profiles/fake"
+	"v.io/x/ref/runtime/factories/fake"
 	"v.io/x/ref/test"
 )
 
diff --git a/services/wspr/wsprd/main.go b/services/wspr/wsprd/main.go
index edc46c8..cde3f9f 100644
--- a/services/wspr/wsprd/main.go
+++ b/services/wspr/wsprd/main.go
@@ -18,7 +18,7 @@
 	"v.io/v23"
 	"v.io/x/ref/lib/signals"
 	// TODO(cnicolaou,benj): figure out how to support roaming as a chrome plugin
-	_ "v.io/x/ref/profiles/roaming"
+	_ "v.io/x/ref/runtime/factories/roaming"
 	"v.io/x/ref/services/wspr/wsprlib"
 )
 
diff --git a/test/hello/hello_v23_test.go b/test/hello/hello_v23_test.go
index ffaa2c3..20fbeb5 100644
--- a/test/hello/hello_v23_test.go
+++ b/test/hello/hello_v23_test.go
@@ -11,7 +11,7 @@
 
 	"v.io/x/ref/envvar"
 	"v.io/x/ref/lib/security"
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/test/modules"
 	"v.io/x/ref/test/testutil"
 	"v.io/x/ref/test/v23tests"
diff --git a/test/hello/helloclient/helloclient.go b/test/hello/helloclient/helloclient.go
index 7c7f199..a50ad5d 100644
--- a/test/hello/helloclient/helloclient.go
+++ b/test/hello/helloclient/helloclient.go
@@ -14,7 +14,7 @@
 	"v.io/v23"
 	"v.io/v23/context"
 	"v.io/v23/verror"
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 var name *string = flag.String("name", "", "Name of the hello server")
diff --git a/test/hello/helloserver/helloserver.go b/test/hello/helloserver/helloserver.go
index 212ca64..6ca4393 100644
--- a/test/hello/helloserver/helloserver.go
+++ b/test/hello/helloserver/helloserver.go
@@ -16,7 +16,7 @@
 	"v.io/v23/rpc"
 	"v.io/v23/security"
 	"v.io/x/ref/lib/signals"
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 var name *string = flag.String("name", "", "Name to publish under")
diff --git a/test/modules/modules_internal_test.go b/test/modules/modules_internal_test.go
index e01364b..7b44e65 100644
--- a/test/modules/modules_internal_test.go
+++ b/test/modules/modules_internal_test.go
@@ -11,7 +11,7 @@
 	"runtime"
 	"testing"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/test"
 )
 
diff --git a/test/modules/modules_test.go b/test/modules/modules_test.go
index 2cf0949..badd777 100644
--- a/test/modules/modules_test.go
+++ b/test/modules/modules_test.go
@@ -29,7 +29,7 @@
 	"v.io/x/ref/test/modules"
 	"v.io/x/ref/test/testutil"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 )
 
 func init() {
diff --git a/test/v23tests/internal/cached_test.go b/test/v23tests/internal/cached_test.go
index f13f7f9..129b7e1 100644
--- a/test/v23tests/internal/cached_test.go
+++ b/test/v23tests/internal/cached_test.go
@@ -13,7 +13,7 @@
 	"testing"
 	"time"
 
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/test"
 	"v.io/x/ref/test/v23tests"
 )
diff --git a/test/v23tests/v23tests_test.go b/test/v23tests/v23tests_test.go
index 4987ff3..3315aa3 100644
--- a/test/v23tests/v23tests_test.go
+++ b/test/v23tests/v23tests_test.go
@@ -22,7 +22,7 @@
 	"v.io/v23/security"
 
 	"v.io/x/ref/envvar"
-	_ "v.io/x/ref/profiles"
+	_ "v.io/x/ref/runtime/factories/generic"
 	"v.io/x/ref/test"
 	"v.io/x/ref/test/modules"
 	"v.io/x/ref/test/testutil"