diff --git a/doc/source/plugins.rst b/doc/source/plugins.rst
index 8640efbc..00aa5137 100644
--- a/doc/source/plugins.rst
+++ b/doc/source/plugins.rst
@@ -153,13 +153,11 @@ the plugin commands:
 
     # osc-lib interfaces available to plugins:
     from osc_lib.cli import parseractions
+    from osc_lib.command import command
     from osc_lib import exceptions
     from osc_lib import logs
     from osc_lib import utils
 
-    # OSC common interfaces available to plugins:
-    from openstackclient.common import command
-
 
     class DeleteMypluginobject(command.Command):
         """Delete mypluginobject"""
diff --git a/openstackclient/common/availability_zone.py b/openstackclient/common/availability_zone.py
index 6117c918..af161d1f 100644
--- a/openstackclient/common/availability_zone.py
+++ b/openstackclient/common/availability_zone.py
@@ -16,10 +16,10 @@
 import copy
 
 from novaclient import exceptions as nova_exceptions
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/common/configuration.py b/openstackclient/common/configuration.py
index ba4de12d..d6e2ab45 100644
--- a/openstackclient/common/configuration.py
+++ b/openstackclient/common/configuration.py
@@ -13,9 +13,9 @@
 
 """Configuration action implementations"""
 
+from osc_lib.command import command
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 REDACTED = "<redacted>"
diff --git a/openstackclient/common/extension.py b/openstackclient/common/extension.py
index 6fcf9fa8..327fc223 100644
--- a/openstackclient/common/extension.py
+++ b/openstackclient/common/extension.py
@@ -17,9 +17,9 @@
 
 import itertools
 
+from osc_lib.command import command
 from osc_lib import utils
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/common/limits.py b/openstackclient/common/limits.py
index 249d1b44..f7aa82f6 100644
--- a/openstackclient/common/limits.py
+++ b/openstackclient/common/limits.py
@@ -17,9 +17,9 @@
 
 import itertools
 
+from osc_lib.command import command
 from osc_lib import utils
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 
diff --git a/openstackclient/common/module.py b/openstackclient/common/module.py
index 91e779fb..7c5fcd55 100644
--- a/openstackclient/common/module.py
+++ b/openstackclient/common/module.py
@@ -17,10 +17,10 @@
 
 import sys
 
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/common/quota.py b/openstackclient/common/quota.py
index 6fd1e2f5..087d8ea3 100644
--- a/openstackclient/common/quota.py
+++ b/openstackclient/common/quota.py
@@ -18,10 +18,10 @@
 import itertools
 import sys
 
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/common/timing.py b/openstackclient/common/timing.py
index 71c2fec7..dd2aeb83 100644
--- a/openstackclient/common/timing.py
+++ b/openstackclient/common/timing.py
@@ -13,7 +13,7 @@
 
 """Timing Implementation"""
 
-from openstackclient.common import command
+from osc_lib.command import command
 
 
 class Timing(command.Lister):
diff --git a/openstackclient/compute/v2/agent.py b/openstackclient/compute/v2/agent.py
index 5f705076..ce6898c1 100644
--- a/openstackclient/compute/v2/agent.py
+++ b/openstackclient/compute/v2/agent.py
@@ -15,11 +15,11 @@
 
 """Agent action implementations"""
 
+from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/compute/v2/aggregate.py b/openstackclient/compute/v2/aggregate.py
index 9e44615d..8000c93a 100644
--- a/openstackclient/compute/v2/aggregate.py
+++ b/openstackclient/compute/v2/aggregate.py
@@ -17,10 +17,10 @@
 """Compute v2 Aggregate action implementations"""
 
 from osc_lib.cli import parseractions
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/compute/v2/console.py b/openstackclient/compute/v2/console.py
index ff7f1af6..97d3f318 100644
--- a/openstackclient/compute/v2/console.py
+++ b/openstackclient/compute/v2/console.py
@@ -18,10 +18,10 @@
 import sys
 
 from osc_lib.cli import parseractions
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/compute/v2/fixedip.py b/openstackclient/compute/v2/fixedip.py
index e3b80c5f..8bd72ca3 100644
--- a/openstackclient/compute/v2/fixedip.py
+++ b/openstackclient/compute/v2/fixedip.py
@@ -15,10 +15,9 @@
 
 """Fixed IP action implementations"""
 
+from osc_lib.command import command
 from osc_lib import utils
 
-from openstackclient.common import command
-
 
 class AddFixedIP(command.Command):
     """Add fixed IP address to server"""
diff --git a/openstackclient/compute/v2/flavor.py b/openstackclient/compute/v2/flavor.py
index 439818eb..ab2bc85d 100644
--- a/openstackclient/compute/v2/flavor.py
+++ b/openstackclient/compute/v2/flavor.py
@@ -16,11 +16,11 @@
 """Flavor action implementations"""
 
 from osc_lib.cli import parseractions
+from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 
diff --git a/openstackclient/compute/v2/floatingip.py b/openstackclient/compute/v2/floatingip.py
index 780ea684..98079fbc 100644
--- a/openstackclient/compute/v2/floatingip.py
+++ b/openstackclient/compute/v2/floatingip.py
@@ -15,10 +15,9 @@
 
 """Floating IP action implementations"""
 
+from osc_lib.command import command
 from osc_lib import utils
 
-from openstackclient.common import command
-
 
 class AddFloatingIP(command.Command):
     """Add floating IP address to server"""
diff --git a/openstackclient/compute/v2/floatingippool.py b/openstackclient/compute/v2/floatingippool.py
index eb7c9e86..0d46e32b 100644
--- a/openstackclient/compute/v2/floatingippool.py
+++ b/openstackclient/compute/v2/floatingippool.py
@@ -15,10 +15,9 @@
 
 """Floating IP Pool action implementations"""
 
+from osc_lib.command import command
 from osc_lib import utils
 
-from openstackclient.common import command
-
 
 class ListFloatingIPPool(command.Lister):
     """List pools of floating IP addresses"""
diff --git a/openstackclient/compute/v2/host.py b/openstackclient/compute/v2/host.py
index 15396d0c..620b4abb 100644
--- a/openstackclient/compute/v2/host.py
+++ b/openstackclient/compute/v2/host.py
@@ -15,9 +15,9 @@
 
 """Host action implementations"""
 
+from osc_lib.command import command
 from osc_lib import utils
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/compute/v2/hypervisor.py b/openstackclient/compute/v2/hypervisor.py
index b13cdb47..a34f2e1d 100644
--- a/openstackclient/compute/v2/hypervisor.py
+++ b/openstackclient/compute/v2/hypervisor.py
@@ -17,10 +17,10 @@
 
 import re
 
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/compute/v2/hypervisor_stats.py b/openstackclient/compute/v2/hypervisor_stats.py
index 290f5418..a70f0ce1 100644
--- a/openstackclient/compute/v2/hypervisor_stats.py
+++ b/openstackclient/compute/v2/hypervisor_stats.py
@@ -16,7 +16,7 @@
 
 import six
 
-from openstackclient.common import command
+from osc_lib.command import command
 
 
 class ShowHypervisorStats(command.ShowOne):
diff --git a/openstackclient/compute/v2/keypair.py b/openstackclient/compute/v2/keypair.py
index acf467b3..13c0a99c 100644
--- a/openstackclient/compute/v2/keypair.py
+++ b/openstackclient/compute/v2/keypair.py
@@ -19,11 +19,11 @@ import io
 import os
 import sys
 
+from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 99429c5a..eb954c36 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -22,6 +22,7 @@ import os
 import sys
 
 from osc_lib.cli import parseractions
+from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 import six
@@ -31,7 +32,6 @@ try:
 except ImportError:
     from novaclient.v1_1 import servers
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 
diff --git a/openstackclient/compute/v2/server_backup.py b/openstackclient/compute/v2/server_backup.py
index 972db660..c0e2e5ee 100644
--- a/openstackclient/compute/v2/server_backup.py
+++ b/openstackclient/compute/v2/server_backup.py
@@ -17,12 +17,12 @@
 
 import sys
 
+from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 from oslo_utils import importutils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/compute/v2/server_group.py b/openstackclient/compute/v2/server_group.py
index 5763ba2f..955b147e 100644
--- a/openstackclient/compute/v2/server_group.py
+++ b/openstackclient/compute/v2/server_group.py
@@ -15,10 +15,10 @@
 
 """Compute v2 Server Group action implementations"""
 
+from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/compute/v2/service.py b/openstackclient/compute/v2/service.py
index 206344dc..30465783 100644
--- a/openstackclient/compute/v2/service.py
+++ b/openstackclient/compute/v2/service.py
@@ -15,10 +15,10 @@
 
 """Service action implementations"""
 
+from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/compute/v2/usage.py b/openstackclient/compute/v2/usage.py
index cc24346f..2f35b01b 100644
--- a/openstackclient/compute/v2/usage.py
+++ b/openstackclient/compute/v2/usage.py
@@ -18,10 +18,10 @@
 import datetime
 import sys
 
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/identity/v2_0/catalog.py b/openstackclient/identity/v2_0/catalog.py
index 2de1e8e7..62e6b1f9 100644
--- a/openstackclient/identity/v2_0/catalog.py
+++ b/openstackclient/identity/v2_0/catalog.py
@@ -13,11 +13,11 @@
 
 """Identity v2 Service Catalog action implementations"""
 
+from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/identity/v2_0/ec2creds.py b/openstackclient/identity/v2_0/ec2creds.py
index 86f07bce..78f65824 100644
--- a/openstackclient/identity/v2_0/ec2creds.py
+++ b/openstackclient/identity/v2_0/ec2creds.py
@@ -16,10 +16,10 @@
 
 """Identity v2 EC2 Credentials action implementations"""
 
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/identity/v2_0/endpoint.py b/openstackclient/identity/v2_0/endpoint.py
index 89c8a38b..4ffa363e 100644
--- a/openstackclient/identity/v2_0/endpoint.py
+++ b/openstackclient/identity/v2_0/endpoint.py
@@ -15,10 +15,10 @@
 
 """Endpoint action implementations"""
 
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
diff --git a/openstackclient/identity/v2_0/project.py b/openstackclient/identity/v2_0/project.py
index b03f8381..8be482fe 100644
--- a/openstackclient/identity/v2_0/project.py
+++ b/openstackclient/identity/v2_0/project.py
@@ -17,10 +17,10 @@
 
 from keystoneauth1 import exceptions as ks_exc
 from osc_lib.cli import parseractions
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/identity/v2_0/role.py b/openstackclient/identity/v2_0/role.py
index 075234fc..4c3fe6e2 100644
--- a/openstackclient/identity/v2_0/role.py
+++ b/openstackclient/identity/v2_0/role.py
@@ -16,11 +16,11 @@
 """Identity v2 Role action implementations"""
 
 from keystoneauth1 import exceptions as ks_exc
+from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/identity/v2_0/service.py b/openstackclient/identity/v2_0/service.py
index 631b8737..947f361c 100644
--- a/openstackclient/identity/v2_0/service.py
+++ b/openstackclient/identity/v2_0/service.py
@@ -17,11 +17,11 @@
 
 import argparse
 
+from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
diff --git a/openstackclient/identity/v2_0/token.py b/openstackclient/identity/v2_0/token.py
index d708749d..56f920f3 100644
--- a/openstackclient/identity/v2_0/token.py
+++ b/openstackclient/identity/v2_0/token.py
@@ -15,10 +15,10 @@
 
 """Identity v2 Token action implementations"""
 
+from osc_lib.command import command
+from osc_lib import exceptions
 import six
 
-from openstackclient.common import command
-from openstackclient.common import exceptions
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/identity/v2_0/user.py b/openstackclient/identity/v2_0/user.py
index a10d213b..7777bab8 100644
--- a/openstackclient/identity/v2_0/user.py
+++ b/openstackclient/identity/v2_0/user.py
@@ -16,10 +16,10 @@
 """Identity v2.0 User action implementations"""
 
 from keystoneauth1 import exceptions as ks_exc
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/identity/v3/catalog.py b/openstackclient/identity/v3/catalog.py
index a3286003..a6e141c9 100644
--- a/openstackclient/identity/v3/catalog.py
+++ b/openstackclient/identity/v3/catalog.py
@@ -13,11 +13,11 @@
 
 """Identity v3 Service Catalog action implementations"""
 
+from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/identity/v3/consumer.py b/openstackclient/identity/v3/consumer.py
index 8aa92f6d..a4620bf9 100644
--- a/openstackclient/identity/v3/consumer.py
+++ b/openstackclient/identity/v3/consumer.py
@@ -17,10 +17,10 @@
 
 import sys
 
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/identity/v3/credential.py b/openstackclient/identity/v3/credential.py
index 6c65a206..eeeddfa5 100644
--- a/openstackclient/identity/v3/credential.py
+++ b/openstackclient/identity/v3/credential.py
@@ -15,10 +15,10 @@
 
 """Identity v3 Credential action implementations"""
 
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/identity/v3/domain.py b/openstackclient/identity/v3/domain.py
index b0cd4d55..8eb7bc91 100644
--- a/openstackclient/identity/v3/domain.py
+++ b/openstackclient/identity/v3/domain.py
@@ -18,10 +18,10 @@
 import sys
 
 from keystoneauth1 import exceptions as ks_exc
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/identity/v3/ec2creds.py b/openstackclient/identity/v3/ec2creds.py
index fe052a3c..835fe96f 100644
--- a/openstackclient/identity/v3/ec2creds.py
+++ b/openstackclient/identity/v3/ec2creds.py
@@ -12,10 +12,10 @@
 
 """Identity v3 EC2 Credentials action implementations"""
 
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
diff --git a/openstackclient/identity/v3/endpoint.py b/openstackclient/identity/v3/endpoint.py
index 8e433fb9..367b4e7b 100644
--- a/openstackclient/identity/v3/endpoint.py
+++ b/openstackclient/identity/v3/endpoint.py
@@ -17,10 +17,10 @@
 
 import sys
 
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
diff --git a/openstackclient/identity/v3/federation_protocol.py b/openstackclient/identity/v3/federation_protocol.py
index 5050ec6f..377ddcce 100644
--- a/openstackclient/identity/v3/federation_protocol.py
+++ b/openstackclient/identity/v3/federation_protocol.py
@@ -14,10 +14,10 @@
 
 """Identity v3 Protocols actions implementations"""
 
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/identity/v3/group.py b/openstackclient/identity/v3/group.py
index 85087214..fb0a25b9 100644
--- a/openstackclient/identity/v3/group.py
+++ b/openstackclient/identity/v3/group.py
@@ -18,10 +18,10 @@
 import sys
 
 from keystoneauth1 import exceptions as ks_exc
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
diff --git a/openstackclient/identity/v3/identity_provider.py b/openstackclient/identity/v3/identity_provider.py
index a082f2f4..0b530a26 100644
--- a/openstackclient/identity/v3/identity_provider.py
+++ b/openstackclient/identity/v3/identity_provider.py
@@ -13,10 +13,10 @@
 
 """Identity v3 IdentityProvider action implementations"""
 
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/identity/v3/mapping.py b/openstackclient/identity/v3/mapping.py
index 723e3bbc..5937474e 100644
--- a/openstackclient/identity/v3/mapping.py
+++ b/openstackclient/identity/v3/mapping.py
@@ -17,11 +17,11 @@
 
 import json
 
+from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/identity/v3/policy.py b/openstackclient/identity/v3/policy.py
index f0992031..68fb2738 100644
--- a/openstackclient/identity/v3/policy.py
+++ b/openstackclient/identity/v3/policy.py
@@ -17,10 +17,10 @@
 
 import sys
 
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/identity/v3/project.py b/openstackclient/identity/v3/project.py
index 843767aa..6145dcf1 100644
--- a/openstackclient/identity/v3/project.py
+++ b/openstackclient/identity/v3/project.py
@@ -17,10 +17,10 @@
 
 from keystoneauth1 import exceptions as ks_exc
 from osc_lib.cli import parseractions
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
diff --git a/openstackclient/identity/v3/region.py b/openstackclient/identity/v3/region.py
index da8e3632..b5e46a9a 100644
--- a/openstackclient/identity/v3/region.py
+++ b/openstackclient/identity/v3/region.py
@@ -13,10 +13,10 @@
 
 """Identity v3 Region action implementations"""
 
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/identity/v3/role.py b/openstackclient/identity/v3/role.py
index 879dbc33..1bb27585 100644
--- a/openstackclient/identity/v3/role.py
+++ b/openstackclient/identity/v3/role.py
@@ -18,10 +18,10 @@
 import sys
 
 from keystoneauth1 import exceptions as ks_exc
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
diff --git a/openstackclient/identity/v3/role_assignment.py b/openstackclient/identity/v3/role_assignment.py
index 5e1d997a..39e2336d 100644
--- a/openstackclient/identity/v3/role_assignment.py
+++ b/openstackclient/identity/v3/role_assignment.py
@@ -13,9 +13,9 @@
 
 """Identity v3 Assignment action implementations """
 
+from osc_lib.command import command
 from osc_lib import utils
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
diff --git a/openstackclient/identity/v3/service.py b/openstackclient/identity/v3/service.py
index 450b066c..7beadc9d 100644
--- a/openstackclient/identity/v3/service.py
+++ b/openstackclient/identity/v3/service.py
@@ -17,10 +17,10 @@
 
 import sys
 
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
diff --git a/openstackclient/identity/v3/service_provider.py b/openstackclient/identity/v3/service_provider.py
index 5bb15463..0beea813 100644
--- a/openstackclient/identity/v3/service_provider.py
+++ b/openstackclient/identity/v3/service_provider.py
@@ -15,10 +15,10 @@
 
 import sys
 
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/identity/v3/token.py b/openstackclient/identity/v3/token.py
index 0eefbf3b..ecf09693 100644
--- a/openstackclient/identity/v3/token.py
+++ b/openstackclient/identity/v3/token.py
@@ -15,11 +15,11 @@
 
 """Identity v3 Token action implementations"""
 
+from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
diff --git a/openstackclient/identity/v3/trust.py b/openstackclient/identity/v3/trust.py
index 0f900250..bbc86adb 100644
--- a/openstackclient/identity/v3/trust.py
+++ b/openstackclient/identity/v3/trust.py
@@ -15,10 +15,10 @@
 
 import datetime
 
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
diff --git a/openstackclient/identity/v3/unscoped_saml.py b/openstackclient/identity/v3/unscoped_saml.py
index 901fa26e..f116174b 100644
--- a/openstackclient/identity/v3/unscoped_saml.py
+++ b/openstackclient/identity/v3/unscoped_saml.py
@@ -17,10 +17,10 @@ The first step of federated auth is to fetch an unscoped token. From there,
 the user can list domains and projects they are allowed to access, and request
 a scoped token."""
 
+from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py
index b2e60f8f..39125e2c 100644
--- a/openstackclient/identity/v3/user.py
+++ b/openstackclient/identity/v3/user.py
@@ -19,10 +19,10 @@ import copy
 import sys
 
 from keystoneauth1 import exceptions as ks_exc
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
diff --git a/openstackclient/image/v1/image.py b/openstackclient/image/v1/image.py
index f137f262..1644809d 100644
--- a/openstackclient/image/v1/image.py
+++ b/openstackclient/image/v1/image.py
@@ -27,11 +27,11 @@ else:
 
 from glanceclient.common import utils as gc_utils
 from osc_lib.cli import parseractions
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
 from openstackclient.api import utils as api_utils
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py
index 7d663a6c..62f7bee8 100644
--- a/openstackclient/image/v2/image.py
+++ b/openstackclient/image/v2/image.py
@@ -19,12 +19,12 @@ import argparse
 
 from glanceclient.common import utils as gc_utils
 from osc_lib.cli import parseractions
+from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 import six
 
 from openstackclient.api import utils as api_utils
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
diff --git a/openstackclient/network/common.py b/openstackclient/network/common.py
index 10c61ab1..16cc7379 100644
--- a/openstackclient/network/common.py
+++ b/openstackclient/network/common.py
@@ -13,10 +13,10 @@
 
 import abc
 
+from osc_lib.command import command
 from osc_lib import exceptions
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/network/v2/address_scope.py b/openstackclient/network/v2/address_scope.py
index fc2ff3f3..bc1a96c3 100644
--- a/openstackclient/network/v2/address_scope.py
+++ b/openstackclient/network/v2/address_scope.py
@@ -13,10 +13,10 @@
 
 """Address scope action implementations"""
 
+from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 
diff --git a/openstackclient/network/v2/ip_availability.py b/openstackclient/network/v2/ip_availability.py
index 6974a246..d429e86c 100644
--- a/openstackclient/network/v2/ip_availability.py
+++ b/openstackclient/network/v2/ip_availability.py
@@ -13,9 +13,9 @@
 
 """IP Availability Info implementations"""
 
+from osc_lib.command import command
 from osc_lib import utils
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 
diff --git a/openstackclient/network/v2/network.py b/openstackclient/network/v2/network.py
index 81e96fb2..4d01accd 100644
--- a/openstackclient/network/v2/network.py
+++ b/openstackclient/network/v2/network.py
@@ -13,9 +13,9 @@
 
 """Network action implementations"""
 
+from osc_lib.command import command
 from osc_lib import utils
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 from openstackclient.network import common
diff --git a/openstackclient/network/v2/network_segment.py b/openstackclient/network/v2/network_segment.py
index e965d2eb..bedf15f7 100644
--- a/openstackclient/network/v2/network_segment.py
+++ b/openstackclient/network/v2/network_segment.py
@@ -15,9 +15,9 @@
 
 # TODO(rtheis): Add description and name properties when support is available.
 
+from osc_lib.command import command
 from osc_lib import utils
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/network/v2/port.py b/openstackclient/network/v2/port.py
index a040f20f..1c5db706 100644
--- a/openstackclient/network/v2/port.py
+++ b/openstackclient/network/v2/port.py
@@ -17,10 +17,10 @@ import argparse
 import logging
 
 from osc_lib.cli import parseractions
+from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 
diff --git a/openstackclient/network/v2/router.py b/openstackclient/network/v2/router.py
index db3a90e1..92ecf84d 100644
--- a/openstackclient/network/v2/router.py
+++ b/openstackclient/network/v2/router.py
@@ -18,9 +18,9 @@ import json
 import logging
 
 from osc_lib.cli import parseractions
+from osc_lib.command import command
 from osc_lib import utils
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 
diff --git a/openstackclient/network/v2/subnet.py b/openstackclient/network/v2/subnet.py
index 6bdb9a54..ceb1cb14 100644
--- a/openstackclient/network/v2/subnet.py
+++ b/openstackclient/network/v2/subnet.py
@@ -16,10 +16,10 @@
 import copy
 
 from osc_lib.cli import parseractions
+from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 
diff --git a/openstackclient/network/v2/subnet_pool.py b/openstackclient/network/v2/subnet_pool.py
index 7e0bb2c0..79f98fd9 100644
--- a/openstackclient/network/v2/subnet_pool.py
+++ b/openstackclient/network/v2/subnet_pool.py
@@ -14,9 +14,9 @@
 """Subnet pool action implementations"""
 
 from osc_lib.cli import parseractions
+from osc_lib.command import command
 from osc_lib import utils
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 
diff --git a/openstackclient/object/v1/account.py b/openstackclient/object/v1/account.py
index 8ef34687..801fe450 100644
--- a/openstackclient/object/v1/account.py
+++ b/openstackclient/object/v1/account.py
@@ -14,11 +14,10 @@
 """Account v1 action implementations"""
 
 from osc_lib.cli import parseractions
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
-
 
 class SetAccount(command.Command):
     """Set account properties"""
diff --git a/openstackclient/object/v1/container.py b/openstackclient/object/v1/container.py
index f26b64a1..2b021ec2 100644
--- a/openstackclient/object/v1/container.py
+++ b/openstackclient/object/v1/container.py
@@ -17,11 +17,10 @@
 
 
 from osc_lib.cli import parseractions
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
-
 
 class CreateContainer(command.Lister):
     """Create new container"""
diff --git a/openstackclient/object/v1/object.py b/openstackclient/object/v1/object.py
index 820780ff..39dba3d5 100644
--- a/openstackclient/object/v1/object.py
+++ b/openstackclient/object/v1/object.py
@@ -17,11 +17,10 @@
 
 
 from osc_lib.cli import parseractions
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
-
 
 class CreateObject(command.Lister):
     """Upload object to container"""
diff --git a/openstackclient/tests/common/test_command.py b/openstackclient/tests/common/test_command.py
index 658bc895..a8bcf6a8 100644
--- a/openstackclient/tests/common/test_command.py
+++ b/openstackclient/tests/common/test_command.py
@@ -14,9 +14,9 @@
 
 import mock
 
+from osc_lib.command import command
 from osc_lib import exceptions
 
-from openstackclient.common import command
 from openstackclient.tests import fakes as test_fakes
 from openstackclient.tests import utils as test_utils
 
diff --git a/openstackclient/volume/v1/backup.py b/openstackclient/volume/v1/backup.py
index f70d9b42..212c74ef 100644
--- a/openstackclient/volume/v1/backup.py
+++ b/openstackclient/volume/v1/backup.py
@@ -17,10 +17,10 @@
 
 import copy
 
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/volume/v1/qos_specs.py b/openstackclient/volume/v1/qos_specs.py
index d26d9af4..56a96256 100644
--- a/openstackclient/volume/v1/qos_specs.py
+++ b/openstackclient/volume/v1/qos_specs.py
@@ -16,10 +16,10 @@
 """Volume v1 QoS action implementations"""
 
 from osc_lib.cli import parseractions
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/volume/v1/service.py b/openstackclient/volume/v1/service.py
index c065b526..2df38573 100644
--- a/openstackclient/volume/v1/service.py
+++ b/openstackclient/volume/v1/service.py
@@ -14,9 +14,9 @@
 
 """Service action implementations"""
 
+from osc_lib.command import command
 from osc_lib import utils
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/volume/v1/snapshot.py b/openstackclient/volume/v1/snapshot.py
index c931eeff..41127af5 100644
--- a/openstackclient/volume/v1/snapshot.py
+++ b/openstackclient/volume/v1/snapshot.py
@@ -18,10 +18,10 @@
 import copy
 
 from osc_lib.cli import parseractions
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/volume/v1/volume.py b/openstackclient/volume/v1/volume.py
index a302ab38..7a3bfb97 100644
--- a/openstackclient/volume/v1/volume.py
+++ b/openstackclient/volume/v1/volume.py
@@ -18,10 +18,10 @@
 import argparse
 
 from osc_lib.cli import parseractions
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/volume/v1/volume_transfer_request.py b/openstackclient/volume/v1/volume_transfer_request.py
index 9cffe988..5d8ff683 100644
--- a/openstackclient/volume/v1/volume_transfer_request.py
+++ b/openstackclient/volume/v1/volume_transfer_request.py
@@ -14,9 +14,9 @@
 
 """Volume v2 transfer action implementations"""
 
+from osc_lib.command import command
 from osc_lib import utils
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/volume/v1/volume_type.py b/openstackclient/volume/v1/volume_type.py
index fb937530..289966e5 100644
--- a/openstackclient/volume/v1/volume_type.py
+++ b/openstackclient/volume/v1/volume_type.py
@@ -16,10 +16,10 @@
 """Volume v1 Type action implementations"""
 
 from osc_lib.cli import parseractions
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/volume/v2/backup.py b/openstackclient/volume/v2/backup.py
index 371ddafd..6a44e30c 100644
--- a/openstackclient/volume/v2/backup.py
+++ b/openstackclient/volume/v2/backup.py
@@ -16,10 +16,10 @@
 
 import copy
 
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/volume/v2/qos_specs.py b/openstackclient/volume/v2/qos_specs.py
index 43772b55..7ec272b3 100644
--- a/openstackclient/volume/v2/qos_specs.py
+++ b/openstackclient/volume/v2/qos_specs.py
@@ -16,10 +16,10 @@
 """Volume v2 QoS action implementations"""
 
 from osc_lib.cli import parseractions
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/volume/v2/service.py b/openstackclient/volume/v2/service.py
index c065b526..2df38573 100644
--- a/openstackclient/volume/v2/service.py
+++ b/openstackclient/volume/v2/service.py
@@ -14,9 +14,9 @@
 
 """Service action implementations"""
 
+from osc_lib.command import command
 from osc_lib import utils
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/volume/v2/snapshot.py b/openstackclient/volume/v2/snapshot.py
index 39af1bd2..439904e7 100644
--- a/openstackclient/volume/v2/snapshot.py
+++ b/openstackclient/volume/v2/snapshot.py
@@ -17,10 +17,10 @@
 import copy
 
 from osc_lib.cli import parseractions
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/volume/v2/volume.py b/openstackclient/volume/v2/volume.py
index c6175c4b..b1a3af2e 100644
--- a/openstackclient/volume/v2/volume.py
+++ b/openstackclient/volume/v2/volume.py
@@ -17,10 +17,10 @@
 import copy
 
 from osc_lib.cli import parseractions
+from osc_lib.command import command
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 
diff --git a/openstackclient/volume/v2/volume_transfer_request.py b/openstackclient/volume/v2/volume_transfer_request.py
index 9cffe988..5d8ff683 100644
--- a/openstackclient/volume/v2/volume_transfer_request.py
+++ b/openstackclient/volume/v2/volume_transfer_request.py
@@ -14,9 +14,9 @@
 
 """Volume v2 transfer action implementations"""
 
+from osc_lib.command import command
 from osc_lib import utils
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 
 
diff --git a/openstackclient/volume/v2/volume_type.py b/openstackclient/volume/v2/volume_type.py
index edea91fd..dc6b4f9b 100644
--- a/openstackclient/volume/v2/volume_type.py
+++ b/openstackclient/volume/v2/volume_type.py
@@ -15,11 +15,11 @@
 """Volume v2 Type action implementations"""
 
 from osc_lib.cli import parseractions
+from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 import six
 
-from openstackclient.common import command
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common