diff --git a/.coverage b/.coverage
new file mode 100644
index 00000000..fe3536a9
Binary files /dev/null and b/.coverage differ
diff --git a/jenkins.sh b/jenkins.sh
index 4ad1c800..da5245e8 100755
--- a/jenkins.sh
+++ b/jenkins.sh
@@ -8,16 +8,16 @@ fi
 export WORKON_HOME=$HOME/.venvs
 source /usr/local/bin/virtualenvwrapper.sh
 
-#create the scientific python virtualenv and copy to provide qexec base
+#create the scientific python virtualenv and copy to provide qsim base
 mkvirtualenv --no-site-packages scientific_base
 workon scientific_base
 ./ordered_pip.sh requirements_sci.txt
 deactivate
-#re-base qexec
-#rmvirtualenv qexec
-cpvirtualenv scientific_base qexec  
+#re-base qsim
+#rmvirtualenv qsim
+cpvirtualenv scientific_base qsim  
 
-workon qexec
+workon qsim
 ./ordered_pip.sh requirements.txt
 ./ordered_pip.sh requirements_dev.txt
 
@@ -25,7 +25,7 @@ workon qexec
 python dev_setup.py 
 
 #run all the tests in test
-nosetests --with-xcoverage --with-xunit --cover-package=myapp --cover-erase
+nosetests --with-xcoverage --with-xunit --cover-erase --cover-inclusive
 pylint -f parseable . | tee pylint.out
 
 deactivate
diff --git a/__init__.py b/simulator/__init__.py
similarity index 100%
rename from __init__.py
rename to simulator/__init__.py
diff --git a/backtest/__init__.py b/simulator/backtest/__init__.py
similarity index 100%
rename from backtest/__init__.py
rename to simulator/backtest/__init__.py
diff --git a/backtest/util.py b/simulator/backtest/util.py
similarity index 100%
rename from backtest/util.py
rename to simulator/backtest/util.py
diff --git a/config.py b/simulator/config.py
similarity index 100%
rename from config.py
rename to simulator/config.py
diff --git a/data/__init__.py b/simulator/data/__init__.py
similarity index 100%
rename from data/__init__.py
rename to simulator/data/__init__.py
diff --git a/data/feed.py b/simulator/data/feed.py
similarity index 97%
rename from data/feed.py
rename to simulator/data/feed.py
index e1962dfb..1f84d4ea 100644
--- a/data/feed.py
+++ b/simulator/data/feed.py
@@ -1,6 +1,6 @@
 
-from data.sources.equity import *
-from backtest.util import *
+from simulator.data.sources.equity import *
+from simulator.backtest.util import *
 import time
 import logging
 
@@ -114,4 +114,4 @@ class DataFeed(object):
         
 
         
-            
\ No newline at end of file
+            
diff --git a/data/sources/__init__.py b/simulator/data/sources/__init__.py
similarity index 100%
rename from data/sources/__init__.py
rename to simulator/data/sources/__init__.py
diff --git a/data/sources/equity.py b/simulator/data/sources/equity.py
similarity index 97%
rename from data/sources/equity.py
rename to simulator/data/sources/equity.py
index 4923871e..a3ef1d62 100644
--- a/data/sources/equity.py
+++ b/simulator/data/sources/equity.py
@@ -10,9 +10,9 @@ import logging
 import random
 from pymongo import ASCENDING, DESCENDING
 
-from backtest.util import *
+from simulator.backtest.util import *
 
-from qbt_server import * #connect_db
+from simulator.qbt_server import * #connect_db
 
 class DataSource(object):
     def __init__(self, feed, source_id):
diff --git a/simulator/host_settings.py b/simulator/host_settings.py
new file mode 100644
index 00000000..23c9efdc
--- /dev/null
+++ b/simulator/host_settings.py
@@ -0,0 +1,14 @@
+class Config(object):
+   def __init__(self, dct):
+       self.__dict__.update(dct)
+
+mongo_conn_args = Config({
+   'mongodb_host'         :  'claire.mongohq.com',
+   'mongodb_port'         :  10087,
+   'mongodb_dbname'       :  'quantodata-staging',
+   'mongodb_user'         :  'quantopian',
+   'mongodb_password'     :  'quantopian',
+})
+
+root_url = 'http://localhost:8000'
+ws_url = 'ws://localhost:8001'
diff --git a/qbt.py b/simulator/qbt.py
similarity index 100%
rename from qbt.py
rename to simulator/qbt.py
diff --git a/qbt_client.py b/simulator/qbt_client.py
similarity index 100%
rename from qbt_client.py
rename to simulator/qbt_client.py
diff --git a/qbt_server.py b/simulator/qbt_server.py
similarity index 100%
rename from qbt_server.py
rename to simulator/qbt_server.py
diff --git a/test/test_messaging.py b/test/test_messaging.py
index a50c5ecf..056d2e47 100644
--- a/test/test_messaging.py
+++ b/test/test_messaging.py
@@ -2,11 +2,11 @@ import unittest2 as unittest
 import zmq
 import logging
 import tornado
-from data.sources.equity import *
-from data.feed import *
-from data.transforms import MergedTransformsFeed, MovingAverage
+from simulator.data.sources.equity import *
+from simulator.data.feed import *
+from transforms.transforms import MergedTransformsFeed, MovingAverage
 
-from qbt_client import TestClient
+from simulator.qbt_client import TestClient
 
 
 class MessagingTestCase(unittest.TestCase):
diff --git a/transforms/__init__.py b/transforms/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/data/transforms.py b/transforms/transforms.py
similarity index 99%
rename from data/transforms.py
rename to transforms/transforms.py
index 78e160cf..b578fd16 100644
--- a/data/transforms.py
+++ b/transforms/transforms.py
@@ -2,11 +2,10 @@ import zmq
 import logging
 import datetime
 import json
-import config
 import copy
 import multiprocessing
-from backtest.util import *
-
+from simulator.backtest.util import *
+import simulator.config as config
 class Transform(object):
     """Parent class for feed transforms. Subclass to create a new derived value from the combined feed."""
     
@@ -223,4 +222,4 @@ class MergedTransformsFeed(Transform):
         #signal to client that we're done
         self.result_socket.send("DONE")
         self.logger.info("Transform {name} received {r} and sent {s}".format(name=self.name, r=self.data_buffer.received_count, s=self.data_buffer.sent_count))  
-                
\ No newline at end of file
+