diff --git a/mcord/non-xos-config/Makefile b/mcord/non-xos-config/Makefile
new file mode 100644
index 0000000..6898687
--- /dev/null
+++ b/mcord/non-xos-config/Makefile
@@ -0,0 +1,124 @@
+# frontend/Makefile
+
+CONFIG_DIR         := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+COMMON_DIR         := $(abspath ../common )
+
+.DEFAULT_GOAL      := frontend
+
+DOCKER_PROJECT     ?= frontend
+BOOTSTRAP_PROJECT  ?= frontendbs
+
+XOS_BOOTSTRAP_PORT ?= 81
+XOS_UI_PORT        ?= 8888 
+
+# Include common functions
+include $(COMMON_DIR)/Makefile
+
+frontend: prereqs config_dirs xos_download cord_services cord_libraries bootstrap onboarding frontendconfig
+
+onboarding:
+	@echo "[ONBOARDING]"
+	# on-board any services here
+	$(RUN_TOSCA_BOOTSTRAP) $(COMMON_DIR)/tosca/disable-onboarding.yaml
+	$(RUN_TOSCA_BOOTSTRAP) $(LIBRARY_DIR)/ng-xos-lib/ng-xos-lib-onboard.yaml
+	$(RUN_TOSCA_BOOTSTRAP) $(COMMON_DIR)/tosca/enable-onboarding.yaml
+	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/ng-xos-lib
+	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
+	bash $(COMMON_DIR)/wait_for_xos_port.sh $(XOS_UI_PORT)
+
+onboard-cord-pod:
+	sudo bash -c "echo somekey > key_import/vsg_rsa"
+	sudo bash -c "echo somekey > key_import/vsg_rsa.pub"
+	sudo bash -c "echo somekey > key_import/volt_rsa"
+	sudo bash -c "echo somekey > key_import/volt_rsa.pub"
+	sudo bash -c "echo somekey > key_import/onos_rsa"
+	sudo bash -c "echo somekey > key_import/onos_rsa.pub"
+	$(RUN_TOSCA_BOOTSTRAP) $(COMMON_DIR)/tosca/disable-onboarding.yaml
+	$(RUN_TOSCA_BOOTSTRAP) $(LIBRARY_DIR)/ng-xos-lib/ng-xos-lib-onboard.yaml
+	$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vrouter/xos/vrouter-onboard.yaml
+	$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/olt/xos/volt-onboard.yaml
+	$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vsg/xos/vsg-onboard.yaml
+	$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/onos-service/xos/onos-onboard.yaml
+	$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/fabric/xos/fabric-onboard.yaml
+	$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vtr/xos/vtr-onboard.yaml
+	$(RUN_TOSCA_BOOTSTRAP) xos-cord-branding.yaml
+	$(RUN_TOSCA_BOOTSTRAP) $(COMMON_DIR)/tosca/enable-onboarding.yaml
+	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/ng-xos-lib
+	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/vrouter
+	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/volt
+	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/vsg
+	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/onos
+	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/fabric
+	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/vtr
+	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
+	bash $(COMMON_DIR)/wait_for_xos_port.sh $(XOS_UI_PORT)
+
+frontendconfig: sample.yaml
+	@echo "[FRONTENDCONFIG]"
+	$(RUN_TOSCA) sample.yaml
+
+mock-cord-pod: onboard-cord-pod
+	$(RUN_TOSCA) $(COMMON_DIR)/tosca/mgmt-net.yaml
+	$(RUN_TOSCA) mocks/onos.yaml
+	$(RUN_TOSCA) ../cord-pod/cord-services.yaml
+	$(RUN_TOSCA) $(COMMON_DIR)/tosca/public-net.yaml
+	$(RUN_TOSCA) ../cord-pod/cord-test-subscriber.yaml
+	$(RUN_TOSCA) $(COMMON_DIR)/tosca/cord-volt-devices.yaml
+
+mock-mcord:
+	# check this
+	$(RUN_TOSCA) $(COMMON_DIR)/tosca/mgmt-net.yaml
+	$(RUN_TOSCA) mocks/mcord.yaml
+	sudo docker exec $(DOCKER_PROJECT)_xos_ui_1 cp /opt/xos/configurations/mcord/xos_mcord_config /opt/xos/xos_configuration/
+	sudo docker exec $(DOCKER_PROJECT)_xos_ui_1 touch /opt/xos/xos/settings.py
+
+exampleservice: $(SERVICE_DIR)/exampleservice
+	mkdir -p key_import
+	# fake keys are fine
+	sudo bash -c "echo somekey > key_import/exampleservice_rsa"
+	sudo bash -c "echo somekey > key_import/exampleservice_rsa.pub"
+	$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/exampleservice/xos/exampleservice-onboard.yaml
+	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/exampleservice
+	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
+	bash $(COMMON_DIR)/wait_for_xos_port.sh $(XOS_UI_PORT)
+
+hypercache: $(SERVICE_DIR)/hypercache
+	$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/hypercache/xos/hpc-onboard.yaml
+	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) services/hpc
+	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
+	bash $(COMMON_DIR)/wait_for_xos_port.sh $(XOS_UI_PORT)
+	$(RUN_TOSCA) mocks/cdn.yaml
+	$(RUN_TOSCA) ../opencloud/cdn-content.yaml
+
+dashboard: dashboard.yaml
+	$(RUN_TOSCA) $(CONFIG_DIR)/dashboard.yaml
+
+# before executing this clone the service from: https://github.com/teone/mcord-slicing-ui.git
+onboard-mcord-slicing: slicing-ui
+	# fix ports (now they are set to use the FE config ones
+	@echo "[ONBOARDING UI SERVICES]"
+	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_UI_PORT) xos
+	$(RUN_TOSCA_BOOTSTRAP) $(COMMON_DIR)/disable-onboarding.yaml
+	$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/mcord-ui-slicing/xos/mcord-slicing-onboard.yaml
+	$(RUN_TOSCA_BOOTSTRAP) $(COMMON_DIR)/enable-onboarding.yaml
+	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_UI_PORT) xos
+	bash $(COMMON_DIR)/wait_for_xos_port.sh $(XOS_UI_PORT)
+
+slicing-ui:
+	$(RUN_TOSCA) ./mocks/mcord-slicing-ui.yaml
+
+slices:
+	$(RUN_TOSCA) ./mocks/slices.yaml
+
+clean-config-folder:
+	sudo docker exec $(DOCKER_PROJECT)_xos_ui_1 rm -f /opt/xos/xos_configuration/xos_mcord_config
+	sudo docker exec $(DOCKER_PROJECT)_xos_ui_1 rm -f /opt/xos/xos_configuration/xos_cord_config
+
+experimental-ui: xos_rest_gw_c
+	$(RUN_TOSCA_BOOTSTRAP) $(COMMON_DIR)/tosca/disable-onboarding.yaml
+	$(RUN_TOSCA_BOOTSTRAP) $(CONFIG_DIR)/ui_containers.yaml
+	$(RUN_TOSCA_BOOTSTRAP) $(CONFIG_DIR)/gui.yaml
+	$(RUN_TOSCA_BOOTSTRAP) $(COMMON_DIR)/tosca/enable-onboarding.yaml
+	bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
+	bash $(COMMON_DIR)/wait_for_xos_port.sh $(XOS_UI_PORT)
+
diff --git a/mcord/non-xos-config/README b/mcord/non-xos-config/README
new file mode 100644
index 0000000..a37df3f
--- /dev/null
+++ b/mcord/non-xos-config/README
@@ -0,0 +1,52 @@
+mcord@mcord:~/service-profile/mcord$ git status
+On branch cord-2.0
+Your branch is up-to-date with 'origin/cord-2.0'.
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git checkout -- <file>..." to discard changes in working directory)
+
+	modified:   ../cord-pod/monitoringservice.yaml
+	modified:   ../frontend/Makefile
+	modified:   ../frontend/gateway-config.yml
+	modified:   ../frontend/ui_containers.yaml
+	modified:   Makefile
+	modified:   cleanup.sh
+	modified:   images.yaml
+	modified:   mcord.yaml
+	modified:   mgmt-net.yaml
+	modified:   monitoringservice.yaml
+	modified:   monitoringtenant.yaml
+	modified:   network-cfg.json
+	modified:   setup.yaml
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+	../cord-pod/#monitoringservice.yaml#
+	../cord-pod/admin-openrc.sh
+	../cord-pod/node_key
+	../frontend/gui.yaml
+	../mcord.tar.gz
+	admin-openrc.sh
+	apt-prereqs
+	containers.txt
+	error-pingping.log
+	files/activetest_config
+	files/passivetest_config
+	gateway-config.yml
+	id_rsa
+	id_rsa.pub
+	images-mwc.yaml
+	inframonitoring.yaml
+	node_key
+	nodes.yaml
+	non-xos-config/
+	onos_monitoring_service_endpoints.json
+	ui-style-config.js
+	ui_containers.yaml
+	vtn-external-april-1.yaml
+	vtn-external.yaml
+	vtnconfig.json
+
+
diff --git a/mcord/non-xos-config/apt-prereqs b/mcord/non-xos-config/apt-prereqs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/mcord/non-xos-config/apt-prereqs
diff --git a/mcord/non-xos-config/gateway-config.yml b/mcord/non-xos-config/gateway-config.yml
new file mode 100644
index 0000000..674b419
--- /dev/null
+++ b/mcord/non-xos-config/gateway-config.yml
@@ -0,0 +1,9 @@
+default:
+  xos:
+    host: xos
+    port: 8888 
+  redis:
+    host: redis
+    port: 6379
+  gateway:
+    port: 3000
diff --git a/mcord/non-xos-config/gui.yaml b/mcord/non-xos-config/gui.yaml
new file mode 100644
index 0000000..4a8c59e
--- /dev/null
+++ b/mcord/non-xos-config/gui.yaml
@@ -0,0 +1,40 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: Onboard the exampleservice
+
+imports:
+   - custom_types/xos.yaml
+
+topology_template:
+  node_templates:
+
+    # UI Container
+    xos-spa-gui:
+      type: tosca.nodes.Component
+      properties:
+        # command: cd /var/www; BRAND=opencloud npm run build
+        name: xos-spa-gui
+        image: xosproject/xos-gui
+        ports: 4000:4000
+        
+    # UI Style Config
+    /var/www/dist/style.config.js:
+      type: tosca.nodes.ComponentVolume
+      properties:
+          host_path: { path_join: [ SELF, CONFIG_DIR, ./ui-style-config.js, ENV_VAR ] }
+          read_only: false
+      requirements:
+          - xos:
+             node: xos-spa-gui
+             relationship: tosca.relationships.VolumeOfComponent
+
+    gui-to-gw:
+      type: tosca.nodes.ComponentLink
+      properties:
+          container: xos-rest-gateway
+          alias: xos-rest-gw
+          kind: internal
+      requirements:
+          - xos:
+             node: xos-spa-gui
+             relationship: tosca.relationships.LinkOfComponent
diff --git a/mcord/non-xos-config/inframonitoring.yaml b/mcord/non-xos-config/inframonitoring.yaml
new file mode 100644
index 0000000..9cb5be1
--- /dev/null
+++ b/mcord/non-xos-config/inframonitoring.yaml
@@ -0,0 +1,107 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: Auto generated file to enable monitoring of infrastructure services (OpenStack, ONOS...etc).
+
+imports:
+   - custom_types/xos.yaml
+   - custom_types/monitoring_tosca_types.yaml
+
+topology_template:
+  node_templates:
+    service_ceilometer:
+      type: tosca.nodes.CeilometerService
+      properties:
+          no-create: true
+          no-update: true
+          no-delete: true
+
+    onos_monitoring_agent_head_node:
+      description: Monitoring agent info
+      type: tosca.nodes.InfraMonitoringAgentInfo
+      properties:
+          start_url: http://ceilometer-1.cord.lab:5004/monitoring/agent/onos/start
+          start_url_json_data: { get_artifact: [ SELF, onos_monitoring_service_endpoints, LOCAL_FILE] }
+          stop_url: http://ceilometer-1.cord.lab:5004/monitoring/agent/onos/stop
+      artifacts:
+          onos_monitoring_service_endpoints: /root/setup/onos_monitoring_service_endpoints.json
+
+    os_monitoring_agent_head_node:
+      description: Openstack Monitoring agent info
+      type: tosca.nodes.InfraMonitoringAgentInfo
+      properties:
+          start_url: http://ceilometer-1.cord.lab:5004/monitoring/agent/openstack/start
+          stop_url: http://ceilometer-1.cord.lab:5004/monitoring/agent/openstack/stop
+
+    os_monitoring_agent_cp_1:
+      description: Openstack Monitoring agent info for only-bucket
+      type: tosca.nodes.InfraMonitoringAgentInfo
+      properties:
+          start_url: http://only-bucket.cord.lab:5004/monitoring/agent/openstack/start
+          stop_url: http://only-bucket.cord.lab:5004/monitoring/agent/openstack/stop
+
+    os_monitoring_agent_cp_2:
+      description: Openstack Monitoring agent info for handy-stomach
+      type: tosca.nodes.InfraMonitoringAgentInfo
+      properties:
+          start_url: http://handy-stomach.cord.lab:5004/monitoring/agent/openstack/start
+          stop_url: http://handy-stomach.cord.lab:5004/monitoring/agent/openstack/stop
+
+    os_monitoring_agent_cp_3:
+      description: Openstack Monitoring agent info for strange-touch
+      type: tosca.nodes.InfraMonitoringAgentInfo
+      properties:
+          start_url: http://strange-touch.cord.lab:5004/monitoring/agent/openstack/start
+          stop_url: http://strange-touch.cord.lab:5004/monitoring/agent/openstack/stop
+
+    os_monitoring_agent_cp_4:
+      description: Openstack Monitoring agent info for salty-interest
+      type: tosca.nodes.InfraMonitoringAgentInfo
+      properties:
+          start_url: http://salty-interest.cord.lab:5004/monitoring/agent/openstack/start
+          stop_url: http://salty-interest.cord.lab:5004/monitoring/agent/openstack/stop
+
+    os_monitoring_agent_cp_5:
+      description: Openstack Monitoring agent info for compute1
+      type: tosca.nodes.InfraMonitoringAgentInfo
+      properties:
+          start_url: http://compute1.cord.lab:5004/monitoring/agent/openstack/start
+          stop_url: http://compute1.cord.lab:5004/monitoring/agent/openstack/stop
+
+    os_monitoring_collector_plugin:
+      description: Infra Monitoring collector plugin info
+      type: tosca.nodes.MonitoringCollectorPluginInfo
+      properties:
+          plugin_folder_path: /opt/xos/synchronizers/monitoring/ceilometer/ceilometer-plugins/network/ext_services/openstack_infra/
+          plugin_rabbit_exchange: openstack_infra
+ 
+    openstack_monitoring_publisher_tenant:
+      description: OpenStack Monitoring Publisher Tenant
+      type: tosca.nodes.OpenStackMonitoringPublisher
+      requirements:
+          - provider_service:
+              node: service_ceilometer
+              relationship: tosca.relationships.TenantOfService
+          - monitoring_collector_plugin:
+              node: os_monitoring_collector_plugin
+              relationship: tosca.relationships.ProvidesMonitoringCollectorPluginInfo
+          - monitoring_agent_1:
+              node: os_monitoring_agent_head_node
+              relationship: tosca.relationships.ProvidesInfraMonitoringAgentInfo
+          - monitoring_agent_2:
+              node: onos_monitoring_agent_head_node
+              relationship: tosca.relationships.ProvidesInfraMonitoringAgentInfo
+          - monitoring_agent_3:
+              node: os_monitoring_agent_cp_1
+              relationship: tosca.relationships.ProvidesInfraMonitoringAgentInfo
+          - monitoring_agent_4:
+              node: os_monitoring_agent_cp_2
+              relationship: tosca.relationships.ProvidesInfraMonitoringAgentInfo
+          - monitoring_agent_5:
+              node: os_monitoring_agent_cp_3
+              relationship: tosca.relationships.ProvidesInfraMonitoringAgentInfo
+          - monitoring_agent_6:
+              node: os_monitoring_agent_cp_4
+              relationship: tosca.relationships.ProvidesInfraMonitoringAgentInfo
+          - monitoring_agent_7:
+              node: os_monitoring_agent_cp_5
+              relationship: tosca.relationships.ProvidesInfraMonitoringAgentInfo
diff --git a/mcord/non-xos-config/monitoringservice.yaml b/mcord/non-xos-config/monitoringservice.yaml
new file mode 100644
index 0000000..1459091
--- /dev/null
+++ b/mcord/non-xos-config/monitoringservice.yaml
@@ -0,0 +1,183 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: Setup CORD-related services -- vOLT, vCPE, vBNG.
+
+imports:
+   - custom_types/xos.yaml
+   - custom_types/monitoring_tosca_types.yaml
+
+topology_template:
+  node_templates:
+    service_ceilometer:
+      type: tosca.nodes.CeilometerService
+      requirements:
+      properties:
+          view_url: /admin/monitoring/ceilometerservice/$id$/
+          kind: ceilometer
+          ceilometer_pub_sub_url: http://10.11.10.1:4455/
+          public_key: { get_artifact: [ SELF, pubkey, LOCAL_FILE] }
+          private_key_fn: /opt/xos/services/monitoring/keys/monitoringservice_rsa
+      artifacts:
+          pubkey: /opt/xos/services/monitoring/keys/monitoringservice_rsa.pub
+
+#    service_sflow:
+#      type: tosca.nodes.SFlowService
+#      requirements:
+#      properties:
+#          view_url: /admin/monitoring/sflowservice/$id$/
+#          kind: sflow
+#          sflow_port: 6343
+#          sflow_api_port: 33333
+
+    Private:
+      type: tosca.nodes.NetworkTemplate
+
+    management:
+      type: tosca.nodes.network.Network.XOS
+      properties:
+          no-create: true
+          no-delete: true
+          no-update: true
+
+#    ceilometer_network:
+#      type: tosca.nodes.network.Network.XOS
+#      properties:
+#          ip_version: 4
+#          labels: ceilometer_client_access
+#      requirements:
+#          - network_template:
+#              node: Private
+#              relationship: tosca.relationships.UsesNetworkTemplate
+#          - owner:
+#              node: mysite_ceilometer
+#              relationship: tosca.relationships.MemberOfSlice
+#          - connection:
+#              node: mysite_ceilometer
+#              relationship: tosca.relationships.ConnectsToSlice
+
+    mysite:
+      type: tosca.nodes.Site
+
+    trusty-server-multi-nic:
+      type: tosca.nodes.Image
+
+    ceilometer-trusty-server-multi-nic:
+      type: tosca.nodes.Image
+
+    ceilometer-service-trusty-server-multi-nic:
+      type: tosca.nodes.Image
+
+    m1.small:
+      type: tosca.nodes.Flavor
+
+    mysite_ceilometer:
+      description: Ceilometer Proxy Slice
+      type: tosca.nodes.Slice
+      properties:
+          default_node: salty-interest
+      requirements:
+          - ceilometer_service:
+              node: service_ceilometer
+              relationship: tosca.relationships.MemberOfService
+          - site:
+              node: mysite
+              relationship: tosca.relationships.MemberOfSite
+          - default_image:
+                node: ceilometer-trusty-server-multi-nic
+                relationship: tosca.relationships.DefaultImage
+          - management:
+              node: management
+              relationship: tosca.relationships.ConnectsToNetwork
+          - m1.small:
+              node: m1.small
+              relationship: tosca.relationships.DefaultFlavor
+
+    # Virtual machines
+    ceilometer_service_instance:
+      type: tosca.nodes.Compute
+      capabilities:
+        # Host container properties
+        host:
+         properties:
+           num_cpus: 2
+           disk_size: 20 GB
+           mem_size: 2 GB
+      requirements:
+          - slice:
+                node: mysite_ceilometer
+                relationship: tosca.relationships.MemberOfSlice
+          - image:
+                node: ceilometer-service-trusty-server-multi-nic
+                relationship: tosca.relationships.UsesImage
+
+#    mysite_sflow:
+#      description: Slice for sFlow service
+#      type: tosca.nodes.Slice
+#      requirements:
+#          - sflow_service:
+#              node: service_sflow
+#              relationship: tosca.relationships.MemberOfService
+#          - site:
+#              node: mysite
+#              relationship: tosca.relationships.MemberOfSite
+
+# MOVING this section to monitoringtenant.yaml
+#    my_ceilometer_tenant:
+#      description: Ceilometer Service default Tenant
+#      type: tosca.nodes.CeilometerTenant
+#      requirements:
+#          - provider_service:
+#              node: service_ceilometer
+#              relationship: tosca.relationships.MemberOfService
+#          - dependency:
+#              node: ceilometer_service_instance
+#              relationship: tosca.relationships.DependsOn
+       
+    # Virtual machines
+#    sflow_service_instance:
+#      type: tosca.nodes.Compute
+#      capabilities:
+#        # Host container properties
+#        host:
+#         properties:
+#           num_cpus: 1
+#           disk_size: 10 GB
+#           mem_size: 4 MB
+#        # Guest Operating System properties
+#        os:
+#          properties:
+#            # host Operating System image properties
+#            architecture: x86_64
+#            type: linux
+#            distribution: Ubuntu
+#            version: 14.10
+#      requirements:
+#          - slice:
+#                node: mysite_sflow
+#                relationship: tosca.relationships.MemberOfSlice
+
+# MOVING the below sections to monitoringtenant.yaml
+#    Ceilometer:
+#      type: tosca.nodes.DashboardView
+#      properties:
+#          url: template:xosCeilometerDashboard
+#    Tenant:
+#      type: tosca.nodes.DashboardView
+#      properties:
+#          no-create: true
+#          no-update: true
+#          no-delete: true
+#
+#    padmin@vicci.org:
+#      type: tosca.nodes.User
+#      properties:
+#          firstname: XOS
+#          lastname: admin
+#          is_admin: true
+#      requirements:
+#          - tenant_dashboard:
+#              node: Tenant
+#              relationship: tosca.relationships.UsesDashboard
+#          - ceilometer_dashboard:
+#              node: Ceilometer
+#              relationship: tosca.relationships.UsesDashboard
diff --git a/mcord/non-xos-config/nodes.yaml b/mcord/non-xos-config/nodes.yaml
new file mode 100644
index 0000000..edc65b4
--- /dev/null
+++ b/mcord/non-xos-config/nodes.yaml
@@ -0,0 +1,59 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+imports:
+   - custom_types/xos.yaml
+
+description: list of compute nodes, created by platform-install
+
+topology_template:
+  node_templates:
+
+# Site/Deployment, fully defined in deployment.yaml
+    mysite:
+      type: tosca.nodes.Site
+
+    MyDeployment:
+      type: tosca.nodes.Deployment
+
+#  compute node
+    compute1:
+      type: tosca.nodes.Node
+      requirements:
+        - site:
+            node: mysite
+            relationship: tosca.relationships.MemberOfSite
+        - deployment:
+            node: MyDeployment
+            relationship: tosca.relationships.MemberOfDeployment
+
+# compute nodes 1
+    only-bucket:
+      type: tosca.nodes.Node
+      requirements:
+        - site:
+            node: mysite
+            relationship: tosca.relationships.MemberOfSite
+        - deployment:
+            node: MyDeployment
+            relationship: tosca.relationships.MemberOfDeployment
+# compute nodes 2
+    salty-interest:
+      type: tosca.nodes.Node
+      requirements:
+        - site:
+            node: mysite
+            relationship: tosca.relationships.MemberOfSite
+        - deployment:
+            node: MyDeployment
+            relationship: tosca.relationships.MemberOfDeployment
+#  nodes 3
+# commented by pingping  after MWC , before ONS
+#    strange-touch:
+#      type: tosca.nodes.Node
+#      requirements:
+#        - site:
+#            node: mysite
+#            relationship: tosca.relationships.MemberOfSite
+#        - deployment:
+#            node: MyDeployment
+#            relationship: tosca.relationships.MemberOfDeployment
diff --git a/mcord/non-xos-config/onos_monitoring_service_endpoints.json b/mcord/non-xos-config/onos_monitoring_service_endpoints.json
new file mode 100644
index 0000000..af9ad84
--- /dev/null
+++ b/mcord/non-xos-config/onos_monitoring_service_endpoints.json
@@ -0,0 +1,6 @@
+{
+    "resources" : [
+        "onos://onos-cord.cord.lab:8182?auth=basic&user=onos&password=rocks&scheme=http",
+        "onos://onos-fabric.cord.lab:8181?auth=basic&user=onos&password=rocks&scheme=http"
+     ]
+}
diff --git a/mcord/non-xos-config/ui-style-config.js b/mcord/non-xos-config/ui-style-config.js
new file mode 100644
index 0000000..bf564fe
--- /dev/null
+++ b/mcord/non-xos-config/ui-style-config.js
@@ -0,0 +1,61 @@
+angular.module('app')
+  .constant('StyleConfig', {
+    projectName: 'M-CORD',
+    favicon: 'cord-favicon.png',
+    background: 'mcord-bg.jpg',
+    payoff: 'Your way toward 5G',
+    logo: 'cord-logo.png',
+    routes: [
+      {
+        label: 'Slices',
+        state: 'xos.core.slices'
+      },
+      {
+        label: 'Instances',
+        state: 'xos.core.instances'
+      },
+      {
+        label: 'Nodes',
+        state: 'xos.core.nodes'
+      },
+      {
+        label: 'Users',
+        state: 'xos.core.users'
+      },
+      {
+        label: 'Services',
+        state: 'xos.mcord.services',
+        // parent: 'xos.mcord'
+      },
+      {
+        label: 'MCORD',
+        state: 'xos.mcord'
+      },
+      {
+        label: 'Global Topology',
+        state: 'xos.mcord.topo',
+        params: {sliceId: ''},
+        parent: 'xos.mcord'
+      },
+      {
+        label: 'Public Safety',
+        state: 'xos.mcord.topo',
+        params: {sliceId: 1},
+        parent: 'xos.mcord'
+      },
+      {
+        label: 'RAN Slicing',
+        state: 'xos.mcord.topo',
+        params: {sliceId: '3,4'},
+        parent: 'xos.mcord'
+      },
+      {
+        label: 'Connectionless GW',
+        state: 'xos.mcord.topo',
+        params: {sliceId: 2},
+        parent: 'xos.mcord'
+      },
+    ]
+  });
+
+
diff --git a/mcord/non-xos-config/ui_containers.yaml b/mcord/non-xos-config/ui_containers.yaml
new file mode 100644
index 0000000..6b51669
--- /dev/null
+++ b/mcord/non-xos-config/ui_containers.yaml
@@ -0,0 +1,82 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: Onboard the exampleservice
+
+imports:
+   - custom_types/xos.yaml
+
+topology_template:
+  node_templates:
+
+    # API Gateway
+    xos-rest-gateway:
+      type: tosca.nodes.Component
+      properties:
+        name: xos-rest-gateway
+        image: xosproject/xos-rest-gw
+        command: npm start -- --config gateway-config.yml
+        ports: 3000:3000
+
+    /var/www/src/config/gateway-config.yml:
+      type: tosca.nodes.ComponentVolume
+      properties:
+          host_path: { path_join: [ SELF, CONFIG_DIR, ./gateway-config.yml, ENV_VAR ] }
+          read_only: false
+      requirements:
+          - xos:
+             node: xos-rest-gateway
+             relationship: tosca.relationships.VolumeOfComponent
+
+    gw-to-xos:
+      type: tosca.nodes.ComponentLink
+      properties:
+          container: xos_ui
+          alias: xos
+          kind: internal
+      requirements:
+          - xos:
+             node: xos-rest-gateway
+             relationship: tosca.relationships.LinkOfComponent
+
+    gw-to-redis:
+      type: tosca.nodes.ComponentLink
+      properties:
+          container: mcordbs_xos_redis_1 
+          alias: redis
+          kind: external
+      requirements:
+          - xos:
+             node: xos-rest-gateway
+             relationship: tosca.relationships.LinkOfComponent
+
+
+    # UI Container
+    xos-spa-gui:
+      type: tosca.nodes.Component
+      properties:
+        # command: cd /var/www; BRAND=opencloud npm run build
+        name: xos-spa-gui
+        image: xosproject/xos-gui
+        ports: 4000:4000
+        
+    # UI Style Config
+    /var/www/dist/style.config.js:
+      type: tosca.nodes.ComponentVolume
+      properties:
+          host_path: { path_join: [ SELF, CONFIG_DIR, ./ui-style-config.js, ENV_VAR ] }
+          read_only: false
+      requirements:
+          - xos:
+             node: xos-spa-gui
+             relationship: tosca.relationships.VolumeOfComponent
+
+    gui-to-gw:
+      type: tosca.nodes.ComponentLink
+      properties:
+          container: xos-rest-gateway
+          alias: xos-rest-gw
+          kind: internal
+      requirements:
+          - xos:
+             node: xos-spa-gui
+             relationship: tosca.relationships.LinkOfComponent