diff --git a/xos/make_synchronizer_manifest.sh b/xos/make_synchronizer_manifest.sh
deleted file mode 100755
index 4609e85..0000000
--- a/xos/make_synchronizer_manifest.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/bash
-
-# 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.
-
-find synchronizer -type f | cut -b 14- > synchronizer/manifest 
diff --git a/xos/vspgwu.xproto b/xos/synchronizer/models/vspgwu.xproto
similarity index 100%
rename from xos/vspgwu.xproto
rename to xos/synchronizer/models/vspgwu.xproto
diff --git a/xos/synchronizer/vspgwu_config.yaml b/xos/synchronizer/vspgwu_config.yaml
index c4d8456..5c7d0fb 100644
--- a/xos/synchronizer/vspgwu_config.yaml
+++ b/xos/synchronizer/vspgwu_config.yaml
@@ -13,14 +13,19 @@
 # limitations under the License.
 
 
-name: vspgwu-synchronizer
+name: vspgwu
 accessor:
   username: xosadmin@opencord.org
   password: "@/opt/xos/services/vspgwu/credentials/xosadmin@opencord.org"
+required_models:
+  - VSPGWUService
+  - VSPGWUVendor
+  - VSPGWUTenant
 dependency_graph: "/opt/xos/synchronizers/vspgwu/model-deps"
 steps_dir: "/opt/xos/synchronizers/vspgwu/steps"
 sys_dir: "/opt/xos/synchronizers/vspgwu/sys"
 model_policies_dir: "/opt/xos/synchronizers/vspgwu/model_policies"
+models_dir: "/opt/xos/synchronizers/vspgwu/models"
 blueprints:
   - name: cord_5_0_blueprint
     graph:
diff --git a/xos/synchronizer/vspgwu_from_api_config b/xos/synchronizer/vspgwu_from_api_config
deleted file mode 100644
index 6e4f99a..0000000
--- a/xos/synchronizer/vspgwu_from_api_config
+++ /dev/null
@@ -1,20 +0,0 @@
-# Sets options for the synchronizer
-[observer]
-name=vspgwu
-dependency_graph=/opt/xos/synchronizers/vspgwu/model-deps
-steps_dir=/opt/xos/synchronizers/vspgwu/steps
-sys_dir=/opt/xos/synchronizers/vspgwu/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
-accessor_kind=api
-accessor_password=@/opt/xos/services/vspgwu/credentials/xosadmin@opencord.org
-
-[networking]
-use_vtn=True
diff --git a/xos/vspgwu-onboard.yaml b/xos/vspgwu-onboard.yaml
deleted file mode 100644
index 18114a6..0000000
--- a/xos/vspgwu-onboard.yaml
+++ /dev/null
@@ -1,35 +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 vSPGWU service
-
-imports:
-  - custom_types/xos.yaml
-
-topology_template:
-  node_templates:
-    servicecontroller#vspgwu:
-      type: tosca.nodes.ServiceController
-      properties:
-          base_url: file:///opt/xos_services/vspgwu/xos/
-          # The following will concatenate with base_url automatically, if
-          # base_url is non-null.
-          xproto: ./
-          synchronizer: synchronizer/manifest  
-          synchronizer_run: vspgwu-synchronizer.py
-          private_key: file:///opt/xos/key_import/mcord_rsa
-          public_key: file:///opt/xos/key_import/mcord_rsa.pub
-