diff --git a/xos/services/fabric/admin.py b/xos/onboard/fabric/admin.py
similarity index 100%
rename from xos/services/fabric/admin.py
rename to xos/onboard/fabric/admin.py
diff --git a/xos/onboard/fabric/fabric-onboard.yaml b/xos/onboard/fabric/fabric-onboard.yaml
new file mode 100644
index 0000000..e0f0fa7
--- /dev/null
+++ b/xos/onboard/fabric/fabric-onboard.yaml
@@ -0,0 +1,24 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: Onboard the fabric
+
+imports:
+   - custom_types/xos.yaml
+
+topology_template:
+  node_templates:
+    servicecontroller#fabric:
+      type: tosca.nodes.ServiceController
+      properties:
+          base_url: file:///opt/xos/onboard/fabric/
+          # The following will concatenate with base_url automatically, if
+          # base_url is non-null.
+          models: models.py
+          admin: admin.py
+          admin_template: templates/fabricadmin.html
+          synchronizer: synchronizer/manifest
+          synchronizer_run: fabric-synchronizer.py
+          tosca_resource: tosca/resources/fabricservice.py
+          #private_key: file:///opt/xos/key_import/vsg_rsa
+          #public_key: file:///opt/xos/key_import/vsg_rsa.pub
+
diff --git a/xos/synchronizers/fabric/fabric-synchronizer.py b/xos/onboard/fabric/fabric/fabric-synchronizer.py
similarity index 100%
rename from xos/synchronizers/fabric/fabric-synchronizer.py
rename to xos/onboard/fabric/fabric/fabric-synchronizer.py
diff --git a/xos/synchronizers/fabric/fabric_synchronizer_config b/xos/onboard/fabric/fabric/fabric_synchronizer_config
similarity index 100%
rename from xos/synchronizers/fabric/fabric_synchronizer_config
rename to xos/onboard/fabric/fabric/fabric_synchronizer_config
diff --git a/xos/synchronizers/fabric/model-deps b/xos/onboard/fabric/fabric/model-deps
similarity index 100%
rename from xos/synchronizers/fabric/model-deps
rename to xos/onboard/fabric/fabric/model-deps
diff --git a/xos/synchronizers/fabric/run.sh b/xos/onboard/fabric/fabric/run.sh
similarity index 100%
rename from xos/synchronizers/fabric/run.sh
rename to xos/onboard/fabric/fabric/run.sh
diff --git a/xos/synchronizers/fabric/start.sh b/xos/onboard/fabric/fabric/start.sh
similarity index 100%
rename from xos/synchronizers/fabric/start.sh
rename to xos/onboard/fabric/fabric/start.sh
diff --git a/xos/synchronizers/fabric/steps/sync_host.yaml b/xos/onboard/fabric/fabric/steps/sync_host.yaml
similarity index 100%
rename from xos/synchronizers/fabric/steps/sync_host.yaml
rename to xos/onboard/fabric/fabric/steps/sync_host.yaml
diff --git a/xos/synchronizers/fabric/steps/sync_vroutertenant.py b/xos/onboard/fabric/fabric/steps/sync_vroutertenant.py
similarity index 100%
rename from xos/synchronizers/fabric/steps/sync_vroutertenant.py
rename to xos/onboard/fabric/fabric/steps/sync_vroutertenant.py
diff --git a/xos/synchronizers/fabric/stop.sh b/xos/onboard/fabric/fabric/stop.sh
similarity index 100%
rename from xos/synchronizers/fabric/stop.sh
rename to xos/onboard/fabric/fabric/stop.sh
diff --git a/xos/services/fabric/models.py b/xos/onboard/fabric/models.py
similarity index 100%
rename from xos/services/fabric/models.py
rename to xos/onboard/fabric/models.py
diff --git a/xos/onboard/fabric/synchronizer/manifest b/xos/onboard/fabric/synchronizer/manifest
new file mode 100644
index 0000000..62a0722
--- /dev/null
+++ b/xos/onboard/fabric/synchronizer/manifest
@@ -0,0 +1,9 @@
+manifest
+fabric_synchronizer_config
+steps/sync_host.yaml
+steps/sync_vroutertenant.py
+start.sh
+stop.sh
+model-deps
+run.sh
+fabric-synchronizer.py
diff --git a/xos/services/fabric/templates/fabricadmin.html b/xos/onboard/fabric/templates/fabricadmin.html
similarity index 100%
rename from xos/services/fabric/templates/fabricadmin.html
rename to xos/onboard/fabric/templates/fabricadmin.html
diff --git a/xos/tosca/resources/fabricservice.py b/xos/onboard/fabric/tosca/resources/fabricservice.py
similarity index 100%
rename from xos/tosca/resources/fabricservice.py
rename to xos/onboard/fabric/tosca/resources/fabricservice.py