diff --git a/monasca_persister/openstack/__init__.py b/openstack/__init__.py
similarity index 100%
rename from monasca_persister/openstack/__init__.py
rename to openstack/__init__.py
diff --git a/monasca_persister/openstack/__init__.pyc b/openstack/__init__.pyc
similarity index 100%
rename from monasca_persister/openstack/__init__.pyc
rename to openstack/__init__.pyc
diff --git a/monasca_persister/openstack/common/__init__.py b/openstack/common/__init__.py
similarity index 100%
rename from monasca_persister/openstack/common/__init__.py
rename to openstack/common/__init__.py
diff --git a/monasca_persister/openstack/common/__init__.pyc b/openstack/common/__init__.pyc
similarity index 100%
rename from monasca_persister/openstack/common/__init__.pyc
rename to openstack/common/__init__.pyc
diff --git a/monasca_persister/openstack/common/eventlet_backdoor.py b/openstack/common/eventlet_backdoor.py
similarity index 100%
rename from monasca_persister/openstack/common/eventlet_backdoor.py
rename to openstack/common/eventlet_backdoor.py
diff --git a/monasca_persister/openstack/common/excutils.py b/openstack/common/excutils.py
similarity index 100%
rename from monasca_persister/openstack/common/excutils.py
rename to openstack/common/excutils.py
diff --git a/monasca_persister/openstack/common/fileutils.py b/openstack/common/fileutils.py
similarity index 100%
rename from monasca_persister/openstack/common/fileutils.py
rename to openstack/common/fileutils.py
diff --git a/monasca_persister/openstack/common/fixture/__init__.py b/openstack/common/fixture/__init__.py
similarity index 100%
rename from monasca_persister/openstack/common/fixture/__init__.py
rename to openstack/common/fixture/__init__.py
diff --git a/monasca_persister/openstack/common/fixture/config.py b/openstack/common/fixture/config.py
similarity index 100%
rename from monasca_persister/openstack/common/fixture/config.py
rename to openstack/common/fixture/config.py
diff --git a/monasca_persister/openstack/common/fixture/lockutils.py b/openstack/common/fixture/lockutils.py
similarity index 100%
rename from monasca_persister/openstack/common/fixture/lockutils.py
rename to openstack/common/fixture/lockutils.py
diff --git a/monasca_persister/openstack/common/fixture/logging.py b/openstack/common/fixture/logging.py
similarity index 100%
rename from monasca_persister/openstack/common/fixture/logging.py
rename to openstack/common/fixture/logging.py
diff --git a/monasca_persister/openstack/common/fixture/mockpatch.py b/openstack/common/fixture/mockpatch.py
similarity index 100%
rename from monasca_persister/openstack/common/fixture/mockpatch.py
rename to openstack/common/fixture/mockpatch.py
diff --git a/monasca_persister/openstack/common/fixture/moxstubout.py b/openstack/common/fixture/moxstubout.py
similarity index 100%
rename from monasca_persister/openstack/common/fixture/moxstubout.py
rename to openstack/common/fixture/moxstubout.py
diff --git a/monasca_persister/openstack/common/gettextutils.py b/openstack/common/gettextutils.py
similarity index 100%
rename from monasca_persister/openstack/common/gettextutils.py
rename to openstack/common/gettextutils.py
diff --git a/monasca_persister/openstack/common/gettextutils.pyc b/openstack/common/gettextutils.pyc
similarity index 100%
rename from monasca_persister/openstack/common/gettextutils.pyc
rename to openstack/common/gettextutils.pyc
diff --git a/monasca_persister/openstack/common/importutils.py b/openstack/common/importutils.py
similarity index 100%
rename from monasca_persister/openstack/common/importutils.py
rename to openstack/common/importutils.py
diff --git a/monasca_persister/openstack/common/importutils.pyc b/openstack/common/importutils.pyc
similarity index 100%
rename from monasca_persister/openstack/common/importutils.pyc
rename to openstack/common/importutils.pyc
diff --git a/monasca_persister/openstack/common/jsonutils.py b/openstack/common/jsonutils.py
similarity index 100%
rename from monasca_persister/openstack/common/jsonutils.py
rename to openstack/common/jsonutils.py
diff --git a/monasca_persister/openstack/common/jsonutils.pyc b/openstack/common/jsonutils.pyc
similarity index 100%
rename from monasca_persister/openstack/common/jsonutils.pyc
rename to openstack/common/jsonutils.pyc
diff --git a/monasca_persister/openstack/common/local.py b/openstack/common/local.py
similarity index 100%
rename from monasca_persister/openstack/common/local.py
rename to openstack/common/local.py
diff --git a/monasca_persister/openstack/common/local.pyc b/openstack/common/local.pyc
similarity index 100%
rename from monasca_persister/openstack/common/local.pyc
rename to openstack/common/local.pyc
diff --git a/monasca_persister/openstack/common/lockutils.py b/openstack/common/lockutils.py
similarity index 100%
rename from monasca_persister/openstack/common/lockutils.py
rename to openstack/common/lockutils.py
diff --git a/monasca_persister/openstack/common/log.py b/openstack/common/log.py
similarity index 100%
rename from monasca_persister/openstack/common/log.py
rename to openstack/common/log.py
diff --git a/monasca_persister/openstack/common/log.pyc b/openstack/common/log.pyc
similarity index 100%
rename from monasca_persister/openstack/common/log.pyc
rename to openstack/common/log.pyc
diff --git a/monasca_persister/openstack/common/loopingcall.py b/openstack/common/loopingcall.py
similarity index 100%
rename from monasca_persister/openstack/common/loopingcall.py
rename to openstack/common/loopingcall.py
diff --git a/monasca_persister/openstack/common/service.py b/openstack/common/service.py
similarity index 100%
rename from monasca_persister/openstack/common/service.py
rename to openstack/common/service.py
diff --git a/monasca_persister/openstack/common/strutils.py b/openstack/common/strutils.py
similarity index 100%
rename from monasca_persister/openstack/common/strutils.py
rename to openstack/common/strutils.py
diff --git a/monasca_persister/openstack/common/strutils.pyc b/openstack/common/strutils.pyc
similarity index 100%
rename from monasca_persister/openstack/common/strutils.pyc
rename to openstack/common/strutils.pyc
diff --git a/monasca_persister/openstack/common/systemd.py b/openstack/common/systemd.py
similarity index 100%
rename from monasca_persister/openstack/common/systemd.py
rename to openstack/common/systemd.py
diff --git a/monasca_persister/openstack/common/threadgroup.py b/openstack/common/threadgroup.py
similarity index 100%
rename from monasca_persister/openstack/common/threadgroup.py
rename to openstack/common/threadgroup.py
diff --git a/monasca_persister/openstack/common/timeutils.py b/openstack/common/timeutils.py
similarity index 100%
rename from monasca_persister/openstack/common/timeutils.py
rename to openstack/common/timeutils.py
diff --git a/monasca_persister/openstack/common/timeutils.pyc b/openstack/common/timeutils.pyc
similarity index 100%
rename from monasca_persister/openstack/common/timeutils.pyc
rename to openstack/common/timeutils.pyc
diff --git a/requirements.txt b/requirements.txt
index 4abf0ad6..3d3d88b7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+eventlet
 kafka-python>=0.9.1
 oslo.config>=1.3.0
 influxdb>=0.1.12
diff --git a/setup.cfg b/setup.cfg
index 5ae2e921..da2c9d37 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,6 +17,7 @@ console_scripts =
 
 [files]
 packages = monasca_persister
+           openstack.common
 
 [flake8]
 max-line-length = 120