diff --git a/xos/observers/hpc/hpc_watcher.py b/xos/observers/hpc/hpc_watcher.py
index 7c49aae..febfff6 100644
--- a/xos/observers/hpc/hpc_watcher.py
+++ b/xos/observers/hpc/hpc_watcher.py
@@ -44,8 +44,8 @@
 import django
 from django.contrib.contenttypes.models import ContentType
 from core.models import *
-from hpc.models import *
-from requestrouter.models import *
+from services.hpc.models import *
+from requestrouter.models import *
 django.setup()
 import time
 import pycurl
diff --git a/xos/observers/hpc/hpclib.py b/xos/observers/hpc/hpclib.py
index 51864a5..a349520 100644
--- a/xos/observers/hpc/hpclib.py
+++ b/xos/observers/hpc/hpclib.py
@@ -10,7 +10,7 @@
 
 from xos.config import Config
 from core.models import Service
-from hpc.models import HpcService
+from services.hpc.models import HpcService
 from requestrouter.models import RequestRouterService
 from util.logger import Logger, logging
 
diff --git a/xos/observers/hpc/steps/garbage_collector.py b/xos/observers/hpc/steps/garbage_collector.py
index 3ccffee..259762b 100644
--- a/xos/observers/hpc/steps/garbage_collector.py
+++ b/xos/observers/hpc/steps/garbage_collector.py
@@ -7,7 +7,7 @@
 from xos.config import Config
 from util.logger import Logger, logging
 from observer.syncstep import SyncStep
-from hpc.models import ServiceProvider, ContentProvider, CDNPrefix, OriginServer
+from services.hpc.models import ServiceProvider, ContentProvider, CDNPrefix, OriginServer
 from core.models import *
 
 # hpclibrary will be in steps/..
diff --git a/xos/observers/hpc/steps/sync_cdnprefix.py b/xos/observers/hpc/steps/sync_cdnprefix.py
index c22eb51..a6382bd 100644
--- a/xos/observers/hpc/steps/sync_cdnprefix.py
+++ b/xos/observers/hpc/steps/sync_cdnprefix.py
@@ -5,7 +5,7 @@
 from xos.config import Config
 from observer.syncstep import SyncStep
 from core.models import Service
-from hpc.models import ServiceProvider, ContentProvider, CDNPrefix
+from services.hpc.models import ServiceProvider, ContentProvider, CDNPrefix
 from util.logger import Logger, logging
 
 # hpclibrary will be in steps/..
diff --git a/xos/observers/hpc/steps/sync_contentprovider.py b/xos/observers/hpc/steps/sync_contentprovider.py
index 3732466..0f86e2e 100644
--- a/xos/observers/hpc/steps/sync_contentprovider.py
+++ b/xos/observers/hpc/steps/sync_contentprovider.py
@@ -5,7 +5,7 @@
 from xos.config import Config
 from observer.syncstep import SyncStep
 from core.models import Service
-from hpc.models import ServiceProvider, ContentProvider
+from services.hpc.models import ServiceProvider, ContentProvider
 from util.logger import Logger, logging
 
 # hpclibrary will be in steps/..
diff --git a/xos/observers/hpc/steps/sync_hpcservices.py b/xos/observers/hpc/steps/sync_hpcservices.py
index ffb8b3a..d54fe84 100644
--- a/xos/observers/hpc/steps/sync_hpcservices.py
+++ b/xos/observers/hpc/steps/sync_hpcservices.py
@@ -5,7 +5,7 @@
 from xos.config import Config
 from observer.syncstep import SyncStep
 from core.models import Service
-from hpc.models import HpcService
+from services.hpc.models import HpcService
 from requestrouter.models import RequestRouterService
 from util.logger import Logger, logging
 
diff --git a/xos/observers/hpc/steps/sync_originserver.py b/xos/observers/hpc/steps/sync_originserver.py
index 851590a..01bd56a 100644
--- a/xos/observers/hpc/steps/sync_originserver.py
+++ b/xos/observers/hpc/steps/sync_originserver.py
@@ -6,7 +6,7 @@
 from xos.config import Config
 from observer.syncstep import SyncStep
 from core.models import Service
-from hpc.models import ServiceProvider, ContentProvider, CDNPrefix, OriginServer
+from services.hpc.models import ServiceProvider, ContentProvider, CDNPrefix, OriginServer
 from util.logger import Logger, logging
 
 # hpclibrary will be in steps/..
diff --git a/xos/observers/hpc/steps/sync_serviceprovider.py b/xos/observers/hpc/steps/sync_serviceprovider.py
index ff7e2f6..68c36ef 100644
--- a/xos/observers/hpc/steps/sync_serviceprovider.py
+++ b/xos/observers/hpc/steps/sync_serviceprovider.py
@@ -5,7 +5,7 @@
 from xos.config import Config
 from observer.syncstep import SyncStep
 from core.models import Service
-from hpc.models import ServiceProvider
+from services.hpc.models import ServiceProvider
 from util.logger import Logger, logging
 
 # hpclibrary will be in steps/..
diff --git a/xos/observers/hpc/steps/sync_sitemap.py b/xos/observers/hpc/steps/sync_sitemap.py
index e406fc3..3fd4b16 100644
--- a/xos/observers/hpc/steps/sync_sitemap.py
+++ b/xos/observers/hpc/steps/sync_sitemap.py
@@ -5,7 +5,7 @@
 from xos.config import Config
 from observer.syncstep import SyncStep
 from core.models import Service
-from hpc.models import ServiceProvider, ContentProvider, CDNPrefix, SiteMap
+from services.hpc.models import ServiceProvider, ContentProvider, CDNPrefix, SiteMap
 from util.logger import Logger, logging
 
 # hpclibrary will be in steps/..