diff --git a/tools/application/impl.go b/tools/application/impl.go
index 182c929..183b966 100644
--- a/tools/application/impl.go
+++ b/tools/application/impl.go
@@ -11,10 +11,10 @@
 	"strings"
 	"time"
 
-	"v.io/lib/cmdline"
 	"v.io/core/veyron/services/mgmt/repository"
 	"v.io/core/veyron2/context"
 	"v.io/core/veyron2/services/mgmt/application"
+	"v.io/lib/cmdline"
 )
 
 func getEnvelopeJSON(ctx context.T, app repository.ApplicationClientMethods, profiles string) ([]byte, error) {
diff --git a/tools/binary/impl.go b/tools/binary/impl.go
index 2a9765c..a70168f 100644
--- a/tools/binary/impl.go
+++ b/tools/binary/impl.go
@@ -3,8 +3,8 @@
 import (
 	"fmt"
 
-	"v.io/lib/cmdline"
 	"v.io/core/veyron/services/mgmt/lib/binary"
+	"v.io/lib/cmdline"
 )
 
 var cmdDelete = &cmdline.Command{
diff --git a/tools/build/impl.go b/tools/build/impl.go
index 24d6935..e426a86 100644
--- a/tools/build/impl.go
+++ b/tools/build/impl.go
@@ -10,9 +10,9 @@
 	"strings"
 	"time"
 
-	"v.io/lib/cmdline"
 	"v.io/core/veyron2/context"
 	vbuild "v.io/core/veyron2/services/mgmt/build"
+	"v.io/lib/cmdline"
 )
 
 var (
diff --git a/tools/debug/impl.go b/tools/debug/impl.go
index 4965531..99a81b2 100644
--- a/tools/debug/impl.go
+++ b/tools/debug/impl.go
@@ -11,7 +11,6 @@
 	"sync"
 	"time"
 
-	"v.io/lib/cmdline"
 	"v.io/core/veyron/lib/glob"
 	"v.io/core/veyron/lib/signals"
 	"v.io/core/veyron/services/mgmt/pprof/client"
@@ -28,6 +27,7 @@
 	"v.io/core/veyron2/uniqueid"
 	"v.io/core/veyron2/vdl/vdlutil"
 	"v.io/core/veyron2/vtrace"
+	"v.io/lib/cmdline"
 )
 
 var (
diff --git a/tools/mgmt/device/acl_impl.go b/tools/mgmt/device/acl_impl.go
index 4933969..441e51a 100644
--- a/tools/mgmt/device/acl_impl.go
+++ b/tools/mgmt/device/acl_impl.go
@@ -5,11 +5,11 @@
 import (
 	"fmt"
 
-	"v.io/lib/cmdline"
 	"v.io/core/veyron2/security"
 	"v.io/core/veyron2/services/mgmt/device"
 	"v.io/core/veyron2/services/security/access"
 	verror "v.io/core/veyron2/verror2"
+	"v.io/lib/cmdline"
 )
 
 var cmdGet = &cmdline.Command{
diff --git a/tools/mgmt/device/associate_impl.go b/tools/mgmt/device/associate_impl.go
index 5e9947c..fdcdb38 100644
--- a/tools/mgmt/device/associate_impl.go
+++ b/tools/mgmt/device/associate_impl.go
@@ -4,8 +4,8 @@
 	"fmt"
 	"time"
 
-	"v.io/lib/cmdline"
 	"v.io/core/veyron2/services/mgmt/device"
+	"v.io/lib/cmdline"
 )
 
 var cmdList = &cmdline.Command{
diff --git a/tools/mgmt/device/impl.go b/tools/mgmt/device/impl.go
index a42c0cd..809d287 100644
--- a/tools/mgmt/device/impl.go
+++ b/tools/mgmt/device/impl.go
@@ -3,11 +3,11 @@
 import (
 	"fmt"
 
-	"v.io/lib/cmdline"
 	"v.io/core/veyron2/ipc"
 	"v.io/core/veyron2/naming"
 	"v.io/core/veyron2/security"
 	"v.io/core/veyron2/services/mgmt/device"
+	"v.io/lib/cmdline"
 )
 
 var cmdInstall = &cmdline.Command{
diff --git a/tools/mgmt/device/instance_impl.go b/tools/mgmt/device/instance_impl.go
index f3b1364..0e1890a 100644
--- a/tools/mgmt/device/instance_impl.go
+++ b/tools/mgmt/device/instance_impl.go
@@ -5,8 +5,8 @@
 import (
 	"fmt"
 
-	"v.io/lib/cmdline"
 	"v.io/core/veyron2/services/mgmt/device"
+	"v.io/lib/cmdline"
 )
 
 var cmdStop = &cmdline.Command{
diff --git a/tools/mounttable/impl.go b/tools/mounttable/impl.go
index d0877fc..a6f568c 100644
--- a/tools/mounttable/impl.go
+++ b/tools/mounttable/impl.go
@@ -5,10 +5,10 @@
 	"fmt"
 	"time"
 
-	"v.io/lib/cmdline"
 	"v.io/core/veyron2/ipc"
 	"v.io/core/veyron2/naming"
 	"v.io/core/veyron2/options"
+	"v.io/lib/cmdline"
 )
 
 var cmdGlob = &cmdline.Command{
diff --git a/tools/namespace/impl.go b/tools/namespace/impl.go
index d8d7063..ea408bd 100644
--- a/tools/namespace/impl.go
+++ b/tools/namespace/impl.go
@@ -4,9 +4,9 @@
 	"fmt"
 	"time"
 
-	"v.io/lib/cmdline"
 	"v.io/core/veyron2/naming"
 	"v.io/core/veyron2/vlog"
+	"v.io/lib/cmdline"
 )
 
 var cmdGlob = &cmdline.Command{
diff --git a/tools/principal/main.go b/tools/principal/main.go
index 4144414..14fb1b3 100644
--- a/tools/principal/main.go
+++ b/tools/principal/main.go
@@ -12,7 +12,6 @@
 	"os/user"
 	"time"
 
-	"v.io/lib/cmdline"
 	profile "v.io/core/veyron/profiles/static"
 	vsecurity "v.io/core/veyron/security"
 	"v.io/core/veyron/services/identity"
@@ -22,6 +21,7 @@
 	"v.io/core/veyron2/rt"
 	"v.io/core/veyron2/security"
 	"v.io/core/veyron2/vom"
+	"v.io/lib/cmdline"
 )
 
 var (
diff --git a/tools/profile/impl.go b/tools/profile/impl.go
index 40efa04..6d2c1eb 100644
--- a/tools/profile/impl.go
+++ b/tools/profile/impl.go
@@ -4,10 +4,10 @@
 	"fmt"
 	"time"
 
-	"v.io/lib/cmdline"
 	"v.io/core/veyron/services/mgmt/profile"
 	"v.io/core/veyron/services/mgmt/repository"
 	"v.io/core/veyron2/services/mgmt/build"
+	"v.io/lib/cmdline"
 )
 
 var cmdLabel = &cmdline.Command{
diff --git a/tools/vrpc/impl.go b/tools/vrpc/impl.go
index dd8fc20..d75c8f8 100644
--- a/tools/vrpc/impl.go
+++ b/tools/vrpc/impl.go
@@ -6,7 +6,6 @@
 	"io"
 	"time"
 
-	"v.io/lib/cmdline"
 	idl_test_base "v.io/core/veyron/tools/vrpc/test_base"
 	"v.io/core/veyron2"
 	"v.io/core/veyron2/context"
@@ -15,6 +14,7 @@
 	"v.io/core/veyron2/vdl/vdlutil"
 	"v.io/core/veyron2/vom"
 	"v.io/core/veyron2/wiretype"
+	"v.io/lib/cmdline"
 
 	idl_binary "v.io/core/veyron2/services/mgmt/binary"
 	idl_device "v.io/core/veyron2/services/mgmt/device"
diff --git a/tools/vrpc/impl_test.go b/tools/vrpc/impl_test.go
index 48c844b..8de58ab 100644
--- a/tools/vrpc/impl_test.go
+++ b/tools/vrpc/impl_test.go
@@ -12,9 +12,9 @@
 	"v.io/core/veyron2/rt"
 	"v.io/core/veyron2/vlog"
 
-	"v.io/lib/cmdline"
 	"v.io/core/veyron/profiles"
 	"v.io/core/veyron/tools/vrpc/test_base"
+	"v.io/lib/cmdline"
 )
 
 type server struct{}
diff --git a/tools/vrun/vrun.go b/tools/vrun/vrun.go
index a13d73d..cb83f86 100644
--- a/tools/vrun/vrun.go
+++ b/tools/vrun/vrun.go
@@ -7,10 +7,10 @@
 	"syscall"
 	"time"
 
-	"v.io/lib/cmdline"
 	"v.io/core/veyron/lib/flags/consts"
 	"v.io/core/veyron/security/agent"
 	"v.io/core/veyron/security/agent/keymgr"
+	"v.io/lib/cmdline"
 
 	"v.io/core/veyron2"
 	"v.io/core/veyron2/options"