diff --git a/openstack/common/cfg.py b/oslo/config/cfg.py
similarity index 99%
rename from openstack/common/cfg.py
rename to oslo/config/cfg.py
index 8c965c1..5e980bb 100644
--- a/openstack/common/cfg.py
+++ b/oslo/config/cfg.py
@@ -107,7 +107,7 @@ and --config-dir::
             self.register_cli_opts(opts)
 
 Option values are parsed from any supplied config files using
-openstack.common.iniparser. If none are specified, a default set is used
+oslo.config.iniparser. If none are specified, a default set is used
 e.g. glance-api.conf and glance-common.conf::
 
     glance-api.conf:
@@ -220,7 +220,7 @@ log files::
 This module also contains a global instance of the CommonConfigOpts class
 in order to support a common usage pattern in OpenStack::
 
-    from openstack.common import cfg
+    from oslo.config import cfg
 
     opts = [
         cfg.StrOpt('bind_host', default='0.0.0.0'),
@@ -268,7 +268,7 @@ import os
 import string
 import sys
 
-from openstack.common import iniparser
+from oslo.config import iniparser
 
 
 class Error(Exception):
diff --git a/openstack/common/iniparser.py b/oslo/config/iniparser.py
similarity index 100%
rename from openstack/common/iniparser.py
rename to oslo/config/iniparser.py
diff --git a/tests/unit/test_cfg.py b/tests/test_cfg.py
similarity index 99%
rename from tests/unit/test_cfg.py
rename to tests/test_cfg.py
index b2c14ec..c803af9 100644
--- a/tests/unit/test_cfg.py
+++ b/tests/test_cfg.py
@@ -23,7 +23,7 @@ import unittest
 
 import stubout
 
-from openstack.common.cfg import *
+from oslo.config.cfg import *
 
 
 class ExceptionsTestCase(unittest.TestCase):
diff --git a/tests/unit/test_iniparser.py b/tests/test_iniparser.py
similarity index 99%
rename from tests/unit/test_iniparser.py
rename to tests/test_iniparser.py
index 9e119e7..7224a2c 100644
--- a/tests/unit/test_iniparser.py
+++ b/tests/test_iniparser.py
@@ -16,7 +16,7 @@
 
 import unittest
 
-from openstack.common import iniparser
+from oslo.config import iniparser
 
 
 class TestParser(iniparser.BaseParser):
diff --git a/tests/testmods/bar_foo_opt.py b/tests/testmods/bar_foo_opt.py
index 88d0bbf..0057f11 100644
--- a/tests/testmods/bar_foo_opt.py
+++ b/tests/testmods/bar_foo_opt.py
@@ -14,7 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from openstack.common import cfg
+from oslo.config import cfg
 
 CONF = cfg.CONF
 
diff --git a/tests/testmods/blaa_opt.py b/tests/testmods/blaa_opt.py
index b320a72..a7b06b2 100644
--- a/tests/testmods/blaa_opt.py
+++ b/tests/testmods/blaa_opt.py
@@ -14,7 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from openstack.common import cfg
+from oslo.config import cfg
 
 CONF = cfg.CONF