diff --git a/xos/internetemulator-onboard.yaml b/xos/internetemulator-onboard.yaml
deleted file mode 100644
index 5f38260..0000000
--- a/xos/internetemulator-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 internetemulator
-
-imports:
-   - custom_types/xos.yaml
-
-topology_template:
-  node_templates:
-    servicecontroller#internetemulator:
-      type: tosca.nodes.ServiceController
-      properties:
-          base_url: file:///opt/xos_services/internetemulator/xos/
-          # The following will concatenate with base_url automatically, if
-          # base_url is non-null.
-          xproto: ./
-          synchronizer: synchronizer/manifest
-          synchronizer_run: internetemulator-synchronizer.py
-          private_key: file:///opt/xos/key_import/mcord_rsa
-          public_key: file:///opt/xos/key_import/mcord_rsa.pub
-
diff --git a/xos/make_synchronizer_manifest.sh b/xos/make_synchronizer_manifest.sh
deleted file mode 100644
index 957f918..0000000
--- a/xos/make_synchronizer_manifest.sh
+++ /dev/null
@@ -1,18 +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/synchronizer/internetemulator_config.yaml b/xos/synchronizer/internetemulator_config.yaml
index 177e042..f21d67e 100644
--- a/xos/synchronizer/internetemulator_config.yaml
+++ b/xos/synchronizer/internetemulator_config.yaml
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 
-name: internetemulator-synchronizer
+name: internetemulator
 accessor:
   username: xosadmin@opencord.org
   password: "@/opt/xos/services/internetemulator/credentials/xosadmin@opencord.org"
@@ -25,4 +25,5 @@
 dependency_graph: "/opt/xos/synchronizers/internetemulator/model-deps"
 steps_dir: "/opt/xos/synchronizers/internetemulator/steps"
 sys_dir: "/opt/xos/synchronizers/internetemulator/sys"
+models_dir: "/opt/xos/synchronizers/internetemulator/models"
 model_policies_dir: "/opt/xos/synchronizers/internetemulator/model_policies"
diff --git a/xos/internetemulator.xproto b/xos/synchronizer/models/internetemulator.xproto
similarity index 100%
rename from xos/internetemulator.xproto
rename to xos/synchronizer/models/internetemulator.xproto