diff --git a/mcord/Makefile b/mcord/Makefile
index 3c340ae..9160029 100644
--- a/mcord/Makefile
+++ b/mcord/Makefile
@@ -1,7 +1,7 @@
 # mcord/Makefile
 
 CONFIG_DIR         := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
-COMMON_DIR         := $(abspath ../common )
+COMMON_DIR         := $(CONFIG_DIR)/../common
 
 .DEFAULT_GOAL      := xos
 
diff --git a/mcord/make-vtn-external-yaml.sh b/mcord/make-vtn-external-yaml.sh
index 36c1eda..a9dc852 100644
--- a/mcord/make-vtn-external-yaml.sh
+++ b/mcord/make-vtn-external-yaml.sh
@@ -29,7 +29,7 @@
           kind: CORD-Platform
           view_url: /admin/vtn/vtnservice/\$id$/
           privateGatewayMac: 00:00:00:00:00:01
-          localManagementIp: 10.102.83.2/24
+          localManagementIp: 172.27.0.1/24
           ovsdbPort: 6641
           sshUser: root
           sshKeyFile: /root/node_key
diff --git a/mcord/nodes.yaml b/mcord/nodes.yaml
deleted file mode 100644
index a32cd2f..0000000
--- a/mcord/nodes.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/xos.yaml
-
-description: autogenerated nodes file
-
-topology_template:
-  node_templates:
-    MyDeployment:
-        type: tosca.nodes.Deployment
-    mysite:
-        type: tosca.nodes.Site
-
-    nova-compute-1:
-      type: tosca.nodes.Node
-      requirements:
-        - site:
-            node: mysite
-            relationship: tosca.relationships.MemberOfSite
-        - deployment:
-            node: MyDeployment
-            relationship: tosca.relationships.MemberOfDeployment
diff --git a/mcord/vtn-external.yaml b/mcord/vtn-external.yaml
deleted file mode 120000
index e2f4f95..0000000
--- a/mcord/vtn-external.yaml
+++ /dev/null
@@ -1 +0,0 @@
-vtn-external.yaml.cloudlab
\ No newline at end of file
diff --git a/mcord/vtn-external.yaml.cloudlab b/mcord/vtn-external.yaml.cloudlab
deleted file mode 100644
index ace73c5..0000000
--- a/mcord/vtn-external.yaml.cloudlab
+++ /dev/null
@@ -1,94 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
-   - custom_types/xos.yaml
-
-description: autogenerated node tags file for VTN configuration
-
-topology_template:
-  node_templates:
-
-    service#ONOS_CORD:
-      type: tosca.nodes.ONOSService
-      requirements:
-      properties:
-          kind: CORD-Platform
-          view_url: /admin/onos/onosservice/$id$/
-          no_container: true
-          rest_hostname: onos-cord
-          replaces: service_ONOS_CORD
-
-    service#vtn:
-      type: tosca.nodes.VTNService
-      properties:
-          kind: CORD-Platform
-          view_url: /admin/vtn/vtnservice/$id$/
-          privateGatewayMac: 00:00:00:00:00:01
-          localManagementIp: 172.27.0.1/24
-          ovsdbPort: 6641
-          sshUser: root
-          sshKeyFile: /root/node_key
-          sshPort: 22
-          xosEndpoint: http://xos/
-          xosUser: padmin@vicci.org
-          xosPassword: letmein
-          replaces: service_vtn
-
-    nova-compute-1:
-      type: tosca.nodes.Node
-
-    # VTN bridgeId field for node nova-compute-1
-    nova-compute-1_bridgeId_tag:
-      type: tosca.nodes.Tag
-      properties:
-          name: bridgeId
-          value: of:0000000000000001
-      requirements:
-          - target:
-              node: nova-compute-1
-              relationship: tosca.relationships.TagsObject
-          - service:
-              node: service#ONOS_CORD
-              relationship: tosca.relationships.MemberOfService
-
-    # VTN dataPlaneIntf field for node nova-compute-1
-    nova-compute-1_dataPlaneIntf_tag:
-      type: tosca.nodes.Tag
-      properties:
-          name: dataPlaneIntf
-          value: fabric
-      requirements:
-          - target:
-              node: nova-compute-1
-              relationship: tosca.relationships.TagsObject
-          - service:
-              node: service#ONOS_CORD
-              relationship: tosca.relationships.MemberOfService
-
-    # VTN dataPlaneIp field for node nova-compute-1
-    nova-compute-1_dataPlaneIp_tag:
-      type: tosca.nodes.Tag
-      properties:
-          name: dataPlaneIp
-          value: 10.168.0.253/24
-      requirements:
-          - target:
-              node: nova-compute-1
-              relationship: tosca.relationships.TagsObject
-          - service:
-              node: service#ONOS_CORD
-              relationship: tosca.relationships.MemberOfService
-
-    VTN_ONOS_app:
-      type: tosca.nodes.ONOSVTNApp
-      requirements:
-          - onos_tenant:
-              node: service#ONOS_CORD
-              relationship: tosca.relationships.TenantOfService
-          - vtn_service:
-              node: service#vtn
-              relationship: tosca.relationships.UsedByService
-      properties:
-          install_dependencies: http://mavenrepo:8080/repository/org/opencord/cord-config/1.1-SNAPSHOT/cord-config-1.1-SNAPSHOT.oar,http://mavenrepo:8080/repository/org/opencord/vtn/1.1-SNAPSHOT/vtn-1.1-SNAPSHOT.oar
-          dependencies: org.onosproject.drivers, org.onosproject.drivers.ovsdb, org.onosproject.openflow-base, org.onosproject.ovsdb-base, org.onosproject.dhcp
-          autogenerate: vtn-network-cfg