diff --git a/openstackclient/__init__.py b/openstackclient/__init__.py
deleted file mode 100644
index 89deee3..0000000
--- a/openstackclient/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#   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.
-#
-
-__all__ = ['__version__']
-
-import pbr.version
-
-version_info = pbr.version.VersionInfo('python-openstackclient')
-try:
-    __version__ = version_info.version_string()
-except AttributeError:
-    __version__ = None
diff --git a/openstackclient/api/__init__.py b/openstackclient/api/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/openstackclient/tests/__init__.py b/openstackclient/tests/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/openstackclient/api/auth.py b/osc_lib/api/auth.py
similarity index 100%
rename from openstackclient/api/auth.py
rename to osc_lib/api/auth.py
diff --git a/osc_lib/clientmanager.py b/osc_lib/clientmanager.py
index 1fbdf15..588cb6a 100644
--- a/osc_lib/clientmanager.py
+++ b/osc_lib/clientmanager.py
@@ -19,11 +19,11 @@ import copy
 import logging
 import sys
 
-from openstackclient.api import auth
 from oslo_utils import strutils
 import requests
 import six
 
+from osc_lib.api import auth
 from osc_lib import exceptions
 from osc_lib import session as osc_session
 
diff --git a/osc_lib/shell.py b/osc_lib/shell.py
index 1d7d892..61fdf74 100644
--- a/osc_lib/shell.py
+++ b/osc_lib/shell.py
@@ -29,7 +29,6 @@ from cliff import help
 from oslo_utils import importutils
 from oslo_utils import strutils
 
-# import openstackclient
 from osc_lib import clientmanager
 from osc_lib.command import commandmanager
 from osc_lib.command import timing
diff --git a/osc_lib/tests/test_clientmanager.py b/osc_lib/tests/test_clientmanager.py
index d8afe80..3931b50 100644
--- a/osc_lib/tests/test_clientmanager.py
+++ b/osc_lib/tests/test_clientmanager.py
@@ -18,9 +18,9 @@ import mock
 
 from keystoneauth1.access import service_catalog
 from keystoneauth1.identity import v2 as auth_v2
-from openstackclient.api import auth
 from requests_mock.contrib import fixture
 
+from osc_lib.api import auth
 from osc_lib import clientmanager
 from osc_lib import exceptions as exc
 from osc_lib.tests import fakes
@@ -388,7 +388,7 @@ class TestClientManager(utils.TestCase):
             client_manager.setup_auth,
         )
 
-    @mock.patch('openstackclient.api.auth.check_valid_auth_options')
+    @mock.patch('osc_lib.api.auth.check_valid_auth_options')
     def test_client_manager_auth_setup_once(self, check_auth_options_func):
         client_manager = clientmanager.ClientManager(
             cli_options=FakeOptions(