diff --git a/xos/make_synchronizer_manifest.sh b/xos/make_synchronizer_manifest.sh
deleted file mode 100755
index 5a0d500..0000000
--- a/xos/make_synchronizer_manifest.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#! /bin/bash
-find synchronizer -type f | cut -b 14- > synchronizer/manifest 
diff --git a/xos/vhss.xproto b/xos/synchronizer/models/vhss.xproto
similarity index 100%
rename from xos/vhss.xproto
rename to xos/synchronizer/models/vhss.xproto
diff --git a/xos/synchronizer/vhss_config.yaml b/xos/synchronizer/vhss_config.yaml
index 0123b0d..6d8c10e 100644
--- a/xos/synchronizer/vhss_config.yaml
+++ b/xos/synchronizer/vhss_config.yaml
@@ -13,11 +13,16 @@
 # limitations under the License.
 
 
-name: vhss-synchronizer
+name: vhss
 accessor:
   username: xosadmin@opencord.org
   password: "@/opt/xos/services/vhss/credentials/xosadmin@opencord.org"
+required_models:
+  - VHSSService
+  - VHSSVendor
+  - VHSSTenant
 dependency_graph: "/opt/xos/synchronizers/vhss/model-deps"
 steps_dir: "/opt/xos/synchronizers/vhss/steps"
 sys_dir: "/opt/xos/synchronizers/vhss/sys"
+models_dir: "/opt/xos/synchronizers/vhss/models"
 model_policies_dir: "/opt/xos/synchronizers/vhss/model_policies"
diff --git a/xos/synchronizer/vhss_from_api_config b/xos/synchronizer/vhss_from_api_config
deleted file mode 100644
index b8a05cc..0000000
--- a/xos/synchronizer/vhss_from_api_config
+++ /dev/null
@@ -1,21 +0,0 @@
-# Sets options for the synchronizer
-[observer]
-name=vhss
-dependency_graph=/opt/xos/synchronizers/vhss/model-deps
-steps_dir=/opt/xos/synchronizers/vhss/steps
-sys_dir=/opt/xos/synchronizers/vhss/sys
-#logfile=/var/log/xos_backend.log
-log_file=console
-log_level=debug
-pretend=False
-backoff_disabled=True
-save_ansible_output=True
-proxy_ssh=True
-proxy_ssh_key=/opt/cord_profile/node_key
-proxy_ssh_user=root
-enable_watchers=True
-accessor_kind=api
-accessor_password=@/opt/xos/services/vhss/credentials/xosadmin@opencord.org
-#required_models=VHSSService, VHSSTenant, ServiceDependency
-[networking]
-use_vtn=True
diff --git a/xos/vhss-onboard.yaml b/xos/vhss-onboard.yaml
deleted file mode 100644
index 0c24f5b..0000000
--- a/xos/vhss-onboard.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Onboard the vHSS service
-
-imports:
-  - custom_types/xos.yaml
-
-topology_template:
-  node_templates:
-    servicecontroller#vhss:
-      type: tosca.nodes.ServiceController
-      properties:
-          base_url: file:///opt/xos_services/vhss/xos/
-          # The following will concatenate with base_url automatically, if
-          # base_url is non-null.
-          xproto: ./
-          private_key: file:///opt/xos/key_import/mcord_rsa
-          public_key: file:///opt/xos/key_import/mcord_rsa.pub
-