diff --git a/manilaclient/api_versions.py b/manilaclient/api_versions.py
index 64d9d8a..4730c05 100644
--- a/manilaclient/api_versions.py
+++ b/manilaclient/api_versions.py
@@ -19,10 +19,10 @@ import re
 import warnings
 
 import manilaclient
+from manilaclient.common._i18n import _
+from manilaclient.common import cliutils
 from manilaclient.common import constants
 from manilaclient import exceptions
-from manilaclient.openstack.common._i18n import _
-from manilaclient.openstack.common import cliutils
 from manilaclient import utils
 
 LOG = logging.getLogger(__name__)
diff --git a/manilaclient/base.py b/manilaclient/base.py
index efc4859..9cab15a 100644
--- a/manilaclient/base.py
+++ b/manilaclient/base.py
@@ -23,8 +23,8 @@ import contextlib
 import hashlib
 import os
 
+from manilaclient.common import cliutils
 from manilaclient import exceptions
-from manilaclient.openstack.common import cliutils
 from manilaclient import utils
 
 
diff --git a/manilaclient/openstack/common/_i18n.py b/manilaclient/common/_i18n.py
similarity index 100%
rename from manilaclient/openstack/common/_i18n.py
rename to manilaclient/common/_i18n.py
diff --git a/manilaclient/openstack/__init__.py b/manilaclient/common/apiclient/__init__.py
similarity index 100%
rename from manilaclient/openstack/__init__.py
rename to manilaclient/common/apiclient/__init__.py
diff --git a/manilaclient/openstack/common/apiclient/auth.py b/manilaclient/common/apiclient/auth.py
similarity index 96%
rename from manilaclient/openstack/common/apiclient/auth.py
rename to manilaclient/common/apiclient/auth.py
index 22cc905..0c6e319 100644
--- a/manilaclient/openstack/common/apiclient/auth.py
+++ b/manilaclient/common/apiclient/auth.py
@@ -24,7 +24,7 @@ import os
 import six
 from stevedore import extension
 
-from manilaclient.openstack.common.apiclient import exceptions
+from manilaclient.common.apiclient import exceptions
 
 
 _discovered_plugins = {}
@@ -41,7 +41,7 @@ def discover_auth_systems():
     def add_plugin(ext):
         _discovered_plugins[ext.name] = ext.plugin
 
-    ep_namespace = "manilaclient.openstack.common.apiclient.auth"
+    ep_namespace = "manilaclient.common.apiclient.auth"
     mgr = extension.ExtensionManager(ep_namespace)
     mgr.map(add_plugin)
 
@@ -143,8 +143,7 @@ class BaseAuthPlugin(object):
 
     @classmethod
     def add_opts(cls, parser):
-        """Populate the parser with the options for this plugin.
-        """
+        """Populate the parser with the options for this plugin."""
         for opt in cls.opt_names:
             # use `BaseAuthPlugin.common_opt_names` since it is never
             # changed in child classes
@@ -153,8 +152,7 @@ class BaseAuthPlugin(object):
 
     @classmethod
     def add_common_opts(cls, parser):
-        """Add options that are common for several plugins.
-        """
+        """Add options that are common for several plugins."""
         for opt in cls.common_opt_names:
             cls._parser_add_opt(parser, opt)
 
@@ -191,8 +189,7 @@ class BaseAuthPlugin(object):
 
     @abc.abstractmethod
     def _do_authenticate(self, http_client):
-        """Protected method for authentication.
-        """
+        """Protected method for authentication."""
 
     def sufficient_options(self):
         """Check if all required options are present.
diff --git a/manilaclient/openstack/common/apiclient/base.py b/manilaclient/common/apiclient/base.py
similarity index 99%
rename from manilaclient/openstack/common/apiclient/base.py
rename to manilaclient/common/apiclient/base.py
index 858bf91..cadb0f5 100644
--- a/manilaclient/openstack/common/apiclient/base.py
+++ b/manilaclient/common/apiclient/base.py
@@ -30,8 +30,8 @@ from oslo_utils import strutils
 import six
 from six.moves.urllib import parse
 
-from manilaclient.openstack.common._i18n import _
-from manilaclient.openstack.common.apiclient import exceptions
+from manilaclient.common._i18n import _
+from manilaclient.common.apiclient import exceptions
 
 
 def getid(obj):
@@ -453,8 +453,7 @@ class Resource(object):
 
     @property
     def human_id(self):
-        """Human-readable ID which can be used for bash completion.
-        """
+        """Human-readable ID which can be used for bash completion."""
         if self.HUMAN_ID:
             name = getattr(self, self.NAME_ATTR, None)
             if name is not None:
diff --git a/manilaclient/openstack/common/apiclient/client.py b/manilaclient/common/apiclient/client.py
similarity index 98%
rename from manilaclient/openstack/common/apiclient/client.py
rename to manilaclient/common/apiclient/client.py
index 1234c97..206016e 100644
--- a/manilaclient/openstack/common/apiclient/client.py
+++ b/manilaclient/common/apiclient/client.py
@@ -36,8 +36,8 @@ except ImportError:
 from oslo_utils import importutils
 import requests
 
-from manilaclient.openstack.common._i18n import _
-from manilaclient.openstack.common.apiclient import exceptions
+from manilaclient.common._i18n import _
+from manilaclient.common.apiclient import exceptions
 
 
 _logger = logging.getLogger(__name__)
@@ -62,7 +62,7 @@ class HTTPClient(object):
       into terminal and send the same request with curl.
     """
 
-    user_agent = "manilaclient.openstack.common.apiclient"
+    user_agent = "manilaclient.common.apiclient"
 
     def __init__(self,
                  auth_plugin,
@@ -275,7 +275,7 @@ class HTTPClient(object):
 
         >>> def test_clients():
         ...     from keystoneclient.auth import keystone
-        ...     from openstack.common.apiclient import client
+        ...     from manilaclient.common.apiclient import client
         ...     auth = keystone.KeystoneAuthPlugin(
         ...         username="user", password="pass", tenant_name="tenant",
         ...         auth_url="http://auth:5000/v2.0")
diff --git a/manilaclient/openstack/common/apiclient/exceptions.py b/manilaclient/common/apiclient/exceptions.py
similarity index 98%
rename from manilaclient/openstack/common/apiclient/exceptions.py
rename to manilaclient/common/apiclient/exceptions.py
index 21af311..11e2d62 100644
--- a/manilaclient/openstack/common/apiclient/exceptions.py
+++ b/manilaclient/common/apiclient/exceptions.py
@@ -38,12 +38,11 @@ import sys
 
 import six
 
-from manilaclient.openstack.common._i18n import _
+from manilaclient.common._i18n import _
 
 
 class ClientException(Exception):
-    """The base exception class for all exceptions this library raises.
-    """
+    """The base exception class for all exceptions this library raises."""
     pass
 
 
@@ -118,8 +117,7 @@ class AmbiguousEndpoints(EndpointException):
 
 
 class HttpError(ClientException):
-    """The base exception class for all HTTP exceptions.
-    """
+    """The base exception class for all HTTP exceptions."""
     http_status = 0
     message = _("HTTP Error")
 
diff --git a/manilaclient/openstack/common/apiclient/fake_client.py b/manilaclient/common/apiclient/fake_client.py
similarity index 97%
rename from manilaclient/openstack/common/apiclient/fake_client.py
rename to manilaclient/common/apiclient/fake_client.py
index c5067d8..cd0eb0c 100644
--- a/manilaclient/openstack/common/apiclient/fake_client.py
+++ b/manilaclient/common/apiclient/fake_client.py
@@ -30,7 +30,7 @@ import requests
 import six
 from six.moves.urllib import parse
 
-from manilaclient.openstack.common.apiclient import client
+from manilaclient.common.apiclient import client
 
 
 def assert_has_keys(dct, required=None, optional=None):
@@ -46,8 +46,7 @@ def assert_has_keys(dct, required=None, optional=None):
 
 
 class TestResponse(requests.Response):
-    """Wrap requests.Response and provide a convenient initialization.
-    """
+    """Wrap requests.Response and provide a convenient initialization."""
 
     def __init__(self, data):
         super(TestResponse, self).__init__()
@@ -86,8 +85,7 @@ class FakeHTTPClient(client.HTTPClient):
         super(FakeHTTPClient, self).__init__(*args, **kwargs)
 
     def assert_called(self, method, url, body=None, pos=-1):
-        """Assert than an API method was just called.
-        """
+        """Assert than an API method was just called."""
         expected = (method, url)
         called = self.callstack[pos][0:2]
         assert self.callstack, \
@@ -103,8 +101,7 @@ class FakeHTTPClient(client.HTTPClient):
 
     def assert_called_anytime(self, method, url, body=None,
                               clear_callstack=True):
-        """Assert than an API method was called anytime in the test.
-        """
+        """Assert than an API method was called anytime in the test."""
         expected = (method, url)
 
         assert self.callstack, \
diff --git a/manilaclient/openstack/common/apiclient/utils.py b/manilaclient/common/apiclient/utils.py
similarity index 85%
rename from manilaclient/openstack/common/apiclient/utils.py
rename to manilaclient/common/apiclient/utils.py
index bd36152..ba8269f 100644
--- a/manilaclient/openstack/common/apiclient/utils.py
+++ b/manilaclient/common/apiclient/utils.py
@@ -12,11 +12,11 @@
 #    under the License.
 
 from oslo_utils import encodeutils
+from oslo_utils import uuidutils
 import six
 
-from manilaclient.openstack.common._i18n import _
-from manilaclient.openstack.common.apiclient import exceptions
-from manilaclient.openstack.common import uuidutils
+from manilaclient.common._i18n import _
+from manilaclient.common.apiclient import exceptions
 
 
 def find_resource(manager, name_or_id, **find_args):
@@ -72,16 +72,12 @@ def find_resource(manager, name_or_id, **find_args):
         except exceptions.NotFound:
             msg = _("No %(name)s with a name or "
                     "ID of '%(name_or_id)s' exists.") % \
-                {
-                    "name": manager.resource_class.__name__.lower(),
-                    "name_or_id": name_or_id
-                }
+                {"name": manager.resource_class.__name__.lower(),
+                 "name_or_id": name_or_id}
             raise exceptions.CommandError(msg)
     except exceptions.NoUniqueMatch:
         msg = _("Multiple %(name)s matches found for "
                 "'%(name_or_id)s', use an ID to be more specific.") % \
-            {
-                "name": manager.resource_class.__name__.lower(),
-                "name_or_id": name_or_id
-            }
+            {"name": manager.resource_class.__name__.lower(),
+             "name_or_id": name_or_id}
         raise exceptions.CommandError(msg)
diff --git a/manilaclient/openstack/common/cliutils.py b/manilaclient/common/cliutils.py
similarity index 99%
rename from manilaclient/openstack/common/cliutils.py
rename to manilaclient/common/cliutils.py
index cdbf76e..a2214ed 100644
--- a/manilaclient/openstack/common/cliutils.py
+++ b/manilaclient/common/cliutils.py
@@ -30,7 +30,7 @@ import prettytable
 import six
 from six import moves
 
-from manilaclient.openstack.common._i18n import _
+from manilaclient.common._i18n import _
 
 
 class MissingArgs(Exception):
diff --git a/manilaclient/exceptions.py b/manilaclient/exceptions.py
index 4b40582..b1ce03b 100644
--- a/manilaclient/exceptions.py
+++ b/manilaclient/exceptions.py
@@ -17,7 +17,7 @@
 Exception definitions.
 """
 
-from manilaclient.openstack.common.apiclient.exceptions import *  # noqa
+from manilaclient.common.apiclient.exceptions import *  # noqa
 
 
 class NoTokenLookupException(ClientException):
diff --git a/manilaclient/openstack/common/__init__.py b/manilaclient/openstack/common/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/manilaclient/openstack/common/apiclient/__init__.py b/manilaclient/openstack/common/apiclient/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/manilaclient/openstack/common/uuidutils.py b/manilaclient/openstack/common/uuidutils.py
deleted file mode 100644
index 234b880..0000000
--- a/manilaclient/openstack/common/uuidutils.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (c) 2012 Intel Corporation.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""
-UUID related utilities and helper functions.
-"""
-
-import uuid
-
-
-def generate_uuid():
-    return str(uuid.uuid4())
-
-
-def is_uuid_like(val):
-    """Returns validation of a value as a UUID.
-
-    For our purposes, a UUID is a canonical form string:
-    aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
-
-    """
-    try:
-        return str(uuid.UUID(val)) == val
-    except (TypeError, ValueError, AttributeError):
-        return False
diff --git a/manilaclient/shell.py b/manilaclient/shell.py
index 6a9aee4..9108de9 100644
--- a/manilaclient/shell.py
+++ b/manilaclient/shell.py
@@ -34,10 +34,10 @@ import six
 
 from manilaclient import api_versions
 from manilaclient import client
+from manilaclient.common import cliutils
 from manilaclient.common import constants
 from manilaclient import exceptions as exc
 import manilaclient.extension
-from manilaclient.openstack.common import cliutils
 from manilaclient.v2 import shell as shell_v2
 
 DEFAULT_OS_SHARE_API_VERSION = api_versions.MAX_VERSION
diff --git a/manilaclient/tests/unit/test_api_versions.py b/manilaclient/tests/unit/test_api_versions.py
index 3a203b7..2390a0c 100644
--- a/manilaclient/tests/unit/test_api_versions.py
+++ b/manilaclient/tests/unit/test_api_versions.py
@@ -17,8 +17,8 @@ import mock
 
 import manilaclient
 from manilaclient import api_versions
+from manilaclient.common import cliutils
 from manilaclient import exceptions
-from manilaclient.openstack.common import cliutils
 from manilaclient.tests.unit import utils
 
 
diff --git a/manilaclient/tests/unit/test_base.py b/manilaclient/tests/unit/test_base.py
index 2a43620..45b421b 100644
--- a/manilaclient/tests/unit/test_base.py
+++ b/manilaclient/tests/unit/test_base.py
@@ -10,8 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from manilaclient.common.apiclient import base as common_base
 from manilaclient import exceptions
-from manilaclient.openstack.common.apiclient import base as common_base
 from manilaclient.tests.unit import utils
 from manilaclient.tests.unit.v2 import fakes
 from manilaclient.v2 import shares
diff --git a/manilaclient/tests/unit/test_shell.py b/manilaclient/tests/unit/test_shell.py
index f4aabba..67bcc79 100644
--- a/manilaclient/tests/unit/test_shell.py
+++ b/manilaclient/tests/unit/test_shell.py
@@ -21,9 +21,9 @@ from tempest.lib.cli import output_parser
 from testtools import matchers
 
 import manilaclient
+from manilaclient.common import cliutils
 from manilaclient.common import constants
 from manilaclient import exceptions
-from manilaclient.openstack.common import cliutils
 from manilaclient import shell
 from manilaclient.tests.unit import utils
 from manilaclient.tests.unit.v2 import fakes
diff --git a/manilaclient/tests/unit/v2/test_shell.py b/manilaclient/tests/unit/v2/test_shell.py
index 8ca61d3..cf77236 100644
--- a/manilaclient/tests/unit/v2/test_shell.py
+++ b/manilaclient/tests/unit/v2/test_shell.py
@@ -22,10 +22,10 @@ import six
 from six.moves.urllib import parse
 
 from manilaclient import client
+from manilaclient.common.apiclient import utils as apiclient_utils
+from manilaclient.common import cliutils
 from manilaclient.common import constants
 from manilaclient import exceptions
-from manilaclient.openstack.common.apiclient import utils as apiclient_utils
-from manilaclient.openstack.common import cliutils
 from manilaclient import shell
 from manilaclient.tests.unit import utils as test_utils
 from manilaclient.tests.unit.v2 import fakes
diff --git a/manilaclient/v2/availability_zones.py b/manilaclient/v2/availability_zones.py
index 7b0a48d..a4856ac 100644
--- a/manilaclient/v2/availability_zones.py
+++ b/manilaclient/v2/availability_zones.py
@@ -15,7 +15,7 @@
 
 from manilaclient import api_versions
 from manilaclient import base
-from manilaclient.openstack.common.apiclient import base as common_base
+from manilaclient.common.apiclient import base as common_base
 
 RESOURCE_PATH_LEGACY = '/os-availability-zone'
 RESOURCE_PATH = '/availability-zones'
diff --git a/manilaclient/v2/consistency_group_snapshots.py b/manilaclient/v2/consistency_group_snapshots.py
index dfc5c4d..433b5b1 100644
--- a/manilaclient/v2/consistency_group_snapshots.py
+++ b/manilaclient/v2/consistency_group_snapshots.py
@@ -18,7 +18,7 @@ from six.moves.urllib import parse
 
 from manilaclient import api_versions
 from manilaclient import base
-from manilaclient.openstack.common.apiclient import base as common_base
+from manilaclient.common.apiclient import base as common_base
 
 RESOURCES_PATH = '/cgsnapshots'
 RESOURCE_PATH = '/cgsnapshots/%s'
diff --git a/manilaclient/v2/consistency_groups.py b/manilaclient/v2/consistency_groups.py
index cbcb6fc..aae3440 100644
--- a/manilaclient/v2/consistency_groups.py
+++ b/manilaclient/v2/consistency_groups.py
@@ -19,7 +19,7 @@ from six.moves.urllib import parse
 
 from manilaclient import api_versions
 from manilaclient import base
-from manilaclient.openstack.common.apiclient import base as common_base
+from manilaclient.common.apiclient import base as common_base
 
 RESOURCES_PATH = '/consistency-groups'
 RESOURCE_PATH = '/consistency-groups/%s'
diff --git a/manilaclient/v2/contrib/list_extensions.py b/manilaclient/v2/contrib/list_extensions.py
index 2e2460f..4dec423 100644
--- a/manilaclient/v2/contrib/list_extensions.py
+++ b/manilaclient/v2/contrib/list_extensions.py
@@ -14,8 +14,8 @@
 #    under the License.
 
 from manilaclient import base
-from manilaclient.openstack.common.apiclient import base as common_base
-from manilaclient.openstack.common import cliutils
+from manilaclient.common.apiclient import base as common_base
+from manilaclient.common import cliutils
 
 
 class ListExtResource(common_base.Resource):
diff --git a/manilaclient/v2/limits.py b/manilaclient/v2/limits.py
index b19aef5..47711eb 100644
--- a/manilaclient/v2/limits.py
+++ b/manilaclient/v2/limits.py
@@ -15,7 +15,7 @@
 # under the License.
 
 from manilaclient import base
-from manilaclient.openstack.common.apiclient import base as common_base
+from manilaclient.common.apiclient import base as common_base
 
 
 class Limits(common_base.Resource):
diff --git a/manilaclient/v2/quota_classes.py b/manilaclient/v2/quota_classes.py
index 1d94078..bfb91ec 100644
--- a/manilaclient/v2/quota_classes.py
+++ b/manilaclient/v2/quota_classes.py
@@ -15,7 +15,7 @@
 
 from manilaclient import api_versions
 from manilaclient import base
-from manilaclient.openstack.common.apiclient import base as common_base
+from manilaclient.common.apiclient import base as common_base
 
 RESOURCE_PATH_LEGACY = '/os-quota-class-sets'
 RESOURCE_PATH = '/quota-class-sets'
diff --git a/manilaclient/v2/quotas.py b/manilaclient/v2/quotas.py
index d5a6c36..c7540d9 100644
--- a/manilaclient/v2/quotas.py
+++ b/manilaclient/v2/quotas.py
@@ -15,7 +15,7 @@
 
 from manilaclient import api_versions
 from manilaclient import base
-from manilaclient.openstack.common.apiclient import base as common_base
+from manilaclient.common.apiclient import base as common_base
 
 RESOURCE_PATH_LEGACY = '/os-quota-sets'
 RESOURCE_PATH = '/quota-sets'
diff --git a/manilaclient/v2/scheduler_stats.py b/manilaclient/v2/scheduler_stats.py
index e3d1a0d..fd2011a 100644
--- a/manilaclient/v2/scheduler_stats.py
+++ b/manilaclient/v2/scheduler_stats.py
@@ -15,7 +15,7 @@
 import six.moves.urllib.parse as urlparse
 
 from manilaclient import base
-from manilaclient.openstack.common.apiclient import base as common_base
+from manilaclient.common.apiclient import base as common_base
 
 
 RESOURCES_PATH = '/scheduler-stats/pools'
diff --git a/manilaclient/v2/security_services.py b/manilaclient/v2/security_services.py
index 0830af7..15721a7 100644
--- a/manilaclient/v2/security_services.py
+++ b/manilaclient/v2/security_services.py
@@ -21,8 +21,8 @@ except ImportError:
 import six
 
 from manilaclient import base
+from manilaclient.common.apiclient import base as common_base
 from manilaclient import exceptions
-from manilaclient.openstack.common.apiclient import base as common_base
 
 RESOURCES_PATH = '/security-services'
 RESOURCE_PATH = "/security-services/%s"
diff --git a/manilaclient/v2/services.py b/manilaclient/v2/services.py
index 18c85d1..9930188 100644
--- a/manilaclient/v2/services.py
+++ b/manilaclient/v2/services.py
@@ -21,7 +21,7 @@ except ImportError:
 
 from manilaclient import api_versions
 from manilaclient import base
-from manilaclient.openstack.common.apiclient import base as common_base
+from manilaclient.common.apiclient import base as common_base
 
 RESOURCE_PATH_LEGACY = '/os-services'
 RESOURCE_PATH = '/services'
diff --git a/manilaclient/v2/share_export_locations.py b/manilaclient/v2/share_export_locations.py
index 0d0cb31..65dac2d 100644
--- a/manilaclient/v2/share_export_locations.py
+++ b/manilaclient/v2/share_export_locations.py
@@ -15,7 +15,7 @@
 
 from manilaclient import api_versions
 from manilaclient import base
-from manilaclient.openstack.common.apiclient import base as common_base
+from manilaclient.common.apiclient import base as common_base
 
 
 class ShareExportLocation(common_base.Resource):
diff --git a/manilaclient/v2/share_instance_export_locations.py b/manilaclient/v2/share_instance_export_locations.py
index 068b338..6116efc 100644
--- a/manilaclient/v2/share_instance_export_locations.py
+++ b/manilaclient/v2/share_instance_export_locations.py
@@ -15,7 +15,7 @@
 
 from manilaclient import api_versions
 from manilaclient import base
-from manilaclient.openstack.common.apiclient import base as common_base
+from manilaclient.common.apiclient import base as common_base
 
 
 class ShareInstanceExportLocation(common_base.Resource):
diff --git a/manilaclient/v2/share_instances.py b/manilaclient/v2/share_instances.py
index 269195d..c0773ef 100644
--- a/manilaclient/v2/share_instances.py
+++ b/manilaclient/v2/share_instances.py
@@ -15,7 +15,7 @@
 
 from manilaclient import api_versions
 from manilaclient import base
-from manilaclient.openstack.common.apiclient import base as common_base
+from manilaclient.common.apiclient import base as common_base
 
 
 class ShareInstance(common_base.Resource):
diff --git a/manilaclient/v2/share_networks.py b/manilaclient/v2/share_networks.py
index 16697d0..ad13d87 100644
--- a/manilaclient/v2/share_networks.py
+++ b/manilaclient/v2/share_networks.py
@@ -21,8 +21,9 @@ except ImportError:
 import six
 
 from manilaclient import base
+from manilaclient.common.apiclient import base as common_base
 from manilaclient import exceptions
-from manilaclient.openstack.common.apiclient import base as common_base
+
 
 RESOURCES_PATH = '/share-networks'
 RESOURCE_PATH = "/share-networks/%s"
diff --git a/manilaclient/v2/share_replicas.py b/manilaclient/v2/share_replicas.py
index 08bad44..18f1312 100644
--- a/manilaclient/v2/share_replicas.py
+++ b/manilaclient/v2/share_replicas.py
@@ -15,7 +15,7 @@
 
 from manilaclient import api_versions
 from manilaclient import base
-from manilaclient.openstack.common.apiclient import base as common_base
+from manilaclient.common.apiclient import base as common_base
 
 RESOURCES_PATH = '/share-replicas'
 RESOURCE_PATH = '/share-replicas/%s'
diff --git a/manilaclient/v2/share_servers.py b/manilaclient/v2/share_servers.py
index 06f4a8c..c820e5a 100644
--- a/manilaclient/v2/share_servers.py
+++ b/manilaclient/v2/share_servers.py
@@ -20,7 +20,7 @@ except ImportError:
     from urllib.parse import urlencode  # noqa
 
 from manilaclient import base
-from manilaclient.openstack.common.apiclient import base as common_base
+from manilaclient.common.apiclient import base as common_base
 
 RESOURCES_PATH = '/share-servers'
 RESOURCE_PATH = '/share-servers/%s'
diff --git a/manilaclient/v2/share_snapshot_instances.py b/manilaclient/v2/share_snapshot_instances.py
index ef77f24..4f4903e 100644
--- a/manilaclient/v2/share_snapshot_instances.py
+++ b/manilaclient/v2/share_snapshot_instances.py
@@ -15,7 +15,7 @@
 
 from manilaclient import api_versions
 from manilaclient import base
-from manilaclient.openstack.common.apiclient import base as common_base
+from manilaclient.common.apiclient import base as common_base
 
 
 class ShareSnapshotInstance(common_base.Resource):
diff --git a/manilaclient/v2/share_snapshots.py b/manilaclient/v2/share_snapshots.py
index 0748d6f..7b76198 100644
--- a/manilaclient/v2/share_snapshots.py
+++ b/manilaclient/v2/share_snapshots.py
@@ -21,8 +21,8 @@ except ImportError:
 
 from manilaclient import api_versions
 from manilaclient import base
+from manilaclient.common.apiclient import base as common_base
 from manilaclient.common import constants
-from manilaclient.openstack.common.apiclient import base as common_base
 
 
 class ShareSnapshot(common_base.Resource):
diff --git a/manilaclient/v2/share_type_access.py b/manilaclient/v2/share_type_access.py
index 1cd6b24..0c7d332 100644
--- a/manilaclient/v2/share_type_access.py
+++ b/manilaclient/v2/share_type_access.py
@@ -16,7 +16,7 @@
 
 from manilaclient import api_versions
 from manilaclient import base
-from manilaclient.openstack.common.apiclient import base as common_base
+from manilaclient.common.apiclient import base as common_base
 
 
 class ShareTypeAccess(common_base.Resource):
diff --git a/manilaclient/v2/share_types.py b/manilaclient/v2/share_types.py
index 1dae8cb..6e3b84c 100644
--- a/manilaclient/v2/share_types.py
+++ b/manilaclient/v2/share_types.py
@@ -20,8 +20,8 @@ Share Type interface.
 
 from manilaclient import api_versions
 from manilaclient import base
+from manilaclient.common.apiclient import base as common_base
 from manilaclient import exceptions
-from manilaclient.openstack.common.apiclient import base as common_base
 
 
 class ShareType(common_base.Resource):
diff --git a/manilaclient/v2/shares.py b/manilaclient/v2/shares.py
index fb1adc0..1facb64 100644
--- a/manilaclient/v2/shares.py
+++ b/manilaclient/v2/shares.py
@@ -24,9 +24,9 @@ except ImportError:
 
 from manilaclient import api_versions
 from manilaclient import base
+from manilaclient.common.apiclient import base as common_base
 from manilaclient.common import constants
 from manilaclient import exceptions
-from manilaclient.openstack.common.apiclient import base as common_base
 from manilaclient.v2 import share_instances
 
 
diff --git a/manilaclient/v2/shell.py b/manilaclient/v2/shell.py
index c2c25bd..37d2c77 100644
--- a/manilaclient/v2/shell.py
+++ b/manilaclient/v2/shell.py
@@ -24,10 +24,10 @@ from oslo_utils import strutils
 import six
 
 from manilaclient import api_versions
+from manilaclient.common.apiclient import utils as apiclient_utils
+from manilaclient.common import cliutils
 from manilaclient.common import constants
 from manilaclient import exceptions
-from manilaclient.openstack.common.apiclient import utils as apiclient_utils
-from manilaclient.openstack.common import cliutils
 from manilaclient.v2 import quotas
 
 
diff --git a/openstack-common.conf b/openstack-common.conf
deleted file mode 100644
index 879b02c..0000000
--- a/openstack-common.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[DEFAULT]
-
-# The list of modules to copy from openstack-common
-module=apiclient
-module=cliutils
-module=uuidutils
-
-# The base module to hold the copy of openstack.common
-base=manilaclient
diff --git a/tox.ini b/tox.ini
index 8c98dd3..7288dd0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -65,4 +65,4 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
 # F821: undefined name
 ignore = F821
 builtins = _
-exclude = .venv,.tox,dist,doc,openstack,*egg
+exclude = .venv,.tox,dist,doc,*egg