diff --git a/tools/tutorials/sdnip/configs-ipv6/addresses.json b/tools/tutorials/sdnip/configs-ipv6/addresses.json
deleted file mode 100644
index 9945e3f..0000000
--- a/tools/tutorials/sdnip/configs-ipv6/addresses.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "addresses" : [
-	{
-	    "dpid" : "00:00:00:00:00:00:00:a1",
-	    "port" : "1",
-	    "ips" : ["2001:1::101/48"],
-	    "mac" : "00:00:00:00:00:01"
-	},
-	{
-	    "dpid" : "00:00:00:00:00:00:00:a2",
-	    "port" : "1",
-	    "ips" : ["2001:2::101/48"],
-	    "mac" : "00:00:00:00:00:01"
-	},
-	{
-	    "dpid" : "00:00:00:00:00:00:00:a5",
-	    "port" : "1",
-	    "ips" : ["2001:3::101/48"],
-	    "mac" : "00:00:00:00:00:01"
-	},
-	{
-	    "dpid" : "00:00:00:00:00:00:00:a6",
-	    "port" : "1",
-	    "ips" : ["2001:4::101/48"],
-	    "mac" : "00:00:00:00:00:01"
-	}
-    ]
-}
diff --git a/tools/tutorials/sdnip/configs-ipv6/network-cfg.json b/tools/tutorials/sdnip/configs-ipv6/network-cfg.json
new file mode 100644
index 0000000..cb59cbf
--- /dev/null
+++ b/tools/tutorials/sdnip/configs-ipv6/network-cfg.json
@@ -0,0 +1,58 @@
+{
+    "ports" : {
+        "of:00000000000000a1/1" : {
+            "interfaces" : [
+                {
+                    "name" : "sw1-1",
+                    "ips"  : [ "2001:1::101/48" ],
+                    "mac"  : "00:00:00:00:00:01"
+                }
+            ]
+        },
+        "of:00000000000000a2/1" : {
+            "interfaces" : [
+                {
+                    "name" : "sw2-1",
+                    "ips"  : [ "2001:2::101/48" ],
+                    "mac"  : "00:00:00:00:00:01"
+                }
+            ]
+        },
+        "of:00000000000000a5/1" : {
+            "interfaces" : [
+                {
+                    "name" : "sw5-1",
+                    "ips"  : [ "2001:3::101/48" ],
+                    "mac"  : "00:00:00:00:00:01"
+                }
+            ]
+        },
+        "of:00000000000000a6/1" : {
+            "interfaces" : [
+                {
+                    "name" : "sw6-1",
+                    "ips"  : [ "2001:4::101/48" ],
+                    "mac"  : "00:00:00:00:00:01"
+                }
+            ]
+        }
+    },
+    "apps" : {
+        "org.onosproject.router" : {
+            "bgp" : {
+                "bgpSpeakers" : [
+                    {
+                        "name" : "speaker1",
+                        "connectPoint" : "of:00000000000000a3/1",
+                        "peers" : [
+                            "2001:1::1",
+                            "2001:2::1",
+                            "2001:3::1",
+                            "2001:4::1"
+                        ]
+                    }
+                ]
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tools/tutorials/sdnip/configs-ipv6/sdnip.json b/tools/tutorials/sdnip/configs-ipv6/sdnip.json
deleted file mode 100644
index 412fb5b..0000000
--- a/tools/tutorials/sdnip/configs-ipv6/sdnip.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "bgpPeers" : [
-        {
-            "attachmentDpid" : "00:00:00:00:00:00:00:a1",
-	    "attachmentPort" : "1",
-            "ipAddress" : "2001:1::1"
-        },
-	{
-            "attachmentDpid" : "00:00:00:00:00:00:00:a2",
-	    "attachmentPort" : "1",
-            "ipAddress" : "2001:2::1"
-        },
-	{
-            "attachmentDpid" : "00:00:00:00:00:00:00:a5",
-	    "attachmentPort" : "1",
-            "ipAddress" : "2001:3::1"
-        },
-	{
-            "attachmentDpid" : "00:00:00:00:00:00:00:a6",
-	    "attachmentPort" : "1",
-            "ipAddress" : "2001:4::1"
-        }
-    ],
-    "bgpSpeakers" : [
-        {
-            "name" : "bgp",
-            "attachmentDpid" : "00:00:00:00:00:00:00:a3",
-            "attachmentPort" : "1",
-            "macAddress" : "00:00:00:00:00:01",
-            "interfaceAddresses" : [
-                {
-		    "interfaceDpid" : "00:00:00:00:00:00:00:a1",
-		    "interfacePort" : "1",
-                    "ipAddress" : "2001:1::101"
-                },
-                {
-		    "interfaceDpid" : "00:00:00:00:00:00:00:a2",
-		    "interfacePort" : "1",
-                    "ipAddress" : "2001:2::101"
-                },
-                {
-		    "interfaceDpid" : "00:00:00:00:00:00:00:a5",
-		    "interfacePort" : "1",
-                    "ipAddress" : "2001:3::101"
-                },
-                {
-		    "interfaceDpid" : "00:00:00:00:00:00:00:a6",
-		    "interfacePort" : "1",
-                    "ipAddress" : "2001:4::101"
-                }
-            ]
-        }
-    ]
-}
diff --git a/tools/tutorials/sdnip/configs/addresses.json b/tools/tutorials/sdnip/configs/addresses.json
deleted file mode 100644
index 5b73321..0000000
--- a/tools/tutorials/sdnip/configs/addresses.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "addresses" : [
-	{
-	    "dpid" : "00:00:00:00:00:00:00:a1",
-	    "port" : "1",
-	    "ips" : ["10.0.1.101/24"],
-	    "mac" : "00:00:00:00:00:01"
-	},
-	{
-	    "dpid" : "00:00:00:00:00:00:00:a2",
-	    "port" : "1",
-	    "ips" : ["10.0.2.101/24"],
-	    "mac" : "00:00:00:00:00:01"
-	},
-	{
-	    "dpid" : "00:00:00:00:00:00:00:a5",
-	    "port" : "1",
-	    "ips" : ["10.0.3.101/24"],
-	    "mac" : "00:00:00:00:00:01"
-	},
-	{
-	    "dpid" : "00:00:00:00:00:00:00:a6",
-	    "port" : "1",
-	    "ips" : ["10.0.4.101/24"],
-	    "mac" : "00:00:00:00:00:01"
-	}
-    ]
-}
diff --git a/tools/tutorials/sdnip/configs/network-cfg.json b/tools/tutorials/sdnip/configs/network-cfg.json
new file mode 100644
index 0000000..050acf3
--- /dev/null
+++ b/tools/tutorials/sdnip/configs/network-cfg.json
@@ -0,0 +1,58 @@
+{
+    "ports" : {
+        "of:00000000000000a1/1" : {
+            "interfaces" : [
+                {
+                    "name" : "sw1-1",
+                    "ips"  : [ "10.0.1.101/24" ],
+                    "mac"  : "00:00:00:00:00:01"
+                }
+            ]
+        },
+        "of:00000000000000a2/1" : {
+            "interfaces" : [
+                {
+                    "name" : "sw2-1",
+                    "ips"  : [ "10.0.2.101/24" ],
+                    "mac"  : "00:00:00:00:00:01"
+                }
+            ]
+        },
+        "of:00000000000000a5/1" : {
+            "interfaces" : [
+                {
+                    "name" : "sw5-1",
+                    "ips"  : [ "10.0.3.101/24" ],
+                    "mac"  : "00:00:00:00:00:01"
+                }
+            ]
+        },
+        "of:00000000000000a6/1" : {
+            "interfaces" : [
+                {
+                    "name" : "sw6-1",
+                    "ips"  : [ "10.0.4.101/24" ],
+                    "mac"  : "00:00:00:00:00:01"
+                }
+            ]
+        }
+    },
+    "apps" : {
+        "org.onosproject.router" : {
+            "bgp" : {
+                "bgpSpeakers" : [
+                    {
+                        "name" : "speaker1",
+                        "connectPoint" : "of:00000000000000a3/1",
+                        "peers" : [
+                            "10.0.1.1",
+                            "10.0.2.1",
+                            "10.0.3.1",
+                            "10.0.4.1"
+                        ]
+                    }
+                ]
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tools/tutorials/sdnip/configs/sdnip.json b/tools/tutorials/sdnip/configs/sdnip.json
deleted file mode 100644
index dde8ea7..0000000
--- a/tools/tutorials/sdnip/configs/sdnip.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "bgpPeers" : [
-        {
-            "attachmentDpid" : "00:00:00:00:00:00:00:a1",
-	    "attachmentPort" : "1",
-            "ipAddress" : "10.0.1.1"
-        },
-	{
-            "attachmentDpid" : "00:00:00:00:00:00:00:a2",
-	    "attachmentPort" : "1",
-            "ipAddress" : "10.0.2.1"
-        },
-	{
-            "attachmentDpid" : "00:00:00:00:00:00:00:a5",
-	    "attachmentPort" : "1",
-            "ipAddress" : "10.0.3.1"
-        },
-	{
-            "attachmentDpid" : "00:00:00:00:00:00:00:a6",
-	    "attachmentPort" : "1",
-            "ipAddress" : "10.0.4.1"
-        }
-    ],
-    "bgpSpeakers" : [
-        {
-            "name" : "bgp",
-            "attachmentDpid" : "00:00:00:00:00:00:00:a3",
-            "attachmentPort" : "1",
-            "macAddress" : "00:00:00:00:00:01",
-            "interfaceAddresses" : [
-                {
-		    "interfaceDpid" : "00:00:00:00:00:00:00:a1",
-		    "interfacePort" : "1",
-                    "ipAddress" : "10.0.1.101"
-                },
-                {
-		    "interfaceDpid" : "00:00:00:00:00:00:00:a2",
-		    "interfacePort" : "1",
-                    "ipAddress" : "10.0.2.101"
-                },
-                {
-		    "interfaceDpid" : "00:00:00:00:00:00:00:a5",
-		    "interfacePort" : "1",
-                    "ipAddress" : "10.0.3.101"
-                },
-                {
-		    "interfaceDpid" : "00:00:00:00:00:00:00:a6",
-		    "interfacePort" : "1",
-                    "ipAddress" : "10.0.4.101"
-                }
-            ]
-        }
-    ]
-}