diff --git a/refstack/client.py b/refstack/client/client.py
similarity index 100%
rename from refstack/client.py
rename to refstack/client/client.py
diff --git a/refstack/client/requirements.txt b/refstack/client/requirements.txt
new file mode 100755
index 00000000..439faee1
--- /dev/null
+++ b/refstack/client/requirements.txt
@@ -0,0 +1,10 @@
+lockfile
+subunit
+python-daemon
+extras
+statsd>=1.0.0,<3.0
+sqlalchemy>=0.8.2,<0.9.0
+pyzmq>=13.1.0,<14.0.0
+git+https://github.com/openstack/tempest.git
+SQLAlchemy==0.8.1
+requests==1.2.3
diff --git a/refstack/client/runtests.sh b/refstack/client/runtests.sh
new file mode 100644
index 00000000..e69de29b
diff --git a/refstack/client/test-requirements.txt b/refstack/client/test-requirements.txt
new file mode 100644
index 00000000..bb3d39d2
--- /dev/null
+++ b/refstack/client/test-requirements.txt
@@ -0,0 +1,2 @@
+python-subunit
+docutils==0.9.1
diff --git a/refstack/client/tox.ini b/refstack/client/tox.ini
new file mode 100755
index 00000000..3d7a9537
--- /dev/null
+++ b/refstack/client/tox.ini
@@ -0,0 +1,19 @@
+# content of: tox.ini , put in same dir as setup.py
+[tox]
+envlist = py27
+
+
+[testenv]
+# Set STATSD env variables so that statsd code paths are tested.
+setenv = STATSD_HOST=localhost
+         STATSD_PORT=8125
+
+         VIRTUAL_ENV=/tmp/1/env
+changedir=/tmp/1
+commands=
+    client.py {posargs:--config}
+    
+
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+