[CORD-1577] Show vHSS on service list

Change-Id: I034f6c339cba01e0d4b05edfe6639897951b8e3a
diff --git a/xos/macros.m4 b/xos/tosca/custom_types/macros.m4
similarity index 100%
rename from xos/macros.m4
rename to xos/tosca/custom_types/macros.m4
diff --git a/xos/vhss.m4 b/xos/tosca/custom_types/vhss.m4
similarity index 100%
rename from xos/vhss.m4
rename to xos/tosca/custom_types/vhss.m4
diff --git a/xos/vhss.yaml b/xos/tosca/custom_types/vhss.yaml
similarity index 100%
rename from xos/vhss.yaml
rename to xos/tosca/custom_types/vhss.yaml
diff --git a/xos/vhss-onboard.yaml b/xos/vhss-onboard.yaml
index 537d8ca..49d2741 100644
--- a/xos/vhss-onboard.yaml
+++ b/xos/vhss-onboard.yaml
@@ -15,7 +15,7 @@
           # base_url is non-null.
           xproto: ./
           admin: admin.py
-          tosca_custom_types: vhss.yaml
+          tosca_custom_types: tosca/custom_types/vhss.yaml
           tosca_resource: tosca/resources/vhssservice.py, tosca/resources/vhsstenant.py
           private_key: file:///opt/xos/key_import/mcord_rsa
           public_key: file:///opt/xos/key_import/mcord_rsa.pub