Adjust BenchI/BenchF paths to account for recent file moves

2 files changed, 176 insertions, 176 deletions

diff --git a/tests/arm/Tests.lst b/tests/arm/Tests.lst
index e2e1400b4a..3a8f97f338 100644
--- a/tests/arm/Tests.lst
+++ b/tests/arm/Tests.lst
@@ -4997,8 +4997,8 @@ Categories=EXPECTED_PASS
 HostStyle=0
 
 [BubbleSort2.cmd_628]
-RelativePath=JIT\Performance\CodeQuality\BenchI\BubbleSort2\BubbleSort2\BubbleSort2.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\BubbleSort2\BubbleSort2
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\BubbleSort2\BubbleSort2\BubbleSort2.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\BubbleSort2\BubbleSort2
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -6549,8 +6549,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [NDhrystone.cmd_823]
-RelativePath=JIT\Performance\CodeQuality\BenchI\NDhrystone\NDhrystone\NDhrystone.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\NDhrystone\NDhrystone
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\NDhrystone\NDhrystone\NDhrystone.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\NDhrystone\NDhrystone
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -8957,8 +8957,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [Ackermann.cmd_1125]
-RelativePath=JIT\Performance\CodeQuality\BenchI\Ackermann\Ackermann\Ackermann.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\Ackermann\Ackermann
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\Ackermann\Ackermann\Ackermann.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\Ackermann\Ackermann
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -13781,8 +13781,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [Romber.cmd_1733]
-RelativePath=JIT\Performance\CodeQuality\BenchF\Romber\Romber\Romber.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\Romber\Romber
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\Romber\Romber\Romber.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\Romber\Romber
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -16805,8 +16805,8 @@ Categories=EXPECTED_PASS
 HostStyle=0
 
 [NewtR.cmd_2112]
-RelativePath=JIT\Performance\CodeQuality\BenchF\NewtR\NewtR\NewtR.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\NewtR\NewtR
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\NewtR\NewtR\NewtR.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\NewtR\NewtR
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -17189,8 +17189,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [MulMatrix.cmd_2160]
-RelativePath=JIT\Performance\CodeQuality\BenchI\MulMatrix\MulMatrix\MulMatrix.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\MulMatrix\MulMatrix
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\MulMatrix\MulMatrix\MulMatrix.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\MulMatrix\MulMatrix
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -17757,8 +17757,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [AddArray2.cmd_2231]
-RelativePath=JIT\Performance\CodeQuality\BenchI\AddArray2\AddArray2\AddArray2.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\AddArray2\AddArray2
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\AddArray2\AddArray2\AddArray2.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\AddArray2\AddArray2
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -20805,8 +20805,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [BenchE.cmd_2613]
-RelativePath=JIT\Performance\CodeQuality\BenchI\BenchE\BenchE\BenchE.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\BenchE\BenchE
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\BenchE\BenchE\BenchE.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\BenchE\BenchE
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -24613,8 +24613,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [TreeSort.cmd_3091]
-RelativePath=JIT\Performance\CodeQuality\BenchI\TreeSort\TreeSort\TreeSort.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\TreeSort\TreeSort
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\TreeSort\TreeSort\TreeSort.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\TreeSort\TreeSort
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -26741,8 +26741,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [LLoops.cmd_3359]
-RelativePath=JIT\Performance\CodeQuality\BenchF\LLoops\LLoops\LLoops.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\LLoops\LLoops
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\LLoops\LLoops\LLoops.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\LLoops\LLoops
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -28933,8 +28933,8 @@ Categories=EXPECTED_FAIL;4851;Pri1
 HostStyle=0
 
 [TreeInsert.cmd_3634]
-RelativePath=JIT\Performance\CodeQuality\BenchI\TreeInsert\TreeInsert\TreeInsert.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\TreeInsert\TreeInsert
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\TreeInsert\TreeInsert\TreeInsert.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\TreeInsert\TreeInsert
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -29965,8 +29965,8 @@ Categories=EXPECTED_PASS
 HostStyle=0
 
 [MatInv4.cmd_3763]
-RelativePath=JIT\Performance\CodeQuality\BenchF\MatInv4\MatInv4\MatInv4.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\MatInv4\MatInv4
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\MatInv4\MatInv4\MatInv4.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\MatInv4\MatInv4
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -37269,8 +37269,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [8Queens.cmd_4677]
-RelativePath=JIT\Performance\CodeQuality\BenchI\8Queens\8Queens\8Queens.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\8Queens\8Queens
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\8Queens\8Queens\8Queens.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\8Queens\8Queens
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -42781,8 +42781,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [Whetsto.cmd_5367]
-RelativePath=JIT\Performance\CodeQuality\BenchF\Whetsto\Whetsto\Whetsto.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\Whetsto\Whetsto
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\Whetsto\Whetsto\Whetsto.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\Whetsto\Whetsto
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -42797,8 +42797,8 @@ Categories=EXPECTED_PASS
 HostStyle=0
 
 [CSieve.cmd_5369]
-RelativePath=JIT\Performance\CodeQuality\BenchI\CSieve\CSieve\CSieve.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\CSieve\CSieve
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\CSieve\CSieve\CSieve.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\CSieve\CSieve
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -48893,8 +48893,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [AddArray.cmd_6134]
-RelativePath=JIT\Performance\CodeQuality\BenchI\AddArray\AddArray\AddArray.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\AddArray\AddArray
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\AddArray\AddArray\AddArray.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\AddArray\AddArray
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -49061,8 +49061,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [Midpoint.cmd_6155]
-RelativePath=JIT\Performance\CodeQuality\BenchI\Midpoint\Midpoint\Midpoint.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\Midpoint\Midpoint
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\Midpoint\Midpoint\Midpoint.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\Midpoint\Midpoint
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -49533,8 +49533,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [SqMtx.cmd_6214]
-RelativePath=JIT\Performance\CodeQuality\BenchF\SqMtx\SqMtx\SqMtx.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\SqMtx\SqMtx
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\SqMtx\SqMtx\SqMtx.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\SqMtx\SqMtx
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -50981,8 +50981,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [BenchMk2.cmd_6396]
-RelativePath=JIT\Performance\CodeQuality\BenchF\BenchMk2\BenchMk2\BenchMk2.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\BenchMk2\BenchMk2
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\BenchMk2\BenchMk2\BenchMk2.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\BenchMk2\BenchMk2
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -53429,8 +53429,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [InvMt.cmd_6702]
-RelativePath=JIT\Performance\CodeQuality\BenchF\InvMt\InvMt\InvMt.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\InvMt\InvMt
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\InvMt\InvMt\InvMt.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\InvMt\InvMt
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -53933,8 +53933,8 @@ Categories=EXPECTED_PASS
 HostStyle=0
 
 [FFT.cmd_6765]
-RelativePath=JIT\Performance\CodeQuality\BenchF\FFT\FFT\FFT.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\FFT\FFT
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\FFT\FFT\FFT.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\FFT\FFT
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -56445,8 +56445,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [Trap.cmd_7084]
-RelativePath=JIT\Performance\CodeQuality\BenchF\Trap\Trap\Trap.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\Trap\Trap
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\Trap\Trap\Trap.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\Trap\Trap
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -58245,8 +58245,8 @@ Categories=EXPECTED_PASS
 HostStyle=0
 
 [BenchMrk.cmd_7309]
-RelativePath=JIT\Performance\CodeQuality\BenchF\BenchMrk\BenchMrk\BenchMrk.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\BenchMrk\BenchMrk
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\BenchMrk\BenchMrk\BenchMrk.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\BenchMrk\BenchMrk
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -59453,8 +59453,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [Array1.cmd_7460]
-RelativePath=JIT\Performance\CodeQuality\BenchI\Array1\Array1\Array1.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\Array1\Array1
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\Array1\Array1\Array1.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\Array1\Array1
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -60277,8 +60277,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [NewtE.cmd_7563]
-RelativePath=JIT\Performance\CodeQuality\BenchF\NewtE\NewtE\NewtE.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\NewtE\NewtE
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\NewtE\NewtE\NewtE.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\NewtE\NewtE
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -60525,8 +60525,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [QuickSort.cmd_7594]
-RelativePath=JIT\Performance\CodeQuality\BenchI\QuickSort\QuickSort\QuickSort.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\QuickSort\QuickSort
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\QuickSort\QuickSort\QuickSort.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\QuickSort\QuickSort
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -62341,8 +62341,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [Adams.cmd_7822]
-RelativePath=JIT\Performance\CodeQuality\BenchF\Adams\Adams\Adams.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\Adams\Adams
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\Adams\Adams\Adams.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\Adams\Adams
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -63485,8 +63485,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [Puzzle.cmd_7965]
-RelativePath=JIT\Performance\CodeQuality\BenchI\Puzzle\Puzzle\Puzzle.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\Puzzle\Puzzle
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\Puzzle\Puzzle\Puzzle.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\Puzzle\Puzzle
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -65485,8 +65485,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [DMath.cmd_8217]
-RelativePath=JIT\Performance\CodeQuality\BenchF\DMath\DMath\DMath.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\DMath\DMath
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\DMath\DMath\DMath.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\DMath\DMath
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -65501,8 +65501,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [Pi.cmd_8219]
-RelativePath=JIT\Performance\CodeQuality\BenchI\Pi\Pi\Pi.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\Pi\Pi
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\Pi\Pi\Pi.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\Pi\Pi
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -69509,8 +69509,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [Regula.cmd_8720]
-RelativePath=JIT\Performance\CodeQuality\BenchF\Regula\Regula\Regula.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\Regula\Regula
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\Regula\Regula\Regula.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\Regula\Regula
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -70853,8 +70853,8 @@ Categories=EXPECTED_PASS
 HostStyle=0
 
 [HeapSort.cmd_8890]
-RelativePath=JIT\Performance\CodeQuality\BenchI\HeapSort\HeapSort\HeapSort.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\HeapSort\HeapSort
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\HeapSort\HeapSort\HeapSort.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\HeapSort\HeapSort
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -73461,8 +73461,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [InProd.cmd_9216]
-RelativePath=JIT\Performance\CodeQuality\BenchF\InProd\InProd\InProd.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\InProd\InProd
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\InProd\InProd\InProd.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\InProd\InProd
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -73821,8 +73821,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [LogicArray.cmd_9261]
-RelativePath=JIT\Performance\CodeQuality\BenchI\LogicArray\LogicArray\LogicArray.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\LogicArray\LogicArray
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\LogicArray\LogicArray\LogicArray.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\LogicArray\LogicArray
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -75749,8 +75749,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [Secant.cmd_9505]
-RelativePath=JIT\Performance\CodeQuality\BenchF\Secant\Secant\Secant.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\Secant\Secant
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\Secant\Secant\Secant.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\Secant\Secant
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -75869,8 +75869,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [BubbleSort.cmd_9521]
-RelativePath=JIT\Performance\CodeQuality\BenchI\BubbleSort\BubbleSort\BubbleSort.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\BubbleSort\BubbleSort
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\BubbleSort\BubbleSort\BubbleSort.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\BubbleSort\BubbleSort
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -77389,8 +77389,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [Array2.cmd_9713]
-RelativePath=JIT\Performance\CodeQuality\BenchI\Array2\Array2\Array2.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\Array2\Array2
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\Array2\Array2\Array2.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\Array2\Array2
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -78325,8 +78325,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [Simpsn.cmd_9831]
-RelativePath=JIT\Performance\CodeQuality\BenchF\Simpsn\Simpsn\Simpsn.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\Simpsn\Simpsn
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\Simpsn\Simpsn\Simpsn.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\Simpsn\Simpsn
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -80261,8 +80261,8 @@ Categories=EXPECTED_PASS
 HostStyle=0
 
 [Fib.cmd_10074]
-RelativePath=JIT\Performance\CodeQuality\BenchI\Fib\Fib\Fib.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\Fib\Fib
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\Fib\Fib\Fib.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\Fib\Fib
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -80597,8 +80597,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [Lorenz.cmd_10117]
-RelativePath=JIT\Performance\CodeQuality\BenchF\Lorenz\Lorenz\Lorenz.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\Lorenz\Lorenz
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\Lorenz\Lorenz\Lorenz.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\Lorenz\Lorenz
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -81821,8 +81821,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [IniArray.cmd_10271]
-RelativePath=JIT\Performance\CodeQuality\BenchI\IniArray\IniArray\IniArray.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\IniArray\IniArray
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\IniArray\IniArray\IniArray.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\IniArray\IniArray
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -83501,8 +83501,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [XposMatrix.cmd_10482]
-RelativePath=JIT\Performance\CodeQuality\BenchI\XposMatrix\XposMatrix\XposMatrix.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\XposMatrix\XposMatrix
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\XposMatrix\XposMatrix\XposMatrix.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\XposMatrix\XposMatrix
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -84717,8 +84717,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [Permutate.cmd_10635]
-RelativePath=JIT\Performance\CodeQuality\BenchI\Permutate\Permutate\Permutate.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\Permutate\Permutate
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\Permutate\Permutate\Permutate.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\Permutate\Permutate
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
@@ -85405,8 +85405,8 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [Bisect.cmd_10721]
-RelativePath=JIT\Performance\CodeQuality\BenchF\Bisect\Bisect\Bisect.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\Bisect\Bisect
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\Bisect\Bisect\Bisect.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\Bisect\Bisect
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
diff --git a/tests/arm64/Tests.lst b/tests/arm64/Tests.lst
index 9a1f475917..3d502a3d85 100644
--- a/tests/arm64/Tests.lst
+++ b/tests/arm64/Tests.lst
@@ -61229,352 +61229,352 @@ Categories=EXPECTED_PASS;Pri1
 HostStyle=0
 
 [Adams.cmd_7971]
-RelativePath=JIT\Performance\CodeQuality\BenchF\Adams\Adams\Adams.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\Adams\Adams
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\Adams\Adams\Adams.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\Adams\Adams
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [BenchMk2.cmd_7972]
-RelativePath=JIT\Performance\CodeQuality\BenchF\BenchMk2\BenchMk2\BenchMk2.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\BenchMk2\BenchMk2
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\BenchMk2\BenchMk2\BenchMk2.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\BenchMk2\BenchMk2
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [BenchMrk.cmd_7973]
-RelativePath=JIT\Performance\CodeQuality\BenchF\BenchMrk\BenchMrk\BenchMrk.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\BenchMrk\BenchMrk
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\BenchMrk\BenchMrk\BenchMrk.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\BenchMrk\BenchMrk
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [Bisect.cmd_7974]
-RelativePath=JIT\Performance\CodeQuality\BenchF\Bisect\Bisect\Bisect.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\Bisect\Bisect
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\Bisect\Bisect\Bisect.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\Bisect\Bisect
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [DMath.cmd_7975]
-RelativePath=JIT\Performance\CodeQuality\BenchF\DMath\DMath\DMath.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\DMath\DMath
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\DMath\DMath\DMath.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\DMath\DMath
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [FFT.cmd_7976]
-RelativePath=JIT\Performance\CodeQuality\BenchF\FFT\FFT\FFT.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\FFT\FFT
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\FFT\FFT\FFT.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\FFT\FFT
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [InProd.cmd_7977]
-RelativePath=JIT\Performance\CodeQuality\BenchF\InProd\InProd\InProd.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\InProd\InProd
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\InProd\InProd\InProd.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\InProd\InProd
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [InvMt.cmd_7978]
-RelativePath=JIT\Performance\CodeQuality\BenchF\InvMt\InvMt\InvMt.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\InvMt\InvMt
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\InvMt\InvMt\InvMt.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\InvMt\InvMt
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [LLoops.cmd_7979]
-RelativePath=JIT\Performance\CodeQuality\BenchF\LLoops\LLoops\LLoops.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\LLoops\LLoops
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\LLoops\LLoops\LLoops.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\LLoops\LLoops
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [Lorenz.cmd_7980]
-RelativePath=JIT\Performance\CodeQuality\BenchF\Lorenz\Lorenz\Lorenz.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\Lorenz\Lorenz
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\Lorenz\Lorenz\Lorenz.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\Lorenz\Lorenz
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [MatInv4.cmd_7981]
-RelativePath=JIT\Performance\CodeQuality\BenchF\MatInv4\MatInv4\MatInv4.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\MatInv4\MatInv4
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\MatInv4\MatInv4\MatInv4.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\MatInv4\MatInv4
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [NewtE.cmd_7982]
-RelativePath=JIT\Performance\CodeQuality\BenchF\NewtE\NewtE\NewtE.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\NewtE\NewtE
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\NewtE\NewtE\NewtE.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\NewtE\NewtE
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [NewtR.cmd_7983]
-RelativePath=JIT\Performance\CodeQuality\BenchF\NewtR\NewtR\NewtR.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\NewtR\NewtR
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\NewtR\NewtR\NewtR.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\NewtR\NewtR
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [Regula.cmd_7984]
-RelativePath=JIT\Performance\CodeQuality\BenchF\Regula\Regula\Regula.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\Regula\Regula
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\Regula\Regula\Regula.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\Regula\Regula
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [Romber.cmd_7985]
-RelativePath=JIT\Performance\CodeQuality\BenchF\Romber\Romber\Romber.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\Romber\Romber
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\Romber\Romber\Romber.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\Romber\Romber
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [Secant.cmd_7986]
-RelativePath=JIT\Performance\CodeQuality\BenchF\Secant\Secant\Secant.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\Secant\Secant
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\Secant\Secant\Secant.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\Secant\Secant
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [Simpsn.cmd_7987]
-RelativePath=JIT\Performance\CodeQuality\BenchF\Simpsn\Simpsn\Simpsn.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\Simpsn\Simpsn
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\Simpsn\Simpsn\Simpsn.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\Simpsn\Simpsn
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [SqMtx.cmd_7988]
-RelativePath=JIT\Performance\CodeQuality\BenchF\SqMtx\SqMtx\SqMtx.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\SqMtx\SqMtx
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\SqMtx\SqMtx\SqMtx.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\SqMtx\SqMtx
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [Trap.cmd_7989]
-RelativePath=JIT\Performance\CodeQuality\BenchF\Trap\Trap\Trap.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\Trap\Trap
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\Trap\Trap\Trap.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\Trap\Trap
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [Whetsto.cmd_7990]
-RelativePath=JIT\Performance\CodeQuality\BenchF\Whetsto\Whetsto\Whetsto.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchF\Whetsto\Whetsto
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchF\Whetsto\Whetsto\Whetsto.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchF\Whetsto\Whetsto
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [8Queens.cmd_7991]
-RelativePath=JIT\Performance\CodeQuality\BenchI\8Queens\8Queens\8Queens.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\8Queens\8Queens
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\8Queens\8Queens\8Queens.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\8Queens\8Queens
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [Ackermann.cmd_7992]
-RelativePath=JIT\Performance\CodeQuality\BenchI\Ackermann\Ackermann\Ackermann.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\Ackermann\Ackermann
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\Ackermann\Ackermann\Ackermann.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\Ackermann\Ackermann
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [AddArray.cmd_7993]
-RelativePath=JIT\Performance\CodeQuality\BenchI\AddArray\AddArray\AddArray.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\AddArray\AddArray
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\AddArray\AddArray\AddArray.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\AddArray\AddArray
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [AddArray2.cmd_7994]
-RelativePath=JIT\Performance\CodeQuality\BenchI\AddArray2\AddArray2\AddArray2.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\AddArray2\AddArray2
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\AddArray2\AddArray2\AddArray2.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\AddArray2\AddArray2
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [Array1.cmd_7995]
-RelativePath=JIT\Performance\CodeQuality\BenchI\Array1\Array1\Array1.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\Array1\Array1
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\Array1\Array1\Array1.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\Array1\Array1
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [Array2.cmd_7996]
-RelativePath=JIT\Performance\CodeQuality\BenchI\Array2\Array2\Array2.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\Array2\Array2
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\Array2\Array2\Array2.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\Array2\Array2
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [BenchE.cmd_7997]
-RelativePath=JIT\Performance\CodeQuality\BenchI\BenchE\BenchE\BenchE.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\BenchE\BenchE
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\BenchE\BenchE\BenchE.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\BenchE\BenchE
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [BubbleSort.cmd_7998]
-RelativePath=JIT\Performance\CodeQuality\BenchI\BubbleSort\BubbleSort\BubbleSort.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\BubbleSort\BubbleSort
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\BubbleSort\BubbleSort\BubbleSort.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\BubbleSort\BubbleSort
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [BubbleSort2.cmd_7999]
-RelativePath=JIT\Performance\CodeQuality\BenchI\BubbleSort2\BubbleSort2\BubbleSort2.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\BubbleSort2\BubbleSort2
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\BubbleSort2\BubbleSort2\BubbleSort2.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\BubbleSort2\BubbleSort2
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [CSieve.cmd_8000]
-RelativePath=JIT\Performance\CodeQuality\BenchI\CSieve\CSieve\CSieve.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\CSieve\CSieve
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\CSieve\CSieve\CSieve.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\CSieve\CSieve
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [Fib.cmd_8001]
-RelativePath=JIT\Performance\CodeQuality\BenchI\Fib\Fib\Fib.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\Fib\Fib
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\Fib\Fib\Fib.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\Fib\Fib
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [HeapSort.cmd_8002]
-RelativePath=JIT\Performance\CodeQuality\BenchI\HeapSort\HeapSort\HeapSort.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\HeapSort\HeapSort
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\HeapSort\HeapSort\HeapSort.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\HeapSort\HeapSort
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [IniArray.cmd_8003]
-RelativePath=JIT\Performance\CodeQuality\BenchI\IniArray\IniArray\IniArray.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\IniArray\IniArray
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\IniArray\IniArray\IniArray.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\IniArray\IniArray
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [LogicArray.cmd_8004]
-RelativePath=JIT\Performance\CodeQuality\BenchI\LogicArray\LogicArray\LogicArray.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\LogicArray\LogicArray
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\LogicArray\LogicArray\LogicArray.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\LogicArray\LogicArray
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [Midpoint.cmd_8005]
-RelativePath=JIT\Performance\CodeQuality\BenchI\Midpoint\Midpoint\Midpoint.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\Midpoint\Midpoint
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\Midpoint\Midpoint\Midpoint.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\Midpoint\Midpoint
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [MulMatrix.cmd_8006]
-RelativePath=JIT\Performance\CodeQuality\BenchI\MulMatrix\MulMatrix\MulMatrix.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\MulMatrix\MulMatrix
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\MulMatrix\MulMatrix\MulMatrix.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\MulMatrix\MulMatrix
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [NDhrystone.cmd_8007]
-RelativePath=JIT\Performance\CodeQuality\BenchI\NDhrystone\NDhrystone\NDhrystone.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\NDhrystone\NDhrystone
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\NDhrystone\NDhrystone\NDhrystone.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\NDhrystone\NDhrystone
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [Permutate.cmd_8008]
-RelativePath=JIT\Performance\CodeQuality\BenchI\Permutate\Permutate\Permutate.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\Permutate\Permutate
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\Permutate\Permutate\Permutate.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\Permutate\Permutate
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [Pi.cmd_8009]
-RelativePath=JIT\Performance\CodeQuality\BenchI\Pi\Pi\Pi.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\Pi\Pi
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\Pi\Pi\Pi.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\Pi\Pi
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [Puzzle.cmd_8010]
-RelativePath=JIT\Performance\CodeQuality\BenchI\Puzzle\Puzzle\Puzzle.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\Puzzle\Puzzle
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\Puzzle\Puzzle\Puzzle.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\Puzzle\Puzzle
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [QuickSort.cmd_8011]
-RelativePath=JIT\Performance\CodeQuality\BenchI\QuickSort\QuickSort\QuickSort.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\QuickSort\QuickSort
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\QuickSort\QuickSort\QuickSort.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\QuickSort\QuickSort
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [TreeInsert.cmd_8012]
-RelativePath=JIT\Performance\CodeQuality\BenchI\TreeInsert\TreeInsert\TreeInsert.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\TreeInsert\TreeInsert
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\TreeInsert\TreeInsert\TreeInsert.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\TreeInsert\TreeInsert
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [TreeSort.cmd_8013]
-RelativePath=JIT\Performance\CodeQuality\BenchI\TreeSort\TreeSort\TreeSort.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\TreeSort\TreeSort
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\TreeSort\TreeSort\TreeSort.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\TreeSort\TreeSort
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS
 HostStyle=0
 
 [XposMatrix.cmd_8014]
-RelativePath=JIT\Performance\CodeQuality\BenchI\XposMatrix\XposMatrix\XposMatrix.cmd
-WorkingDir=JIT\Performance\CodeQuality\BenchI\XposMatrix\XposMatrix
+RelativePath=JIT\Performance\CodeQuality\Benchstones\BenchI\XposMatrix\XposMatrix\XposMatrix.cmd
+WorkingDir=JIT\Performance\CodeQuality\Benchstones\BenchI\XposMatrix\XposMatrix
 Expected=0
 MaxAllowedDurationSeconds=600
 Categories=EXPECTED_PASS