diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.py b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.py
index 6811fd5..6f8c9fc 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.py
@@ -11,7 +11,7 @@
         Start 0x1 single ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 1,
                                 topology = '0x1',
@@ -27,7 +27,7 @@
         Start 0x2 dual-homed ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 2,
                                 topology = '0x2',
@@ -43,7 +43,7 @@
         Start 2x2 leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 3,
                                 topology = '2x2',
@@ -59,7 +59,7 @@
         Start 2x4 dual-homed leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 4,
                                 topology = '2x4',
@@ -75,7 +75,7 @@
         Start 0x1 single ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 5,
                                 topology = '0x1',
@@ -91,7 +91,7 @@
         Start 0x2 dual-homed ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 6,
                                 topology = '0x2',
@@ -107,7 +107,7 @@
         Start 2x2 leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 7,
                                 topology = '2x2',
@@ -123,7 +123,7 @@
         Start 2x4 dual-homed leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 8,
                                 topology = '2x4',
@@ -139,7 +139,7 @@
         Start 0x1 single ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 11,
                                 topology = '0x1',
@@ -156,7 +156,7 @@
         Start 0x2 dual-homed ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 12,
                                 topology = '0x2',
@@ -173,7 +173,7 @@
         Start 2x2 leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 13,
                                 topology = '2x2',
@@ -190,7 +190,7 @@
         Start 2x4 dual-homed leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 14,
                                 topology = '2x4',
@@ -207,7 +207,7 @@
         Start 0x1 single ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 15,
                                 topology = '0x1',
@@ -224,7 +224,7 @@
         Start 0x2 dual-homed ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 16,
                                 topology = '0x2',
@@ -241,7 +241,7 @@
         Start 2x2 leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 17,
                                 topology = '2x2',
@@ -258,7 +258,7 @@
         Start 2x4 dual-homed leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 18,
                                 topology = '2x4',
@@ -275,7 +275,7 @@
         Start 0x1 single ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 21,
                                 topology = '0x1',
@@ -291,7 +291,7 @@
         Start 0x2 dual-homed ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 22,
                                 topology = '0x2',
@@ -307,7 +307,7 @@
         Start 2x2 leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 23,
                                 topology = '2x2',
@@ -323,7 +323,7 @@
         Start 2x4 dual-homed leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 24,
                                 topology = '2x4',
@@ -339,7 +339,7 @@
         Start 0x1 single ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 25,
                                 topology = '0x1',
@@ -355,7 +355,7 @@
         Start 0x2 dual-homed ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 26,
                                 topology = '0x2',
@@ -371,7 +371,7 @@
         Start 2x2 leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 27,
                                 topology = '2x2',
@@ -387,7 +387,7 @@
         Start 2x4 dual-homed leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 28,
                                 topology = '2x4',
@@ -404,7 +404,7 @@
         Start 0x1 single ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 31,
                                 topology = '0x1',
@@ -422,7 +422,7 @@
         Start 0x2 dual-homed ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 32,
                                 topology = '0x2',
@@ -440,7 +440,7 @@
         Start 2x2 leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 33,
                                 topology = '2x2',
@@ -458,7 +458,7 @@
         Start 2x4 dual-homed leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 34,
                                 topology = '2x4',
@@ -476,7 +476,7 @@
         Start 0x1 single ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 35,
                                 topology = '0x1',
@@ -494,7 +494,7 @@
         Start 0x2 dual-homed ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 36,
                                 topology = '0x2',
@@ -512,7 +512,7 @@
         Start 2x2 leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 37,
                                 topology = '2x2',
@@ -530,7 +530,7 @@
         Start 2x4 dual-homed leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest(main,
                                test_idx = 38,
                                topology = '2x4',
@@ -548,7 +548,7 @@
         Start 0x1 single ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 41,
                                 topology = '0x1',
@@ -566,7 +566,7 @@
         Start 0x2 dual-homed ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 42,
                                 topology = '0x2',
@@ -584,7 +584,7 @@
         Start 2x2 leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 43,
                                 topology = '2x2',
@@ -602,7 +602,7 @@
         Start 2x4 dual-homed leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 44,
                                 topology = '2x4',
@@ -620,7 +620,7 @@
         Start 0x1 single ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 45,
                                 topology = '0x1',
@@ -638,7 +638,7 @@
         Start 0x2 dual-homed ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 46,
                                 topology = '0x2',
@@ -656,7 +656,7 @@
         Start 2x2 leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 47,
                                 topology = '2x2',
@@ -674,7 +674,7 @@
         Start 2x4 dual-homed leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 48,
                                 topology = '2x4',
@@ -691,7 +691,7 @@
         Start 0x1 single ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 51,
                                 topology = '0x1',
@@ -707,7 +707,7 @@
         Start 0x2 dual-homed ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 52,
                                 topology = '0x2',
@@ -723,7 +723,7 @@
         Start 2x2 leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 53,
                                 topology = '2x2',
@@ -739,7 +739,7 @@
         Start 2x4 dual-homed leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 54,
                                 topology = '2x4',
@@ -755,7 +755,7 @@
         Start 0x1 single ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 55,
                                 topology = '0x1',
@@ -771,7 +771,7 @@
         Start 0x2 dual-homed ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 56,
                                 topology = '0x2',
@@ -787,7 +787,7 @@
         Start 2x2 leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 57,
                                 topology = '2x2',
@@ -803,7 +803,7 @@
         Start 2x4 dual-homed leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 58,
                                 topology = '2x4',
@@ -819,7 +819,7 @@
         Start 0x1 single ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 61,
                                 topology = '0x1',
@@ -836,7 +836,7 @@
         Start 0x2 dual-homed ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 62,
                                 topology = '0x2',
@@ -853,7 +853,7 @@
         Start 2x2 leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 63,
                                 topology = '2x2',
@@ -870,7 +870,7 @@
         Start 2x4 dual-homed leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 64,
                                 topology = '2x4',
@@ -887,7 +887,7 @@
         Start 0x1 single ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 65,
                                 topology = '0x1',
@@ -904,7 +904,7 @@
         Start 0x2 dual-homed ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 66,
                                 topology = '0x2',
@@ -921,7 +921,7 @@
         Start 2x2 leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 67,
                                 topology = '2x2',
@@ -938,7 +938,7 @@
         Start 2x4 dual-homed leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 68,
                                 topology = '2x4',
@@ -955,7 +955,7 @@
         Start 0x1 single ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 71,
                                 topology = '0x1',
@@ -972,7 +972,7 @@
         Start 0x2 dual-homed ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 72,
                                 topology = '0x2',
@@ -989,7 +989,7 @@
         Start 2x2 leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 73,
                                 topology = '2x2',
@@ -1006,7 +1006,7 @@
         Start 2x2 dual-homed leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 74,
                                 topology = '2x4',
@@ -1023,7 +1023,7 @@
         Start 0x1 single ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 75,
                                 topology = '0x1',
@@ -1040,7 +1040,7 @@
         Start 0x2 dual-homed ToR topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 76,
                                 topology = '0x2',
@@ -1057,7 +1057,7 @@
         Start 2x2 leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 77,
                                 topology = '2x2',
@@ -1074,7 +1074,7 @@
         Start 2x2 dual-homed leaf-spine topology
         Pingall
         """
-        from tests.USECASE.SegmentRouting.dependencies.SRBridgingTest import SRBridgingTest
+        from tests.USECASE.SegmentRouting.SRBridging.dependencies.SRBridgingTest import SRBridgingTest
         SRBridgingTest.runTest( main,
                                 test_idx = 78,
                                 topology = '2x4',
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/SRBridgingTest.py b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/SRBridgingTest.py
similarity index 95%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/SRBridgingTest.py
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/SRBridgingTest.py
index 1523811..ac79922 100644
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/SRBridgingTest.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/SRBridgingTest.py
@@ -19,7 +19,7 @@
     along with TestON.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-from Testcaselib import Testcaselib as run
+from tests.USECASE.SegmentRouting.dependencies.Testcaselib import Testcaselib as run
 
 class SRBridgingTest ():
 
@@ -50,6 +50,7 @@
                    ( description, topo[ topology ][ 3 ], onosNodes, 's' if onosNodes > 1 else '' ) )
 
         main.cfgName = 'CASE%01d%01d' % ( test_idx / 10, ( ( test_idx - 1 ) % 10 ) % 4 + 1 )
+        main.configPath = main.path + "/dependencies/"
         main.resultFileName = 'CASE%02d' % test_idx
         main.Cluster.setRunningNode( onosNodes )
         run.installOnos( main, skipPackage=skipPackage, cliSleep=5 )
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/__init__.py b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/__init__.py
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE01.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE01.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE01.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE01.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE01.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE01.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE01.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE01.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE02.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE02.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE02.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE02.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE02.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE02.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE02.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE02.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE03.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE03.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE03.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE03.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE03.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE03.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE03.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE03.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE04.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE04.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE04.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE04.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE04.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE04.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE04.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE04.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE11.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE11.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE11.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE11.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE11.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE11.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE11.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE11.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE12.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE12.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE12.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE12.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE12.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE12.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE12.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE12.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE13.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE13.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE13.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE13.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE13.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE13.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE13.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE13.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE14.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE14.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE14.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE14.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE14.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE14.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE14.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE14.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE21.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE21.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE21.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE21.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE21.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE21.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE21.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE21.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE22.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE22.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE22.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE22.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE22.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE22.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE22.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE22.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE23.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE23.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE23.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE23.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE23.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE23.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE23.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE23.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE24.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE24.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE24.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE24.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE24.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE24.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE24.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE24.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE31.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE31.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE31.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE31.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE31.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE31.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE31.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE31.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE32.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE32.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE32.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE32.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE32.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE32.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE32.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE32.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE33.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE33.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE33.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE33.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE33.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE33.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE33.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE33.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE34.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE34.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE34.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE34.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE34.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE34.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE34.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE34.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE41.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE41.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE41.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE41.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE41.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE41.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE41.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE41.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE42.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE42.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE42.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE42.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE42.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE42.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE42.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE42.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE43.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE43.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE43.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE43.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE43.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE43.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE43.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE43.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE44.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE44.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE44.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE44.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE44.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE44.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE44.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE44.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE51.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE51.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE51.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE51.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE51.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE51.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE51.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE51.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE52.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE52.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE52.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE52.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE52.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE52.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE52.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE52.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE53.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE53.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE53.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE53.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE53.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE53.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE53.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE53.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE54.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE54.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE54.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE54.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE54.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE54.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE54.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE54.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE61.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE61.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE61.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE61.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE61.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE61.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE61.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE61.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE62.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE62.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE62.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE62.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE62.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE62.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE62.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE62.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE63.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE63.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE63.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE63.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE63.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE63.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE63.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE63.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE64.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE64.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE64.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE64.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE64.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE64.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE64.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE64.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE71.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE71.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE71.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE71.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE71.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE71.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE71.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE71.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE72.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE72.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE72.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE72.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE72.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE72.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE72.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE72.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE73.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE73.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE73.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE73.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE73.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE73.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE73.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE73.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE74.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE74.chart
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE74.chart
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE74.chart
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE74.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE74.json
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/dependencies/json/CASE74.json
rename to TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE74.json
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
index ba4e0d7..5198dbe 100644
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
@@ -58,7 +58,8 @@
             main.apps = main.params[ 'ENV' ][ 'cellApps' ]
             main.diff = main.params[ 'ENV' ][ 'diffApps' ]
             main.path = os.path.dirname( main.testFile )
-            main.dependencyPath = main.path + "/../dependencies/"
+            main.topoPath = main.path + "/../dependencies/"
+            main.configPath = main.path + "/../dependencies/"
             main.topology = main.params[ 'DEPENDENCY' ][ 'topology' ]
             wrapperFile1 = main.params[ 'DEPENDENCY' ][ 'wrapper1' ]
             main.scale = ( main.params[ 'SCALE' ][ 'size' ] ).split( "," )
@@ -113,10 +114,10 @@
                                  onfail="ONOS summary command failed" )
 
         with open( "%s/json/%s.json" % (
-                main.dependencyPath, main.cfgName ) ) as cfg:
+                main.configPath, main.cfgName ) ) as cfg:
             main.Cluster.active( 0 ).REST.setNetCfg( json.load( cfg ) )
         with open( "%s/json/%s.chart" % (
-                main.dependencyPath, main.cfgName ) ) as chart:
+                main.configPath, main.cfgName ) ) as chart:
             main.pingChart = json.load( chart )
         if not ready:
             main.log.error( "ONOS startup failed!" )
@@ -132,17 +133,17 @@
     def startMininet( main, topology, args="" ):
         try:
             copyResult1 = main.ONOSbench.scp( main.Mininet1,
-                                              main.dependencyPath +
+                                              main.topoPath +
                                               main.topology,
                                               main.Mininet1.home,
                                               direction="to" )
             copyResult2 = main.ONOSbench.scp( main.Mininet1,
-                                              main.dependencyPath +
+                                              main.topoPath +
                                               main.topologyLib1,
                                               main.Mininet1.home,
                                               direction="to" )
             copyResult3 = main.ONOSbench.scp( main.Mininet1,
-                                              main.dependencyPath +
+                                              main.topoPath +
                                               main.topologyLib2,
                                               main.Mininet1.home,
                                               direction="to" )
@@ -540,7 +541,7 @@
         """
         import json
         hostCfg = {}
-        with open( main.dependencyPath + "/json/extra.json" ) as template:
+        with open( main.configPath + "/json/extra.json" ) as template:
             hostCfg = json.load( template )
         main.pingChart[ 'ip' ][ 'hosts' ] += [ 'in1' ]
         main.step( "Pushing new configuration" )
@@ -577,7 +578,7 @@
         """
         import json
         hostCfg = {}
-        with open( main.dependencyPath + "/json/extra.json" ) as template:
+        with open( main.configPath + "/json/extra.json" ) as template:
             hostCfg = json.load( template )
         main.step( "Removing host configuration" )
         main.pingChart[ 'ip' ][ 'expect' ] = 0