diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..7f57aed
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,6 @@
+[gerrit]
+host=gerrit.opencord.org
+port=29418
+project=onos.git
+defaultremote=origin
+defaultbranch=master
diff --git a/xos/__init__.py b/xos/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/xos/__init__.py
diff --git a/xos/make_synchronizer_manifest.sh b/xos/make_synchronizer_manifest.sh
new file mode 100755
index 0000000..4058982
--- /dev/null
+++ b/xos/make_synchronizer_manifest.sh
@@ -0,0 +1,2 @@
+#! /bin/bash
+find synchronizer -type f | cut -b 14- > synchronizer/manifest 
diff --git a/xos/synchronizer/manifest b/xos/synchronizer/manifest
new file mode 100644
index 0000000..dc78252
--- /dev/null
+++ b/xos/synchronizer/manifest
@@ -0,0 +1,9 @@
+__init__.py
+manifest
+model-deps
+run.sh
+steps/sync_vpgwc.py
+steps/sync_vpgwc.yaml
+stop.sh
+vpgwc-synchronizer.py
+vpgwc_config
diff --git a/xos/templates/vPGWCAdmin.html b/xos/templates/vPGWCAdmin.html
new file mode 100644
index 0000000..4585199
--- /dev/null
+++ b/xos/templates/vPGWCAdmin.html
@@ -0,0 +1,10 @@
+<!-- Template used to for the button leading to the HelloWorldTenantComplete form. -->
+<div class = "left-nav">
+  <ul>
+    <li>
+      <a href="/admin/mcordservice/vpgwccomponent/">
+        vPGWC Service Components
+      </a>
+    </li>
+  </ul>
+</div>
diff --git a/xos/tosca/resources/mcordservice.py b/xos/tosca/resources/mcordservice.py
deleted file mode 100644
index 37cc03f..0000000
--- a/xos/tosca/resources/mcordservice.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import os
-import pdb
-import sys
-import tempfile
-sys.path.append("/opt/tosca")
-from translator.toscalib.tosca_template import ToscaTemplate
-import pdb
-
-from services.vpgwc.models import MCORDService
-
-from service import XOSService
-
-class XOSMCORDService(XOSService):
-    provides = "tosca.nodes.MCORDService"
-    xos_model = MCORDService
-    copyin_props = ["view_url", "icon_url", "enabled", "published", "public_key",
-                    "private_key_fn", "versionNumber",
-                    ]
-
diff --git a/xos/vPGWC-onboard.yaml b/xos/vPGWC-onboard.yaml
new file mode 100644
index 0000000..bde25d8
--- /dev/null
+++ b/xos/vPGWC-onboard.yaml
@@ -0,0 +1,27 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: Onboard the vPGWC service
+
+imports:
+   - custom_types/xos.yaml
+
+topology_template:
+  node_templates:
+    servicecontroller#vpgwc:
+      type: tosca.nodes.ServiceController
+      properties:
+          base_url: file:///opt/xos_services/vPGWC/xos/
+          # The following will concatenate with base_url automatically, if
+          # base_url is non-null.
+          models: models.py
+          admin: admin.py
+          admin_template: templates/vPGWCAdmin.html
+          synchronizer: synchronizer/manifest
+          synchronizer_run: vpgwc-synchronizer.py
+          #tosca_custom_types: exampleservice.yaml
+          tosca_resource: tosca/resources/VPGWCComponent.py, tosca/resources/VPGWCService.py
+          #rest_service: subdirectory:vsg api/service/vsg/vsgservice.py
+          #rest_tenant: subdirectory:cord api/tenant/cord/vsg.py
+          private_key: file:///opt/xos/key_import/vPGWC_rsa
+          public_key: file:///opt/xos/key_import/vPGWC_rsa.pub
+