all: rewrite import paths from upspin.io/exp to exp.upspin.io
diff --git a/client/gobind/gobind.go b/client/gobind/gobind.go
index 834d3e7..08402d5 100644
--- a/client/gobind/gobind.go
+++ b/client/gobind/gobind.go
@@ -11,7 +11,7 @@
 // or roundings are silently ignored.
 // This package is experimental and is NOT an official upspin.Client
 // implementation. Its definition may change or break without warning.
-package gobind // import "upspin.io/exp/client/gobind"
+package gobind // import "exp.upspin.io/client/gobind"
 
 // To regenerate the .aar archive for Android Java, run:
 //	go generate
diff --git a/cmd/camclient/main.go b/cmd/camclient/main.go
index 99d981b..ee8262b 100644
--- a/cmd/camclient/main.go
+++ b/cmd/camclient/main.go
@@ -3,8 +3,8 @@
 // license that can be found in the LICENSE file.
 
 // Command camclient serves a video stream generated by
-// upspin.io/exp/cmd/camserver over HTTP as a Motion JPEG stream.
-package main
+// exp.upspin.io/cmd/camserver over HTTP as a Motion JPEG stream.
+package main // import "exp.upspin.io/cmd/camclient"
 
 import (
 	"flag"
diff --git a/cmd/camserver/camserver.upbox b/cmd/camserver/camserver.upbox
index 0ba9f37..9b6d78a 100644
--- a/cmd/camserver/camserver.upbox
+++ b/cmd/camserver/camserver.upbox
@@ -9,7 +9,7 @@
   - name: storeserver
   - name: dirserver
   - name: camserver
-    importpath: upspin.io/exp/cmd/camserver
+    importpath: exp.upspin.io/cmd/camserver
     flags:
       readers: user@example.com
 
diff --git a/cmd/camserver/main.go b/cmd/camserver/main.go
index e8ac084..56101b7 100644
--- a/cmd/camserver/main.go
+++ b/cmd/camserver/main.go
@@ -5,7 +5,7 @@
 // Command camserver is an Upspin Directory and Store server that serves JPEG
 // images read from a webcam. It requires an ffmpeg binary be present in PATH.
 // It only works with the built in camera on MacOS machines, for now.
-package main
+package main // import "exp.upspin.io/cmd/camserver"
 
 import (
 	"flag"
diff --git a/cmd/demoserver/demoserver.upbox b/cmd/demoserver/demoserver.upbox
index 4027f9e..8f4119b 100644
--- a/cmd/demoserver/demoserver.upbox
+++ b/cmd/demoserver/demoserver.upbox
@@ -6,6 +6,6 @@
 servers:
   - name: keyserver
   - name: demoserver
-    importpath: upspin.io/exp/cmd/demoserver
+    importpath: exp.upspin.io/cmd/demoserver
 
 domain: example.com
diff --git a/cmd/demoserver/main.go b/cmd/demoserver/main.go
index 786a6fc..f3fd014 100644
--- a/cmd/demoserver/main.go
+++ b/cmd/demoserver/main.go
@@ -12,7 +12,7 @@
 // combined Upspin DirServer and StoreServer that serves dynamic content.
 //
 // See also: https://en.wikipedia.org/wiki/Schrödinger's_cat
-package main
+package main // import "exp.upspin.io/cmd/demoserver"
 
 import (
 	"fmt"
diff --git a/cmd/fileserver/fileserver.upbox b/cmd/fileserver/fileserver.upbox
index f38ae37..ec90626 100644
--- a/cmd/fileserver/fileserver.upbox
+++ b/cmd/fileserver/fileserver.upbox
@@ -6,7 +6,7 @@
 servers:
   - name: keyserver
   - name: fileserver
-    importpath: upspin.io/exp/cmd/fileserver
+    importpath: exp.upspin.io/cmd/fileserver
     flags:
       root: /tmp
 
diff --git a/cmd/fileserver/main.go b/cmd/fileserver/main.go
index a1b82ce..bcdec07 100644
--- a/cmd/fileserver/main.go
+++ b/cmd/fileserver/main.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // Command fileserver serves a local file system as an Upspin tree.
-package main
+package main // import "exp.upspin.io/cmd/fileserver"
 
 import (
 	"flag"
@@ -11,9 +11,10 @@
 	"net/http"
 	"os"
 
+	"exp.upspin.io/filesystem"
+
 	"upspin.io/cloud/https"
 	"upspin.io/config"
-	"upspin.io/exp/filesystem"
 	"upspin.io/flags"
 	"upspin.io/log"
 	"upspin.io/rpc/dirserver"
diff --git a/cmd/issueserver/issueserver.upbox b/cmd/issueserver/issueserver.upbox
index 90c738e..e791831 100644
--- a/cmd/issueserver/issueserver.upbox
+++ b/cmd/issueserver/issueserver.upbox
@@ -6,7 +6,7 @@
 servers:
   - name: keyserver
   - name: issueserver
-    importpath: upspin.io/exp/cmd/issueserver
+    importpath: exp.upspin.io/cmd/issueserver
     flags:
      watch-github: upspin/upspin
 
diff --git a/cmd/issueserver/main.go b/cmd/issueserver/main.go
index 5aa269b..66744b8 100644
--- a/cmd/issueserver/main.go
+++ b/cmd/issueserver/main.go
@@ -12,7 +12,7 @@
 //   $ upbox -schema=issueserver.upbox
 // If all goes well, upbox will leave you in an 'upspin shell' session as
 // issueserver@example.com. Type 'ls' to look around.
-package main
+package main // import "exp.upspin.io/cmd/issueserver"
 
 import (
 	"bytes"
diff --git a/filesystem/common.go b/filesystem/common.go
index 4977164..7903230 100644
--- a/filesystem/common.go
+++ b/filesystem/common.go
@@ -4,7 +4,7 @@
 
 // Package filesystem provides a DirServer and StoreServer that serve
 // files from a local file system.
-package filesystem // import "upspin.io/exp/filesystem"
+package filesystem // import "exp.upspin.io/filesystem"
 
 import (
 	"io/ioutil"