diff --git a/xos/observers/helloworldservice_complete/steps/sync_helloworldtenant.py b/xos/observers/helloworldservice_complete/steps/sync_helloworldtenant.py
index a4b5435..5604296 100644
--- a/xos/observers/helloworldservice_complete/steps/sync_helloworldtenant.py
+++ b/xos/observers/helloworldservice_complete/steps/sync_helloworldtenant.py
@@ -1,7 +1,7 @@
 import os
 import sys
 from django.db.models import Q, F
-from helloworldservice_complete.models import HelloWorldServiceComplete, HelloWorldTenantComplete
+from services.helloworldservice_complete.models import HelloWorldServiceComplete, HelloWorldTenantComplete
 from observers.base.SyncInstanceUsingAnsible import SyncInstanceUsingAnsible
 
 parentdir = os.path.join(os.path.dirname(__file__), "..")
diff --git a/xos/helloworldservice_complete/__init__.py b/xos/services/helloworldservice_complete/__init__.py
similarity index 100%
rename from xos/helloworldservice_complete/__init__.py
rename to xos/services/helloworldservice_complete/__init__.py
diff --git a/xos/helloworldservice_complete/admin.py b/xos/services/helloworldservice_complete/admin.py
similarity index 97%
rename from xos/helloworldservice_complete/admin.py
rename to xos/services/helloworldservice_complete/admin.py
index 9a3e4f7..3c8e793 100644
--- a/xos/helloworldservice_complete/admin.py
+++ b/xos/services/helloworldservice_complete/admin.py
@@ -4,7 +4,7 @@
 from core.models import User
 from django import forms
 from django.contrib import admin
-from helloworldservice_complete.models import HelloWorldServiceComplete, HelloWorldTenantComplete, HELLO_WORLD_KIND
+from services.helloworldservice_complete.models import HelloWorldServiceComplete, HelloWorldTenantComplete, HELLO_WORLD_KIND
 
 # The class to provide an admin interface on the web for the service.
 # We do only configuration here and don't change any logic because the logic
diff --git a/xos/helloworldservice_complete/models.py b/xos/services/helloworldservice_complete/models.py
similarity index 100%
rename from xos/helloworldservice_complete/models.py
rename to xos/services/helloworldservice_complete/models.py
diff --git a/xos/helloworldservice_complete/templates/helloworldserviceadmin.html b/xos/services/helloworldservice_complete/templates/helloworldserviceadmin.html
similarity index 100%
rename from xos/helloworldservice_complete/templates/helloworldserviceadmin.html
rename to xos/services/helloworldservice_complete/templates/helloworldserviceadmin.html
diff --git a/xos/tosca/samples/helloworld-chain.yaml b/xos/tosca/samples/helloworld-chain.yaml
index 8a35b9e..2b5cd53 100644
--- a/xos/tosca/samples/helloworld-chain.yaml
+++ b/xos/tosca/samples/helloworld-chain.yaml
@@ -37,7 +37,7 @@
        properties:
            kind: helloworldservice_complete
            service_specific_attribute: "{\"display_message\": \"Hello World from Tosca\"}"
-           model: helloworldservice_complete.models.HelloWorldTenantComplete
+           model: services.helloworldservice_complete.models.HelloWorldTenantComplete
        requirements:
            - provider_service:
                node: service_helloworld