TBR x/ref: Rename services/security/access to security/access

Rename services/security/access/object to services/security/object

MultiPart: 2/7
Change-Id: Ie20e90302b18765fd6b54bdc39da02db75dda795
diff --git a/cmd/application/impl_test.go b/cmd/application/impl_test.go
index 5df47a9..7943205 100644
--- a/cmd/application/impl_test.go
+++ b/cmd/application/impl_test.go
@@ -16,8 +16,8 @@
 	"v.io/v23/naming"
 	"v.io/v23/rpc"
 	"v.io/v23/security"
+	"v.io/v23/security/access"
 	"v.io/v23/services/mgmt/application"
-	"v.io/v23/services/security/access"
 	"v.io/x/lib/vlog"
 
 	_ "v.io/x/ref/profiles"
diff --git a/cmd/binary/impl_test.go b/cmd/binary/impl_test.go
index 8d53851..79fafa1 100644
--- a/cmd/binary/impl_test.go
+++ b/cmd/binary/impl_test.go
@@ -20,9 +20,9 @@
 	"v.io/v23/naming"
 	"v.io/v23/rpc"
 	"v.io/v23/security"
+	"v.io/v23/security/access"
 	"v.io/v23/services/mgmt/binary"
 	"v.io/v23/services/mgmt/repository"
-	"v.io/v23/services/security/access"
 	"v.io/x/lib/vlog"
 
 	_ "v.io/x/ref/profiles"
diff --git a/cmd/mgmt/device/acl_impl.go b/cmd/mgmt/device/acl_impl.go
index fd81a77..65f427a 100644
--- a/cmd/mgmt/device/acl_impl.go
+++ b/cmd/mgmt/device/acl_impl.go
@@ -10,8 +10,8 @@
 	"fmt"
 
 	"v.io/v23/security"
+	"v.io/v23/security/access"
 	"v.io/v23/services/mgmt/device"
-	"v.io/v23/services/security/access"
 	"v.io/v23/verror"
 	"v.io/x/lib/cmdline"
 )
diff --git a/cmd/mgmt/device/acl_test.go b/cmd/mgmt/device/acl_test.go
index 3977bb7..a8894e4 100644
--- a/cmd/mgmt/device/acl_test.go
+++ b/cmd/mgmt/device/acl_test.go
@@ -12,7 +12,7 @@
 	"testing"
 
 	"v.io/v23/security"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 	"v.io/v23/verror"
 
 	cmd_device "v.io/x/ref/cmd/mgmt/device"
diff --git a/cmd/mgmt/device/devicemanager_mock_test.go b/cmd/mgmt/device/devicemanager_mock_test.go
index 7828a91..41b2190 100644
--- a/cmd/mgmt/device/devicemanager_mock_test.go
+++ b/cmd/mgmt/device/devicemanager_mock_test.go
@@ -17,11 +17,11 @@
 	"v.io/v23/naming"
 	"v.io/v23/rpc"
 	"v.io/v23/security"
+	"v.io/v23/security/access"
 	"v.io/v23/services/mgmt/application"
 	"v.io/v23/services/mgmt/binary"
 	"v.io/v23/services/mgmt/device"
 	"v.io/v23/services/mgmt/repository"
-	"v.io/v23/services/security/access"
 	"v.io/x/lib/vlog"
 
 	binlib "v.io/x/ref/services/mgmt/lib/binary"
diff --git a/cmd/mgmt/device/local_install.go b/cmd/mgmt/device/local_install.go
index eb3d6e1..f722b65 100644
--- a/cmd/mgmt/device/local_install.go
+++ b/cmd/mgmt/device/local_install.go
@@ -19,11 +19,11 @@
 	"v.io/v23/naming"
 	"v.io/v23/rpc"
 	"v.io/v23/security"
+	"v.io/v23/security/access"
 	"v.io/v23/services/mgmt/application"
 	"v.io/v23/services/mgmt/binary"
 	"v.io/v23/services/mgmt/device"
 	"v.io/v23/services/mgmt/repository"
-	"v.io/v23/services/security/access"
 	"v.io/v23/uniqueid"
 	"v.io/x/lib/vlog"
 
diff --git a/cmd/mgmt/device/publish.go b/cmd/mgmt/device/publish.go
index f2bb269..7f225fa 100644
--- a/cmd/mgmt/device/publish.go
+++ b/cmd/mgmt/device/publish.go
@@ -15,9 +15,9 @@
 
 	"v.io/v23/naming"
 	"v.io/v23/security"
+	"v.io/v23/security/access"
 	"v.io/v23/services/mgmt/application"
-	"v.io/v23/services/security/access"
-	"v.io/v23/services/security/access/object"
+	"v.io/v23/services/security/object"
 	"v.io/v23/verror"
 
 	"v.io/x/lib/cmdline"
diff --git a/cmd/mounttable/impl_test.go b/cmd/mounttable/impl_test.go
index b5c7c60..348319b 100644
--- a/cmd/mounttable/impl_test.go
+++ b/cmd/mounttable/impl_test.go
@@ -16,8 +16,8 @@
 	"v.io/v23/naming"
 	"v.io/v23/rpc"
 	"v.io/v23/security"
+	"v.io/v23/security/access"
 	"v.io/v23/services/mounttable"
-	"v.io/v23/services/security/access"
 	vdltime "v.io/v23/vdlroot/time"
 	"v.io/x/lib/vlog"
 
diff --git a/examples/rps/service.vdl b/examples/rps/service.vdl
index e7f593c..f9afda2 100644
--- a/examples/rps/service.vdl
+++ b/examples/rps/service.vdl
@@ -20,7 +20,7 @@
 
 import (
 	"time"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 )
 
 type RockPaperScissors interface {
diff --git a/examples/rps/service.vdl.go b/examples/rps/service.vdl.go
index 6c1afec..8cd98c2 100644
--- a/examples/rps/service.vdl.go
+++ b/examples/rps/service.vdl.go
@@ -31,7 +31,7 @@
 
 	// VDL user imports
 	"time"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 	_ "v.io/v23/vdlroot/time"
 )
 
diff --git a/examples/tunnel/tunnel.vdl b/examples/tunnel/tunnel.vdl
index 4f48f5e..24629ba 100644
--- a/examples/tunnel/tunnel.vdl
+++ b/examples/tunnel/tunnel.vdl
@@ -6,7 +6,7 @@
 // network tunnel from the client to the server.
 package tunnel
 
-import "v.io/v23/services/security/access"
+import "v.io/v23/security/access"
 
 type Tunnel interface {
   // The Forward method is used for network forwarding. All the data sent over
diff --git a/examples/tunnel/tunnel.vdl.go b/examples/tunnel/tunnel.vdl.go
index fcdbfd1..5023a9e 100644
--- a/examples/tunnel/tunnel.vdl.go
+++ b/examples/tunnel/tunnel.vdl.go
@@ -18,7 +18,7 @@
 	"v.io/v23/vdl"
 
 	// VDL user imports
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 )
 
 type ShellOpts struct {
diff --git a/profiles/internal/naming/namespace/acl.go b/profiles/internal/naming/namespace/acl.go
index 64d0fbb..61f6a0d 100644
--- a/profiles/internal/naming/namespace/acl.go
+++ b/profiles/internal/naming/namespace/acl.go
@@ -9,7 +9,7 @@
 	"v.io/v23/context"
 	"v.io/v23/options"
 	"v.io/v23/rpc"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 	"v.io/x/lib/vlog"
 )
 
diff --git a/profiles/internal/naming/namespace/acl_test.go b/profiles/internal/naming/namespace/acl_test.go
index 9d466bf..d64b009 100644
--- a/profiles/internal/naming/namespace/acl_test.go
+++ b/profiles/internal/naming/namespace/acl_test.go
@@ -14,7 +14,7 @@
 	"v.io/v23/naming"
 	"v.io/v23/rpc"
 	"v.io/v23/security"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 
 	_ "v.io/x/ref/profiles"
 	service "v.io/x/ref/services/mounttable/lib"
diff --git a/profiles/internal/rpc/benchmark/benchmark.vdl b/profiles/internal/rpc/benchmark/benchmark.vdl
index c5ca138..c3aacaa 100644
--- a/profiles/internal/rpc/benchmark/benchmark.vdl
+++ b/profiles/internal/rpc/benchmark/benchmark.vdl
@@ -7,7 +7,7 @@
 package benchmark
 
 import (
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 )
 
 type Benchmark interface {
diff --git a/profiles/internal/rpc/benchmark/benchmark.vdl.go b/profiles/internal/rpc/benchmark/benchmark.vdl.go
index b432604..84e7d4f 100644
--- a/profiles/internal/rpc/benchmark/benchmark.vdl.go
+++ b/profiles/internal/rpc/benchmark/benchmark.vdl.go
@@ -18,7 +18,7 @@
 	"v.io/v23/vdl"
 
 	// VDL user imports
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 )
 
 // BenchmarkClientMethods is the client interface
diff --git a/profiles/internal/rpc/full_test.go b/profiles/internal/rpc/full_test.go
index 64c68fe..40995e0 100644
--- a/profiles/internal/rpc/full_test.go
+++ b/profiles/internal/rpc/full_test.go
@@ -26,7 +26,7 @@
 	"v.io/v23/options"
 	"v.io/v23/rpc"
 	"v.io/v23/security"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 	"v.io/v23/uniqueid"
 	"v.io/v23/vdl"
 	"v.io/v23/verror"
diff --git a/profiles/internal/rpc/reserved.go b/profiles/internal/rpc/reserved.go
index f25e6db..890f5c3 100644
--- a/profiles/internal/rpc/reserved.go
+++ b/profiles/internal/rpc/reserved.go
@@ -12,7 +12,7 @@
 	"v.io/v23/rpc"
 	"v.io/v23/rpc/reserved"
 	"v.io/v23/security"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 	"v.io/v23/vdl"
 	"v.io/v23/vdlroot/signature"
 	"v.io/v23/verror"
diff --git a/profiles/internal/rpc/server.go b/profiles/internal/rpc/server.go
index 8efaf7e..8ed14e8 100644
--- a/profiles/internal/rpc/server.go
+++ b/profiles/internal/rpc/server.go
@@ -21,7 +21,7 @@
 	"v.io/v23/options"
 	"v.io/v23/rpc"
 	"v.io/v23/security"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 	"v.io/v23/vdl"
 	"v.io/v23/verror"
 	"v.io/v23/vom"
diff --git a/profiles/internal/rpc/stress/stress.vdl b/profiles/internal/rpc/stress/stress.vdl
index cf7bff1..dd89068 100644
--- a/profiles/internal/rpc/stress/stress.vdl
+++ b/profiles/internal/rpc/stress/stress.vdl
@@ -5,7 +5,7 @@
 package stress
 
 import (
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 )
 
 type Arg struct {
diff --git a/profiles/internal/rpc/stress/stress.vdl.go b/profiles/internal/rpc/stress/stress.vdl.go
index 35efd30..100df93 100644
--- a/profiles/internal/rpc/stress/stress.vdl.go
+++ b/profiles/internal/rpc/stress/stress.vdl.go
@@ -16,7 +16,7 @@
 	"v.io/v23/vdl"
 
 	// VDL user imports
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 )
 
 type Arg struct {
diff --git a/profiles/internal/testing/mocks/naming/namespace.go b/profiles/internal/testing/mocks/naming/namespace.go
index 73be209..39dde7a 100644
--- a/profiles/internal/testing/mocks/naming/namespace.go
+++ b/profiles/internal/testing/mocks/naming/namespace.go
@@ -14,7 +14,7 @@
 	"v.io/v23/naming"
 	"v.io/v23/naming/ns"
 	"v.io/v23/security"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
 
diff --git a/security/flag/flag.go b/security/flag/flag.go
index 137fe2c..7be9dd0 100644
--- a/security/flag/flag.go
+++ b/security/flag/flag.go
@@ -12,7 +12,7 @@
 	"os"
 
 	"v.io/v23/security"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 	"v.io/v23/verror"
 
 	"v.io/x/ref/lib/flags"
diff --git a/security/flag/flag_test.go b/security/flag/flag_test.go
index b20a07f..7a53492 100644
--- a/security/flag/flag_test.go
+++ b/security/flag/flag_test.go
@@ -15,7 +15,7 @@
 	"testing"
 
 	"v.io/v23/security"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 
 	"v.io/x/ref/test/modules"
 )
diff --git a/services/mgmt/application/applicationd/acl_test.go b/services/mgmt/application/applicationd/acl_test.go
index e4679a7..99c3b03 100644
--- a/services/mgmt/application/applicationd/acl_test.go
+++ b/services/mgmt/application/applicationd/acl_test.go
@@ -15,8 +15,8 @@
 	"v.io/v23"
 	"v.io/v23/naming"
 	"v.io/v23/security"
+	"v.io/v23/security/access"
 	"v.io/v23/services/mgmt/application"
-	"v.io/v23/services/security/access"
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
 
diff --git a/services/mgmt/application/applicationd/dispatcher.go b/services/mgmt/application/applicationd/dispatcher.go
index f9ac2ae..04c03e8 100644
--- a/services/mgmt/application/applicationd/dispatcher.go
+++ b/services/mgmt/application/applicationd/dispatcher.go
@@ -10,7 +10,7 @@
 	"v.io/v23/naming"
 	"v.io/v23/rpc"
 	"v.io/v23/security"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 	"v.io/v23/verror"
 
 	"v.io/x/ref/services/mgmt/lib/acls"
diff --git a/services/mgmt/application/applicationd/service.go b/services/mgmt/application/applicationd/service.go
index 81e35d5..7ec48b8 100644
--- a/services/mgmt/application/applicationd/service.go
+++ b/services/mgmt/application/applicationd/service.go
@@ -13,8 +13,8 @@
 
 	"v.io/v23/naming"
 	"v.io/v23/rpc"
+	"v.io/v23/security/access"
 	"v.io/v23/services/mgmt/application"
-	"v.io/v23/services/security/access"
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
 )
diff --git a/services/mgmt/binary/impl/acl_test.go b/services/mgmt/binary/impl/acl_test.go
index 4670f36..dc90be2 100644
--- a/services/mgmt/binary/impl/acl_test.go
+++ b/services/mgmt/binary/impl/acl_test.go
@@ -16,8 +16,8 @@
 	"v.io/v23/context"
 	"v.io/v23/naming"
 	"v.io/v23/security"
+	"v.io/v23/security/access"
 	"v.io/v23/services/mgmt/repository"
-	"v.io/v23/services/security/access"
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
 
diff --git a/services/mgmt/binary/impl/service.go b/services/mgmt/binary/impl/service.go
index d7fa896..46e4b0f 100644
--- a/services/mgmt/binary/impl/service.go
+++ b/services/mgmt/binary/impl/service.go
@@ -42,9 +42,9 @@
 
 	"v.io/v23/rpc"
 	"v.io/v23/security"
+	"v.io/v23/security/access"
 	"v.io/v23/services/mgmt/binary"
 	"v.io/v23/services/mgmt/repository"
-	"v.io/v23/services/security/access"
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
 	"v.io/x/ref/services/mgmt/lib/acls"
diff --git a/services/mgmt/device/impl/acl_propagator.go b/services/mgmt/device/impl/acl_propagator.go
index 0dacc31..944ea60 100644
--- a/services/mgmt/device/impl/acl_propagator.go
+++ b/services/mgmt/device/impl/acl_propagator.go
@@ -8,7 +8,7 @@
 	"path/filepath"
 
 	"v.io/v23/security"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 
 	"v.io/x/ref/services/mgmt/lib/acls"
 )
diff --git a/services/mgmt/device/impl/app_service.go b/services/mgmt/device/impl/app_service.go
index 9801323..9a72262 100644
--- a/services/mgmt/device/impl/app_service.go
+++ b/services/mgmt/device/impl/app_service.go
@@ -144,10 +144,10 @@
 	"v.io/v23/naming"
 	"v.io/v23/rpc"
 	"v.io/v23/security"
+	"v.io/v23/security/access"
 	"v.io/v23/services/mgmt/appcycle"
 	"v.io/v23/services/mgmt/application"
 	"v.io/v23/services/mgmt/device"
-	"v.io/v23/services/security/access"
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
 
diff --git a/services/mgmt/device/impl/claim.go b/services/mgmt/device/impl/claim.go
index 8311361..d58e9b2 100644
--- a/services/mgmt/device/impl/claim.go
+++ b/services/mgmt/device/impl/claim.go
@@ -12,7 +12,7 @@
 	"v.io/v23/context"
 	"v.io/v23/rpc"
 	"v.io/v23/security"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
 	"v.io/x/ref/services/mgmt/lib/acls"
diff --git a/services/mgmt/device/impl/debug_acls_test.go b/services/mgmt/device/impl/debug_acls_test.go
index 40cd3d8..a7bcb6b 100644
--- a/services/mgmt/device/impl/debug_acls_test.go
+++ b/services/mgmt/device/impl/debug_acls_test.go
@@ -12,8 +12,8 @@
 	"v.io/v23/context"
 	"v.io/v23/naming"
 	"v.io/v23/security"
-	"v.io/v23/services/security/access"
-	"v.io/v23/services/security/access/object"
+	"v.io/v23/security/access"
+	"v.io/v23/services/security/object"
 	"v.io/v23/verror"
 
 	mgmttest "v.io/x/ref/services/mgmt/lib/testutil"
diff --git a/services/mgmt/device/impl/device_service.go b/services/mgmt/device/impl/device_service.go
index 4d7c33d..86a3ae1 100644
--- a/services/mgmt/device/impl/device_service.go
+++ b/services/mgmt/device/impl/device_service.go
@@ -57,10 +57,10 @@
 	"v.io/v23/naming"
 	"v.io/v23/rpc"
 	"v.io/v23/security"
+	"v.io/v23/security/access"
 	"v.io/v23/services/mgmt/application"
 	"v.io/v23/services/mgmt/binary"
 	"v.io/v23/services/mgmt/device"
-	"v.io/v23/services/security/access"
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
 	"v.io/x/ref/lib/flags/buildinfo"
diff --git a/services/mgmt/device/impl/dispatcher.go b/services/mgmt/device/impl/dispatcher.go
index c321cfb..044243b 100644
--- a/services/mgmt/device/impl/dispatcher.go
+++ b/services/mgmt/device/impl/dispatcher.go
@@ -24,10 +24,10 @@
 	"v.io/v23/naming"
 	"v.io/v23/rpc"
 	"v.io/v23/security"
+	"v.io/v23/security/access"
 	"v.io/v23/services/mgmt/device"
 	"v.io/v23/services/mgmt/pprof"
 	"v.io/v23/services/mgmt/stats"
-	"v.io/v23/services/security/access"
 	"v.io/v23/vdl"
 	"v.io/v23/vdlroot/signature"
 	"v.io/v23/verror"
diff --git a/services/mgmt/device/impl/impl_test.go b/services/mgmt/device/impl/impl_test.go
index 9709de7..45e366d 100644
--- a/services/mgmt/device/impl/impl_test.go
+++ b/services/mgmt/device/impl/impl_test.go
@@ -37,10 +37,10 @@
 	"v.io/v23/naming"
 	"v.io/v23/rpc"
 	"v.io/v23/security"
+	"v.io/v23/security/access"
 	"v.io/v23/services/mgmt/application"
 	"v.io/v23/services/mgmt/device"
 	"v.io/v23/services/mgmt/repository"
-	"v.io/v23/services/security/access"
 	"v.io/v23/verror"
 
 	"v.io/x/ref/envvar"
diff --git a/services/mgmt/device/impl/mock_repo_test.go b/services/mgmt/device/impl/mock_repo_test.go
index 7c08d4a..04d9817 100644
--- a/services/mgmt/device/impl/mock_repo_test.go
+++ b/services/mgmt/device/impl/mock_repo_test.go
@@ -16,10 +16,10 @@
 
 	"v.io/v23/context"
 	"v.io/v23/rpc"
+	"v.io/v23/security/access"
 	"v.io/v23/services/mgmt/application"
 	"v.io/v23/services/mgmt/binary"
 	"v.io/v23/services/mgmt/repository"
-	"v.io/v23/services/security/access"
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
 
diff --git a/services/mgmt/device/impl/proxy_invoker.go b/services/mgmt/device/impl/proxy_invoker.go
index b37174f..a78cf55 100644
--- a/services/mgmt/device/impl/proxy_invoker.go
+++ b/services/mgmt/device/impl/proxy_invoker.go
@@ -12,7 +12,7 @@
 	"v.io/v23/context"
 	"v.io/v23/naming"
 	"v.io/v23/rpc"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 	"v.io/v23/vdl"
 	"v.io/v23/vdlroot/signature"
 	"v.io/v23/verror"
diff --git a/services/mgmt/device/impl/proxy_invoker_test.go b/services/mgmt/device/impl/proxy_invoker_test.go
index f62026d..ef6063b 100644
--- a/services/mgmt/device/impl/proxy_invoker_test.go
+++ b/services/mgmt/device/impl/proxy_invoker_test.go
@@ -12,8 +12,8 @@
 	"v.io/v23/naming"
 	"v.io/v23/rpc"
 	"v.io/v23/security"
+	"v.io/v23/security/access"
 	"v.io/v23/services/mgmt/stats"
-	"v.io/v23/services/security/access"
 
 	"v.io/x/lib/vlog"
 
diff --git a/services/mgmt/lib/acls/aclaccess.go b/services/mgmt/lib/acls/aclaccess.go
index 510233a..7d11555 100644
--- a/services/mgmt/lib/acls/aclaccess.go
+++ b/services/mgmt/lib/acls/aclaccess.go
@@ -15,7 +15,7 @@
 	"sync"
 
 	"v.io/v23/security"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
 
diff --git a/services/mgmt/lib/acls/etag.go b/services/mgmt/lib/acls/etag.go
index 8288b78..50d84bf 100644
--- a/services/mgmt/lib/acls/etag.go
+++ b/services/mgmt/lib/acls/etag.go
@@ -11,11 +11,11 @@
 	"crypto/md5"
 	"encoding/hex"
 
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 )
 
 // ComputeEtag produces the tag value returned by access.GetPermissions() (per
-// v.io/v23/services/security/access/service.vdl) that GetPermissions()/SetPermissions()
+// v.io/v23/security/access/service.vdl) that GetPermissions()/SetPermissions()
 // use to determine if the AccessLists have been asynchronously modified.
 func ComputeEtag(acl access.Permissions) (string, error) {
 	b := new(bytes.Buffer)
diff --git a/services/mgmt/lib/acls/hierarchical_authorizer.go b/services/mgmt/lib/acls/hierarchical_authorizer.go
index 79a98f9..142b59d 100644
--- a/services/mgmt/lib/acls/hierarchical_authorizer.go
+++ b/services/mgmt/lib/acls/hierarchical_authorizer.go
@@ -7,7 +7,7 @@
 import (
 	"v.io/v23/context"
 	"v.io/v23/security"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 	"v.io/x/lib/vlog"
 )
 
diff --git a/services/mgmt/lib/fs/simplestore.go b/services/mgmt/lib/fs/simplestore.go
index 1039135..442d327 100644
--- a/services/mgmt/lib/fs/simplestore.go
+++ b/services/mgmt/lib/fs/simplestore.go
@@ -18,8 +18,8 @@
 	"v.io/x/ref/services/mgmt/profile"
 
 	"v.io/v23/security"
+	"v.io/v23/security/access"
 	"v.io/v23/services/mgmt/application"
-	"v.io/v23/services/security/access"
 	"v.io/v23/verror"
 	"v.io/v23/vom"
 )
diff --git a/services/mgmt/repository/repository.vdl b/services/mgmt/repository/repository.vdl
index 23827e5..4f6f1b3 100644
--- a/services/mgmt/repository/repository.vdl
+++ b/services/mgmt/repository/repository.vdl
@@ -7,9 +7,9 @@
 package repository
 
 import (
-	"v.io/x/ref/services/mgmt/profile"
+	"v.io/v23/security/access"
 	"v.io/v23/services/mgmt/application"
-	"v.io/v23/services/security/access"
+	"v.io/x/ref/services/mgmt/profile"
 	public "v.io/v23/services/mgmt/repository"
 )
 
diff --git a/services/mgmt/repository/repository.vdl.go b/services/mgmt/repository/repository.vdl.go
index 33be89d..cdeec9a 100644
--- a/services/mgmt/repository/repository.vdl.go
+++ b/services/mgmt/repository/repository.vdl.go
@@ -17,10 +17,10 @@
 	"v.io/v23/vdl"
 
 	// VDL user imports
+	"v.io/v23/security/access"
 	"v.io/v23/services/mgmt/application"
 	"v.io/v23/services/mgmt/repository"
-	"v.io/v23/services/security/access"
-	"v.io/v23/services/security/access/object"
+	"v.io/v23/services/security/object"
 	"v.io/x/ref/services/mgmt/profile"
 )
 
diff --git a/services/mounttable/lib/mounttable.go b/services/mounttable/lib/mounttable.go
index 586725c..e40e986 100644
--- a/services/mounttable/lib/mounttable.go
+++ b/services/mounttable/lib/mounttable.go
@@ -20,8 +20,8 @@
 	"v.io/v23/naming"
 	"v.io/v23/rpc"
 	"v.io/v23/security"
+	"v.io/v23/security/access"
 	"v.io/v23/services/mounttable"
-	"v.io/v23/services/security/access"
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
 )
@@ -81,7 +81,7 @@
 //
 // aclfile is a JSON-encoded mapping from paths in the mounttable to the
 // access.Permissions for that path. The tags used in the map are the typical
-// access tags (the Tag type defined in v.io/v23/services/security/access).
+// access tags (the Tag type defined in v.io/v23/security/access).
 func NewMountTableDispatcher(aclfile string) (rpc.Dispatcher, error) {
 	mt := &mountTable{
 		root: new(node),
diff --git a/services/mounttable/lib/mounttable_test.go b/services/mounttable/lib/mounttable_test.go
index a8c3913..a156f10 100644
--- a/services/mounttable/lib/mounttable_test.go
+++ b/services/mounttable/lib/mounttable_test.go
@@ -19,7 +19,7 @@
 	"v.io/v23/options"
 	"v.io/v23/rpc"
 	"v.io/v23/security"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 	"v.io/x/lib/vlog"
 
 	_ "v.io/x/ref/profiles"
diff --git a/services/mounttable/lib/neighborhood.go b/services/mounttable/lib/neighborhood.go
index b04535e..034867e 100644
--- a/services/mounttable/lib/neighborhood.go
+++ b/services/mounttable/lib/neighborhood.go
@@ -19,8 +19,8 @@
 	"v.io/v23/naming"
 	"v.io/v23/rpc"
 	"v.io/v23/security"
+	"v.io/v23/security/access"
 	"v.io/v23/services/mounttable"
-	"v.io/v23/services/security/access"
 	vdltime "v.io/v23/vdlroot/time"
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
diff --git a/services/mounttable/lib/tamg.go b/services/mounttable/lib/tamg.go
index e21dbae..568852e 100644
--- a/services/mounttable/lib/tamg.go
+++ b/services/mounttable/lib/tamg.go
@@ -8,7 +8,7 @@
 	"strconv"
 
 	"v.io/v23/security"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 	"v.io/v23/verror"
 )
 
diff --git a/services/security/groups/grpserverd/main.go b/services/security/groups/grpserverd/main.go
index fb7eeca..dab3768 100644
--- a/services/security/groups/grpserverd/main.go
+++ b/services/security/groups/grpserverd/main.go
@@ -12,7 +12,7 @@
 	"flag"
 
 	"v.io/v23"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 	"v.io/x/lib/vlog"
 
 	"v.io/x/ref/lib/signals"
diff --git a/services/security/groups/server/group.go b/services/security/groups/server/group.go
index 508b444..b275a7a 100644
--- a/services/security/groups/server/group.go
+++ b/services/security/groups/server/group.go
@@ -7,7 +7,7 @@
 import (
 	"v.io/v23/rpc"
 	"v.io/v23/security"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 	"v.io/v23/services/security/groups"
 	"v.io/v23/verror"
 )
diff --git a/services/security/groups/server/manager.go b/services/security/groups/server/manager.go
index a5eec45..aa0c7ff 100644
--- a/services/security/groups/server/manager.go
+++ b/services/security/groups/server/manager.go
@@ -9,7 +9,7 @@
 
 	"v.io/v23/rpc"
 	"v.io/v23/security"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 	"v.io/v23/services/security/groups"
 )
 
diff --git a/services/security/groups/server/server_test.go b/services/security/groups/server/server_test.go
index ece1dc8..ed5c490 100644
--- a/services/security/groups/server/server_test.go
+++ b/services/security/groups/server/server_test.go
@@ -13,7 +13,7 @@
 	"v.io/v23/context"
 	"v.io/v23/naming"
 	"v.io/v23/security"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 	"v.io/v23/services/security/groups"
 	"v.io/v23/verror"
 	"v.io/x/lib/vlog"
diff --git a/services/security/groups/server/types.vdl b/services/security/groups/server/types.vdl
index aa695c8..cefcb08 100644
--- a/services/security/groups/server/types.vdl
+++ b/services/security/groups/server/types.vdl
@@ -5,7 +5,7 @@
 package server
 
 import (
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 	"v.io/v23/services/security/groups"
 )
 
diff --git a/services/security/groups/server/types.vdl.go b/services/security/groups/server/types.vdl.go
index 267d732..cfdafdb 100644
--- a/services/security/groups/server/types.vdl.go
+++ b/services/security/groups/server/types.vdl.go
@@ -12,7 +12,7 @@
 	"v.io/v23/vdl"
 
 	// VDL user imports
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 	"v.io/v23/services/security/groups"
 )
 
diff --git a/services/wsprd/namespace/namespace.vdl b/services/wsprd/namespace/namespace.vdl
index f87b675..bfb3849 100644
--- a/services/wsprd/namespace/namespace.vdl
+++ b/services/wsprd/namespace/namespace.vdl
@@ -12,7 +12,7 @@
 	"time"
 
 	"v.io/v23/naming"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 )
 
 type Namespace interface {
diff --git a/services/wsprd/namespace/namespace.vdl.go b/services/wsprd/namespace/namespace.vdl.go
index d3a3aa9..2ea27e2 100644
--- a/services/wsprd/namespace/namespace.vdl.go
+++ b/services/wsprd/namespace/namespace.vdl.go
@@ -21,7 +21,7 @@
 	// VDL user imports
 	"time"
 	"v.io/v23/naming"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 	_ "v.io/v23/vdlroot/time"
 )
 
diff --git a/services/wsprd/namespace/request_handler.go b/services/wsprd/namespace/request_handler.go
index c95eebd..79629c9 100644
--- a/services/wsprd/namespace/request_handler.go
+++ b/services/wsprd/namespace/request_handler.go
@@ -12,7 +12,7 @@
 	"v.io/v23/naming"
 	"v.io/v23/naming/ns"
 	"v.io/v23/rpc"
-	"v.io/v23/services/security/access"
+	"v.io/v23/security/access"
 	"v.io/v23/verror"
 )