diff --git a/xos/ceilometer/__init__.py b/xos/services/ceilometer/__init__.py
similarity index 100%
rename from xos/ceilometer/__init__.py
rename to xos/services/ceilometer/__init__.py
diff --git a/xos/ceilometer/admin.py b/xos/services/ceilometer/admin.py
similarity index 100%
rename from xos/ceilometer/admin.py
rename to xos/services/ceilometer/admin.py
diff --git a/xos/ceilometer/models.py b/xos/services/ceilometer/models.py
similarity index 100%
rename from xos/ceilometer/models.py
rename to xos/services/ceilometer/models.py
diff --git a/xos/ceilometer/templates/ceilometeradmin.html b/xos/services/ceilometer/templates/ceilometeradmin.html
similarity index 100%
rename from xos/ceilometer/templates/ceilometeradmin.html
rename to xos/services/ceilometer/templates/ceilometeradmin.html
diff --git a/xos/tosca/resources/tenant.py b/xos/tosca/resources/tenant.py
index 831f6eb..21b8e88 100644
--- a/xos/tosca/resources/tenant.py
+++ b/xos/tosca/resources/tenant.py
@@ -7,7 +7,7 @@
 from translator.toscalib.tosca_template import ToscaTemplate
 import pdb
 
-from ceilometer.models import Tenant, Service
+from core.models import Tenant, Service
 
 from xosresource import XOSResource