diff --git a/xos/core/views/hpc_config.py b/xos/core/views/hpc_config.py
index bd74dc2..3c1baa2 100644
--- a/xos/core/views/hpc_config.py
+++ b/xos/core/views/hpc_config.py
@@ -2,7 +2,7 @@
 from monitor import driver
 from core.models import *
 from services.hpc.models import *
-from requestrouter.models import *
+from services.requestrouter.models import *
 import xos.settings
 import json
 import os
diff --git a/xos/core/xoslib/methods/hpcview.py b/xos/core/xoslib/methods/hpcview.py
index 7a728f9..3769e4e 100644
--- a/xos/core/xoslib/methods/hpcview.py
+++ b/xos/core/xoslib/methods/hpcview.py
@@ -6,7 +6,7 @@
 from rest_framework.views import APIView
 from core.models import *
 from services.hpc.models import *
-from requestrouter.models import *
+from services.requestrouter.models import *
 from django.forms import widgets
 from syndicate_storage.models import Volume
 from django.core.exceptions import PermissionDenied
diff --git a/xos/observers/hpc/hpc_watcher.py b/xos/observers/hpc/hpc_watcher.py
index febfff6..d2efdcc 100644
--- a/xos/observers/hpc/hpc_watcher.py
+++ b/xos/observers/hpc/hpc_watcher.py
@@ -45,7 +45,7 @@
 from django.contrib.contenttypes.models import ContentType
 from core.models import *
 from services.hpc.models import *
-from requestrouter.models import *
+from services.requestrouter.models import *
 django.setup()
 import time
 import pycurl
diff --git a/xos/observers/hpc/hpclib.py b/xos/observers/hpc/hpclib.py
index a349520..88abf23 100644
--- a/xos/observers/hpc/hpclib.py
+++ b/xos/observers/hpc/hpclib.py
@@ -11,7 +11,7 @@
 from xos.config import Config
 from core.models import Service
 from services.hpc.models import HpcService
-from requestrouter.models import RequestRouterService
+from services.requestrouter.models import RequestRouterService
 from util.logger import Logger, logging
 
 logger = Logger(level=logging.INFO)
diff --git a/xos/observers/hpc/steps/sync_hpcservices.py b/xos/observers/hpc/steps/sync_hpcservices.py
index d54fe84..4ceb096 100644
--- a/xos/observers/hpc/steps/sync_hpcservices.py
+++ b/xos/observers/hpc/steps/sync_hpcservices.py
@@ -6,7 +6,7 @@
 from observer.syncstep import SyncStep
 from core.models import Service
 from services.hpc.models import HpcService
-from requestrouter.models import RequestRouterService
+from services.requestrouter.models import RequestRouterService
 from util.logger import Logger, logging
 
 # hpclibrary will be in steps/..
diff --git a/xos/rr_observer/deleters/servicemap_deleter.py b/xos/rr_observer/deleters/servicemap_deleter.py
index d0a707f..800c8a1 100644
--- a/xos/rr_observer/deleters/servicemap_deleter.py
+++ b/xos/rr_observer/deleters/servicemap_deleter.py
@@ -1,7 +1,7 @@
 import os
 import sys
 import traceback
-from requestrouter.models import ServiceMap
+from services.requestrouter.models import ServiceMap
 from observer.deleter import Deleter
 from util.logger import Logger, logging
 from xos.config import Config, XOS_DIR
diff --git a/xos/rr_observer/rrlib.py b/xos/rr_observer/rrlib.py
index 6968dcd..9faca4a 100644
--- a/xos/rr_observer/rrlib.py
+++ b/xos/rr_observer/rrlib.py
@@ -10,7 +10,7 @@
 
 from xos.config import Config
 from core.models import Service
-from requestrouter.models import RequestRouterService, ServiceMap
+from services.requestrouter.models import RequestRouterService, ServiceMap
 from util.logger import Logger, logging
 import rrlib_config
 
diff --git a/xos/rr_observer/steps/sync_requestrouterservices.py b/xos/rr_observer/steps/sync_requestrouterservices.py
index db63c5b..ccf9291 100644
--- a/xos/rr_observer/steps/sync_requestrouterservices.py
+++ b/xos/rr_observer/steps/sync_requestrouterservices.py
@@ -6,7 +6,7 @@
 from xos.config import Config
 from observer.syncstep import SyncStep
 from core.models import Service
-from requestrouter.models import RequestRouterService
+from services.requestrouter.models import RequestRouterService
 from util.logger import Logger, logging
 
 parentdir = os.path.join(os.path.dirname(__file__),"..")
diff --git a/xos/rr_observer/steps/sync_servicemap.py b/xos/rr_observer/steps/sync_servicemap.py
index 1ec54aa..3985e35 100644
--- a/xos/rr_observer/steps/sync_servicemap.py
+++ b/xos/rr_observer/steps/sync_servicemap.py
@@ -8,7 +8,7 @@
 from xos.config import Config, XOS_DIR
 from observer.syncstep import SyncStep
 from core.models import Service
-from requestrouter.models import ServiceMap
+from services.requestrouter.models import ServiceMap
 from util.logger import Logger, logging
 
 parentdir = os.path.join(os.path.dirname(__file__),"..")
diff --git a/xos/requestrouter/__init__.py b/xos/services/requestrouter/__init__.py
similarity index 100%
rename from xos/requestrouter/__init__.py
rename to xos/services/requestrouter/__init__.py
diff --git a/xos/requestrouter/admin.py b/xos/services/requestrouter/admin.py
similarity index 98%
rename from xos/requestrouter/admin.py
rename to xos/services/requestrouter/admin.py
index 510dd27..6d9e2fe 100644
--- a/xos/requestrouter/admin.py
+++ b/xos/services/requestrouter/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from requestrouter.models import *
+from services.requestrouter.models import *
 from django import forms
 from django.utils.safestring import mark_safe
 from django.contrib.auth.admin import UserAdmin
diff --git a/xos/requestrouter/migrations/0001_initial.py b/xos/services/requestrouter/migrations/0001_initial.py
similarity index 100%
rename from xos/requestrouter/migrations/0001_initial.py
rename to xos/services/requestrouter/migrations/0001_initial.py
diff --git a/xos/requestrouter/migrations/__init__.py b/xos/services/requestrouter/migrations/__init__.py
similarity index 100%
rename from xos/requestrouter/migrations/__init__.py
rename to xos/services/requestrouter/migrations/__init__.py
diff --git a/xos/requestrouter/models.py b/xos/services/requestrouter/models.py
similarity index 100%
rename from xos/requestrouter/models.py
rename to xos/services/requestrouter/models.py
diff --git a/xos/requestrouter/templates/rradmin.html b/xos/services/requestrouter/templates/rradmin.html
similarity index 100%
rename from xos/requestrouter/templates/rradmin.html
rename to xos/services/requestrouter/templates/rradmin.html
diff --git a/xos/xos/settings.py b/xos/xos/settings.py
index ae871c9..7cb645a 100644
--- a/xos/xos/settings.py
+++ b/xos/xos/settings.py
@@ -178,7 +178,7 @@
     'helloworldservice_complete',
     'services.onos',
     'ceilometer',
-    'requestrouter',
+    'services.requestrouter',
 #    'urlfilter',
 #    'servcomp',
     'syndicate_storage',