diff --git a/devops/.gitignore b/devops/.gitignore
new file mode 100644
index 000000000..37ff877e4
--- /dev/null
+++ b/devops/.gitignore
@@ -0,0 +1,3 @@
+build
+dist
+MANIFEST
diff --git a/devops/scripts/devops b/devops/scripts/devops
new file mode 100755
index 000000000..496f93a3b
--- /dev/null
+++ b/devops/scripts/devops
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+exec python -m devops "$@"
+
diff --git a/devops/setup.py b/devops/setup.py
new file mode 100644
index 000000000..b465c2e93
--- /dev/null
+++ b/devops/setup.py
@@ -0,0 +1,12 @@
+from distutils.core import setup
+
+setup(
+    name='devops',
+    version='0.1',
+    description='Library to aid creating and manipulating virtual environments',
+    author='Mirantis, Inc.',
+    author_email='product@mirantis.com',
+    packages=['devops'],
+    scripts=['scripts/devops']
+)
+
diff --git a/devops/devops/driver/test_libvirt.py b/devops/test/test_libvirt.py
similarity index 100%
rename from devops/devops/driver/test_libvirt.py
rename to devops/test/test_libvirt.py
diff --git a/devops/devops/test_network.py b/devops/test/test_network.py
similarity index 100%
rename from devops/devops/test_network.py
rename to devops/test/test_network.py
diff --git a/devops/devops/test_scancodes.py b/devops/test/test_scancodes.py
similarity index 96%
rename from devops/devops/test_scancodes.py
rename to devops/test/test_scancodes.py
index 51679774c..8a8098f8d 100644
--- a/devops/devops/test_scancodes.py
+++ b/devops/test/test_scancodes.py
@@ -1,5 +1,5 @@
 import unittest
-from . import scancodes
+from devops import scancodes
 
 class TestScancodes(unittest.TestCase):
 
diff --git a/devops/devops/test_xml.py b/devops/test/test_xml.py
similarity index 98%
rename from devops/devops/test_xml.py
rename to devops/test/test_xml.py
index 0f29efcb5..e2e152b7f 100644
--- a/devops/devops/test_xml.py
+++ b/devops/test/test_xml.py
@@ -1,5 +1,5 @@
 
-from . import xml
+from devops import xml
 import unittest
 
 class TestXml(unittest.TestCase):
diff --git a/devops/devops/test_yaml_config_loader.py b/devops/test/test_yaml_config_loader.py
similarity index 100%
rename from devops/devops/test_yaml_config_loader.py
rename to devops/test/test_yaml_config_loader.py