diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 00000000..960c0552
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,7 @@
+[run]
+branch = True
+source = db
+omit = db/tests/*,db/openstack/*
+
+[report]
+ignore-errors = True
\ No newline at end of file
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..cc92f17b
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+# Format is:
+# <preferred e-mail> <other e-mail 1>
+# <preferred e-mail> <other e-mail 2>
\ No newline at end of file
diff --git a/.testr.conf b/.testr.conf
new file mode 100644
index 00000000..fb622677
--- /dev/null
+++ b/.testr.conf
@@ -0,0 +1,7 @@
+[DEFAULT]
+test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
+             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
+             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
+             ${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION
+test_id_option=--load-list $IDFILE
+test_list_option=--list
\ No newline at end of file
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
new file mode 100644
index 00000000..c458b441
--- /dev/null
+++ b/CONTRIBUTING.rst
@@ -0,0 +1,17 @@
+If you would like to contribute to the development of OpenStack,
+you must follow the steps in the "If you're a developer, start here"
+section of this page:
+
+   http://wiki.openstack.org/HowToContribute
+
+Once those steps have been completed, changes to OpenStack
+should be submitted for review via the Gerrit tool, following
+the workflow documented at:
+
+   http://wiki.openstack.org/GerritWorkflow
+
+Pull requests submitted through GitHub will be ignored.
+
+Bugs should be filed on Launchpad, not GitHub:
+
+   https://bugs.launchpad.net/oslo.db
\ No newline at end of file
diff --git a/HACKING.rst b/HACKING.rst
new file mode 100644
index 00000000..8f0f190d
--- /dev/null
+++ b/HACKING.rst
@@ -0,0 +1,4 @@
+ Style Commandments
+===============================================
+
+Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..67db8588
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,175 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 00000000..90f8a7ae
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,6 @@
+include AUTHORS
+include ChangeLog
+exclude .gitignore
+exclude .gitreview
+
+global-exclude *.pyc
\ No newline at end of file
diff --git a/README.rst b/README.rst
new file mode 100644
index 00000000..b87094bb
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,10 @@
+===================================
+oslo.db
+===================================
+
+oslo.db library
+
+* Free software: Apache license
+* Documentation: http://docs.openstack.org/developer/oslo.db
+* Source: http://git.openstack.org/cgit/openstack/oslo.db
+* Bugs: http://bugs.launchpad.net/oslo
\ No newline at end of file
diff --git a/babel.cfg b/babel.cfg
new file mode 100644
index 00000000..efceab81
--- /dev/null
+++ b/babel.cfg
@@ -0,0 +1 @@
+[python: **.py]
diff --git a/doc/source/conf.py b/doc/source/conf.py
new file mode 100755
index 00000000..510e579f
--- /dev/null
+++ b/doc/source/conf.py
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+# 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.
+
+import os
+import sys
+
+sys.path.insert(0, os.path.abspath('../..'))
+# -- General configuration ----------------------------------------------------
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = [
+    'sphinx.ext.autodoc',
+    #'sphinx.ext.intersphinx',
+    'oslosphinx'
+]
+
+# autodoc generation is a bit aggressive and a nuisance when doing heavy
+# text edit cycles.
+# execute "export SPHINX_DEBUG=1" in your terminal to disable
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'oslo.db'
+copyright = u'2014, OpenStack Foundation'
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+add_module_names = True
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# -- Options for HTML output --------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  Major themes that come with
+# Sphinx are currently 'default' and 'sphinxdoc'.
+# html_theme_path = ["."]
+# html_theme = '_theme'
+# html_static_path = ['static']
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = '%sdoc' % project
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass
+# [howto/manual]).
+latex_documents = [
+    ('index',
+     '%s.tex' % project,
+     u'%s Documentation' % project,
+     u'OpenStack Foundation', 'manual'),
+]
+
+# Example configuration for intersphinx: refer to the Python standard library.
+#intersphinx_mapping = {'http://docs.python.org/': None}
\ No newline at end of file
diff --git a/doc/source/contributing.rst b/doc/source/contributing.rst
new file mode 100644
index 00000000..8cb3146f
--- /dev/null
+++ b/doc/source/contributing.rst
@@ -0,0 +1 @@
+.. include:: ../../CONTRIBUTING.rst
\ No newline at end of file
diff --git a/doc/source/index.rst b/doc/source/index.rst
new file mode 100644
index 00000000..63940022
--- /dev/null
+++ b/doc/source/index.rst
@@ -0,0 +1,24 @@
+..  documentation master file, created by
+   sphinx-quickstart on Tue Jul  9 22:26:36 2013.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome to 's documentation!
+========================================================
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+
+   readme
+   installation
+   usage
+   contributing
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
diff --git a/doc/source/installation.rst b/doc/source/installation.rst
new file mode 100644
index 00000000..5c01c7ae
--- /dev/null
+++ b/doc/source/installation.rst
@@ -0,0 +1,12 @@
+============
+Installation
+============
+
+At the command line::
+
+    $ pip install 
+
+Or, if you have virtualenvwrapper installed::
+
+    $ mkvirtualenv 
+    $ pip install 
\ No newline at end of file
diff --git a/doc/source/readme.rst b/doc/source/readme.rst
new file mode 100644
index 00000000..6b2b3ec6
--- /dev/null
+++ b/doc/source/readme.rst
@@ -0,0 +1 @@
+.. include:: ../README.rst
\ No newline at end of file
diff --git a/doc/source/usage.rst b/doc/source/usage.rst
new file mode 100644
index 00000000..81c25cf9
--- /dev/null
+++ b/doc/source/usage.rst
@@ -0,0 +1,7 @@
+========
+Usage
+========
+
+To use  in a project::
+
+	import db
\ No newline at end of file
diff --git a/oslo/__init__.py b/oslo/__init__.py
new file mode 100644
index 00000000..c659cac1
--- /dev/null
+++ b/oslo/__init__.py
@@ -0,0 +1,15 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+#    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.
+
+__import__('pkg_resources').declare_namespace(__name__)
\ No newline at end of file
diff --git a/openstack/common/db/__init__.py b/oslo/db/__init__.py
similarity index 100%
rename from openstack/common/db/__init__.py
rename to oslo/db/__init__.py
diff --git a/openstack/common/db/api.py b/oslo/db/api.py
similarity index 99%
rename from openstack/common/db/api.py
rename to oslo/db/api.py
index bfd8fefa..28e9a826 100644
--- a/openstack/common/db/api.py
+++ b/oslo/db/api.py
@@ -25,7 +25,7 @@ import logging
 import threading
 import time
 
-from openstack.common.db import exception
+from oslo.db import exception
 from openstack.common.gettextutils import _LE
 from openstack.common import importutils
 
diff --git a/openstack/common/db/exception.py b/oslo/db/exception.py
similarity index 100%
rename from openstack/common/db/exception.py
rename to oslo/db/exception.py
diff --git a/openstack/common/db/options.py b/oslo/db/options.py
similarity index 100%
rename from openstack/common/db/options.py
rename to oslo/db/options.py
diff --git a/openstack/common/db/sqlalchemy/__init__.py b/oslo/db/sqlalchemy/__init__.py
similarity index 100%
rename from openstack/common/db/sqlalchemy/__init__.py
rename to oslo/db/sqlalchemy/__init__.py
diff --git a/openstack/common/db/sqlalchemy/migration.py b/oslo/db/sqlalchemy/migration.py
similarity index 99%
rename from openstack/common/db/sqlalchemy/migration.py
rename to oslo/db/sqlalchemy/migration.py
index 44ce0970..5c69d27a 100644
--- a/openstack/common/db/sqlalchemy/migration.py
+++ b/oslo/db/sqlalchemy/migration.py
@@ -50,7 +50,7 @@ from migrate.versioning.repository import Repository
 import sqlalchemy
 from sqlalchemy.schema import UniqueConstraint
 
-from openstack.common.db import exception
+from oslo.db import exception
 from openstack.common.gettextutils import _
 
 
diff --git a/openstack/common/db/sqlalchemy/migration_cli/README.rst b/oslo/db/sqlalchemy/migration_cli/README.rst
similarity index 100%
rename from openstack/common/db/sqlalchemy/migration_cli/README.rst
rename to oslo/db/sqlalchemy/migration_cli/README.rst
diff --git a/openstack/common/db/sqlalchemy/migration_cli/__init__.py b/oslo/db/sqlalchemy/migration_cli/__init__.py
similarity index 100%
rename from openstack/common/db/sqlalchemy/migration_cli/__init__.py
rename to oslo/db/sqlalchemy/migration_cli/__init__.py
diff --git a/openstack/common/db/sqlalchemy/migration_cli/ext_alembic.py b/oslo/db/sqlalchemy/migration_cli/ext_alembic.py
similarity index 95%
rename from openstack/common/db/sqlalchemy/migration_cli/ext_alembic.py
rename to oslo/db/sqlalchemy/migration_cli/ext_alembic.py
index 03b8a989..be3d8c63 100644
--- a/openstack/common/db/sqlalchemy/migration_cli/ext_alembic.py
+++ b/oslo/db/sqlalchemy/migration_cli/ext_alembic.py
@@ -16,8 +16,8 @@ import alembic
 from alembic import config as alembic_config
 import alembic.migration as alembic_migration
 
-from openstack.common.db.sqlalchemy.migration_cli import ext_base
-from openstack.common.db.sqlalchemy import session as db_session
+from oslo.db.sqlalchemy.migration_cli import ext_base
+from oslo.db.sqlalchemy import session as db_session
 
 
 class AlembicExtension(ext_base.MigrationExtensionBase):
diff --git a/openstack/common/db/sqlalchemy/migration_cli/ext_base.py b/oslo/db/sqlalchemy/migration_cli/ext_base.py
similarity index 100%
rename from openstack/common/db/sqlalchemy/migration_cli/ext_base.py
rename to oslo/db/sqlalchemy/migration_cli/ext_base.py
diff --git a/openstack/common/db/sqlalchemy/migration_cli/ext_migrate.py b/oslo/db/sqlalchemy/migration_cli/ext_migrate.py
similarity index 92%
rename from openstack/common/db/sqlalchemy/migration_cli/ext_migrate.py
rename to oslo/db/sqlalchemy/migration_cli/ext_migrate.py
index 7411caaa..cf5280b8 100644
--- a/openstack/common/db/sqlalchemy/migration_cli/ext_migrate.py
+++ b/oslo/db/sqlalchemy/migration_cli/ext_migrate.py
@@ -13,9 +13,9 @@
 import logging
 import os
 
-from openstack.common.db.sqlalchemy import migration
-from openstack.common.db.sqlalchemy.migration_cli import ext_base
-from openstack.common.db.sqlalchemy import session as db_session
+from oslo.db.sqlalchemy import migration
+from oslo.db.sqlalchemy.migration_cli import ext_base
+from oslo.db.sqlalchemy import session as db_session
 from openstack.common.gettextutils import _LE
 
 
diff --git a/openstack/common/db/sqlalchemy/migration_cli/manager.py b/oslo/db/sqlalchemy/migration_cli/manager.py
similarity index 100%
rename from openstack/common/db/sqlalchemy/migration_cli/manager.py
rename to oslo/db/sqlalchemy/migration_cli/manager.py
diff --git a/openstack/common/db/sqlalchemy/models.py b/oslo/db/sqlalchemy/models.py
similarity index 100%
rename from openstack/common/db/sqlalchemy/models.py
rename to oslo/db/sqlalchemy/models.py
diff --git a/openstack/common/db/sqlalchemy/provision.py b/oslo/db/sqlalchemy/provision.py
similarity index 99%
rename from openstack/common/db/sqlalchemy/provision.py
rename to oslo/db/sqlalchemy/provision.py
index 33882a80..598305b6 100644
--- a/openstack/common/db/sqlalchemy/provision.py
+++ b/oslo/db/sqlalchemy/provision.py
@@ -24,7 +24,7 @@ import string
 from six import moves
 import sqlalchemy
 
-from openstack.common.db import exception as exc
+from oslo.db import exception as exc
 
 
 LOG = logging.getLogger(__name__)
diff --git a/openstack/common/db/sqlalchemy/session.py b/oslo/db/sqlalchemy/session.py
similarity index 99%
rename from openstack/common/db/sqlalchemy/session.py
rename to oslo/db/sqlalchemy/session.py
index 7ec799c3..90ff9344 100644
--- a/openstack/common/db/sqlalchemy/session.py
+++ b/oslo/db/sqlalchemy/session.py
@@ -290,7 +290,7 @@ import sqlalchemy.orm
 from sqlalchemy.pool import NullPool, StaticPool
 from sqlalchemy.sql.expression import literal_column
 
-from openstack.common.db import exception
+from oslo.db import exception
 from openstack.common.gettextutils import _LE, _LW
 from openstack.common import timeutils
 
diff --git a/openstack/common/db/sqlalchemy/test_base.py b/oslo/db/sqlalchemy/test_base.py
similarity index 97%
rename from openstack/common/db/sqlalchemy/test_base.py
rename to oslo/db/sqlalchemy/test_base.py
index ac36e872..7664faa2 100644
--- a/openstack/common/db/sqlalchemy/test_base.py
+++ b/oslo/db/sqlalchemy/test_base.py
@@ -21,9 +21,9 @@ import fixtures
 from oslotest import base as test_base
 import six
 
-from openstack.common.db.sqlalchemy import provision
-from openstack.common.db.sqlalchemy import session
-from openstack.common.db.sqlalchemy import utils
+from oslo.db.sqlalchemy import provision
+from oslo.db.sqlalchemy import session
+from oslo.db.sqlalchemy import utils
 
 
 class DbFixture(fixtures.Fixture):
diff --git a/openstack/common/db/sqlalchemy/test_migrations.conf b/oslo/db/sqlalchemy/test_migrations.conf
similarity index 100%
rename from openstack/common/db/sqlalchemy/test_migrations.conf
rename to oslo/db/sqlalchemy/test_migrations.conf
diff --git a/openstack/common/db/sqlalchemy/test_migrations.py b/oslo/db/sqlalchemy/test_migrations.py
similarity index 99%
rename from openstack/common/db/sqlalchemy/test_migrations.py
rename to oslo/db/sqlalchemy/test_migrations.py
index e13e1f62..886bb046 100644
--- a/openstack/common/db/sqlalchemy/test_migrations.py
+++ b/oslo/db/sqlalchemy/test_migrations.py
@@ -26,7 +26,7 @@ from six.moves.urllib import parse
 import sqlalchemy
 import sqlalchemy.exc
 
-from openstack.common.db.sqlalchemy import utils
+from oslo.db.sqlalchemy import utils
 from openstack.common.gettextutils import _LE
 
 LOG = logging.getLogger(__name__)
diff --git a/openstack/common/db/sqlalchemy/utils.py b/oslo/db/sqlalchemy/utils.py
similarity index 99%
rename from openstack/common/db/sqlalchemy/utils.py
rename to oslo/db/sqlalchemy/utils.py
index 11c0a169..02daea50 100644
--- a/openstack/common/db/sqlalchemy/utils.py
+++ b/oslo/db/sqlalchemy/utils.py
@@ -37,7 +37,7 @@ from sqlalchemy import Table
 from sqlalchemy.types import NullType
 
 from openstack.common import context as request_context
-from openstack.common.db.sqlalchemy import models
+from oslo.db.sqlalchemy import models
 from openstack.common.gettextutils import _, _LI, _LW
 from openstack.common import timeutils
 
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..dbb4dd15
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1 @@
+Babel>=0.9.6
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 00000000..efd771c7
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,49 @@
+[metadata]
+name = oslo.db
+summary = oslo.db library
+description-file =
+    README.rst
+author = OpenStack
+author-email = openstack-dev@lists.openstack.org
+home-page = http://launchpad.net/oslo
+classifier =
+    Environment :: OpenStack
+    Intended Audience :: Information Technology
+    Intended Audience :: System Administrators
+    License :: OSI Approved :: Apache Software License
+    Operating System :: POSIX :: Linux
+    Programming Language :: Python
+    Programming Language :: Python :: 2
+    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 2.6
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.3
+
+[files]
+packages =
+    oslo
+    oslo.db
+namespace_packages =
+    oslo
+
+[build_sphinx]
+source-dir = doc/source
+build-dir = doc/build
+all_files = 1
+
+[upload_sphinx]
+upload-dir = doc/build/html
+
+[compile_catalog]
+directory = oslo.db/locale
+domain = oslo.db
+
+[update_catalog]
+domain = oslo.db
+output_dir = oslo.db/locale
+input_file = oslo.db/locale/oslo.db.pot
+
+[extract_messages]
+keywords = _ gettext ngettext l_ lazy_gettext
+mapping_file = babel.cfg
+output_file = oslo.db/locale/oslo.db.pot
\ No newline at end of file
diff --git a/setup.py b/setup.py
new file mode 100755
index 00000000..7eeb36b5
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
+#
+# 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.
+
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
+import setuptools
+
+setuptools.setup(
+    setup_requires=['pbr'],
+    pbr=True)
\ No newline at end of file
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 00000000..2a46bd80
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1,11 @@
+hacking>=0.5.6,<0.8
+
+coverage>=3.6
+discover
+fixtures>=0.3.14
+python-subunit
+sphinx>=1.1.2
+oslosphinx
+testrepository>=0.0.17
+testscenarios>=0.4,<0.5
+testtools>=0.9.32
\ No newline at end of file
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 00000000..f88664ea
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+# 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.
\ No newline at end of file
diff --git a/tests/base.py b/tests/base.py
new file mode 100644
index 00000000..f9a09a8e
--- /dev/null
+++ b/tests/base.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2010-2011 OpenStack Foundation
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
+#
+# 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.
+
+import os
+
+import fixtures
+import testtools
+
+_TRUE_VALUES = ('true', '1', 'yes')
+
+# FIXME(dhellmann) Update this to use oslo.test library
+
+class TestCase(testtools.TestCase):
+
+    """Test case base class for all unit tests."""
+
+    def setUp(self):
+        """Run before each test method to initialize test environment."""
+
+        super(TestCase, self).setUp()
+        test_timeout = os.environ.get('OS_TEST_TIMEOUT', 0)
+        try:
+            test_timeout = int(test_timeout)
+        except ValueError:
+            # If timeout value is invalid do not set a timeout.
+            test_timeout = 0
+        if test_timeout > 0:
+            self.useFixture(fixtures.Timeout(test_timeout, gentle=True))
+
+        self.useFixture(fixtures.NestedTempfile())
+        self.useFixture(fixtures.TempHomeDir())
+
+        if os.environ.get('OS_STDOUT_CAPTURE') in _TRUE_VALUES:
+            stdout = self.useFixture(fixtures.StringStream('stdout')).stream
+            self.useFixture(fixtures.MonkeyPatch('sys.stdout', stdout))
+        if os.environ.get('OS_STDERR_CAPTURE') in _TRUE_VALUES:
+            stderr = self.useFixture(fixtures.StringStream('stderr')).stream
+            self.useFixture(fixtures.MonkeyPatch('sys.stderr', stderr))
+
+        self.log_fixture = self.useFixture(fixtures.FakeLogger())
\ No newline at end of file
diff --git a/tests/test_db.py b/tests/test_db.py
new file mode 100644
index 00000000..6156b0e7
--- /dev/null
+++ b/tests/test_db.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+
+# 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.
+
+"""
+test_db
+----------------------------------
+
+Tests for `db` module.
+"""
+
+from . import base
+
+
+class TestDb(base.TestCase):
+
+    def test_something(self):
+        pass
\ No newline at end of file
diff --git a/tests/unit/db/sqlalchemy/test_migrate.py b/tests/unit/db/sqlalchemy/test_migrate.py
index a6e97008..23833e14 100644
--- a/tests/unit/db/sqlalchemy/test_migrate.py
+++ b/tests/unit/db/sqlalchemy/test_migrate.py
@@ -17,8 +17,8 @@ from migrate.changeset.constraint import UniqueConstraint
 from migrate.changeset.databases import sqlite
 import sqlalchemy as sa
 
-from openstack.common.db.sqlalchemy import migration
-from openstack.common.db.sqlalchemy import test_base
+from oslo.db.sqlalchemy import migration
+from oslo.db.sqlalchemy import test_base
 
 
 def uniques(*constraints):
diff --git a/tests/unit/db/sqlalchemy/test_migrate_cli.py b/tests/unit/db/sqlalchemy/test_migrate_cli.py
index 9e33bf5a..f23ee872 100644
--- a/tests/unit/db/sqlalchemy/test_migrate_cli.py
+++ b/tests/unit/db/sqlalchemy/test_migrate_cli.py
@@ -13,9 +13,9 @@
 import mock
 from oslotest import base as test_base
 
-from openstack.common.db.sqlalchemy.migration_cli import ext_alembic
-from openstack.common.db.sqlalchemy.migration_cli import ext_migrate
-from openstack.common.db.sqlalchemy.migration_cli import manager
+from oslo.db.sqlalchemy.migration_cli import ext_alembic
+from oslo.db.sqlalchemy.migration_cli import ext_migrate
+from oslo.db.sqlalchemy.migration_cli import manager
 
 
 class MockWithCmp(mock.MagicMock):
@@ -26,7 +26,7 @@ class MockWithCmp(mock.MagicMock):
         return self.order > other.order
 
 
-@mock.patch(('openstack.common.db.sqlalchemy.migration_cli.'
+@mock.patch(('oslo.db.sqlalchemy.migration_cli.'
              'ext_alembic.alembic.command'))
 class TestAlembicExtension(test_base.BaseTestCase):
 
@@ -86,7 +86,7 @@ class TestAlembicExtension(test_base.BaseTestCase):
         self.assertIsNone(version)
 
 
-@mock.patch(('openstack.common.db.sqlalchemy.migration_cli.'
+@mock.patch(('oslo.db.sqlalchemy.migration_cli.'
              'ext_migrate.migration'))
 class TestMigrateExtension(test_base.BaseTestCase):
 
diff --git a/tests/unit/db/sqlalchemy/test_migration_common.py b/tests/unit/db/sqlalchemy/test_migration_common.py
index 789c1689..9f05affc 100644
--- a/tests/unit/db/sqlalchemy/test_migration_common.py
+++ b/tests/unit/db/sqlalchemy/test_migration_common.py
@@ -23,9 +23,9 @@ from migrate.versioning import api as versioning_api
 import mock
 import sqlalchemy
 
-from openstack.common.db import exception as db_exception
-from openstack.common.db.sqlalchemy import migration
-from openstack.common.db.sqlalchemy import test_base
+from oslo.db import exception as db_exception
+from oslo.db.sqlalchemy import migration
+from oslo.db.sqlalchemy import test_base
 
 
 class TestMigrationCommon(test_base.DbTestCase):
diff --git a/tests/unit/db/sqlalchemy/test_migrations.py b/tests/unit/db/sqlalchemy/test_migrations.py
index 1b65ffa2..f39bb734 100644
--- a/tests/unit/db/sqlalchemy/test_migrations.py
+++ b/tests/unit/db/sqlalchemy/test_migrations.py
@@ -17,7 +17,7 @@
 import mock
 from oslotest import base as test_base
 
-from openstack.common.db.sqlalchemy import test_migrations as migrate
+from oslo.db.sqlalchemy import test_migrations as migrate
 
 
 class TestWalkVersions(test_base.BaseTestCase, migrate.WalkVersionsMixin):
diff --git a/tests/unit/db/sqlalchemy/test_models.py b/tests/unit/db/sqlalchemy/test_models.py
index 13783d5f..8c23da81 100644
--- a/tests/unit/db/sqlalchemy/test_models.py
+++ b/tests/unit/db/sqlalchemy/test_models.py
@@ -18,8 +18,8 @@ from sqlalchemy import Column
 from sqlalchemy import Integer, String
 from sqlalchemy.ext.declarative import declarative_base
 
-from openstack.common.db.sqlalchemy import models
-from openstack.common.db.sqlalchemy import test_base
+from oslo.db.sqlalchemy import models
+from oslo.db.sqlalchemy import test_base
 
 
 BASE = declarative_base()
diff --git a/tests/unit/db/sqlalchemy/test_options.py b/tests/unit/db/sqlalchemy/test_options.py
index c5faa2cf..10d6451a 100644
--- a/tests/unit/db/sqlalchemy/test_options.py
+++ b/tests/unit/db/sqlalchemy/test_options.py
@@ -17,7 +17,7 @@ from openstack.common.fixture import config
 from tests import utils as test_utils
 
 
-cfg.CONF.import_opt('connection', 'openstack.common.db.options',
+cfg.CONF.import_opt('connection', 'oslo.db.options',
                     group='database')
 
 
diff --git a/tests/unit/db/sqlalchemy/test_sqlalchemy.py b/tests/unit/db/sqlalchemy/test_sqlalchemy.py
index 9212bef6..9cda622c 100644
--- a/tests/unit/db/sqlalchemy/test_sqlalchemy.py
+++ b/tests/unit/db/sqlalchemy/test_sqlalchemy.py
@@ -29,10 +29,10 @@ from sqlalchemy import exc as sqla_exc
 from sqlalchemy.exc import DataError
 from sqlalchemy.ext.declarative import declarative_base
 
-from openstack.common.db import exception as db_exc
-from openstack.common.db.sqlalchemy import models
-from openstack.common.db.sqlalchemy import session
-from openstack.common.db.sqlalchemy import test_base
+from oslo.db import exception as db_exc
+from oslo.db.sqlalchemy import models
+from oslo.db.sqlalchemy import session
+from oslo.db.sqlalchemy import test_base
 
 
 BASE = declarative_base()
@@ -348,8 +348,8 @@ class EngineFacadeTestCase(oslo_test.BaseTestCase):
         self.assertFalse(ses.autocommit)
         self.assertTrue(ses.expire_on_commit)
 
-    @mock.patch('openstack.common.db.sqlalchemy.session.get_maker')
-    @mock.patch('openstack.common.db.sqlalchemy.session.create_engine')
+    @mock.patch('oslo.db.sqlalchemy.session.get_maker')
+    @mock.patch('oslo.db.sqlalchemy.session.create_engine')
     def test_creation_from_config(self, create_engine, get_maker):
         conf = mock.MagicMock()
         conf.database.items.return_value = [
diff --git a/tests/unit/db/sqlalchemy/test_utils.py b/tests/unit/db/sqlalchemy/test_utils.py
index a2335b6d..d7f1783e 100644
--- a/tests/unit/db/sqlalchemy/test_utils.py
+++ b/tests/unit/db/sqlalchemy/test_utils.py
@@ -32,12 +32,12 @@ from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.sql import select
 from sqlalchemy.types import UserDefinedType, NullType
 
-from openstack.common.db import exception
-from openstack.common.db.sqlalchemy import migration
-from openstack.common.db.sqlalchemy import models
-from openstack.common.db.sqlalchemy import session
-from openstack.common.db.sqlalchemy import test_migrations
-from openstack.common.db.sqlalchemy import utils
+from oslo.db import exception
+from oslo.db.sqlalchemy import migration
+from oslo.db.sqlalchemy import models
+from oslo.db.sqlalchemy import session
+from oslo.db.sqlalchemy import test_migrations
+from oslo.db.sqlalchemy import utils
 from openstack.common.fixture import moxstubout
 from tests import utils as test_utils
 
diff --git a/tests/unit/db/test_api.py b/tests/unit/db/test_api.py
index 1f10d9d5..c4b2bb93 100644
--- a/tests/unit/db/test_api.py
+++ b/tests/unit/db/test_api.py
@@ -17,8 +17,8 @@
 
 import mock
 
-from openstack.common.db import api
-from openstack.common.db import exception
+from oslo.db import api
+from oslo.db import exception
 from openstack.common import importutils
 from tests import utils as test_utils
 
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..83f4dac5
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,35 @@
+[tox]
+minversion = 1.6
+envlist = py26,py27,py33,pypy,pep8
+# NOTE(dhellmann): We cannot set skipdist=True
+# for oslo libraries because of the namespace package.
+#skipsdist = True
+
+[testenv]
+# NOTE(dhellmann): We cannot set usedevelop=True
+# for oslo libraries because of the namespace package.
+#usedevelop = True
+install_command = pip install -U {opts} {packages}
+setenv =
+   VIRTUAL_ENV={envdir}
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+commands = python setup.py testr --slowest --testr-args='{posargs}'
+
+[testenv:pep8]
+commands = flake8
+
+[testenv:venv]
+commands = {posargs}
+
+[testenv:cover]
+commands = python setup.py testr --coverage --testr-args='{posargs}'
+
+[flake8]
+# H803 skipped on purpose per list discussion.
+# E123, E125 skipped as they are invalid PEP-8.
+
+show-source = True
+ignore = E123,E125,H803
+builtins = _
+exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
\ No newline at end of file