diff --git a/xos/synchronizer/driver.py b/xos/synchronizer/driver.py
index 3064eb2..e5ce2f8 100644
--- a/xos/synchronizer/driver.py
+++ b/xos/synchronizer/driver.py
@@ -4,7 +4,7 @@
 from core.models import Controller
 
 try:
-    from openstack_xos.client import OpenStackClient
+    from synchronizers.openstack.client import OpenStackClient
     has_openstack = True
 except:
     has_openstack = False
diff --git a/xos/synchronizer/manager.py b/xos/synchronizer/manager.py
index 193ec75..ae6cab9 100644
--- a/xos/synchronizer/manager.py
+++ b/xos/synchronizer/manager.py
@@ -12,8 +12,8 @@
 from core.models import *
 from xos.config import Config
 try:
-    from openstack_xos.client import OpenStackClient
-    from openstack_xos.driver import OpenStackDriver
+    from synchronizers.openstack.client import OpenStackClient
+    from synchronizers.openstack.driver import OpenStackDriver
     has_openstack = True
 except:
     has_openstack = False
diff --git a/xos/synchronizer/steps/sync_controller_networks.py b/xos/synchronizer/steps/sync_controller_networks.py
index b61ef7b..bdb6eab 100644
--- a/xos/synchronizer/steps/sync_controller_networks.py
+++ b/xos/synchronizer/steps/sync_controller_networks.py
@@ -13,7 +13,6 @@
 from core.models.instance import Instance
 from xos.logger import observer_logger as logger
 from synchronizers.base.ansible import *
-from openstack_xos.driver import OpenStackDriver
 from xos.config import Config
 import json
 
@@ -148,16 +147,3 @@
 
         return network_fields
 
-	"""
-        driver = OpenStackDriver().client_driver(caller=controller_network.network.owner.creator,
-                                                 tenant=controller_network.network.owner.name,
-                                                 controller=controller_network.controller.name)
-        if (controller_network.router_id) and (controller_network.subnet_id):
-            driver.delete_router_interface(controller_network.router_id, controller_network.subnet_id)
-        if controller_network.subnet_id:
-            driver.delete_subnet(controller_network.subnet_id)
-        if controller_network.router_id:
-            driver.delete_router(controller_network.router_id)
-        if controller_network.net_id:
-            driver.delete_network(controller_network.net_id)
-	"""
diff --git a/xos/synchronizer/steps/sync_controller_slices.py b/xos/synchronizer/steps/sync_controller_slices.py
index 0666230..2f9081b 100644
--- a/xos/synchronizer/steps/sync_controller_slices.py
+++ b/xos/synchronizer/steps/sync_controller_slices.py
@@ -8,7 +8,6 @@
 from synchronizers.base.syncstep import *
 from core.models import *
 from synchronizers.base.ansible import *
-from openstack_xos.driver import OpenStackDriver
 from xos.logger import observer_logger as logger
 import json
 
@@ -31,7 +30,7 @@
             raise Exception("slice createor %s has not accout at controller %s" % (controller_slice.slice.creator, controller_slice.controller.name))
         else:
             controller_user = controller_users[0]
-            driver = OpenStackDriver().admin_driver(controller=controller_slice.controller)
+            driver = self.driver.admin_driver(controller=controller_slice.controller)
             roles = [driver.get_admin_role().name]
 
         max_instances=int(controller_slice.slice.max_instances)
@@ -54,7 +53,7 @@
         tenant_id = res[0]['id']
         if (not controller_slice.tenant_id):
             try:
-                driver = OpenStackDriver().admin_driver(controller=controller_slice.controller)
+                driver = self.driver.admin_driver(controller=controller_slice.controller)
                 driver.shell.nova.quotas.update(tenant_id=tenant_id, instances=int(controller_slice.slice.max_instances))
             except:
                 logger.log_exc('Could not update quota for %s'%controller_slice.slice.name)
diff --git a/xos/synchronizer/steps/sync_controller_users.py b/xos/synchronizer/steps/sync_controller_users.py
index c9de142..1a6b3e7 100644
--- a/xos/synchronizer/steps/sync_controller_users.py
+++ b/xos/synchronizer/steps/sync_controller_users.py
@@ -9,7 +9,6 @@
 from core.models.user import User
 from core.models.controlleruser import ControllerUser
 from synchronizers.base.ansible import *
-from openstack_xos.driver import OpenStackDriver
 from xos.logger import observer_logger as logger
 import json
 
@@ -29,7 +28,7 @@
 
         roles = ['user']
         if controller_user.user.is_admin:
-            driver = OpenStackDriver().admin_driver(controller=controller_user.controller)
+            driver = self.driver.admin_driver(controller=controller_user.controller)
             roles.append(driver.get_admin_role().name)
 
         # setup user home site roles at controller
diff --git a/xos/synchronizer/steps/sync_object.py b/xos/synchronizer/steps/sync_object.py
index aaf2f25..18979f5 100644
--- a/xos/synchronizer/steps/sync_object.py
+++ b/xos/synchronizer/steps/sync_object.py
@@ -7,7 +7,6 @@
 from synchronizers.base.syncstep import *
 from core.models import *
 from synchronizers.base.ansible import *
-from openstack_xos.driver import OpenStackDriver
 from xos.logger import observer_logger as logger
 import json
 
diff --git a/xos/synchronizer/steps/sync_ports.py b/xos/synchronizer/steps/sync_ports.py
index 5e0ff04..cbe6eb2 100644
--- a/xos/synchronizer/steps/sync_ports.py
+++ b/xos/synchronizer/steps/sync_ports.py
@@ -30,8 +30,8 @@
 
         # A bunch of stuff to compensate for OpenStackDriver.client_driver()
         # not being in working condition.
-        from openstack_xos.client import OpenStackClient
-        from openstack_xos.driver import OpenStackDriver
+        from synchronizers.openstack.client import OpenStackClient
+        from synchronizers.openstack.driver import OpenStackDriver
         controller = port.instance.node.site_deployment.controller
         slice = port.instance.slice
         caller = port.network.owner.creator
diff --git a/xos/synchronizer/xos-synchronizer.py b/xos/synchronizer/xos-synchronizer.py
index 0036012..e4ac046 100644
--- a/xos/synchronizer/xos-synchronizer.py
+++ b/xos/synchronizer/xos-synchronizer.py
@@ -21,7 +21,7 @@
 config = Config()
 
 # set the driver.
-from openstack_xos.driver import OpenStackDriver
+from synchronizers.openstack.driver import OpenStackDriver
 set_driver(OpenStackDriver())
 
 # after http://www.erlenstar.demon.co.uk/unix/faq_2.html