diff --git a/xos/rr_observer/configurationPush.py b/xos/observers/requestrouter/configurationPush.py
similarity index 100%
rename from xos/rr_observer/configurationPush.py
rename to xos/observers/requestrouter/configurationPush.py
diff --git a/xos/rr_observer/deleters/servicemap_deleter.py b/xos/observers/requestrouter/deleters/servicemap_deleter.py
similarity index 84%
rename from xos/rr_observer/deleters/servicemap_deleter.py
rename to xos/observers/requestrouter/deleters/servicemap_deleter.py
index 800c8a1..5e4b5a4 100644
--- a/xos/rr_observer/deleters/servicemap_deleter.py
+++ b/xos/observers/requestrouter/deleters/servicemap_deleter.py
@@ -28,8 +28,8 @@
           try:
               servicemap = ServiceMap.objects.get(pk=pk)
               service_uid = self.get_servicemap_uid(servicemap)
-              self.config_push(service_uid, rrlib_config.REDIR_USER, XOS_DIR + "/rr_observer/playbook/site_redir_delete.yml", "/etc/ansible/requestrouter/dnsredir/hosts")
-              self.config_push(service_uid, rrlib_config.DEMUX_USER, XOS_DIR + "/rr_observer/playbook/site_demux_delete.yml", "/etc/ansible/requestrouter/dnsdemux/hosts")
+              self.config_push(service_uid, rrlib_config.REDIR_USER, XOS_DIR + "/observers/requestrouter/playbook/site_redir_delete.yml", "/etc/ansible/requestrouter/dnsredir/hosts")
+              self.config_push(service_uid, rrlib_config.DEMUX_USER, XOS_DIR + "/observers/requestrouter/playbook/site_demux_delete.yml", "/etc/ansible/requestrouter/dnsdemux/hosts")
               print "XXX delete ServiceMap %s", servicemap.name
               return True
           except Exception, e:
diff --git a/xos/rr_observer/model-deps b/xos/observers/requestrouter/model-deps
similarity index 100%
rename from xos/rr_observer/model-deps
rename to xos/observers/requestrouter/model-deps
diff --git a/xos/rr_observer/playbook/roles/delete_demux/handlers/main.yml b/xos/observers/requestrouter/playbook/roles/delete_demux/handlers/main.yml
similarity index 100%
rename from xos/rr_observer/playbook/roles/delete_demux/handlers/main.yml
rename to xos/observers/requestrouter/playbook/roles/delete_demux/handlers/main.yml
diff --git a/xos/rr_observer/playbook/roles/delete_demux/tasks/main.yml b/xos/observers/requestrouter/playbook/roles/delete_demux/tasks/main.yml
similarity index 100%
rename from xos/rr_observer/playbook/roles/delete_demux/tasks/main.yml
rename to xos/observers/requestrouter/playbook/roles/delete_demux/tasks/main.yml
diff --git a/xos/rr_observer/playbook/roles/delete_demux/vars/main.yml b/xos/observers/requestrouter/playbook/roles/delete_demux/vars/main.yml
similarity index 100%
rename from xos/rr_observer/playbook/roles/delete_demux/vars/main.yml
rename to xos/observers/requestrouter/playbook/roles/delete_demux/vars/main.yml
diff --git a/xos/rr_observer/playbook/roles/delete_redir/handlers/main.yml b/xos/observers/requestrouter/playbook/roles/delete_redir/handlers/main.yml
similarity index 100%
rename from xos/rr_observer/playbook/roles/delete_redir/handlers/main.yml
rename to xos/observers/requestrouter/playbook/roles/delete_redir/handlers/main.yml
diff --git a/xos/rr_observer/playbook/roles/delete_redir/tasks/main.yml b/xos/observers/requestrouter/playbook/roles/delete_redir/tasks/main.yml
similarity index 100%
rename from xos/rr_observer/playbook/roles/delete_redir/tasks/main.yml
rename to xos/observers/requestrouter/playbook/roles/delete_redir/tasks/main.yml
diff --git a/xos/rr_observer/playbook/roles/delete_redir/vars/main.yml b/xos/observers/requestrouter/playbook/roles/delete_redir/vars/main.yml
similarity index 100%
rename from xos/rr_observer/playbook/roles/delete_redir/vars/main.yml
rename to xos/observers/requestrouter/playbook/roles/delete_redir/vars/main.yml
diff --git a/xos/rr_observer/playbook/roles/demux/handlers/main.yml b/xos/observers/requestrouter/playbook/roles/demux/handlers/main.yml
similarity index 100%
rename from xos/rr_observer/playbook/roles/demux/handlers/main.yml
rename to xos/observers/requestrouter/playbook/roles/demux/handlers/main.yml
diff --git a/xos/rr_observer/playbook/roles/demux/tasks/main.yml b/xos/observers/requestrouter/playbook/roles/demux/tasks/main.yml
similarity index 100%
rename from xos/rr_observer/playbook/roles/demux/tasks/main.yml
rename to xos/observers/requestrouter/playbook/roles/demux/tasks/main.yml
diff --git a/xos/rr_observer/playbook/roles/demux/vars/main.yml b/xos/observers/requestrouter/playbook/roles/demux/vars/main.yml
similarity index 100%
rename from xos/rr_observer/playbook/roles/demux/vars/main.yml
rename to xos/observers/requestrouter/playbook/roles/demux/vars/main.yml
diff --git a/xos/rr_observer/playbook/roles/redir/handlers/main.yml b/xos/observers/requestrouter/playbook/roles/redir/handlers/main.yml
similarity index 100%
rename from xos/rr_observer/playbook/roles/redir/handlers/main.yml
rename to xos/observers/requestrouter/playbook/roles/redir/handlers/main.yml
diff --git a/xos/rr_observer/playbook/roles/redir/tasks/main.yml b/xos/observers/requestrouter/playbook/roles/redir/tasks/main.yml
similarity index 100%
rename from xos/rr_observer/playbook/roles/redir/tasks/main.yml
rename to xos/observers/requestrouter/playbook/roles/redir/tasks/main.yml
diff --git a/xos/rr_observer/playbook/roles/redir/vars/main.yml b/xos/observers/requestrouter/playbook/roles/redir/vars/main.yml
similarity index 100%
rename from xos/rr_observer/playbook/roles/redir/vars/main.yml
rename to xos/observers/requestrouter/playbook/roles/redir/vars/main.yml
diff --git a/xos/rr_observer/playbook/site_demux.yml b/xos/observers/requestrouter/playbook/site_demux.yml
similarity index 100%
rename from xos/rr_observer/playbook/site_demux.yml
rename to xos/observers/requestrouter/playbook/site_demux.yml
diff --git a/xos/rr_observer/playbook/site_demux_delete.yml b/xos/observers/requestrouter/playbook/site_demux_delete.yml
similarity index 100%
rename from xos/rr_observer/playbook/site_demux_delete.yml
rename to xos/observers/requestrouter/playbook/site_demux_delete.yml
diff --git a/xos/rr_observer/playbook/site_redir.yml b/xos/observers/requestrouter/playbook/site_redir.yml
similarity index 100%
rename from xos/rr_observer/playbook/site_redir.yml
rename to xos/observers/requestrouter/playbook/site_redir.yml
diff --git a/xos/rr_observer/playbook/site_redir_delete.yml b/xos/observers/requestrouter/playbook/site_redir_delete.yml
similarity index 100%
rename from xos/rr_observer/playbook/site_redir_delete.yml
rename to xos/observers/requestrouter/playbook/site_redir_delete.yml
diff --git a/xos/rr_observer/rr_observer_config b/xos/observers/requestrouter/rr_observer_config
similarity index 72%
rename from xos/rr_observer/rr_observer_config
rename to xos/observers/requestrouter/rr_observer_config
index 5ca423e..ec3a1ba 100644
--- a/xos/rr_observer/rr_observer_config
+++ b/xos/observers/requestrouter/rr_observer_config
@@ -24,9 +24,9 @@
 nova_enabled=True
 
 [observer]
-dependency_graph=/opt/xos/rr_observer/model-deps
-steps_dir=/opt/xos/rr_observer/steps
-deleters_dir=/opt/xos/rr_observer/deleters
+dependency_graph=/opt/xos/observers/requestrouter/model-deps
+steps_dir=/opt/xos/observers/requestrouter/steps
+deleters_dir=/opt/xos/observers/requestrouter/deleters
 log_file=console
 #/var/log/hpc.log
 driver=None
diff --git a/xos/rr_observer/rrlib.py b/xos/observers/requestrouter/rrlib.py
similarity index 100%
rename from xos/rr_observer/rrlib.py
rename to xos/observers/requestrouter/rrlib.py
diff --git a/xos/rr_observer/rrlib_config.py b/xos/observers/requestrouter/rrlib_config.py
similarity index 100%
rename from xos/rr_observer/rrlib_config.py
rename to xos/observers/requestrouter/rrlib_config.py
diff --git a/xos/rr_observer/steps/sync_requestrouterservices.py b/xos/observers/requestrouter/steps/sync_requestrouterservices.py
similarity index 100%
rename from xos/rr_observer/steps/sync_requestrouterservices.py
rename to xos/observers/requestrouter/steps/sync_requestrouterservices.py
diff --git a/xos/rr_observer/steps/sync_servicemap.py b/xos/observers/requestrouter/steps/sync_servicemap.py
similarity index 89%
rename from xos/rr_observer/steps/sync_servicemap.py
rename to xos/observers/requestrouter/steps/sync_servicemap.py
index 3985e35..094e5f1 100644
--- a/xos/rr_observer/steps/sync_servicemap.py
+++ b/xos/observers/requestrouter/steps/sync_servicemap.py
@@ -44,8 +44,8 @@
 		self.gen_dnsdemux_serviceconf(servicemap)
         	# push generated files from temp_config
 		service_uid = self.get_servicemap_uid(servicemap)
-		self.config_push(service_uid, rrlib_config.REDIR_USER, XOS_DIR + "/rr_observer/playbook/site_redir.yml", "/etc/ansible/requestrouter/dnsredir/hosts")
-		self.config_push(service_uid, rrlib_config.DEMUX_USER, XOS_DIR + "/rr_observer/playbook/site_demux.yml", "/etc/ansible/requestrouter/dnsdemux/hosts")
+		self.config_push(service_uid, rrlib_config.REDIR_USER, XOS_DIR + "/observers/requestrouter/playbook/site_redir.yml", "/etc/ansible/requestrouter/dnsredir/hosts")
+		self.config_push(service_uid, rrlib_config.DEMUX_USER, XOS_DIR + "/observers/requestrouter/playbook/site_demux.yml", "/etc/ansible/requestrouter/dnsdemux/hosts")
 		self.teardown_temp_configfiles(service_uid)
 	except Exception, e:
                 traceback.print_exc()