diff --git a/xos/apigen/hpc-api.template.py b/xos/apigen/hpc-api.template.py
index 301346b..56aa074 100644
--- a/xos/apigen/hpc-api.template.py
+++ b/xos/apigen/hpc-api.template.py
@@ -5,7 +5,7 @@
 from rest_framework import generics
 from rest_framework import status
 from rest_framework.generics import GenericAPIView
-from hpc.models import *
+from services.hpc.models import *
 from django.forms import widgets
 from rest_framework import filters
 from django.conf.urls import patterns, url
diff --git a/xos/cord/models.py b/xos/cord/models.py
index 1a81419..e6959e5 100644
--- a/xos/cord/models.py
+++ b/xos/cord/models.py
@@ -15,9 +15,9 @@
 sys.path.append("/opt/xos")
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "xos.settings")
 import django
-from core.models import *
-from hpc.models import *
-from cord.models import *
+from core.models import *
+from services.hpc.models import *
+from cord.models import *
 django.setup()
 
 t = VOLTTenant()
diff --git a/xos/core/dashboard/views/view_common.py b/xos/core/dashboard/views/view_common.py
index 0ef422e..4b054fe 100644
--- a/xos/core/dashboard/views/view_common.py
+++ b/xos/core/dashboard/views/view_common.py
@@ -6,7 +6,7 @@
 import json
 from syndicate_storage.models import *
 from core.models import *
-from hpc.models import ContentProvider
+from services.hpc.models import ContentProvider
 from operator import attrgetter
 from django import template
 from django.views.decorators.csrf import csrf_exempt
diff --git a/xos/core/views/hpc_config.py b/xos/core/views/hpc_config.py
index c83c01b..bd74dc2 100644
--- a/xos/core/views/hpc_config.py
+++ b/xos/core/views/hpc_config.py
@@ -1,7 +1,7 @@
 from django.http import HttpResponse, HttpResponseServerError
 from monitor import driver
 from core.models import *
-from hpc.models import *
+from services.hpc.models import *
 from requestrouter.models import *
 import xos.settings
 import json
diff --git a/xos/core/views/services.py b/xos/core/views/serviceGraph.py
similarity index 100%
rename from xos/core/views/services.py
rename to xos/core/views/serviceGraph.py
diff --git a/xos/core/xoslib/methods/hpcview.py b/xos/core/xoslib/methods/hpcview.py
index 1118eda..7a728f9 100644
--- a/xos/core/xoslib/methods/hpcview.py
+++ b/xos/core/xoslib/methods/hpcview.py
@@ -5,7 +5,7 @@
 from rest_framework import generics
 from rest_framework.views import APIView
 from core.models import *
-from hpc.models import *
+from services.hpc.models import *
 from requestrouter.models import *
 from django.forms import widgets
 from syndicate_storage.models import Volume
diff --git a/xos/core/xoslib/objects/cordsubscriber.py b/xos/core/xoslib/objects/cordsubscriber.py
index 089c91b..0b2763b 100644
--- a/xos/core/xoslib/objects/cordsubscriber.py
+++ b/xos/core/xoslib/objects/cordsubscriber.py
@@ -11,7 +11,7 @@
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "xos.settings")
 import django
 from core.models import *
-from hpc.models import *
+from services.hpc.models import *
 from cord.models import *
 django.setup()
 from core.xoslib.objects.cordsubscriber import CordSubscriber
diff --git a/xos/hpc/__init__.py b/xos/services/hpc/__init__.py
similarity index 100%
rename from xos/hpc/__init__.py
rename to xos/services/hpc/__init__.py
diff --git a/xos/hpc/admin.py b/xos/services/hpc/admin.py
similarity index 99%
rename from xos/hpc/admin.py
rename to xos/services/hpc/admin.py
index de876ac..233668b 100644
--- a/xos/hpc/admin.py
+++ b/xos/services/hpc/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from hpc.models import *
+from services.hpc.models import *
 from django import forms
 from django.utils.safestring import mark_safe
 from django.contrib.auth.admin import UserAdmin
diff --git a/xos/hpc/filteredadmin.py b/xos/services/hpc/filteredadmin.py
similarity index 99%
rename from xos/hpc/filteredadmin.py
rename to xos/services/hpc/filteredadmin.py
index 4ef3fe3..6cad25c 100644
--- a/xos/hpc/filteredadmin.py
+++ b/xos/services/hpc/filteredadmin.py
@@ -1,7 +1,7 @@
 from django.contrib import admin
 
 from django import forms
-from hpc.models import HpcService
+from services.hpc.models import HpcService
 from core.admin import ServiceAppAdmin,SliceInline,ServiceAttrAsTabInline, ReadOnlyAwareAdmin, XOSTabularInline, SliderWidget, ServicePrivilegeInline
 from core.middleware import get_request
 
diff --git a/xos/hpc/migrations/0001_initial.py b/xos/services/hpc/migrations/0001_initial.py
similarity index 100%
rename from xos/hpc/migrations/0001_initial.py
rename to xos/services/hpc/migrations/0001_initial.py
diff --git a/xos/hpc/migrations/__init__.py b/xos/services/hpc/migrations/__init__.py
similarity index 100%
rename from xos/hpc/migrations/__init__.py
rename to xos/services/hpc/migrations/__init__.py
diff --git a/xos/hpc/models.py b/xos/services/hpc/models.py
similarity index 100%
rename from xos/hpc/models.py
rename to xos/services/hpc/models.py
diff --git a/xos/hpc/templates/hpcadmin.html b/xos/services/hpc/templates/hpcadmin.html
similarity index 100%
rename from xos/hpc/templates/hpcadmin.html
rename to xos/services/hpc/templates/hpcadmin.html
diff --git a/xos/hpc/templates/hpctools.html b/xos/services/hpc/templates/hpctools.html
similarity index 100%
rename from xos/hpc/templates/hpctools.html
rename to xos/services/hpc/templates/hpctools.html
diff --git a/xos/hpc/tests.py b/xos/services/hpc/tests.py
similarity index 100%
rename from xos/hpc/tests.py
rename to xos/services/hpc/tests.py
diff --git a/xos/hpc/views.py b/xos/services/hpc/views.py
similarity index 100%
rename from xos/hpc/views.py
rename to xos/services/hpc/views.py
diff --git a/xos/tools/cleanup_unique.py b/xos/tools/cleanup_unique.py
index a637df1..629e17f 100644
--- a/xos/tools/cleanup_unique.py
+++ b/xos/tools/cleanup_unique.py
@@ -4,7 +4,7 @@
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "xos.settings")
 import django
 from core.models import *
-from hpc.models import *
+from services.hpc.models import *
 from cord.models import *
 django.setup()
 
diff --git a/xos/tools/purge.py b/xos/tools/purge.py
index 1df479d..a0e8351 100644
--- a/xos/tools/purge.py
+++ b/xos/tools/purge.py
@@ -4,7 +4,7 @@
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "xos.settings")
 import django
 from core.models import *
-from hpc.models import *
+from services.hpc.models import *
 from cord.models import *
 django.setup()
 
diff --git a/xos/tosca/resources/cdnprefix.py b/xos/tosca/resources/cdnprefix.py
index 8fbdd19..5faaca8 100644
--- a/xos/tosca/resources/cdnprefix.py
+++ b/xos/tosca/resources/cdnprefix.py
@@ -5,7 +5,7 @@
 sys.path.append("/opt/tosca")
 from translator.toscalib.tosca_template import ToscaTemplate
 
-from hpc.models import CDNPrefix, ContentProvider
+from services.hpc.models import CDNPrefix, ContentProvider
 
 from xosresource import XOSResource
 
diff --git a/xos/tosca/resources/cdnservice.py b/xos/tosca/resources/cdnservice.py
index 4dbc561..4082938 100644
--- a/xos/tosca/resources/cdnservice.py
+++ b/xos/tosca/resources/cdnservice.py
@@ -5,7 +5,7 @@
 sys.path.append("/opt/tosca")
 from translator.toscalib.tosca_template import ToscaTemplate
 
-from hpc.models import HpcService
+from services.hpc.models import HpcService
 
 from service import XOSService
 
diff --git a/xos/tosca/resources/contentprovider.py b/xos/tosca/resources/contentprovider.py
index d63ea82..06ca02e 100644
--- a/xos/tosca/resources/contentprovider.py
+++ b/xos/tosca/resources/contentprovider.py
@@ -5,7 +5,7 @@
 sys.path.append("/opt/tosca")
 from translator.toscalib.tosca_template import ToscaTemplate
 
-from hpc.models import ContentProvider, ServiceProvider
+from services.hpc.models import ContentProvider, ServiceProvider
 
 from xosresource import XOSResource
 
diff --git a/xos/tosca/resources/originserver.py b/xos/tosca/resources/originserver.py
index 0f50f04..196ce2e 100644
--- a/xos/tosca/resources/originserver.py
+++ b/xos/tosca/resources/originserver.py
@@ -5,7 +5,7 @@
 sys.path.append("/opt/tosca")
 from translator.toscalib.tosca_template import ToscaTemplate
 
-from hpc.models import OriginServer, ContentProvider
+from services.hpc.models import OriginServer, ContentProvider
 
 from xosresource import XOSResource
 
diff --git a/xos/tosca/resources/serviceprovider.py b/xos/tosca/resources/serviceprovider.py
index 0ca401b..8faec6c 100644
--- a/xos/tosca/resources/serviceprovider.py
+++ b/xos/tosca/resources/serviceprovider.py
@@ -5,7 +5,7 @@
 sys.path.append("/opt/tosca")
 from translator.toscalib.tosca_template import ToscaTemplate
 
-from hpc.models import ServiceProvider, HpcService
+from services.hpc.models import ServiceProvider, HpcService
 
 from xosresource import XOSResource
 
diff --git a/xos/xos/hpcapi.py b/xos/xos/hpcapi.py
index 9de4989..28bdd7b 100644
--- a/xos/xos/hpcapi.py
+++ b/xos/xos/hpcapi.py
@@ -5,7 +5,7 @@
 from rest_framework import generics
 from rest_framework import status
 from rest_framework.generics import GenericAPIView
-from hpc.models import *
+from services.hpc.models import *
 from django.forms import widgets
 from rest_framework import filters
 from django.conf.urls import patterns, url
diff --git a/xos/xos/settings.py b/xos/xos/settings.py
index e276954..ae871c9 100644
--- a/xos/xos/settings.py
+++ b/xos/xos/settings.py
@@ -173,7 +173,7 @@
     'rest_framework',
     'django_extensions',
     'core',
-    'hpc',
+    'services.hpc',
     'cord',
     'helloworldservice_complete',
     'services.onos',
diff --git a/xos/xos/urls.py b/xos/xos/urls.py
index 3660282..4caacbc 100644
--- a/xos/xos/urls.py
+++ b/xos/xos/urls.py
@@ -8,7 +8,7 @@
 from hpcapi import *
 
 from core.views.legacyapi import LegacyXMLRPC
-from core.views.services import ServiceGridView, ServiceGraphView
+from core.views.serviceGraph import ServiceGridView, ServiceGraphView
 from helloworld.view import *
 #from core.views.analytics import AnalyticsAjaxView
 from core.models import *