diff --git a/test/unit_tests/aievec_tests/float_dynamic_sized_memref/conv2d_uij_f32_unbounded.mlir b/test/unit_tests/aievec_tests/aie/float_dynamic_sized_memref/conv2d_uij_f32_unbounded.mlir
similarity index 98%
rename from test/unit_tests/aievec_tests/float_dynamic_sized_memref/conv2d_uij_f32_unbounded.mlir
rename to test/unit_tests/aievec_tests/aie/float_dynamic_sized_memref/conv2d_uij_f32_unbounded.mlir
index b32a67f7b8..7d20dad39d 100644
--- a/test/unit_tests/aievec_tests/float_dynamic_sized_memref/conv2d_uij_f32_unbounded.mlir
+++ b/test/unit_tests/aievec_tests/aie/float_dynamic_sized_memref/conv2d_uij_f32_unbounded.mlir
@@ -2,7 +2,7 @@
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=8" --aie-vectorize | aie-translate --aievec-to-cpp -o gen.cc
 // RUN: xchesscc_wrapper aie -f -g +s +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
 // RUN: xchesscc_wrapper aie -f -g +s +w work +o work -I%S -I. %S/float.cc work/kernel.o
-// RUN: cp -r %S/data . && xca_udm_dbg -qf -T -P %aietools/data/versal_prod/lib -t "%S/../profiling.tcl ./work/a.out"
+// RUN: cp -r %S/data . && xca_udm_dbg -qf -T -P %aietools/data/versal_prod/lib -t "%S/../../profiling.tcl ./work/a.out"
 
 func.func @conv2d (%A: memref<?x?xf32>, %B: memref<?xf32>, %C: memref<?x?xf32>) {
     %c0 = arith.constant 0 : index
diff --git a/test/unit_tests/aievec_tests/float_dynamic_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie/float_dynamic_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/float_dynamic_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie/float_dynamic_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/float_dynamic_sized_memref/data/refImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie/float_dynamic_sized_memref/data/refImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/float_dynamic_sized_memref/data/refImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie/float_dynamic_sized_memref/data/refImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/float_dynamic_sized_memref/float.cc b/test/unit_tests/aievec_tests/aie/float_dynamic_sized_memref/float.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/float_dynamic_sized_memref/float.cc
rename to test/unit_tests/aievec_tests/aie/float_dynamic_sized_memref/float.cc
diff --git a/test/unit_tests/aievec_tests/float_dynamic_sized_memref/float.h b/test/unit_tests/aievec_tests/aie/float_dynamic_sized_memref/float.h
similarity index 100%
rename from test/unit_tests/aievec_tests/float_dynamic_sized_memref/float.h
rename to test/unit_tests/aievec_tests/aie/float_dynamic_sized_memref/float.h
diff --git a/test/unit_tests/aievec_tests/float_dynamic_sized_memref/kernel.cc b/test/unit_tests/aievec_tests/aie/float_dynamic_sized_memref/kernel.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/float_dynamic_sized_memref/kernel.cc
rename to test/unit_tests/aievec_tests/aie/float_dynamic_sized_memref/kernel.cc
diff --git a/test/unit_tests/aievec_tests/float_dynamic_sized_memref/reference.cc b/test/unit_tests/aievec_tests/aie/float_dynamic_sized_memref/reference.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/float_dynamic_sized_memref/reference.cc
rename to test/unit_tests/aievec_tests/aie/float_dynamic_sized_memref/reference.cc
diff --git a/test/unit_tests/aievec_tests/float_static_sized_memref/conv2d.c b/test/unit_tests/aievec_tests/aie/float_static_sized_memref/conv2d.c
similarity index 100%
rename from test/unit_tests/aievec_tests/float_static_sized_memref/conv2d.c
rename to test/unit_tests/aievec_tests/aie/float_static_sized_memref/conv2d.c
diff --git a/test/unit_tests/aievec_tests/float_static_sized_memref/conv2d_uij_f32_noinit.mlir b/test/unit_tests/aievec_tests/aie/float_static_sized_memref/conv2d_uij_f32_noinit.mlir
similarity index 98%
rename from test/unit_tests/aievec_tests/float_static_sized_memref/conv2d_uij_f32_noinit.mlir
rename to test/unit_tests/aievec_tests/aie/float_static_sized_memref/conv2d_uij_f32_noinit.mlir
index 1a14fa04a5..17121c1143 100644
--- a/test/unit_tests/aievec_tests/float_static_sized_memref/conv2d_uij_f32_noinit.mlir
+++ b/test/unit_tests/aievec_tests/aie/float_static_sized_memref/conv2d_uij_f32_noinit.mlir
@@ -2,7 +2,7 @@
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=8" --aie-vectorize | aie-translate --aievec-to-cpp -o gen.cc
 // RUN: xchesscc_wrapper aie -f -g +s +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
 // RUN: xchesscc_wrapper aie -f -g +s +w work +o work -I%S -I. %S/float.cc work/kernel.o
-// RUN: cp -r %S/data . && xca_udm_dbg -qf -T -P %aietools/data/versal_prod/lib -t "%S/../profiling.tcl ./work/a.out"
+// RUN: cp -r %S/data . && xca_udm_dbg -qf -T -P %aietools/data/versal_prod/lib -t "%S/../../profiling.tcl ./work/a.out"
 
 func.func @conv2d (%A: memref<18x272xf32>, %B: memref<9xf32>, %C: memref<16x256xf32>) {
     affine.for %arg3 = 0 to 16 {
diff --git a/test/unit_tests/aievec_tests/float_static_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie/float_static_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/float_static_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie/float_static_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/float_static_sized_memref/data/refImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie/float_static_sized_memref/data/refImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/float_static_sized_memref/data/refImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie/float_static_sized_memref/data/refImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/float_static_sized_memref/float.cc b/test/unit_tests/aievec_tests/aie/float_static_sized_memref/float.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/float_static_sized_memref/float.cc
rename to test/unit_tests/aievec_tests/aie/float_static_sized_memref/float.cc
diff --git a/test/unit_tests/aievec_tests/float_static_sized_memref/float.h b/test/unit_tests/aievec_tests/aie/float_static_sized_memref/float.h
similarity index 100%
rename from test/unit_tests/aievec_tests/float_static_sized_memref/float.h
rename to test/unit_tests/aievec_tests/aie/float_static_sized_memref/float.h
diff --git a/test/unit_tests/aievec_tests/float_static_sized_memref/kernel.cc b/test/unit_tests/aievec_tests/aie/float_static_sized_memref/kernel.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/float_static_sized_memref/kernel.cc
rename to test/unit_tests/aievec_tests/aie/float_static_sized_memref/kernel.cc
diff --git a/test/unit_tests/aievec_tests/float_static_sized_memref/reference.cc b/test/unit_tests/aievec_tests/aie/float_static_sized_memref/reference.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/float_static_sized_memref/reference.cc
rename to test/unit_tests/aievec_tests/aie/float_static_sized_memref/reference.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_dynamic_sized_memref/conv2d_uij_i16_unbounded.mlir b/test/unit_tests/aievec_tests/aie/i16xi16_dynamic_sized_memref/conv2d_uij_i16_unbounded.mlir
similarity index 98%
rename from test/unit_tests/aievec_tests/i16xi16_dynamic_sized_memref/conv2d_uij_i16_unbounded.mlir
rename to test/unit_tests/aievec_tests/aie/i16xi16_dynamic_sized_memref/conv2d_uij_i16_unbounded.mlir
index 27ae522955..af4f02b795 100644
--- a/test/unit_tests/aievec_tests/i16xi16_dynamic_sized_memref/conv2d_uij_i16_unbounded.mlir
+++ b/test/unit_tests/aievec_tests/aie/i16xi16_dynamic_sized_memref/conv2d_uij_i16_unbounded.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=16" --aie-vectorize="shift=10 zero-offset=4" | aie-translate --aievec-to-cpp -o gen.cc
 // RUN: xchesscc_wrapper aie -f -g +s +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
 // RUN: xchesscc_wrapper aie -f -g +s +w work +o work -I%S -I. %S/i16xi16.cc work/kernel.o
-// RUN: cp -r %S/data . && xca_udm_dbg -qf -T -P %aietools/data/versal_prod/lib -t "%S/../profiling.tcl ./work/a.out"
+// RUN: cp -r %S/data . && xca_udm_dbg -qf -T -P %aietools/data/versal_prod/lib -t "%S/../../profiling.tcl ./work/a.out"
 
 func.func @conv2d(%A: memref<?x?xi16>, %B: memref<?xi16>, %C: memref<?x?xi16>) {
     %c0 = arith.constant 0 : index
diff --git a/test/unit_tests/aievec_tests/i16xi16_dynamic_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie/i16xi16_dynamic_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_dynamic_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie/i16xi16_dynamic_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i16xi16_dynamic_sized_memref/data/refImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie/i16xi16_dynamic_sized_memref/data/refImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_dynamic_sized_memref/data/refImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie/i16xi16_dynamic_sized_memref/data/refImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i16xi16_dynamic_sized_memref/i16xi16.cc b/test/unit_tests/aievec_tests/aie/i16xi16_dynamic_sized_memref/i16xi16.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_dynamic_sized_memref/i16xi16.cc
rename to test/unit_tests/aievec_tests/aie/i16xi16_dynamic_sized_memref/i16xi16.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_dynamic_sized_memref/i16xi16.h b/test/unit_tests/aievec_tests/aie/i16xi16_dynamic_sized_memref/i16xi16.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_dynamic_sized_memref/i16xi16.h
rename to test/unit_tests/aievec_tests/aie/i16xi16_dynamic_sized_memref/i16xi16.h
diff --git a/test/unit_tests/aievec_tests/i16xi16_dynamic_sized_memref/kernel.cc b/test/unit_tests/aievec_tests/aie/i16xi16_dynamic_sized_memref/kernel.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_dynamic_sized_memref/kernel.cc
rename to test/unit_tests/aievec_tests/aie/i16xi16_dynamic_sized_memref/kernel.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_dynamic_sized_memref/reference.cc b/test/unit_tests/aievec_tests/aie/i16xi16_dynamic_sized_memref/reference.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_dynamic_sized_memref/reference.cc
rename to test/unit_tests/aievec_tests/aie/i16xi16_dynamic_sized_memref/reference.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_static_sized_memref/conv2d_uij_i16_noinit.mlir b/test/unit_tests/aievec_tests/aie/i16xi16_static_sized_memref/conv2d_uij_i16_noinit.mlir
similarity index 98%
rename from test/unit_tests/aievec_tests/i16xi16_static_sized_memref/conv2d_uij_i16_noinit.mlir
rename to test/unit_tests/aievec_tests/aie/i16xi16_static_sized_memref/conv2d_uij_i16_noinit.mlir
index aa48a64128..cb8f37fae8 100644
--- a/test/unit_tests/aievec_tests/i16xi16_static_sized_memref/conv2d_uij_i16_noinit.mlir
+++ b/test/unit_tests/aievec_tests/aie/i16xi16_static_sized_memref/conv2d_uij_i16_noinit.mlir
@@ -2,7 +2,7 @@
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=16" --aie-vectorize="shift=10 zero-offset=4" | aie-translate --aievec-to-cpp -o gen.cc
 // RUN: xchesscc_wrapper aie -f -g +s +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
 // RUN: xchesscc_wrapper aie -f -g +s +w work +o work -I%S -I. %S/i16xi16.cc work/kernel.o
-// RUN: cp -r %S/data . && xca_udm_dbg -qf -T -P %aietools/data/versal_prod/lib -t "%S/../profiling.tcl ./work/a.out"
+// RUN: cp -r %S/data . && xca_udm_dbg -qf -T -P %aietools/data/versal_prod/lib -t "%S/../../profiling.tcl ./work/a.out"
 
 func.func @conv2d (%A: memref<18x288xi16>, %B: memref<9xi16>, %C: memref<16x256xi16>) {
     affine.for %arg3 = 0 to 16 {
diff --git a/test/unit_tests/aievec_tests/i16xi16_static_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie/i16xi16_static_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_static_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie/i16xi16_static_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i16xi16_static_sized_memref/data/refImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie/i16xi16_static_sized_memref/data/refImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_static_sized_memref/data/refImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie/i16xi16_static_sized_memref/data/refImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i16xi16_static_sized_memref/i16xi16.cc b/test/unit_tests/aievec_tests/aie/i16xi16_static_sized_memref/i16xi16.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_static_sized_memref/i16xi16.cc
rename to test/unit_tests/aievec_tests/aie/i16xi16_static_sized_memref/i16xi16.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_static_sized_memref/i16xi16.h b/test/unit_tests/aievec_tests/aie/i16xi16_static_sized_memref/i16xi16.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_static_sized_memref/i16xi16.h
rename to test/unit_tests/aievec_tests/aie/i16xi16_static_sized_memref/i16xi16.h
diff --git a/test/unit_tests/aievec_tests/i16xi16_static_sized_memref/kernel.cc b/test/unit_tests/aievec_tests/aie/i16xi16_static_sized_memref/kernel.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_static_sized_memref/kernel.cc
rename to test/unit_tests/aievec_tests/aie/i16xi16_static_sized_memref/kernel.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_static_sized_memref/reference.cc b/test/unit_tests/aievec_tests/aie/i16xi16_static_sized_memref/reference.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_static_sized_memref/reference.cc
rename to test/unit_tests/aievec_tests/aie/i16xi16_static_sized_memref/reference.cc
diff --git a/test/unit_tests/aievec_tests/i32xi32_dynamic_sized_memref/conv2d_uij_i32_unbounded.mlir b/test/unit_tests/aievec_tests/aie/i32xi32_dynamic_sized_memref/conv2d_uij_i32_unbounded.mlir
similarity index 98%
rename from test/unit_tests/aievec_tests/i32xi32_dynamic_sized_memref/conv2d_uij_i32_unbounded.mlir
rename to test/unit_tests/aievec_tests/aie/i32xi32_dynamic_sized_memref/conv2d_uij_i32_unbounded.mlir
index feab1b477f..b454945c41 100644
--- a/test/unit_tests/aievec_tests/i32xi32_dynamic_sized_memref/conv2d_uij_i32_unbounded.mlir
+++ b/test/unit_tests/aievec_tests/aie/i32xi32_dynamic_sized_memref/conv2d_uij_i32_unbounded.mlir
@@ -2,7 +2,7 @@
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=8" --aie-vectorize="shift=10" | aie-translate --aievec-to-cpp -o gen.cc
 // RUN: xchesscc_wrapper aie -f -g +s +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
 // RUN: xchesscc_wrapper aie -f -g +s +w work +o work -I%S -I. %S/i32xi32.cc work/kernel.o
-// RUN: cp -r %S/data . && xca_udm_dbg -qf -T -P %aietools/data/versal_prod/lib -t "%S/../profiling.tcl ./work/a.out"
+// RUN: cp -r %S/data . && xca_udm_dbg -qf -T -P %aietools/data/versal_prod/lib -t "%S/../../profiling.tcl ./work/a.out"
 
 func.func @conv2d (%A: memref<?x?xi32>, %B: memref<?xi32>, %C: memref<?x?xi32>) {
     %c0 = arith.constant 0 : index
diff --git a/test/unit_tests/aievec_tests/i16xi16_static_sized_memref_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie/i32xi32_dynamic_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_static_sized_memref_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie/i32xi32_dynamic_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i16xi16_static_sized_memref_aie-ml/data/refImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie/i32xi32_dynamic_sized_memref/data/refImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_static_sized_memref_aie-ml/data/refImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie/i32xi32_dynamic_sized_memref/data/refImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i32xi32_dynamic_sized_memref/i32xi32.cc b/test/unit_tests/aievec_tests/aie/i32xi32_dynamic_sized_memref/i32xi32.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_dynamic_sized_memref/i32xi32.cc
rename to test/unit_tests/aievec_tests/aie/i32xi32_dynamic_sized_memref/i32xi32.cc
diff --git a/test/unit_tests/aievec_tests/i32xi32_dynamic_sized_memref/i32xi32.h b/test/unit_tests/aievec_tests/aie/i32xi32_dynamic_sized_memref/i32xi32.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_dynamic_sized_memref/i32xi32.h
rename to test/unit_tests/aievec_tests/aie/i32xi32_dynamic_sized_memref/i32xi32.h
diff --git a/test/unit_tests/aievec_tests/i32xi32_dynamic_sized_memref/kernel.cc b/test/unit_tests/aievec_tests/aie/i32xi32_dynamic_sized_memref/kernel.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_dynamic_sized_memref/kernel.cc
rename to test/unit_tests/aievec_tests/aie/i32xi32_dynamic_sized_memref/kernel.cc
diff --git a/test/unit_tests/aievec_tests/i32xi32_dynamic_sized_memref/reference.cc b/test/unit_tests/aievec_tests/aie/i32xi32_dynamic_sized_memref/reference.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_dynamic_sized_memref/reference.cc
rename to test/unit_tests/aievec_tests/aie/i32xi32_dynamic_sized_memref/reference.cc
diff --git a/test/unit_tests/aievec_tests/i32xi32_static_sized_memref/conv2d_uij_i32_noinit.mlir b/test/unit_tests/aievec_tests/aie/i32xi32_static_sized_memref/conv2d_uij_i32_noinit.mlir
similarity index 98%
rename from test/unit_tests/aievec_tests/i32xi32_static_sized_memref/conv2d_uij_i32_noinit.mlir
rename to test/unit_tests/aievec_tests/aie/i32xi32_static_sized_memref/conv2d_uij_i32_noinit.mlir
index f1aeb6026b..013ef45ff1 100644
--- a/test/unit_tests/aievec_tests/i32xi32_static_sized_memref/conv2d_uij_i32_noinit.mlir
+++ b/test/unit_tests/aievec_tests/aie/i32xi32_static_sized_memref/conv2d_uij_i32_noinit.mlir
@@ -2,7 +2,7 @@
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=8" --aie-vectorize="shift=10" | aie-translate --aievec-to-cpp -o gen.cc
 // RUN: xchesscc_wrapper aie -f -g +s +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
 // RUN: xchesscc_wrapper aie -f -g +s +w work +o work -I%S -I. %S/i32xi32.cc work/kernel.o
-// RUN: cp -r %S/data . && xca_udm_dbg -qf -T -P %aietools/data/versal_prod/lib -t "%S/../profiling.tcl ./work/a.out"
+// RUN: cp -r %S/data . && xca_udm_dbg -qf -T -P %aietools/data/versal_prod/lib -t "%S/../../profiling.tcl ./work/a.out"
  
 func.func @conv2d (%A: memref<18x272xi32>, %B: memref<9xi32>, %C: memref<16x256xi32>) {
     affine.for %arg3 = 0 to 16 {
diff --git a/test/unit_tests/aievec_tests/i32xi32_dynamic_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie/i32xi32_static_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_dynamic_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie/i32xi32_static_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i32xi32_dynamic_sized_memref/data/refImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie/i32xi32_static_sized_memref/data/refImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_dynamic_sized_memref/data/refImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie/i32xi32_static_sized_memref/data/refImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i32xi32_static_sized_memref/i32xi32.cc b/test/unit_tests/aievec_tests/aie/i32xi32_static_sized_memref/i32xi32.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_static_sized_memref/i32xi32.cc
rename to test/unit_tests/aievec_tests/aie/i32xi32_static_sized_memref/i32xi32.cc
diff --git a/test/unit_tests/aievec_tests/i32xi32_static_sized_memref/i32xi32.h b/test/unit_tests/aievec_tests/aie/i32xi32_static_sized_memref/i32xi32.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_static_sized_memref/i32xi32.h
rename to test/unit_tests/aievec_tests/aie/i32xi32_static_sized_memref/i32xi32.h
diff --git a/test/unit_tests/aievec_tests/i32xi32_static_sized_memref/kernel.cc b/test/unit_tests/aievec_tests/aie/i32xi32_static_sized_memref/kernel.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_static_sized_memref/kernel.cc
rename to test/unit_tests/aievec_tests/aie/i32xi32_static_sized_memref/kernel.cc
diff --git a/test/unit_tests/aievec_tests/i32xi32_static_sized_memref/reference.cc b/test/unit_tests/aievec_tests/aie/i32xi32_static_sized_memref/reference.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_static_sized_memref/reference.cc
rename to test/unit_tests/aievec_tests/aie/i32xi32_static_sized_memref/reference.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_dynamic_sized_memref/conv2d_uij_i8_unbounded.mlir b/test/unit_tests/aievec_tests/aie/i8xi8_dynamic_sized_memref/conv2d_uij_i8_unbounded.mlir
similarity index 98%
rename from test/unit_tests/aievec_tests/i8xi8_dynamic_sized_memref/conv2d_uij_i8_unbounded.mlir
rename to test/unit_tests/aievec_tests/aie/i8xi8_dynamic_sized_memref/conv2d_uij_i8_unbounded.mlir
index 5056ba9dbe..97c2f39b9b 100644
--- a/test/unit_tests/aievec_tests/i8xi8_dynamic_sized_memref/conv2d_uij_i8_unbounded.mlir
+++ b/test/unit_tests/aievec_tests/aie/i8xi8_dynamic_sized_memref/conv2d_uij_i8_unbounded.mlir
@@ -2,7 +2,7 @@
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=16" --aie-vectorize="shift=0 dup-factor=2" | aie-translate --aievec-to-cpp -o gen.cc
 // RUN: xchesscc_wrapper aie -f -g +s +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
 // RUN: xchesscc_wrapper aie -f -g +s +w work +o work -I%S -I. %S/i8xi8.cc work/kernel.o
-// RUN: cp -r %S/data . && xca_udm_dbg -qf -T -P %aietools/data/versal_prod/lib -t "%S/../profiling.tcl ./work/a.out"
+// RUN: cp -r %S/data . && xca_udm_dbg -qf -T -P %aietools/data/versal_prod/lib -t "%S/../../profiling.tcl ./work/a.out"
 
 func.func @conv2d (%A: memref<?x?xi8>, %B: memref<?xi8>, %C: memref<?x?xi8>) {
     %c0 = arith.constant 0 : index
diff --git a/test/unit_tests/aievec_tests/i8xi8_dynamic_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie/i8xi8_dynamic_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_dynamic_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie/i8xi8_dynamic_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i8xi8_dynamic_sized_memref/data/refImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie/i8xi8_dynamic_sized_memref/data/refImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_dynamic_sized_memref/data/refImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie/i8xi8_dynamic_sized_memref/data/refImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i8xi8_dynamic_sized_memref/i8xi8.cc b/test/unit_tests/aievec_tests/aie/i8xi8_dynamic_sized_memref/i8xi8.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_dynamic_sized_memref/i8xi8.cc
rename to test/unit_tests/aievec_tests/aie/i8xi8_dynamic_sized_memref/i8xi8.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_dynamic_sized_memref/i8xi8.h b/test/unit_tests/aievec_tests/aie/i8xi8_dynamic_sized_memref/i8xi8.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_dynamic_sized_memref/i8xi8.h
rename to test/unit_tests/aievec_tests/aie/i8xi8_dynamic_sized_memref/i8xi8.h
diff --git a/test/unit_tests/aievec_tests/i8xi8_dynamic_sized_memref/kernel.cc b/test/unit_tests/aievec_tests/aie/i8xi8_dynamic_sized_memref/kernel.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_dynamic_sized_memref/kernel.cc
rename to test/unit_tests/aievec_tests/aie/i8xi8_dynamic_sized_memref/kernel.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref/conv2d_uij_i8_noinit.mlir b/test/unit_tests/aievec_tests/aie/i8xi8_static_sized_memref/conv2d_uij_i8_noinit.mlir
similarity index 98%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref/conv2d_uij_i8_noinit.mlir
rename to test/unit_tests/aievec_tests/aie/i8xi8_static_sized_memref/conv2d_uij_i8_noinit.mlir
index 2400bb77ab..ce49d2d129 100644
--- a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref/conv2d_uij_i8_noinit.mlir
+++ b/test/unit_tests/aievec_tests/aie/i8xi8_static_sized_memref/conv2d_uij_i8_noinit.mlir
@@ -2,7 +2,7 @@
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=16" --aie-vectorize="shift=0 dup-factor=2" | aie-translate --aievec-to-cpp -o gen.cc
 // RUN: xchesscc_wrapper aie -f -g +s +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
 // RUN: xchesscc_wrapper aie -f -g +s +w work +o work -I%S -I. %S/i8xi8.cc work/kernel.o
-// RUN: cp -r %S/data . && xca_udm_dbg -qf -T -P %aietools/data/versal_prod/lib -t "%S/../profiling.tcl ./work/a.out"
+// RUN: cp -r %S/data . && xca_udm_dbg -qf -T -P %aietools/data/versal_prod/lib -t "%S/../../profiling.tcl ./work/a.out"
 
 func.func @conv2d (%A: memref<18x288xi8>, %B: memref<48xi8>, %C: memref<16x256xi8>) {
     affine.for %arg3 = 0 to 16 {
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie/i8xi8_static_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie/i8xi8_static_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref/data/refImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie/i8xi8_static_sized_memref/data/refImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref/data/refImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie/i8xi8_static_sized_memref/data/refImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref/i8xi8.cc b/test/unit_tests/aievec_tests/aie/i8xi8_static_sized_memref/i8xi8.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref/i8xi8.cc
rename to test/unit_tests/aievec_tests/aie/i8xi8_static_sized_memref/i8xi8.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref/i8xi8.h b/test/unit_tests/aievec_tests/aie/i8xi8_static_sized_memref/i8xi8.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref/i8xi8.h
rename to test/unit_tests/aievec_tests/aie/i8xi8_static_sized_memref/i8xi8.h
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref/kernel.cc b/test/unit_tests/aievec_tests/aie/i8xi8_static_sized_memref/kernel.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref/kernel.cc
rename to test/unit_tests/aievec_tests/aie/i8xi8_static_sized_memref/kernel.cc
diff --git a/test/unit_tests/aievec_tests/bf16_add_reduce/bf16_add_reduce.mlir b/test/unit_tests/aievec_tests/aie2/bf16_add_reduce/bf16_add_reduce.mlir
similarity index 92%
rename from test/unit_tests/aievec_tests/bf16_add_reduce/bf16_add_reduce.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16_add_reduce/bf16_add_reduce.mlir
index a8350e2f3d..379f7ec13e 100644
--- a/test/unit_tests/aievec_tests/bf16_add_reduce/bf16_add_reduce.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16_add_reduce/bf16_add_reduce.mlir
@@ -2,7 +2,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/bf16_add_reduce/defines.h b/test/unit_tests/aievec_tests/aie2/bf16_add_reduce/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_add_reduce/defines.h
rename to test/unit_tests/aievec_tests/aie2/bf16_add_reduce/defines.h
diff --git a/test/unit_tests/aievec_tests/bf16_add_reduce/dut.cc b/test/unit_tests/aievec_tests/aie2/bf16_add_reduce/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_add_reduce/dut.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_add_reduce/dut.cc
diff --git a/test/unit_tests/aievec_tests/bf16_add_reduce/testbench.cc b/test/unit_tests/aievec_tests/aie2/bf16_add_reduce/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/bf16_add_reduce/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_add_reduce/testbench.cc
index 0775761d7d..394576f093 100644
--- a/test/unit_tests/aievec_tests/bf16_add_reduce/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/bf16_add_reduce/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/bf16_exp_lut/bf16_exp_lut-llvm.mlir b/test/unit_tests/aievec_tests/aie2/bf16_exp_lut/bf16_exp_lut-llvm.mlir
similarity index 95%
rename from test/unit_tests/aievec_tests/bf16_exp_lut/bf16_exp_lut-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16_exp_lut/bf16_exp_lut-llvm.mlir
index d376e5a5eb..6f07173dc6 100644
--- a/test/unit_tests/aievec_tests/bf16_exp_lut/bf16_exp_lut-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16_exp_lut/bf16_exp_lut-llvm.mlir
@@ -12,7 +12,7 @@
 // RUN: llvm-link -S lut_constants.ll dut_functions.ll -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -DTO_LLVM -D__AIEARCH__=20 -D__AIENGINE__ -I. %S/testbench.cc dut.o 
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/bf16_exp_lut/bf16_exp_lut.mlir b/test/unit_tests/aievec_tests/aie2/bf16_exp_lut/bf16_exp_lut.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/bf16_exp_lut/bf16_exp_lut.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16_exp_lut/bf16_exp_lut.mlir
index 71c8fc7479..58e6908aed 100644
--- a/test/unit_tests/aievec_tests/bf16_exp_lut/bf16_exp_lut.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16_exp_lut/bf16_exp_lut.mlir
@@ -7,7 +7,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -D__AIEARCH__=20 -D__AIENGINE__ -I. -c %aie_runtime_lib%/AIE2/lut_based_ops.cpp -o lut_based_ops.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -D__AIEARCH__=20 -D__AIENGINE__ -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -D__AIEARCH__=20 -D__AIENGINE__ -I. %S/testbench.cc work/dut.o work/lut_based_ops.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/bf16_exp_lut/defines.h b/test/unit_tests/aievec_tests/aie2/bf16_exp_lut/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_exp_lut/defines.h
rename to test/unit_tests/aievec_tests/aie2/bf16_exp_lut/defines.h
diff --git a/test/unit_tests/aievec_tests/bf16_exp_lut/dut.cc b/test/unit_tests/aievec_tests/aie2/bf16_exp_lut/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_exp_lut/dut.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_exp_lut/dut.cc
diff --git a/test/unit_tests/aievec_tests/bf16_exp_lut/dut_simple.cc b/test/unit_tests/aievec_tests/aie2/bf16_exp_lut/dut_simple.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_exp_lut/dut_simple.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_exp_lut/dut_simple.cc
diff --git a/test/unit_tests/aievec_tests/bf16_exp_lut/testbench.cc b/test/unit_tests/aievec_tests/aie2/bf16_exp_lut/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/bf16_exp_lut/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_exp_lut/testbench.cc
index 1c99da356e..db44d65c3b 100644
--- a/test/unit_tests/aievec_tests/bf16_exp_lut/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/bf16_exp_lut/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/bf16_float_add_reduce/bf16_float_add_reduce.mlir b/test/unit_tests/aievec_tests/aie2/bf16_float_add_reduce/bf16_float_add_reduce.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/bf16_float_add_reduce/bf16_float_add_reduce.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16_float_add_reduce/bf16_float_add_reduce.mlir
index 9bde9636b5..fafaf8ac79 100644
--- a/test/unit_tests/aievec_tests/bf16_float_add_reduce/bf16_float_add_reduce.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16_float_add_reduce/bf16_float_add_reduce.mlir
@@ -2,7 +2,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/bf16_float_add_reduce/defines.h b/test/unit_tests/aievec_tests/aie2/bf16_float_add_reduce/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_float_add_reduce/defines.h
rename to test/unit_tests/aievec_tests/aie2/bf16_float_add_reduce/defines.h
diff --git a/test/unit_tests/aievec_tests/bf16_float_add_reduce/dut.cc b/test/unit_tests/aievec_tests/aie2/bf16_float_add_reduce/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_float_add_reduce/dut.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_float_add_reduce/dut.cc
diff --git a/test/unit_tests/aievec_tests/bf16_float_add_reduce/testbench.cc b/test/unit_tests/aievec_tests/aie2/bf16_float_add_reduce/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/bf16_float_add_reduce/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_float_add_reduce/testbench.cc
index e16a2439b2..69ab672052 100644
--- a/test/unit_tests/aievec_tests/bf16_float_add_reduce/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/bf16_float_add_reduce/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/bf16_inv_lut/bf16_inv_lut.mlir b/test/unit_tests/aievec_tests/aie2/bf16_inv_lut/bf16_inv_lut.mlir
similarity index 95%
rename from test/unit_tests/aievec_tests/bf16_inv_lut/bf16_inv_lut.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16_inv_lut/bf16_inv_lut.mlir
index 9d0b435cd7..32744c1391 100644
--- a/test/unit_tests/aievec_tests/bf16_inv_lut/bf16_inv_lut.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16_inv_lut/bf16_inv_lut.mlir
@@ -7,7 +7,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -D__AIEARCH__=20 -D__AIENGINE__ -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -D__AIEARCH__=20 -D__AIENGINE__ -I. %S/testbench.cc work/dut.o work/lut_based_ops.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/bf16_inv_lut/defines.h b/test/unit_tests/aievec_tests/aie2/bf16_inv_lut/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_inv_lut/defines.h
rename to test/unit_tests/aievec_tests/aie2/bf16_inv_lut/defines.h
diff --git a/test/unit_tests/aievec_tests/bf16_inv_lut/dut.cc b/test/unit_tests/aievec_tests/aie2/bf16_inv_lut/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_inv_lut/dut.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_inv_lut/dut.cc
diff --git a/test/unit_tests/aievec_tests/bf16_inv_lut/testbench.cc b/test/unit_tests/aievec_tests/aie2/bf16_inv_lut/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/bf16_inv_lut/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_inv_lut/testbench.cc
index 1f0dd03cc8..942ad08958 100644
--- a/test/unit_tests/aievec_tests/bf16_inv_lut/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/bf16_inv_lut/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/bf16_max_reduce/bf16_max_reduce-llvm.mlir b/test/unit_tests/aievec_tests/aie2/bf16_max_reduce/bf16_max_reduce-llvm.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/bf16_max_reduce/bf16_max_reduce-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16_max_reduce/bf16_max_reduce-llvm.mlir
index 3acfa8fa98..0e327ca649 100644
--- a/test/unit_tests/aievec_tests/bf16_max_reduce/bf16_max_reduce-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16_max_reduce/bf16_max_reduce-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/bf16_max_reduce/bf16_max_reduce.mlir b/test/unit_tests/aievec_tests/aie2/bf16_max_reduce/bf16_max_reduce.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/bf16_max_reduce/bf16_max_reduce.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16_max_reduce/bf16_max_reduce.mlir
index 970fb80635..66e7cfe9fd 100644
--- a/test/unit_tests/aievec_tests/bf16_max_reduce/bf16_max_reduce.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16_max_reduce/bf16_max_reduce.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/bf16_max_reduce/defines.h b/test/unit_tests/aievec_tests/aie2/bf16_max_reduce/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_max_reduce/defines.h
rename to test/unit_tests/aievec_tests/aie2/bf16_max_reduce/defines.h
diff --git a/test/unit_tests/aievec_tests/bf16_max_reduce/dut.cc b/test/unit_tests/aievec_tests/aie2/bf16_max_reduce/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_max_reduce/dut.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_max_reduce/dut.cc
diff --git a/test/unit_tests/aievec_tests/bf16_max_reduce/testbench.cc b/test/unit_tests/aievec_tests/aie2/bf16_max_reduce/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/bf16_max_reduce/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_max_reduce/testbench.cc
index d9a18848df..a083268023 100644
--- a/test/unit_tests/aievec_tests/bf16_max_reduce/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/bf16_max_reduce/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/bf16_min_reduce/bf16_min_reduce-llvm.mlir b/test/unit_tests/aievec_tests/aie2/bf16_min_reduce/bf16_min_reduce-llvm.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/bf16_min_reduce/bf16_min_reduce-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16_min_reduce/bf16_min_reduce-llvm.mlir
index badfa132b7..ce02a081ed 100644
--- a/test/unit_tests/aievec_tests/bf16_min_reduce/bf16_min_reduce-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16_min_reduce/bf16_min_reduce-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/bf16_min_reduce/bf16_min_reduce.mlir b/test/unit_tests/aievec_tests/aie2/bf16_min_reduce/bf16_min_reduce.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/bf16_min_reduce/bf16_min_reduce.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16_min_reduce/bf16_min_reduce.mlir
index ed6df48a31..e3a31b569f 100644
--- a/test/unit_tests/aievec_tests/bf16_min_reduce/bf16_min_reduce.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16_min_reduce/bf16_min_reduce.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/bf16_min_reduce/defines.h b/test/unit_tests/aievec_tests/aie2/bf16_min_reduce/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_min_reduce/defines.h
rename to test/unit_tests/aievec_tests/aie2/bf16_min_reduce/defines.h
diff --git a/test/unit_tests/aievec_tests/bf16_min_reduce/dut.cc b/test/unit_tests/aievec_tests/aie2/bf16_min_reduce/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_min_reduce/dut.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_min_reduce/dut.cc
diff --git a/test/unit_tests/aievec_tests/bf16_min_reduce/testbench.cc b/test/unit_tests/aievec_tests/aie2/bf16_min_reduce/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/bf16_min_reduce/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_min_reduce/testbench.cc
index 8cb77ab849..059d6e5ee2 100644
--- a/test/unit_tests/aievec_tests/bf16_min_reduce/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/bf16_min_reduce/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/bf16_rsqrt_v16/bf16_rsqrt.mlir b/test/unit_tests/aievec_tests/aie2/bf16_rsqrt_v16/bf16_rsqrt.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/bf16_rsqrt_v16/bf16_rsqrt.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16_rsqrt_v16/bf16_rsqrt.mlir
index 45e81ce67c..6b4f29e675 100644
--- a/test/unit_tests/aievec_tests/bf16_rsqrt_v16/bf16_rsqrt.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16_rsqrt_v16/bf16_rsqrt.mlir
@@ -6,7 +6,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -D__AIE_ARCH__=20 -D__AIENGINE__ -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -D__AIE_ARCH__=20 -D__AIENGINE__ -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 // Cycle count: 1708
diff --git a/test/unit_tests/aievec_tests/bf16_rsqrt_v16/defines.h b/test/unit_tests/aievec_tests/aie2/bf16_rsqrt_v16/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_rsqrt_v16/defines.h
rename to test/unit_tests/aievec_tests/aie2/bf16_rsqrt_v16/defines.h
diff --git a/test/unit_tests/aievec_tests/bf16_rsqrt_v16/dut.cc b/test/unit_tests/aievec_tests/aie2/bf16_rsqrt_v16/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_rsqrt_v16/dut.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_rsqrt_v16/dut.cc
diff --git a/test/unit_tests/aievec_tests/bf16_rsqrt_v16/testbench.cc b/test/unit_tests/aievec_tests/aie2/bf16_rsqrt_v16/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/bf16_rsqrt_v16/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_rsqrt_v16/testbench.cc
index 6d2010ce6a..08891ab360 100644
--- a/test/unit_tests/aievec_tests/bf16_rsqrt_v16/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/bf16_rsqrt_v16/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/bf16_rsqrt_v32/bf16_rsqrt.mlir b/test/unit_tests/aievec_tests/aie2/bf16_rsqrt_v32/bf16_rsqrt.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/bf16_rsqrt_v32/bf16_rsqrt.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16_rsqrt_v32/bf16_rsqrt.mlir
index 37766366f5..83498f219d 100644
--- a/test/unit_tests/aievec_tests/bf16_rsqrt_v32/bf16_rsqrt.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16_rsqrt_v32/bf16_rsqrt.mlir
@@ -6,7 +6,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -D__AIE_ARCH__=20 -D__AIENGINE__ -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -D__AIE_ARCH__=20 -D__AIENGINE__ -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 // Cycle count: 1040
diff --git a/test/unit_tests/aievec_tests/bf16_rsqrt_v32/defines.h b/test/unit_tests/aievec_tests/aie2/bf16_rsqrt_v32/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_rsqrt_v32/defines.h
rename to test/unit_tests/aievec_tests/aie2/bf16_rsqrt_v32/defines.h
diff --git a/test/unit_tests/aievec_tests/bf16_rsqrt_v32/dut.cc b/test/unit_tests/aievec_tests/aie2/bf16_rsqrt_v32/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_rsqrt_v32/dut.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_rsqrt_v32/dut.cc
diff --git a/test/unit_tests/aievec_tests/bf16_rsqrt_v32/testbench.cc b/test/unit_tests/aievec_tests/aie2/bf16_rsqrt_v32/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/bf16_rsqrt_v32/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_rsqrt_v32/testbench.cc
index 6d2010ce6a..08891ab360 100644
--- a/test/unit_tests/aievec_tests/bf16_rsqrt_v32/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/bf16_rsqrt_v32/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/bf16_softmax/bf16_softmax.mlir b/test/unit_tests/aievec_tests/aie2/bf16_softmax/bf16_softmax.mlir
similarity index 96%
rename from test/unit_tests/aievec_tests/bf16_softmax/bf16_softmax.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16_softmax/bf16_softmax.mlir
index b7c6f21151..7b17fe795c 100644
--- a/test/unit_tests/aievec_tests/bf16_softmax/bf16_softmax.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16_softmax/bf16_softmax.mlir
@@ -3,7 +3,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -D__AIEARCH__=20 -D__AIENGINE__ -I. -c dut.cc -o dut.cc.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -D__AIEARCH__=20 -D__AIENGINE__ -I. %S/testbench.cc work/dut.cc.o work/lut_based_ops.cpp.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 module {
diff --git a/test/unit_tests/aievec_tests/bf16_softmax/defines.h b/test/unit_tests/aievec_tests/aie2/bf16_softmax/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_softmax/defines.h
rename to test/unit_tests/aievec_tests/aie2/bf16_softmax/defines.h
diff --git a/test/unit_tests/aievec_tests/bf16_softmax/dut.cc b/test/unit_tests/aievec_tests/aie2/bf16_softmax/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_softmax/dut.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_softmax/dut.cc
diff --git a/test/unit_tests/aievec_tests/bf16_softmax/testbench.cc b/test/unit_tests/aievec_tests/aie2/bf16_softmax/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/bf16_softmax/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_softmax/testbench.cc
index cd82b0c14c..166dc12d98 100644
--- a/test/unit_tests/aievec_tests/bf16_softmax/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/bf16_softmax/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/bf16_softmax_2/bf16_softmax.mlir b/test/unit_tests/aievec_tests/aie2/bf16_softmax_2/bf16_softmax.mlir
similarity index 96%
rename from test/unit_tests/aievec_tests/bf16_softmax_2/bf16_softmax.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16_softmax_2/bf16_softmax.mlir
index 55c787e4d1..9044db986b 100644
--- a/test/unit_tests/aievec_tests/bf16_softmax_2/bf16_softmax.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16_softmax_2/bf16_softmax.mlir
@@ -3,7 +3,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -D__AIEARCH__=20 -D__AIENGINE__ -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -D__AIEARCH__=20 -D__AIENGINE__ -I. %S/testbench.cc work/dut.o work/lut_based_ops.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 module {
diff --git a/test/unit_tests/aievec_tests/bf16_softmax_2/defines.h b/test/unit_tests/aievec_tests/aie2/bf16_softmax_2/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_softmax_2/defines.h
rename to test/unit_tests/aievec_tests/aie2/bf16_softmax_2/defines.h
diff --git a/test/unit_tests/aievec_tests/bf16_softmax_2/dut.cc b/test/unit_tests/aievec_tests/aie2/bf16_softmax_2/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_softmax_2/dut.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_softmax_2/dut.cc
diff --git a/test/unit_tests/aievec_tests/bf16_softmax_2/testbench.cc b/test/unit_tests/aievec_tests/aie2/bf16_softmax_2/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/bf16_softmax_2/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_softmax_2/testbench.cc
index 00a115721f..3c7db3de59 100644
--- a/test/unit_tests/aievec_tests/bf16_softmax_2/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/bf16_softmax_2/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/bf16_sqrt_v16/bf16_sqrt.mlir b/test/unit_tests/aievec_tests/aie2/bf16_sqrt_v16/bf16_sqrt.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/bf16_sqrt_v16/bf16_sqrt.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16_sqrt_v16/bf16_sqrt.mlir
index 623632e122..dd7b3d4d0a 100644
--- a/test/unit_tests/aievec_tests/bf16_sqrt_v16/bf16_sqrt.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16_sqrt_v16/bf16_sqrt.mlir
@@ -6,7 +6,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -D__AIE_ARCH__=20 -D__AIENGINE__ -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -D__AIE_ARCH__=20 -D__AIENGINE__ -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 // Cycle count: 2724
diff --git a/test/unit_tests/aievec_tests/bf16_sqrt_v16/defines.h b/test/unit_tests/aievec_tests/aie2/bf16_sqrt_v16/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_sqrt_v16/defines.h
rename to test/unit_tests/aievec_tests/aie2/bf16_sqrt_v16/defines.h
diff --git a/test/unit_tests/aievec_tests/bf16_sqrt_v16/dut.cc b/test/unit_tests/aievec_tests/aie2/bf16_sqrt_v16/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_sqrt_v16/dut.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_sqrt_v16/dut.cc
diff --git a/test/unit_tests/aievec_tests/bf16_sqrt_v32/testbench.cc b/test/unit_tests/aievec_tests/aie2/bf16_sqrt_v16/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/bf16_sqrt_v32/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_sqrt_v16/testbench.cc
index 7278180744..3ef1b20420 100644
--- a/test/unit_tests/aievec_tests/bf16_sqrt_v32/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/bf16_sqrt_v16/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/bf16_sqrt_v32/bf16_sqrt.mlir b/test/unit_tests/aievec_tests/aie2/bf16_sqrt_v32/bf16_sqrt.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/bf16_sqrt_v32/bf16_sqrt.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16_sqrt_v32/bf16_sqrt.mlir
index 1f7dfa11ca..40d85c8374 100644
--- a/test/unit_tests/aievec_tests/bf16_sqrt_v32/bf16_sqrt.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16_sqrt_v32/bf16_sqrt.mlir
@@ -6,7 +6,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -D__AIE_ARCH__=20 -D__AIENGINE__ -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -D__AIE_ARCH__=20 -D__AIENGINE__ -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 // Cycle count: 2122
diff --git a/test/unit_tests/aievec_tests/bf16_sqrt_v32/defines.h b/test/unit_tests/aievec_tests/aie2/bf16_sqrt_v32/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_sqrt_v32/defines.h
rename to test/unit_tests/aievec_tests/aie2/bf16_sqrt_v32/defines.h
diff --git a/test/unit_tests/aievec_tests/bf16_sqrt_v32/dut.cc b/test/unit_tests/aievec_tests/aie2/bf16_sqrt_v32/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16_sqrt_v32/dut.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_sqrt_v32/dut.cc
diff --git a/test/unit_tests/aievec_tests/bf16_sqrt_v16/testbench.cc b/test/unit_tests/aievec_tests/aie2/bf16_sqrt_v32/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/bf16_sqrt_v16/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/bf16_sqrt_v32/testbench.cc
index 7278180744..3ef1b20420 100644
--- a/test/unit_tests/aievec_tests/bf16_sqrt_v16/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/bf16_sqrt_v32/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_add_elem/bf16xbf16_add_elem.mlir b/test/unit_tests/aievec_tests/aie2/bf16xbf16_add_elem/bf16xbf16_add_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/bf16xbf16_add_elem/bf16xbf16_add_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_add_elem/bf16xbf16_add_elem.mlir
index 7160d5f7e7..82bee4bf09 100644
--- a/test/unit_tests/aievec_tests/bf16xbf16_add_elem/bf16xbf16_add_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16xbf16_add_elem/bf16xbf16_add_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_add_elem/defines.h b/test/unit_tests/aievec_tests/aie2/bf16xbf16_add_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16xbf16_add_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_add_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_add_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/bf16xbf16_add_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16xbf16_add_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_add_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_add_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/bf16xbf16_add_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/bf16xbf16_add_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_add_elem/testbench.cc
index bee5585438..026a18ea71 100644
--- a/test/unit_tests/aievec_tests/bf16xbf16_add_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/bf16xbf16_add_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_max_elem/bf16xbf16_max_elem-llvm.mlir b/test/unit_tests/aievec_tests/aie2/bf16xbf16_max_elem/bf16xbf16_max_elem-llvm.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/bf16xbf16_max_elem/bf16xbf16_max_elem-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_max_elem/bf16xbf16_max_elem-llvm.mlir
index 825311efa4..9b666db50f 100644
--- a/test/unit_tests/aievec_tests/bf16xbf16_max_elem/bf16xbf16_max_elem-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16xbf16_max_elem/bf16xbf16_max_elem-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_max_elem/bf16xbf16_max_elem.mlir b/test/unit_tests/aievec_tests/aie2/bf16xbf16_max_elem/bf16xbf16_max_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/bf16xbf16_max_elem/bf16xbf16_max_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_max_elem/bf16xbf16_max_elem.mlir
index ac08368dd3..d3ad8b2ddb 100644
--- a/test/unit_tests/aievec_tests/bf16xbf16_max_elem/bf16xbf16_max_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16xbf16_max_elem/bf16xbf16_max_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=32" --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_max_elem/defines.h b/test/unit_tests/aievec_tests/aie2/bf16xbf16_max_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16xbf16_max_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_max_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_max_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/bf16xbf16_max_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16xbf16_max_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_max_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_max_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/bf16xbf16_max_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/bf16xbf16_max_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_max_elem/testbench.cc
index 83dd622010..be4a115b29 100644
--- a/test/unit_tests/aievec_tests/bf16xbf16_max_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/bf16xbf16_max_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_min_elem/bf16xbf16_min_elem-llvm.mlir b/test/unit_tests/aievec_tests/aie2/bf16xbf16_min_elem/bf16xbf16_min_elem-llvm.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/bf16xbf16_min_elem/bf16xbf16_min_elem-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_min_elem/bf16xbf16_min_elem-llvm.mlir
index 1e7760c2b3..26f47bc72b 100644
--- a/test/unit_tests/aievec_tests/bf16xbf16_min_elem/bf16xbf16_min_elem-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16xbf16_min_elem/bf16xbf16_min_elem-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_min_elem/bf16xbf16_min_elem.mlir b/test/unit_tests/aievec_tests/aie2/bf16xbf16_min_elem/bf16xbf16_min_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/bf16xbf16_min_elem/bf16xbf16_min_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_min_elem/bf16xbf16_min_elem.mlir
index f8daad5610..05c3247bf6 100644
--- a/test/unit_tests/aievec_tests/bf16xbf16_min_elem/bf16xbf16_min_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16xbf16_min_elem/bf16xbf16_min_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=32" --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_min_elem/defines.h b/test/unit_tests/aievec_tests/aie2/bf16xbf16_min_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16xbf16_min_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_min_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_min_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/bf16xbf16_min_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16xbf16_min_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_min_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_min_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/bf16xbf16_min_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/bf16xbf16_min_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_min_elem/testbench.cc
index 8822b4c78a..2636426d75 100644
--- a/test/unit_tests/aievec_tests/bf16xbf16_min_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/bf16xbf16_min_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_mul_elem/bf16xbf16_mul_elem-llvm-scalar.mlir b/test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem/bf16xbf16_mul_elem-llvm-scalar.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/bf16xbf16_mul_elem/bf16xbf16_mul_elem-llvm-scalar.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem/bf16xbf16_mul_elem-llvm-scalar.mlir
index 823d263843..2f7d1f4fa0 100644
--- a/test/unit_tests/aievec_tests/bf16xbf16_mul_elem/bf16xbf16_mul_elem-llvm-scalar.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem/bf16xbf16_mul_elem-llvm-scalar.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 // XFAIL: *
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_mul_elem/bf16xbf16_mul_elem-llvm.mlir b/test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem/bf16xbf16_mul_elem-llvm.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/bf16xbf16_mul_elem/bf16xbf16_mul_elem-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem/bf16xbf16_mul_elem-llvm.mlir
index 1e0e3ba99d..8814490e25 100644
--- a/test/unit_tests/aievec_tests/bf16xbf16_mul_elem/bf16xbf16_mul_elem-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem/bf16xbf16_mul_elem-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_mul_elem/bf16xbf16_mul_elem.mlir b/test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem/bf16xbf16_mul_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/bf16xbf16_mul_elem/bf16xbf16_mul_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem/bf16xbf16_mul_elem.mlir
index cf108ce97b..cb1dfec808 100644
--- a/test/unit_tests/aievec_tests/bf16xbf16_mul_elem/bf16xbf16_mul_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem/bf16xbf16_mul_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=16" --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_mul_elem/defines.h b/test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16xbf16_mul_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_mul_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16xbf16_mul_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_mul_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/bf16xbf16_mul_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem/testbench.cc
index d521a10aa9..125b74a502 100644
--- a/test/unit_tests/aievec_tests/bf16xbf16_mul_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_mul_elem_2/bf16xbf16_mul_elem-llvm.mlir b/test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem_2/bf16xbf16_mul_elem-llvm.mlir
similarity index 95%
rename from test/unit_tests/aievec_tests/bf16xbf16_mul_elem_2/bf16xbf16_mul_elem-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem_2/bf16xbf16_mul_elem-llvm.mlir
index 41b73ac156..16a92c43bd 100644
--- a/test/unit_tests/aievec_tests/bf16xbf16_mul_elem_2/bf16xbf16_mul_elem-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem_2/bf16xbf16_mul_elem-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_mul_elem_2/bf16xbf16_mul_elem.mlir b/test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem_2/bf16xbf16_mul_elem.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/bf16xbf16_mul_elem_2/bf16xbf16_mul_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem_2/bf16xbf16_mul_elem.mlir
index 7aed95c354..9fe50ddb00 100644
--- a/test/unit_tests/aievec_tests/bf16xbf16_mul_elem_2/bf16xbf16_mul_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem_2/bf16xbf16_mul_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_mul_elem_2/defines.h b/test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem_2/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16xbf16_mul_elem_2/defines.h
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem_2/defines.h
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_mul_elem_2/dut.cc b/test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem_2/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16xbf16_mul_elem_2/dut.cc
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem_2/dut.cc
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_mul_elem_2/testbench.cc b/test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem_2/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/bf16xbf16_mul_elem_2/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem_2/testbench.cc
index 69a532871e..c890e49e14 100644
--- a/test/unit_tests/aievec_tests/bf16xbf16_mul_elem_2/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/bf16xbf16_mul_elem_2/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_sel/bf16xbf16_sel.mlir b/test/unit_tests/aievec_tests/aie2/bf16xbf16_sel/bf16xbf16_sel.mlir
similarity index 92%
rename from test/unit_tests/aievec_tests/bf16xbf16_sel/bf16xbf16_sel.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_sel/bf16xbf16_sel.mlir
index cbd8e40706..0fd0cfadba 100644
--- a/test/unit_tests/aievec_tests/bf16xbf16_sel/bf16xbf16_sel.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16xbf16_sel/bf16xbf16_sel.mlir
@@ -2,7 +2,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_sel/defines.h b/test/unit_tests/aievec_tests/aie2/bf16xbf16_sel/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16xbf16_sel/defines.h
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_sel/defines.h
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_sel/dut.cc b/test/unit_tests/aievec_tests/aie2/bf16xbf16_sel/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16xbf16_sel/dut.cc
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_sel/dut.cc
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_sel/testbench.cc b/test/unit_tests/aievec_tests/aie2/bf16xbf16_sel/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/bf16xbf16_sel/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_sel/testbench.cc
index 9498797883..1ae46abd90 100644
--- a/test/unit_tests/aievec_tests/bf16xbf16_sel/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/bf16xbf16_sel/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_sub_elem/bf16xbf16_sub_elem.mlir b/test/unit_tests/aievec_tests/aie2/bf16xbf16_sub_elem/bf16xbf16_sub_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/bf16xbf16_sub_elem/bf16xbf16_sub_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_sub_elem/bf16xbf16_sub_elem.mlir
index 1b776d7d68..fc9639fdb1 100644
--- a/test/unit_tests/aievec_tests/bf16xbf16_sub_elem/bf16xbf16_sub_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16xbf16_sub_elem/bf16xbf16_sub_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_sub_elem/defines.h b/test/unit_tests/aievec_tests/aie2/bf16xbf16_sub_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16xbf16_sub_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_sub_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_sub_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/bf16xbf16_sub_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16xbf16_sub_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_sub_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/bf16xbf16_sub_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/bf16xbf16_sub_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/bf16xbf16_sub_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/bf16xbf16_sub_elem/testbench.cc
index a7d6d2b91b..aa3ffb9d4d 100644
--- a/test/unit_tests/aievec_tests/bf16xbf16_sub_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/bf16xbf16_sub_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/bf16xf32_add_elem/bf16xfloat_add_elem.mlir b/test/unit_tests/aievec_tests/aie2/bf16xf32_add_elem/bf16xfloat_add_elem.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/bf16xf32_add_elem/bf16xfloat_add_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/bf16xf32_add_elem/bf16xfloat_add_elem.mlir
index b083b94317..b0ddaf87c8 100644
--- a/test/unit_tests/aievec_tests/bf16xf32_add_elem/bf16xfloat_add_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/bf16xf32_add_elem/bf16xfloat_add_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/bf16xf32_add_elem/defines.h b/test/unit_tests/aievec_tests/aie2/bf16xf32_add_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16xf32_add_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/bf16xf32_add_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/bf16xf32_add_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/bf16xf32_add_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/bf16xf32_add_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/bf16xf32_add_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/bf16xf32_add_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/bf16xf32_add_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/bf16xf32_add_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/bf16xf32_add_elem/testbench.cc
index 4150e7b007..cd173ae23e 100644
--- a/test/unit_tests/aievec_tests/bf16xf32_add_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/bf16xf32_add_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/float_add_reduce/defines.h b/test/unit_tests/aievec_tests/aie2/float_add_reduce/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/float_add_reduce/defines.h
rename to test/unit_tests/aievec_tests/aie2/float_add_reduce/defines.h
diff --git a/test/unit_tests/aievec_tests/float_add_reduce/dut.cc b/test/unit_tests/aievec_tests/aie2/float_add_reduce/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/float_add_reduce/dut.cc
rename to test/unit_tests/aievec_tests/aie2/float_add_reduce/dut.cc
diff --git a/test/unit_tests/aievec_tests/float_add_reduce/float_add_reduce.mlir b/test/unit_tests/aievec_tests/aie2/float_add_reduce/float_add_reduce.mlir
similarity index 92%
rename from test/unit_tests/aievec_tests/float_add_reduce/float_add_reduce.mlir
rename to test/unit_tests/aievec_tests/aie2/float_add_reduce/float_add_reduce.mlir
index 3f44b5f81e..8b5928b86a 100644
--- a/test/unit_tests/aievec_tests/float_add_reduce/float_add_reduce.mlir
+++ b/test/unit_tests/aievec_tests/aie2/float_add_reduce/float_add_reduce.mlir
@@ -2,7 +2,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/float_add_reduce/testbench.cc b/test/unit_tests/aievec_tests/aie2/float_add_reduce/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/float_add_reduce/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/float_add_reduce/testbench.cc
index b3ef49c84b..316fc3f04d 100644
--- a/test/unit_tests/aievec_tests/float_add_reduce/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/float_add_reduce/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/float_max_reduce/defines.h b/test/unit_tests/aievec_tests/aie2/float_max_reduce/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/float_max_reduce/defines.h
rename to test/unit_tests/aievec_tests/aie2/float_max_reduce/defines.h
diff --git a/test/unit_tests/aievec_tests/float_max_reduce/dut.cc b/test/unit_tests/aievec_tests/aie2/float_max_reduce/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/float_max_reduce/dut.cc
rename to test/unit_tests/aievec_tests/aie2/float_max_reduce/dut.cc
diff --git a/test/unit_tests/aievec_tests/float_max_reduce/float_max_reduce.mlir b/test/unit_tests/aievec_tests/aie2/float_max_reduce/float_max_reduce.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/float_max_reduce/float_max_reduce.mlir
rename to test/unit_tests/aievec_tests/aie2/float_max_reduce/float_max_reduce.mlir
index 97450ec225..c757eeaad8 100644
--- a/test/unit_tests/aievec_tests/float_max_reduce/float_max_reduce.mlir
+++ b/test/unit_tests/aievec_tests/aie2/float_max_reduce/float_max_reduce.mlir
@@ -2,7 +2,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/float_max_reduce/testbench.cc b/test/unit_tests/aievec_tests/aie2/float_max_reduce/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/float_max_reduce/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/float_max_reduce/testbench.cc
index 8a905d5ce1..78c716c1a0 100644
--- a/test/unit_tests/aievec_tests/float_max_reduce/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/float_max_reduce/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/float_min_reduce/defines.h b/test/unit_tests/aievec_tests/aie2/float_min_reduce/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/float_min_reduce/defines.h
rename to test/unit_tests/aievec_tests/aie2/float_min_reduce/defines.h
diff --git a/test/unit_tests/aievec_tests/float_min_reduce/dut.cc b/test/unit_tests/aievec_tests/aie2/float_min_reduce/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/float_min_reduce/dut.cc
rename to test/unit_tests/aievec_tests/aie2/float_min_reduce/dut.cc
diff --git a/test/unit_tests/aievec_tests/float_min_reduce/float_min_reduce.mlir b/test/unit_tests/aievec_tests/aie2/float_min_reduce/float_min_reduce.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/float_min_reduce/float_min_reduce.mlir
rename to test/unit_tests/aievec_tests/aie2/float_min_reduce/float_min_reduce.mlir
index a63e9207eb..f7b4319be0 100644
--- a/test/unit_tests/aievec_tests/float_min_reduce/float_min_reduce.mlir
+++ b/test/unit_tests/aievec_tests/aie2/float_min_reduce/float_min_reduce.mlir
@@ -2,7 +2,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/float_min_reduce/testbench.cc b/test/unit_tests/aievec_tests/aie2/float_min_reduce/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/float_min_reduce/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/float_min_reduce/testbench.cc
index dfe0e65ab0..f57cc63133 100644
--- a/test/unit_tests/aievec_tests/float_min_reduce/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/float_min_reduce/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/floatxfloat_add_elem/defines.h b/test/unit_tests/aievec_tests/aie2/floatxfloat_add_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/floatxfloat_add_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_add_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/floatxfloat_add_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/floatxfloat_add_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/floatxfloat_add_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_add_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/floatxfloat_add_elem/floatxfloat_add_elem.mlir b/test/unit_tests/aievec_tests/aie2/floatxfloat_add_elem/floatxfloat_add_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/floatxfloat_add_elem/floatxfloat_add_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_add_elem/floatxfloat_add_elem.mlir
index 5c641b150b..15f3aff507 100644
--- a/test/unit_tests/aievec_tests/floatxfloat_add_elem/floatxfloat_add_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/floatxfloat_add_elem/floatxfloat_add_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/floatxfloat_add_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/floatxfloat_add_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/floatxfloat_add_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_add_elem/testbench.cc
index 929dd4b44e..9f1de3a14c 100644
--- a/test/unit_tests/aievec_tests/floatxfloat_add_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/floatxfloat_add_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/floatxfloat_max_elem/defines.h b/test/unit_tests/aievec_tests/aie2/floatxfloat_max_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/floatxfloat_max_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_max_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/floatxfloat_max_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/floatxfloat_max_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/floatxfloat_max_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_max_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/floatxfloat_max_elem/floatxfloat_max_elem.mlir b/test/unit_tests/aievec_tests/aie2/floatxfloat_max_elem/floatxfloat_max_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/floatxfloat_max_elem/floatxfloat_max_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_max_elem/floatxfloat_max_elem.mlir
index 918809704d..1c739eaad7 100644
--- a/test/unit_tests/aievec_tests/floatxfloat_max_elem/floatxfloat_max_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/floatxfloat_max_elem/floatxfloat_max_elem.mlir
@@ -2,7 +2,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/floatxfloat_max_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/floatxfloat_max_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/floatxfloat_max_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_max_elem/testbench.cc
index ae8f5258e9..304759ac64 100644
--- a/test/unit_tests/aievec_tests/floatxfloat_max_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/floatxfloat_max_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/floatxfloat_min_elem/defines.h b/test/unit_tests/aievec_tests/aie2/floatxfloat_min_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/floatxfloat_min_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_min_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/floatxfloat_min_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/floatxfloat_min_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/floatxfloat_min_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_min_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/floatxfloat_min_elem/floatxfloat_min_elem.mlir b/test/unit_tests/aievec_tests/aie2/floatxfloat_min_elem/floatxfloat_min_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/floatxfloat_min_elem/floatxfloat_min_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_min_elem/floatxfloat_min_elem.mlir
index 7fc4736606..56827444a0 100644
--- a/test/unit_tests/aievec_tests/floatxfloat_min_elem/floatxfloat_min_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/floatxfloat_min_elem/floatxfloat_min_elem.mlir
@@ -2,7 +2,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/floatxfloat_min_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/floatxfloat_min_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/floatxfloat_min_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_min_elem/testbench.cc
index ee89a6ee14..f8cbe4bfe6 100644
--- a/test/unit_tests/aievec_tests/floatxfloat_min_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/floatxfloat_min_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/floatxfloat_mul_elem/defines.h b/test/unit_tests/aievec_tests/aie2/floatxfloat_mul_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/floatxfloat_mul_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_mul_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/floatxfloat_mul_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/floatxfloat_mul_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/floatxfloat_mul_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_mul_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/floatxfloat_mul_elem/floatxfloat_mul_elem-llvm-scalar.mlir b/test/unit_tests/aievec_tests/aie2/floatxfloat_mul_elem/floatxfloat_mul_elem-llvm-scalar.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/floatxfloat_mul_elem/floatxfloat_mul_elem-llvm-scalar.mlir
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_mul_elem/floatxfloat_mul_elem-llvm-scalar.mlir
index 17e8be81e5..7167d5ba76 100644
--- a/test/unit_tests/aievec_tests/floatxfloat_mul_elem/floatxfloat_mul_elem-llvm-scalar.mlir
+++ b/test/unit_tests/aievec_tests/aie2/floatxfloat_mul_elem/floatxfloat_mul_elem-llvm-scalar.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 // XFAIL: *
diff --git a/test/unit_tests/aievec_tests/floatxfloat_mul_elem/floatxfloat_mul_elem-llvm.mlir b/test/unit_tests/aievec_tests/aie2/floatxfloat_mul_elem/floatxfloat_mul_elem-llvm.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/floatxfloat_mul_elem/floatxfloat_mul_elem-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_mul_elem/floatxfloat_mul_elem-llvm.mlir
index b15fc9adf7..3d66369ea2 100644
--- a/test/unit_tests/aievec_tests/floatxfloat_mul_elem/floatxfloat_mul_elem-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/floatxfloat_mul_elem/floatxfloat_mul_elem-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/floatxfloat_mul_elem/floatxfloat_mul_elem.mlir b/test/unit_tests/aievec_tests/aie2/floatxfloat_mul_elem/floatxfloat_mul_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/floatxfloat_mul_elem/floatxfloat_mul_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_mul_elem/floatxfloat_mul_elem.mlir
index 73eb994816..468bbc8f41 100644
--- a/test/unit_tests/aievec_tests/floatxfloat_mul_elem/floatxfloat_mul_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/floatxfloat_mul_elem/floatxfloat_mul_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=16" --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/floatxfloat_mul_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/floatxfloat_mul_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/floatxfloat_mul_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_mul_elem/testbench.cc
index 1c51360146..821eab33fa 100644
--- a/test/unit_tests/aievec_tests/floatxfloat_mul_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/floatxfloat_mul_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/floatxfloat_sel/defines.h b/test/unit_tests/aievec_tests/aie2/floatxfloat_sel/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/floatxfloat_sel/defines.h
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_sel/defines.h
diff --git a/test/unit_tests/aievec_tests/floatxfloat_sel/dut.cc b/test/unit_tests/aievec_tests/aie2/floatxfloat_sel/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/floatxfloat_sel/dut.cc
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_sel/dut.cc
diff --git a/test/unit_tests/aievec_tests/floatxfloat_sel/floatxfloat_sel.mlir b/test/unit_tests/aievec_tests/aie2/floatxfloat_sel/floatxfloat_sel.mlir
similarity index 92%
rename from test/unit_tests/aievec_tests/floatxfloat_sel/floatxfloat_sel.mlir
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_sel/floatxfloat_sel.mlir
index d2ca288cca..d5598216f1 100644
--- a/test/unit_tests/aievec_tests/floatxfloat_sel/floatxfloat_sel.mlir
+++ b/test/unit_tests/aievec_tests/aie2/floatxfloat_sel/floatxfloat_sel.mlir
@@ -2,7 +2,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/floatxfloat_sel/testbench.cc b/test/unit_tests/aievec_tests/aie2/floatxfloat_sel/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/floatxfloat_sel/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_sel/testbench.cc
index e08665a1e5..7ba1db5ea1 100644
--- a/test/unit_tests/aievec_tests/floatxfloat_sel/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/floatxfloat_sel/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/floatxfloat_sub_elem/defines.h b/test/unit_tests/aievec_tests/aie2/floatxfloat_sub_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/floatxfloat_sub_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_sub_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/floatxfloat_sub_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/floatxfloat_sub_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/floatxfloat_sub_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_sub_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/floatxfloat_sub_elem/floatxfloat_sub_elem.mlir b/test/unit_tests/aievec_tests/aie2/floatxfloat_sub_elem/floatxfloat_sub_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/floatxfloat_sub_elem/floatxfloat_sub_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_sub_elem/floatxfloat_sub_elem.mlir
index f864155be7..1727abca0b 100644
--- a/test/unit_tests/aievec_tests/floatxfloat_sub_elem/floatxfloat_sub_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/floatxfloat_sub_elem/floatxfloat_sub_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/floatxfloat_sub_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/floatxfloat_sub_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/floatxfloat_sub_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/floatxfloat_sub_elem/testbench.cc
index 2bd43ba037..fc32b6b613 100644
--- a/test/unit_tests/aievec_tests/floatxfloat_sub_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/floatxfloat_sub_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i16_abs_v32_2/defines.h b/test/unit_tests/aievec_tests/aie2/i16_abs_v32_2/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i16_abs_v32_2/defines.h
rename to test/unit_tests/aievec_tests/aie2/i16_abs_v32_2/defines.h
diff --git a/test/unit_tests/aievec_tests/i16_abs_v32_2/dut.cc b/test/unit_tests/aievec_tests/aie2/i16_abs_v32_2/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16_abs_v32_2/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i16_abs_v32_2/dut.cc
diff --git a/test/unit_tests/aievec_tests/i16_abs_v32_2/i16_abs.mlir b/test/unit_tests/aievec_tests/aie2/i16_abs_v32_2/i16_abs.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/i16_abs_v32_2/i16_abs.mlir
rename to test/unit_tests/aievec_tests/aie2/i16_abs_v32_2/i16_abs.mlir
index 02ff34e209..f9d6fdb743 100644
--- a/test/unit_tests/aievec_tests/i16_abs_v32_2/i16_abs.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16_abs_v32_2/i16_abs.mlir
@@ -2,7 +2,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -D__AIE_ARCH__=20 -D__AIENGINE__ -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -D__AIE_ARCH__=20 -D__AIENGINE__ -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 // Cycle count: 86
diff --git a/test/unit_tests/aievec_tests/i16_abs_v32_2/testbench.cc b/test/unit_tests/aievec_tests/aie2/i16_abs_v32_2/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i16_abs_v32_2/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i16_abs_v32_2/testbench.cc
index 429464aaa6..90bbc5470c 100644
--- a/test/unit_tests/aievec_tests/i16_abs_v32_2/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i16_abs_v32_2/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i16_add_reduce/defines.h b/test/unit_tests/aievec_tests/aie2/i16_add_reduce/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i16_add_reduce/defines.h
rename to test/unit_tests/aievec_tests/aie2/i16_add_reduce/defines.h
diff --git a/test/unit_tests/aievec_tests/i16_add_reduce/dut.cc b/test/unit_tests/aievec_tests/aie2/i16_add_reduce/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16_add_reduce/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i16_add_reduce/dut.cc
diff --git a/test/unit_tests/aievec_tests/i16_add_reduce/i16_add_reduce.mlir b/test/unit_tests/aievec_tests/aie2/i16_add_reduce/i16_add_reduce.mlir
similarity index 92%
rename from test/unit_tests/aievec_tests/i16_add_reduce/i16_add_reduce.mlir
rename to test/unit_tests/aievec_tests/aie2/i16_add_reduce/i16_add_reduce.mlir
index 10799400ac..8580a84111 100644
--- a/test/unit_tests/aievec_tests/i16_add_reduce/i16_add_reduce.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16_add_reduce/i16_add_reduce.mlir
@@ -2,7 +2,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i16_add_reduce/testbench.cc b/test/unit_tests/aievec_tests/aie2/i16_add_reduce/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i16_add_reduce/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i16_add_reduce/testbench.cc
index b85dd08b3c..a9b8f3218a 100644
--- a/test/unit_tests/aievec_tests/i16_add_reduce/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i16_add_reduce/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i16_i32_add_reduce/defines.h b/test/unit_tests/aievec_tests/aie2/i16_i32_add_reduce/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i16_i32_add_reduce/defines.h
rename to test/unit_tests/aievec_tests/aie2/i16_i32_add_reduce/defines.h
diff --git a/test/unit_tests/aievec_tests/i16_i32_add_reduce/dut.cc b/test/unit_tests/aievec_tests/aie2/i16_i32_add_reduce/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16_i32_add_reduce/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i16_i32_add_reduce/dut.cc
diff --git a/test/unit_tests/aievec_tests/i16_i32_add_reduce/i16_i32_add_reduce.mlir b/test/unit_tests/aievec_tests/aie2/i16_i32_add_reduce/i16_i32_add_reduce.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/i16_i32_add_reduce/i16_i32_add_reduce.mlir
rename to test/unit_tests/aievec_tests/aie2/i16_i32_add_reduce/i16_i32_add_reduce.mlir
index df8606da2b..b3ae0f2a45 100644
--- a/test/unit_tests/aievec_tests/i16_i32_add_reduce/i16_i32_add_reduce.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16_i32_add_reduce/i16_i32_add_reduce.mlir
@@ -2,7 +2,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i16_i32_add_reduce/testbench.cc b/test/unit_tests/aievec_tests/aie2/i16_i32_add_reduce/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i16_i32_add_reduce/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i16_i32_add_reduce/testbench.cc
index bb58b250da..f4dfc0c6a8 100644
--- a/test/unit_tests/aievec_tests/i16_i32_add_reduce/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i16_i32_add_reduce/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i16_max_reduce/defines.h b/test/unit_tests/aievec_tests/aie2/i16_max_reduce/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i16_max_reduce/defines.h
rename to test/unit_tests/aievec_tests/aie2/i16_max_reduce/defines.h
diff --git a/test/unit_tests/aievec_tests/i16_max_reduce/dut.cc b/test/unit_tests/aievec_tests/aie2/i16_max_reduce/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16_max_reduce/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i16_max_reduce/dut.cc
diff --git a/test/unit_tests/aievec_tests/i16_max_reduce/i16_max_reduce-llvm.mlir b/test/unit_tests/aievec_tests/aie2/i16_max_reduce/i16_max_reduce-llvm.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i16_max_reduce/i16_max_reduce-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/i16_max_reduce/i16_max_reduce-llvm.mlir
index 5b2cc863d3..e2c3b0c920 100644
--- a/test/unit_tests/aievec_tests/i16_max_reduce/i16_max_reduce-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16_max_reduce/i16_max_reduce-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i16_max_reduce/i16_max_reduce.mlir b/test/unit_tests/aievec_tests/aie2/i16_max_reduce/i16_max_reduce.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i16_max_reduce/i16_max_reduce.mlir
rename to test/unit_tests/aievec_tests/aie2/i16_max_reduce/i16_max_reduce.mlir
index 9262d9f545..7743121d82 100644
--- a/test/unit_tests/aievec_tests/i16_max_reduce/i16_max_reduce.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16_max_reduce/i16_max_reduce.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i16_max_reduce/testbench.cc b/test/unit_tests/aievec_tests/aie2/i16_max_reduce/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i16_max_reduce/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i16_max_reduce/testbench.cc
index b2efdc8578..e9be02e519 100644
--- a/test/unit_tests/aievec_tests/i16_max_reduce/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i16_max_reduce/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i16_min_reduce/defines.h b/test/unit_tests/aievec_tests/aie2/i16_min_reduce/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i16_min_reduce/defines.h
rename to test/unit_tests/aievec_tests/aie2/i16_min_reduce/defines.h
diff --git a/test/unit_tests/aievec_tests/i16_min_reduce/dut.cc b/test/unit_tests/aievec_tests/aie2/i16_min_reduce/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16_min_reduce/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i16_min_reduce/dut.cc
diff --git a/test/unit_tests/aievec_tests/i16_min_reduce/i16_min_reduce-llvm.mlir b/test/unit_tests/aievec_tests/aie2/i16_min_reduce/i16_min_reduce-llvm.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i16_min_reduce/i16_min_reduce-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/i16_min_reduce/i16_min_reduce-llvm.mlir
index 4fbe03c27e..5de5c5789c 100644
--- a/test/unit_tests/aievec_tests/i16_min_reduce/i16_min_reduce-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16_min_reduce/i16_min_reduce-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i16_min_reduce/i16_min_reduce.mlir b/test/unit_tests/aievec_tests/aie2/i16_min_reduce/i16_min_reduce.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i16_min_reduce/i16_min_reduce.mlir
rename to test/unit_tests/aievec_tests/aie2/i16_min_reduce/i16_min_reduce.mlir
index 34c38eccba..9a4dfce3a1 100644
--- a/test/unit_tests/aievec_tests/i16_min_reduce/i16_min_reduce.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16_min_reduce/i16_min_reduce.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i16_min_reduce/testbench.cc b/test/unit_tests/aievec_tests/aie2/i16_min_reduce/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i16_min_reduce/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i16_min_reduce/testbench.cc
index 52f1cee4fd..20353f0e0c 100644
--- a/test/unit_tests/aievec_tests/i16_min_reduce/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i16_min_reduce/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i16xi16_add_elem/defines.h b/test/unit_tests/aievec_tests/aie2/i16xi16_add_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_add_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/i16xi16_add_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/i16xi16_add_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_add_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_add_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_add_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_add_elem/i16xi16_add_elem.mlir b/test/unit_tests/aievec_tests/aie2/i16xi16_add_elem/i16xi16_add_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/i16xi16_add_elem/i16xi16_add_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/i16xi16_add_elem/i16xi16_add_elem.mlir
index 050a872ef7..3ca70bd399 100644
--- a/test/unit_tests/aievec_tests/i16xi16_add_elem/i16xi16_add_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_add_elem/i16xi16_add_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i16xi16_add_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_add_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i16xi16_add_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_add_elem/testbench.cc
index 7e637aa830..f5ae4d335a 100644
--- a/test/unit_tests/aievec_tests/i16xi16_add_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_add_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i16xi16_add_elem_2/defines.h b/test/unit_tests/aievec_tests/aie2/i16xi16_add_elem_2/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_add_elem_2/defines.h
rename to test/unit_tests/aievec_tests/aie2/i16xi16_add_elem_2/defines.h
diff --git a/test/unit_tests/aievec_tests/i16xi16_add_elem_2/dut.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_add_elem_2/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_add_elem_2/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_add_elem_2/dut.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_add_elem_2/i16xi16_add_elem.mlir b/test/unit_tests/aievec_tests/aie2/i16xi16_add_elem_2/i16xi16_add_elem.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i16xi16_add_elem_2/i16xi16_add_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/i16xi16_add_elem_2/i16xi16_add_elem.mlir
index ac6fd4ca94..bd3a284ccf 100644
--- a/test/unit_tests/aievec_tests/i16xi16_add_elem_2/i16xi16_add_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_add_elem_2/i16xi16_add_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i16xi16_add_elem_2/testbench.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_add_elem_2/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i16xi16_add_elem_2/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_add_elem_2/testbench.cc
index 852e694800..7de8ebc049 100644
--- a/test/unit_tests/aievec_tests/i16xi16_add_elem_2/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_add_elem_2/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml/conv2d_i16_after_polygeist.mlir b/test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml/conv2d_i16_after_polygeist.mlir
similarity index 88%
rename from test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml/conv2d_i16_after_polygeist.mlir
rename to test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml/conv2d_i16_after_polygeist.mlir
index e7d4cdbe69..7e599d4a37 100644
--- a/test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml/conv2d_i16_after_polygeist.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml/conv2d_i16_after_polygeist.mlir
@@ -3,9 +3,9 @@
 
 // REQUIRES: valid_xchess_license
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=16" -aieml=true --aie-vectorize="shift=10 zero-offset=4" | aie-translate -aie2=true --aievec-to-cpp -o gen_aie-ml.cc
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. %S/testbench.cc work/kernel.o
-// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out"
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/kernel.o
+// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out"
 
 module attributes {dlti.dl_spec = #dlti.dl_spec<#dlti.dl_entry<"dlti.endianness", "little">, #dlti.dl_entry<i64, dense<64> : vector<2xi64>>, #dlti.dl_entry<f80, dense<128> : vector<2xi64>>, #dlti.dl_entry<i1, dense<8> : vector<2xi64>>, #dlti.dl_entry<i8, dense<8> : vector<2xi64>>, #dlti.dl_entry<i16, dense<16> : vector<2xi64>>, #dlti.dl_entry<i32, dense<32> : vector<2xi64>>, #dlti.dl_entry<f16, dense<16> : vector<2xi64>>, #dlti.dl_entry<f64, dense<64> : vector<2xi64>>, #dlti.dl_entry<f128, dense<128> : vector<2xi64>>>, llvm.data_layout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128", llvm.target_triple = "x86_64-unknown-linux-gnu", "polygeist.target-cpu" = "x86-64", "polygeist.target-features" = "+cx8,+fxsr,+mmx,+sse,+sse2,+x87", "polygeist.tune-cpu" = "generic"} {
   func.func @conv2d(%arg0: memref<?x288xi16>, %arg1: memref<?xi16>, %arg2: memref<?x256xi16>) attributes {llvm.linkage = #llvm.linkage<external>} {
diff --git a/test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml/data/refImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml/data/refImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml/data/refImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml/data/refImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml/gen_aie-ml.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml/gen_aie-ml.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml/gen_aie-ml.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml/gen_aie-ml.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml/kernel.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml/kernel.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml/kernel.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml/kernel.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml/testbench.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml/testbench.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml/testbench.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml/testbench.h b/test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml/testbench.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml/testbench.h
rename to test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml/testbench.h
diff --git a/test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/conv2d_i16_after_polygeist_2.mlir b/test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/conv2d_i16_after_polygeist_2.mlir
similarity index 88%
rename from test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/conv2d_i16_after_polygeist_2.mlir
rename to test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/conv2d_i16_after_polygeist_2.mlir
index 14d5c30351..0dc82acebe 100644
--- a/test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/conv2d_i16_after_polygeist_2.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/conv2d_i16_after_polygeist_2.mlir
@@ -3,9 +3,9 @@
 
 // REQUIRES: valid_xchess_license
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=16" -aieml=true --aie-vectorize="shift=10 zero-offset=4" | aie-translate -aie2=true --aievec-to-cpp -o gen_aie-ml.cc
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. %S/testbench.cc work/kernel.o
-// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out"
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/kernel.o
+// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out"
 
 module attributes {dlti.dl_spec = #dlti.dl_spec<#dlti.dl_entry<"dlti.endianness", "little">, #dlti.dl_entry<i64, dense<64> : vector<2xi64>>, #dlti.dl_entry<f80, dense<128> : vector<2xi64>>, #dlti.dl_entry<i1, dense<8> : vector<2xi64>>, #dlti.dl_entry<i8, dense<8> : vector<2xi64>>, #dlti.dl_entry<i16, dense<16> : vector<2xi64>>, #dlti.dl_entry<i32, dense<32> : vector<2xi64>>, #dlti.dl_entry<f16, dense<16> : vector<2xi64>>, #dlti.dl_entry<f64, dense<64> : vector<2xi64>>, #dlti.dl_entry<f128, dense<128> : vector<2xi64>>>, llvm.data_layout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128", llvm.target_triple = "x86_64-unknown-linux-gnu", "polygeist.target-cpu" = "x86-64", "polygeist.target-features" = "+cx8,+fxsr,+mmx,+sse,+sse2,+x87", "polygeist.tune-cpu" = "generic"} {
   func.func @conv2d(%arg0: memref<?x288xi16>, %arg1: memref<?xi16>, %arg2: memref<?x256xi32>) attributes {llvm.linkage = #llvm.linkage<external>} {
diff --git a/test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/data/kernelAndInImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/data/kernelAndInImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/data/kernelAndInImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/data/kernelAndInImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/data/refImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/data/refImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/data/refImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/data/refImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/gen_aie-ml.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/gen_aie-ml.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/gen_aie-ml.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/gen_aie-ml.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/kernel.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/kernel.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/kernel.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/kernel.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/testbench.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/testbench.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/testbench.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/testbench.h b/test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/testbench.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/testbench.h
rename to test/unit_tests/aievec_tests/aie2/i16xi16_conv2d_1x3_after_polygeist_aie-ml_2/testbench.h
diff --git a/test/unit_tests/aievec_tests/i16xi16_gemm/data/matrix_a_test.txt b/test/unit_tests/aievec_tests/aie2/i16xi16_gemm/data/matrix_a_test.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_gemm/data/matrix_a_test.txt
rename to test/unit_tests/aievec_tests/aie2/i16xi16_gemm/data/matrix_a_test.txt
diff --git a/test/unit_tests/aievec_tests/i16xi16_gemm/data/matrix_b_test.txt b/test/unit_tests/aievec_tests/aie2/i16xi16_gemm/data/matrix_b_test.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_gemm/data/matrix_b_test.txt
rename to test/unit_tests/aievec_tests/aie2/i16xi16_gemm/data/matrix_b_test.txt
diff --git a/test/unit_tests/aievec_tests/i16xi16_gemm/data/matrix_c_test.txt b/test/unit_tests/aievec_tests/aie2/i16xi16_gemm/data/matrix_c_test.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_gemm/data/matrix_c_test.txt
rename to test/unit_tests/aievec_tests/aie2/i16xi16_gemm/data/matrix_c_test.txt
diff --git a/test/unit_tests/aievec_tests/i16xi16_gemm/gemm64_int16_unroll32.mlir b/test/unit_tests/aievec_tests/aie2/i16xi16_gemm/gemm64_int16_unroll32.mlir
similarity index 97%
rename from test/unit_tests/aievec_tests/i16xi16_gemm/gemm64_int16_unroll32.mlir
rename to test/unit_tests/aievec_tests/aie2/i16xi16_gemm/gemm64_int16_unroll32.mlir
index ad36f578b6..03d23f3258 100644
--- a/test/unit_tests/aievec_tests/i16xi16_gemm/gemm64_int16_unroll32.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_gemm/gemm64_int16_unroll32.mlir
@@ -1,9 +1,9 @@
 // REQUIRES: valid_xchess_license
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=32" -aieml=true --aie-vectorize | aie-translate -aie2=true --aievec-to-cpp -o gen_aie-ml.cc
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=32" --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o gen_aie-ml.cc
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. %S/testbench.cc work/kernel.o
-// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out"
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/kernel.o
+// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out"
 
 module {
   func.func @matmul(%arg0: memref<64x64xi16>, %arg1: memref<64x64xi16>, %arg2: memref<64x64xi16>) {
diff --git a/test/unit_tests/aievec_tests/i16xi16_gemm/gen_aie-ml.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_gemm/gen_aie-ml.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_gemm/gen_aie-ml.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_gemm/gen_aie-ml.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_gemm/kernel.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_gemm/kernel.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_gemm/kernel.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_gemm/kernel.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_gemm/testbench.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_gemm/testbench.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_gemm/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_gemm/testbench.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_gemm/testbench.h b/test/unit_tests/aievec_tests/aie2/i16xi16_gemm/testbench.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_gemm/testbench.h
rename to test/unit_tests/aievec_tests/aie2/i16xi16_gemm/testbench.h
diff --git a/test/unit_tests/aievec_tests/i16xi16_gemm_after_polygeist/data/matrix_a_test.txt b/test/unit_tests/aievec_tests/aie2/i16xi16_gemm_after_polygeist/data/matrix_a_test.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_gemm_after_polygeist/data/matrix_a_test.txt
rename to test/unit_tests/aievec_tests/aie2/i16xi16_gemm_after_polygeist/data/matrix_a_test.txt
diff --git a/test/unit_tests/aievec_tests/i16xi16_gemm_after_polygeist/data/matrix_b_test.txt b/test/unit_tests/aievec_tests/aie2/i16xi16_gemm_after_polygeist/data/matrix_b_test.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_gemm_after_polygeist/data/matrix_b_test.txt
rename to test/unit_tests/aievec_tests/aie2/i16xi16_gemm_after_polygeist/data/matrix_b_test.txt
diff --git a/test/unit_tests/aievec_tests/i16xi16_gemm_after_polygeist/data/matrix_c_test.txt b/test/unit_tests/aievec_tests/aie2/i16xi16_gemm_after_polygeist/data/matrix_c_test.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_gemm_after_polygeist/data/matrix_c_test.txt
rename to test/unit_tests/aievec_tests/aie2/i16xi16_gemm_after_polygeist/data/matrix_c_test.txt
diff --git a/test/unit_tests/aievec_tests/i16xi16_gemm_after_polygeist/gemm64_int16_unroll32_after_polygeist.mlir b/test/unit_tests/aievec_tests/aie2/i16xi16_gemm_after_polygeist/gemm64_int16_unroll32_after_polygeist.mlir
similarity index 98%
rename from test/unit_tests/aievec_tests/i16xi16_gemm_after_polygeist/gemm64_int16_unroll32_after_polygeist.mlir
rename to test/unit_tests/aievec_tests/aie2/i16xi16_gemm_after_polygeist/gemm64_int16_unroll32_after_polygeist.mlir
index 8db71aa64e..8952ff81f3 100644
--- a/test/unit_tests/aievec_tests/i16xi16_gemm_after_polygeist/gemm64_int16_unroll32_after_polygeist.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_gemm_after_polygeist/gemm64_int16_unroll32_after_polygeist.mlir
@@ -1,9 +1,9 @@
 // REQUIRES: valid_xchess_license
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=32" -aieml=true --aie-vectorize | aie-translate -aie2=true --aievec-to-cpp -o gen_aie-ml.cc
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=32" --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o gen_aie-ml.cc
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. %S/testbench.cc work/kernel.o
-// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out"
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/kernel.o
+// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out"
 
 // XFAIL: *
 
diff --git a/test/unit_tests/aievec_tests/i16xi16_gemm_after_polygeist/gen_aie-ml.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_gemm_after_polygeist/gen_aie-ml.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_gemm_after_polygeist/gen_aie-ml.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_gemm_after_polygeist/gen_aie-ml.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_gemm_after_polygeist/kernel.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_gemm_after_polygeist/kernel.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_gemm_after_polygeist/kernel.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_gemm_after_polygeist/kernel.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_gemm_after_polygeist/testbench.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_gemm_after_polygeist/testbench.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_gemm_after_polygeist/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_gemm_after_polygeist/testbench.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_gemm_after_polygeist/testbench.h b/test/unit_tests/aievec_tests/aie2/i16xi16_gemm_after_polygeist/testbench.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_gemm_after_polygeist/testbench.h
rename to test/unit_tests/aievec_tests/aie2/i16xi16_gemm_after_polygeist/testbench.h
diff --git a/test/unit_tests/aievec_tests/i16xi16_max_elem/defines.h b/test/unit_tests/aievec_tests/aie2/i16xi16_max_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_max_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/i16xi16_max_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/i16xi16_max_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_max_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_max_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_max_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_max_elem/i16xi16_max_elem-llvm.mlir b/test/unit_tests/aievec_tests/aie2/i16xi16_max_elem/i16xi16_max_elem-llvm.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i16xi16_max_elem/i16xi16_max_elem-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/i16xi16_max_elem/i16xi16_max_elem-llvm.mlir
index c1d3d88390..a76a942656 100644
--- a/test/unit_tests/aievec_tests/i16xi16_max_elem/i16xi16_max_elem-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_max_elem/i16xi16_max_elem-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i16xi16_max_elem/i16xi16_max_elem.mlir b/test/unit_tests/aievec_tests/aie2/i16xi16_max_elem/i16xi16_max_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/i16xi16_max_elem/i16xi16_max_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/i16xi16_max_elem/i16xi16_max_elem.mlir
index fe6ea06858..6550b9f506 100644
--- a/test/unit_tests/aievec_tests/i16xi16_max_elem/i16xi16_max_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_max_elem/i16xi16_max_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=32" --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i16xi16_max_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_max_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i16xi16_max_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_max_elem/testbench.cc
index de145a5642..dc29e4bd91 100644
--- a/test/unit_tests/aievec_tests/i16xi16_max_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_max_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i16xi16_min_elem/defines.h b/test/unit_tests/aievec_tests/aie2/i16xi16_min_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_min_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/i16xi16_min_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/i16xi16_min_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_min_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_min_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_min_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_min_elem/i16xi16_min_elem-llvm.mlir b/test/unit_tests/aievec_tests/aie2/i16xi16_min_elem/i16xi16_min_elem-llvm.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i16xi16_min_elem/i16xi16_min_elem-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/i16xi16_min_elem/i16xi16_min_elem-llvm.mlir
index dfdf3d3db0..2c50e870e8 100644
--- a/test/unit_tests/aievec_tests/i16xi16_min_elem/i16xi16_min_elem-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_min_elem/i16xi16_min_elem-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i16xi16_min_elem/i16xi16_min_elem.mlir b/test/unit_tests/aievec_tests/aie2/i16xi16_min_elem/i16xi16_min_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/i16xi16_min_elem/i16xi16_min_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/i16xi16_min_elem/i16xi16_min_elem.mlir
index eb9cffd0ff..841b6e58b5 100644
--- a/test/unit_tests/aievec_tests/i16xi16_min_elem/i16xi16_min_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_min_elem/i16xi16_min_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=32" --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i16xi16_min_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_min_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i16xi16_min_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_min_elem/testbench.cc
index 39d8b1acd0..aa743e8475 100644
--- a/test/unit_tests/aievec_tests/i16xi16_min_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_min_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i16xi16_mul_elem/convert_aie-ml.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem/convert_aie-ml.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_mul_elem/convert_aie-ml.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem/convert_aie-ml.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_mul_elem/defines.h b/test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_mul_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/i16xi16_mul_elem/i16xi16_mul_elem-llvm-scalar.mlir b/test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem/i16xi16_mul_elem-llvm-scalar.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i16xi16_mul_elem/i16xi16_mul_elem-llvm-scalar.mlir
rename to test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem/i16xi16_mul_elem-llvm-scalar.mlir
index f2af352513..51494f813d 100644
--- a/test/unit_tests/aievec_tests/i16xi16_mul_elem/i16xi16_mul_elem-llvm-scalar.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem/i16xi16_mul_elem-llvm-scalar.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i16xi16_mul_elem/i16xi16_mul_elem-llvm.mlir b/test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem/i16xi16_mul_elem-llvm.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i16xi16_mul_elem/i16xi16_mul_elem-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem/i16xi16_mul_elem-llvm.mlir
index 821e6318df..58914d1df4 100644
--- a/test/unit_tests/aievec_tests/i16xi16_mul_elem/i16xi16_mul_elem-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem/i16xi16_mul_elem-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i16xi16_mul_elem/i16xi16_mul_elem.mlir b/test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem/i16xi16_mul_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/i16xi16_mul_elem/i16xi16_mul_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem/i16xi16_mul_elem.mlir
index 014d547921..a71a36ce39 100644
--- a/test/unit_tests/aievec_tests/i16xi16_mul_elem/i16xi16_mul_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem/i16xi16_mul_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=32" --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i16xi16_mul_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i16xi16_mul_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem/testbench.cc
index ad4240870a..b260fa85ff 100644
--- a/test/unit_tests/aievec_tests/i16xi16_mul_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i16xi16_mul_elem_2/defines.h b/test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem_2/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_mul_elem_2/defines.h
rename to test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem_2/defines.h
diff --git a/test/unit_tests/aievec_tests/i16xi16_mul_elem_2/dut.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem_2/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_mul_elem_2/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem_2/dut.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_mul_elem_2/i16xi16_mul_elem-llvm-scalar.mlir b/test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem_2/i16xi16_mul_elem-llvm-scalar.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i16xi16_mul_elem_2/i16xi16_mul_elem-llvm-scalar.mlir
rename to test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem_2/i16xi16_mul_elem-llvm-scalar.mlir
index b96688c20e..a9c68eed45 100644
--- a/test/unit_tests/aievec_tests/i16xi16_mul_elem_2/i16xi16_mul_elem-llvm-scalar.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem_2/i16xi16_mul_elem-llvm-scalar.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i16xi16_mul_elem_2/i16xi16_mul_elem-llvm.mlir b/test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem_2/i16xi16_mul_elem-llvm.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i16xi16_mul_elem_2/i16xi16_mul_elem-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem_2/i16xi16_mul_elem-llvm.mlir
index 045020aee4..8435003798 100644
--- a/test/unit_tests/aievec_tests/i16xi16_mul_elem_2/i16xi16_mul_elem-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem_2/i16xi16_mul_elem-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i16xi16_mul_elem_2/i16xi16_mul_elem.mlir b/test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem_2/i16xi16_mul_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/i16xi16_mul_elem_2/i16xi16_mul_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem_2/i16xi16_mul_elem.mlir
index 564cc1c022..c9e93c51d1 100644
--- a/test/unit_tests/aievec_tests/i16xi16_mul_elem_2/i16xi16_mul_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem_2/i16xi16_mul_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=32" --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i16xi16_mul_elem_2/testbench.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem_2/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i16xi16_mul_elem_2/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem_2/testbench.cc
index d31c97785e..64a464ffe5 100644
--- a/test/unit_tests/aievec_tests/i16xi16_mul_elem_2/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_mul_elem_2/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i16xi16_sel/defines.h b/test/unit_tests/aievec_tests/aie2/i16xi16_sel/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_sel/defines.h
rename to test/unit_tests/aievec_tests/aie2/i16xi16_sel/defines.h
diff --git a/test/unit_tests/aievec_tests/i16xi16_sel/dut.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_sel/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_sel/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_sel/dut.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_sel/i16xi16_sel.mlir b/test/unit_tests/aievec_tests/aie2/i16xi16_sel/i16xi16_sel.mlir
similarity index 92%
rename from test/unit_tests/aievec_tests/i16xi16_sel/i16xi16_sel.mlir
rename to test/unit_tests/aievec_tests/aie2/i16xi16_sel/i16xi16_sel.mlir
index b9850b9de8..604c2e2ac9 100644
--- a/test/unit_tests/aievec_tests/i16xi16_sel/i16xi16_sel.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_sel/i16xi16_sel.mlir
@@ -2,7 +2,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i16xi16_sel/testbench.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_sel/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i16xi16_sel/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_sel/testbench.cc
index 11ac90347e..904e892e75 100644
--- a/test/unit_tests/aievec_tests/i16xi16_sel/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_sel/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i16xi16_sel_unsigned_cmp/defines.h b/test/unit_tests/aievec_tests/aie2/i16xi16_sel_unsigned_cmp/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_sel_unsigned_cmp/defines.h
rename to test/unit_tests/aievec_tests/aie2/i16xi16_sel_unsigned_cmp/defines.h
diff --git a/test/unit_tests/aievec_tests/i16xi16_sel_unsigned_cmp/dut.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_sel_unsigned_cmp/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_sel_unsigned_cmp/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_sel_unsigned_cmp/dut.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_sel_unsigned_cmp/i16xi16_sel_unsigned_cmp.mlir b/test/unit_tests/aievec_tests/aie2/i16xi16_sel_unsigned_cmp/i16xi16_sel_unsigned_cmp.mlir
similarity index 92%
rename from test/unit_tests/aievec_tests/i16xi16_sel_unsigned_cmp/i16xi16_sel_unsigned_cmp.mlir
rename to test/unit_tests/aievec_tests/aie2/i16xi16_sel_unsigned_cmp/i16xi16_sel_unsigned_cmp.mlir
index 4114c44a1b..5ac9053c1b 100644
--- a/test/unit_tests/aievec_tests/i16xi16_sel_unsigned_cmp/i16xi16_sel_unsigned_cmp.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_sel_unsigned_cmp/i16xi16_sel_unsigned_cmp.mlir
@@ -2,7 +2,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i16xi16_sel_unsigned_cmp/testbench.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_sel_unsigned_cmp/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i16xi16_sel_unsigned_cmp/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_sel_unsigned_cmp/testbench.cc
index 22587c3c74..157b518d12 100644
--- a/test/unit_tests/aievec_tests/i16xi16_sel_unsigned_cmp/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_sel_unsigned_cmp/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i16xi16_static_sized_memref_aie-ml/conv2d_uij_i16_noinit.mlir b/test/unit_tests/aievec_tests/aie2/i16xi16_static_sized_memref_aie-ml/conv2d_uij_i16_noinit.mlir
similarity index 83%
rename from test/unit_tests/aievec_tests/i16xi16_static_sized_memref_aie-ml/conv2d_uij_i16_noinit.mlir
rename to test/unit_tests/aievec_tests/aie2/i16xi16_static_sized_memref_aie-ml/conv2d_uij_i16_noinit.mlir
index e142468049..ee69039c40 100644
--- a/test/unit_tests/aievec_tests/i16xi16_static_sized_memref_aie-ml/conv2d_uij_i16_noinit.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_static_sized_memref_aie-ml/conv2d_uij_i16_noinit.mlir
@@ -1,13 +1,13 @@
 // REQUIRES: valid_xchess_license
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=16" -aieml=true --aie-vectorize="shift=10 zero-offset=4" | aie-translate -aie2=true --aievec-to-cpp -o gen_aie-ml.cc
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. %S/testbench.cc work/kernel.o
-// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out"
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/kernel.o
+// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out"
 
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=16" --convert-vector-to-aievec="aie-target=aie2 shift=10" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o convert_aie-ml.cc
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. -c %S/convert_kernel.cc -o convert_kernel.o
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. %S/testbench.cc work/convert_kernel.o
-// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out"
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c %S/convert_kernel.cc -o convert_kernel.o
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/convert_kernel.o
+// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out"
 
 func.func @conv2d (%A: memref<18x288xi16>, %B: memref<9xi16>, %C: memref<16x256xi16>) {
     affine.for %arg3 = 0 to 16 {
diff --git a/test/unit_tests/aievec_tests/i16xi16_static_sized_memref_aie-ml/convert_aie-ml.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_static_sized_memref_aie-ml/convert_aie-ml.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_static_sized_memref_aie-ml/convert_aie-ml.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_static_sized_memref_aie-ml/convert_aie-ml.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_static_sized_memref_aie-ml/convert_kernel.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_static_sized_memref_aie-ml/convert_kernel.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_static_sized_memref_aie-ml/convert_kernel.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_static_sized_memref_aie-ml/convert_kernel.cc
diff --git a/test/unit_tests/aievec_tests/i32xi32_static_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie2/i16xi16_static_sized_memref_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_static_sized_memref/data/kernelAndInImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie2/i16xi16_static_sized_memref_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i32xi32_static_sized_memref/data/refImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie2/i16xi16_static_sized_memref_aie-ml/data/refImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_static_sized_memref/data/refImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie2/i16xi16_static_sized_memref_aie-ml/data/refImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i16xi16_static_sized_memref_aie-ml/gen_aie-ml.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_static_sized_memref_aie-ml/gen_aie-ml.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_static_sized_memref_aie-ml/gen_aie-ml.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_static_sized_memref_aie-ml/gen_aie-ml.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_static_sized_memref_aie-ml/kernel.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_static_sized_memref_aie-ml/kernel.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_static_sized_memref_aie-ml/kernel.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_static_sized_memref_aie-ml/kernel.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_static_sized_memref_aie-ml/testbench.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_static_sized_memref_aie-ml/testbench.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_static_sized_memref_aie-ml/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_static_sized_memref_aie-ml/testbench.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_static_sized_memref_aie-ml/testbench.h b/test/unit_tests/aievec_tests/aie2/i16xi16_static_sized_memref_aie-ml/testbench.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_static_sized_memref_aie-ml/testbench.h
rename to test/unit_tests/aievec_tests/aie2/i16xi16_static_sized_memref_aie-ml/testbench.h
diff --git a/test/unit_tests/aievec_tests/i16xi16_sub_elem/defines.h b/test/unit_tests/aievec_tests/aie2/i16xi16_sub_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_sub_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/i16xi16_sub_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/i16xi16_sub_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_sub_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_sub_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_sub_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_sub_elem/i16xi16_sub_elem.mlir b/test/unit_tests/aievec_tests/aie2/i16xi16_sub_elem/i16xi16_sub_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/i16xi16_sub_elem/i16xi16_sub_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/i16xi16_sub_elem/i16xi16_sub_elem.mlir
index 99e16172d6..51b98f5b58 100644
--- a/test/unit_tests/aievec_tests/i16xi16_sub_elem/i16xi16_sub_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_sub_elem/i16xi16_sub_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i16xi16_sub_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_sub_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i16xi16_sub_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_sub_elem/testbench.cc
index 962b0f43ab..91cb8e5bea 100644
--- a/test/unit_tests/aievec_tests/i16xi16_sub_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_sub_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i16xi16_sub_elem_2/defines.h b/test/unit_tests/aievec_tests/aie2/i16xi16_sub_elem_2/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_sub_elem_2/defines.h
rename to test/unit_tests/aievec_tests/aie2/i16xi16_sub_elem_2/defines.h
diff --git a/test/unit_tests/aievec_tests/i16xi16_sub_elem_2/dut.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_sub_elem_2/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i16xi16_sub_elem_2/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_sub_elem_2/dut.cc
diff --git a/test/unit_tests/aievec_tests/i16xi16_sub_elem_2/i16xi16_sub_elem.mlir b/test/unit_tests/aievec_tests/aie2/i16xi16_sub_elem_2/i16xi16_sub_elem.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i16xi16_sub_elem_2/i16xi16_sub_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/i16xi16_sub_elem_2/i16xi16_sub_elem.mlir
index 613912ec29..577bb5da41 100644
--- a/test/unit_tests/aievec_tests/i16xi16_sub_elem_2/i16xi16_sub_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_sub_elem_2/i16xi16_sub_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i16xi16_sub_elem_2/testbench.cc b/test/unit_tests/aievec_tests/aie2/i16xi16_sub_elem_2/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i16xi16_sub_elem_2/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i16xi16_sub_elem_2/testbench.cc
index fbf52806ba..218f5543df 100644
--- a/test/unit_tests/aievec_tests/i16xi16_sub_elem_2/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i16xi16_sub_elem_2/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i32_abs_v16_2/defines.h b/test/unit_tests/aievec_tests/aie2/i32_abs_v16_2/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i32_abs_v16_2/defines.h
rename to test/unit_tests/aievec_tests/aie2/i32_abs_v16_2/defines.h
diff --git a/test/unit_tests/aievec_tests/i32_abs_v16_2/dut.cc b/test/unit_tests/aievec_tests/aie2/i32_abs_v16_2/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i32_abs_v16_2/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i32_abs_v16_2/dut.cc
diff --git a/test/unit_tests/aievec_tests/i32_abs_v16_2/i32_abs.mlir b/test/unit_tests/aievec_tests/aie2/i32_abs_v16_2/i32_abs.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/i32_abs_v16_2/i32_abs.mlir
rename to test/unit_tests/aievec_tests/aie2/i32_abs_v16_2/i32_abs.mlir
index 0fd4554181..70a5f82263 100644
--- a/test/unit_tests/aievec_tests/i32_abs_v16_2/i32_abs.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i32_abs_v16_2/i32_abs.mlir
@@ -2,7 +2,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -D__AIE_ARCH__=20 -D__AIENGINE__ -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -D__AIE_ARCH__=20 -D__AIENGINE__ -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 // Cycle count: 150
diff --git a/test/unit_tests/aievec_tests/i32_abs_v16_2/testbench.cc b/test/unit_tests/aievec_tests/aie2/i32_abs_v16_2/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i32_abs_v16_2/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i32_abs_v16_2/testbench.cc
index f7c06e3d2a..8df8118960 100644
--- a/test/unit_tests/aievec_tests/i32_abs_v16_2/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i32_abs_v16_2/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i32_add_reduce/defines.h b/test/unit_tests/aievec_tests/aie2/i32_add_reduce/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i32_add_reduce/defines.h
rename to test/unit_tests/aievec_tests/aie2/i32_add_reduce/defines.h
diff --git a/test/unit_tests/aievec_tests/i32_add_reduce/dut.cc b/test/unit_tests/aievec_tests/aie2/i32_add_reduce/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i32_add_reduce/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i32_add_reduce/dut.cc
diff --git a/test/unit_tests/aievec_tests/i32_add_reduce/i32_add_reduce.mlir b/test/unit_tests/aievec_tests/aie2/i32_add_reduce/i32_add_reduce.mlir
similarity index 92%
rename from test/unit_tests/aievec_tests/i32_add_reduce/i32_add_reduce.mlir
rename to test/unit_tests/aievec_tests/aie2/i32_add_reduce/i32_add_reduce.mlir
index 234e9807aa..ce0e29d711 100644
--- a/test/unit_tests/aievec_tests/i32_add_reduce/i32_add_reduce.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i32_add_reduce/i32_add_reduce.mlir
@@ -2,7 +2,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i32_add_reduce/testbench.cc b/test/unit_tests/aievec_tests/aie2/i32_add_reduce/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i32_add_reduce/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i32_add_reduce/testbench.cc
index 8a586fcc90..c32d98e8f7 100644
--- a/test/unit_tests/aievec_tests/i32_add_reduce/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i32_add_reduce/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i32_max_reduce/defines.h b/test/unit_tests/aievec_tests/aie2/i32_max_reduce/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i32_max_reduce/defines.h
rename to test/unit_tests/aievec_tests/aie2/i32_max_reduce/defines.h
diff --git a/test/unit_tests/aievec_tests/i32_max_reduce/dut.cc b/test/unit_tests/aievec_tests/aie2/i32_max_reduce/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i32_max_reduce/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i32_max_reduce/dut.cc
diff --git a/test/unit_tests/aievec_tests/i32_max_reduce/i32_max_reduce-llvm.mlir b/test/unit_tests/aievec_tests/aie2/i32_max_reduce/i32_max_reduce-llvm.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i32_max_reduce/i32_max_reduce-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/i32_max_reduce/i32_max_reduce-llvm.mlir
index 6f469c2055..2a003ed1e4 100644
--- a/test/unit_tests/aievec_tests/i32_max_reduce/i32_max_reduce-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i32_max_reduce/i32_max_reduce-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i32_max_reduce/i32_max_reduce.mlir b/test/unit_tests/aievec_tests/aie2/i32_max_reduce/i32_max_reduce.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i32_max_reduce/i32_max_reduce.mlir
rename to test/unit_tests/aievec_tests/aie2/i32_max_reduce/i32_max_reduce.mlir
index 523f109d8d..998e9c5c0c 100644
--- a/test/unit_tests/aievec_tests/i32_max_reduce/i32_max_reduce.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i32_max_reduce/i32_max_reduce.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i32_max_reduce/testbench.cc b/test/unit_tests/aievec_tests/aie2/i32_max_reduce/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i32_max_reduce/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i32_max_reduce/testbench.cc
index 69fc94e467..37f2136996 100644
--- a/test/unit_tests/aievec_tests/i32_max_reduce/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i32_max_reduce/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i32_min_reduce/defines.h b/test/unit_tests/aievec_tests/aie2/i32_min_reduce/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i32_min_reduce/defines.h
rename to test/unit_tests/aievec_tests/aie2/i32_min_reduce/defines.h
diff --git a/test/unit_tests/aievec_tests/i32_min_reduce/dut.cc b/test/unit_tests/aievec_tests/aie2/i32_min_reduce/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i32_min_reduce/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i32_min_reduce/dut.cc
diff --git a/test/unit_tests/aievec_tests/i32_min_reduce/i32_min_reduce-llvm.mlir b/test/unit_tests/aievec_tests/aie2/i32_min_reduce/i32_min_reduce-llvm.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i32_min_reduce/i32_min_reduce-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/i32_min_reduce/i32_min_reduce-llvm.mlir
index ef7d6f7104..bdf902361e 100644
--- a/test/unit_tests/aievec_tests/i32_min_reduce/i32_min_reduce-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i32_min_reduce/i32_min_reduce-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i32_min_reduce/i32_min_reduce.mlir b/test/unit_tests/aievec_tests/aie2/i32_min_reduce/i32_min_reduce.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i32_min_reduce/i32_min_reduce.mlir
rename to test/unit_tests/aievec_tests/aie2/i32_min_reduce/i32_min_reduce.mlir
index 4978db9a82..6ae2ea7878 100644
--- a/test/unit_tests/aievec_tests/i32_min_reduce/i32_min_reduce.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i32_min_reduce/i32_min_reduce.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i32_min_reduce/testbench.cc b/test/unit_tests/aievec_tests/aie2/i32_min_reduce/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i32_min_reduce/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i32_min_reduce/testbench.cc
index 59d4a8afca..1a1e87ba5b 100644
--- a/test/unit_tests/aievec_tests/i32_min_reduce/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i32_min_reduce/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i32xi32_add_elem/defines.h b/test/unit_tests/aievec_tests/aie2/i32xi32_add_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_add_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/i32xi32_add_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/i32xi32_add_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/i32xi32_add_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_add_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i32xi32_add_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/i32xi32_add_elem/i32xi32_add_elem.mlir b/test/unit_tests/aievec_tests/aie2/i32xi32_add_elem/i32xi32_add_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/i32xi32_add_elem/i32xi32_add_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/i32xi32_add_elem/i32xi32_add_elem.mlir
index 29c0c2f81b..def45a1c66 100644
--- a/test/unit_tests/aievec_tests/i32xi32_add_elem/i32xi32_add_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_add_elem/i32xi32_add_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i32xi32_add_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/i32xi32_add_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i32xi32_add_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i32xi32_add_elem/testbench.cc
index d3d1fb3a9b..a869a48e36 100644
--- a/test/unit_tests/aievec_tests/i32xi32_add_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_add_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i32xi32_add_elem_2/defines.h b/test/unit_tests/aievec_tests/aie2/i32xi32_add_elem_2/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_add_elem_2/defines.h
rename to test/unit_tests/aievec_tests/aie2/i32xi32_add_elem_2/defines.h
diff --git a/test/unit_tests/aievec_tests/i32xi32_add_elem_2/dut.cc b/test/unit_tests/aievec_tests/aie2/i32xi32_add_elem_2/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_add_elem_2/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i32xi32_add_elem_2/dut.cc
diff --git a/test/unit_tests/aievec_tests/i32xi32_add_elem_2/i32xi32_add_elem.mlir b/test/unit_tests/aievec_tests/aie2/i32xi32_add_elem_2/i32xi32_add_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/i32xi32_add_elem_2/i32xi32_add_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/i32xi32_add_elem_2/i32xi32_add_elem.mlir
index 54415c9ba8..7fd2850136 100644
--- a/test/unit_tests/aievec_tests/i32xi32_add_elem_2/i32xi32_add_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_add_elem_2/i32xi32_add_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i32xi32_add_elem_2/testbench.cc b/test/unit_tests/aievec_tests/aie2/i32xi32_add_elem_2/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i32xi32_add_elem_2/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i32xi32_add_elem_2/testbench.cc
index d3d1fb3a9b..a869a48e36 100644
--- a/test/unit_tests/aievec_tests/i32xi32_add_elem_2/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_add_elem_2/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i32xi32_gemm/data/matrix_a_test.txt b/test/unit_tests/aievec_tests/aie2/i32xi32_gemm/data/matrix_a_test.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_gemm/data/matrix_a_test.txt
rename to test/unit_tests/aievec_tests/aie2/i32xi32_gemm/data/matrix_a_test.txt
diff --git a/test/unit_tests/aievec_tests/i32xi32_gemm/data/matrix_b_test.txt b/test/unit_tests/aievec_tests/aie2/i32xi32_gemm/data/matrix_b_test.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_gemm/data/matrix_b_test.txt
rename to test/unit_tests/aievec_tests/aie2/i32xi32_gemm/data/matrix_b_test.txt
diff --git a/test/unit_tests/aievec_tests/i32xi32_gemm/data/matrix_c_test.txt b/test/unit_tests/aievec_tests/aie2/i32xi32_gemm/data/matrix_c_test.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_gemm/data/matrix_c_test.txt
rename to test/unit_tests/aievec_tests/aie2/i32xi32_gemm/data/matrix_c_test.txt
diff --git a/test/unit_tests/aievec_tests/i32xi32_gemm/gemm64_int_unroll16.mlir b/test/unit_tests/aievec_tests/aie2/i32xi32_gemm/gemm64_int_unroll16.mlir
similarity index 95%
rename from test/unit_tests/aievec_tests/i32xi32_gemm/gemm64_int_unroll16.mlir
rename to test/unit_tests/aievec_tests/aie2/i32xi32_gemm/gemm64_int_unroll16.mlir
index f255abdde9..cca24b6bd0 100644
--- a/test/unit_tests/aievec_tests/i32xi32_gemm/gemm64_int_unroll16.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_gemm/gemm64_int_unroll16.mlir
@@ -1,9 +1,9 @@
 // REQUIRES: valid_xchess_license
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=16" -aieml=true --aie-vectorize | aie-translate -aie2=true --aievec-to-cpp -o gen_aie-ml.cc
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=16" --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o gen_aie-ml.cc
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. %S/testbench.cc work/kernel.o
-// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out"
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/kernel.o
+// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out"
 module {
   func.func @matmul(%arg0: memref<64x64xi32>, %arg1: memref<64x64xi32>, %arg2: memref<64x64xi32>) {
     affine.for %arg3 = 0 to 64 {
diff --git a/test/unit_tests/aievec_tests/i32xi32_gemm/gen_aie-ml.cc b/test/unit_tests/aievec_tests/aie2/i32xi32_gemm/gen_aie-ml.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_gemm/gen_aie-ml.cc
rename to test/unit_tests/aievec_tests/aie2/i32xi32_gemm/gen_aie-ml.cc
diff --git a/test/unit_tests/aievec_tests/i32xi32_gemm/kernel.cc b/test/unit_tests/aievec_tests/aie2/i32xi32_gemm/kernel.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_gemm/kernel.cc
rename to test/unit_tests/aievec_tests/aie2/i32xi32_gemm/kernel.cc
diff --git a/test/unit_tests/aievec_tests/i32xi32_gemm/testbench.cc b/test/unit_tests/aievec_tests/aie2/i32xi32_gemm/testbench.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_gemm/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i32xi32_gemm/testbench.cc
diff --git a/test/unit_tests/aievec_tests/i32xi32_gemm/testbench.h b/test/unit_tests/aievec_tests/aie2/i32xi32_gemm/testbench.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_gemm/testbench.h
rename to test/unit_tests/aievec_tests/aie2/i32xi32_gemm/testbench.h
diff --git a/test/unit_tests/aievec_tests/i32xi32_max_elem/defines.h b/test/unit_tests/aievec_tests/aie2/i32xi32_max_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_max_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/i32xi32_max_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/i32xi32_max_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/i32xi32_max_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_max_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i32xi32_max_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/i32xi32_max_elem/i32xi32_max_elem-llvm.mlir b/test/unit_tests/aievec_tests/aie2/i32xi32_max_elem/i32xi32_max_elem-llvm.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i32xi32_max_elem/i32xi32_max_elem-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/i32xi32_max_elem/i32xi32_max_elem-llvm.mlir
index 0e3c3590b3..f11b072710 100644
--- a/test/unit_tests/aievec_tests/i32xi32_max_elem/i32xi32_max_elem-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_max_elem/i32xi32_max_elem-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i32xi32_max_elem/i32xi32_max_elem.mlir b/test/unit_tests/aievec_tests/aie2/i32xi32_max_elem/i32xi32_max_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/i32xi32_max_elem/i32xi32_max_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/i32xi32_max_elem/i32xi32_max_elem.mlir
index 1b2b100142..b09ffb19cc 100644
--- a/test/unit_tests/aievec_tests/i32xi32_max_elem/i32xi32_max_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_max_elem/i32xi32_max_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=16" --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i32xi32_max_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/i32xi32_max_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i32xi32_max_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i32xi32_max_elem/testbench.cc
index b3e9943c5c..4dfc85b918 100644
--- a/test/unit_tests/aievec_tests/i32xi32_max_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_max_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i32xi32_min_elem/defines.h b/test/unit_tests/aievec_tests/aie2/i32xi32_min_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_min_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/i32xi32_min_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/i32xi32_min_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/i32xi32_min_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_min_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i32xi32_min_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/i32xi32_min_elem/i32xi32_min_elem-llvm.mlir b/test/unit_tests/aievec_tests/aie2/i32xi32_min_elem/i32xi32_min_elem-llvm.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i32xi32_min_elem/i32xi32_min_elem-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/i32xi32_min_elem/i32xi32_min_elem-llvm.mlir
index 96c20735d6..5c326e1118 100644
--- a/test/unit_tests/aievec_tests/i32xi32_min_elem/i32xi32_min_elem-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_min_elem/i32xi32_min_elem-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i32xi32_min_elem/i32xi32_min_elem.mlir b/test/unit_tests/aievec_tests/aie2/i32xi32_min_elem/i32xi32_min_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/i32xi32_min_elem/i32xi32_min_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/i32xi32_min_elem/i32xi32_min_elem.mlir
index 744e305039..9026323912 100644
--- a/test/unit_tests/aievec_tests/i32xi32_min_elem/i32xi32_min_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_min_elem/i32xi32_min_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=16" --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i32xi32_min_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/i32xi32_min_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i32xi32_min_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i32xi32_min_elem/testbench.cc
index 1d2876116b..8a191c0053 100644
--- a/test/unit_tests/aievec_tests/i32xi32_min_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_min_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i32xi32_mul_elem/convert_aie-ml.cc b/test/unit_tests/aievec_tests/aie2/i32xi32_mul_elem/convert_aie-ml.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_mul_elem/convert_aie-ml.cc
rename to test/unit_tests/aievec_tests/aie2/i32xi32_mul_elem/convert_aie-ml.cc
diff --git a/test/unit_tests/aievec_tests/i32xi32_mul_elem/defines.h b/test/unit_tests/aievec_tests/aie2/i32xi32_mul_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_mul_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/i32xi32_mul_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/i32xi32_mul_elem/i32xi32_mul_elem-llvm-scalar.mlir b/test/unit_tests/aievec_tests/aie2/i32xi32_mul_elem/i32xi32_mul_elem-llvm-scalar.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i32xi32_mul_elem/i32xi32_mul_elem-llvm-scalar.mlir
rename to test/unit_tests/aievec_tests/aie2/i32xi32_mul_elem/i32xi32_mul_elem-llvm-scalar.mlir
index 8b1ebe0523..2169325fcb 100644
--- a/test/unit_tests/aievec_tests/i32xi32_mul_elem/i32xi32_mul_elem-llvm-scalar.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_mul_elem/i32xi32_mul_elem-llvm-scalar.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i32xi32_mul_elem/i32xi32_mul_elem-llvm.mlir b/test/unit_tests/aievec_tests/aie2/i32xi32_mul_elem/i32xi32_mul_elem-llvm.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i32xi32_mul_elem/i32xi32_mul_elem-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/i32xi32_mul_elem/i32xi32_mul_elem-llvm.mlir
index 71695ab586..45c2217563 100644
--- a/test/unit_tests/aievec_tests/i32xi32_mul_elem/i32xi32_mul_elem-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_mul_elem/i32xi32_mul_elem-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i32xi32_mul_elem/i32xi32_mul_elem.mlir b/test/unit_tests/aievec_tests/aie2/i32xi32_mul_elem/i32xi32_mul_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/i32xi32_mul_elem/i32xi32_mul_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/i32xi32_mul_elem/i32xi32_mul_elem.mlir
index addf837af7..aeac77a780 100644
--- a/test/unit_tests/aievec_tests/i32xi32_mul_elem/i32xi32_mul_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_mul_elem/i32xi32_mul_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=16" --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i32xi32_mul_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/i32xi32_mul_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i32xi32_mul_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i32xi32_mul_elem/testbench.cc
index 7b194e4b82..7629d377c3 100644
--- a/test/unit_tests/aievec_tests/i32xi32_mul_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_mul_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i32xi32_sel/defines.h b/test/unit_tests/aievec_tests/aie2/i32xi32_sel/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_sel/defines.h
rename to test/unit_tests/aievec_tests/aie2/i32xi32_sel/defines.h
diff --git a/test/unit_tests/aievec_tests/i32xi32_sel/dut.cc b/test/unit_tests/aievec_tests/aie2/i32xi32_sel/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_sel/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i32xi32_sel/dut.cc
diff --git a/test/unit_tests/aievec_tests/i32xi32_sel/i32xi32_sel.mlir b/test/unit_tests/aievec_tests/aie2/i32xi32_sel/i32xi32_sel.mlir
similarity index 92%
rename from test/unit_tests/aievec_tests/i32xi32_sel/i32xi32_sel.mlir
rename to test/unit_tests/aievec_tests/aie2/i32xi32_sel/i32xi32_sel.mlir
index 25a8f5063b..9436fa4a3f 100644
--- a/test/unit_tests/aievec_tests/i32xi32_sel/i32xi32_sel.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_sel/i32xi32_sel.mlir
@@ -2,7 +2,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i32xi32_sel/testbench.cc b/test/unit_tests/aievec_tests/aie2/i32xi32_sel/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i32xi32_sel/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i32xi32_sel/testbench.cc
index ca7574c12d..1c1d8d8954 100644
--- a/test/unit_tests/aievec_tests/i32xi32_sel/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_sel/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i32xi32_sel_unsigned_cmp/defines.h b/test/unit_tests/aievec_tests/aie2/i32xi32_sel_unsigned_cmp/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_sel_unsigned_cmp/defines.h
rename to test/unit_tests/aievec_tests/aie2/i32xi32_sel_unsigned_cmp/defines.h
diff --git a/test/unit_tests/aievec_tests/i32xi32_sel_unsigned_cmp/dut.cc b/test/unit_tests/aievec_tests/aie2/i32xi32_sel_unsigned_cmp/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_sel_unsigned_cmp/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i32xi32_sel_unsigned_cmp/dut.cc
diff --git a/test/unit_tests/aievec_tests/i32xi32_sel_unsigned_cmp/i32xi32_sel_unsigned_cmp.mlir b/test/unit_tests/aievec_tests/aie2/i32xi32_sel_unsigned_cmp/i32xi32_sel_unsigned_cmp.mlir
similarity index 92%
rename from test/unit_tests/aievec_tests/i32xi32_sel_unsigned_cmp/i32xi32_sel_unsigned_cmp.mlir
rename to test/unit_tests/aievec_tests/aie2/i32xi32_sel_unsigned_cmp/i32xi32_sel_unsigned_cmp.mlir
index 2ca5370791..5d752a9bd4 100644
--- a/test/unit_tests/aievec_tests/i32xi32_sel_unsigned_cmp/i32xi32_sel_unsigned_cmp.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_sel_unsigned_cmp/i32xi32_sel_unsigned_cmp.mlir
@@ -2,7 +2,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i32xi32_sel_unsigned_cmp/testbench.cc b/test/unit_tests/aievec_tests/aie2/i32xi32_sel_unsigned_cmp/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i32xi32_sel_unsigned_cmp/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i32xi32_sel_unsigned_cmp/testbench.cc
index 74b251b6b8..0d95ce5faa 100644
--- a/test/unit_tests/aievec_tests/i32xi32_sel_unsigned_cmp/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_sel_unsigned_cmp/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i32xi32_sub_elem/defines.h b/test/unit_tests/aievec_tests/aie2/i32xi32_sub_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_sub_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/i32xi32_sub_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/i32xi32_sub_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/i32xi32_sub_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_sub_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i32xi32_sub_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/i32xi32_sub_elem/i32xi32_sub_elem.mlir b/test/unit_tests/aievec_tests/aie2/i32xi32_sub_elem/i32xi32_sub_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/i32xi32_sub_elem/i32xi32_sub_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/i32xi32_sub_elem/i32xi32_sub_elem.mlir
index ee25b6e802..475d45558c 100644
--- a/test/unit_tests/aievec_tests/i32xi32_sub_elem/i32xi32_sub_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_sub_elem/i32xi32_sub_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i32xi32_sub_elem/i32xi32_sub_elem.mlir2 b/test/unit_tests/aievec_tests/aie2/i32xi32_sub_elem/i32xi32_sub_elem.mlir2
similarity index 93%
rename from test/unit_tests/aievec_tests/i32xi32_sub_elem/i32xi32_sub_elem.mlir2
rename to test/unit_tests/aievec_tests/aie2/i32xi32_sub_elem/i32xi32_sub_elem.mlir2
index ee25b6e802..475d45558c 100644
--- a/test/unit_tests/aievec_tests/i32xi32_sub_elem/i32xi32_sub_elem.mlir2
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_sub_elem/i32xi32_sub_elem.mlir2
@@ -6,7 +6,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i32xi32_sub_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/i32xi32_sub_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i32xi32_sub_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i32xi32_sub_elem/testbench.cc
index dbe77d1c58..16d1d3a307 100644
--- a/test/unit_tests/aievec_tests/i32xi32_sub_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_sub_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i32xi32_sub_elem_2/defines.h b/test/unit_tests/aievec_tests/aie2/i32xi32_sub_elem_2/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_sub_elem_2/defines.h
rename to test/unit_tests/aievec_tests/aie2/i32xi32_sub_elem_2/defines.h
diff --git a/test/unit_tests/aievec_tests/i32xi32_sub_elem_2/dut.cc b/test/unit_tests/aievec_tests/aie2/i32xi32_sub_elem_2/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i32xi32_sub_elem_2/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i32xi32_sub_elem_2/dut.cc
diff --git a/test/unit_tests/aievec_tests/i32xi32_sub_elem_2/i32xi32_sub_elem.mlir b/test/unit_tests/aievec_tests/aie2/i32xi32_sub_elem_2/i32xi32_sub_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/i32xi32_sub_elem_2/i32xi32_sub_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/i32xi32_sub_elem_2/i32xi32_sub_elem.mlir
index 0dc4c0ae0d..35852823a1 100644
--- a/test/unit_tests/aievec_tests/i32xi32_sub_elem_2/i32xi32_sub_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_sub_elem_2/i32xi32_sub_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i32xi32_sub_elem_2/testbench.cc b/test/unit_tests/aievec_tests/aie2/i32xi32_sub_elem_2/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i32xi32_sub_elem_2/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i32xi32_sub_elem_2/testbench.cc
index dbe77d1c58..16d1d3a307 100644
--- a/test/unit_tests/aievec_tests/i32xi32_sub_elem_2/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i32xi32_sub_elem_2/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i8_abs_v64_2/defines.h b/test/unit_tests/aievec_tests/aie2/i8_abs_v64_2/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i8_abs_v64_2/defines.h
rename to test/unit_tests/aievec_tests/aie2/i8_abs_v64_2/defines.h
diff --git a/test/unit_tests/aievec_tests/i8_abs_v64_2/dut.cc b/test/unit_tests/aievec_tests/aie2/i8_abs_v64_2/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8_abs_v64_2/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i8_abs_v64_2/dut.cc
diff --git a/test/unit_tests/aievec_tests/i8_abs_v64_2/i8_abs.mlir b/test/unit_tests/aievec_tests/aie2/i8_abs_v64_2/i8_abs.mlir
similarity index 92%
rename from test/unit_tests/aievec_tests/i8_abs_v64_2/i8_abs.mlir
rename to test/unit_tests/aievec_tests/aie2/i8_abs_v64_2/i8_abs.mlir
index 0839fd2179..dddfe348ca 100644
--- a/test/unit_tests/aievec_tests/i8_abs_v64_2/i8_abs.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8_abs_v64_2/i8_abs.mlir
@@ -2,7 +2,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -D__AIE_ARCH__=20 -D__AIENGINE__ -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I%aie_runtime_lib%/AIE2 -I %aietools/include -D__AIE_ARCH__=20 -D__AIENGINE__ -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 // Cycle count: 54
diff --git a/test/unit_tests/aievec_tests/i8_abs_v64_2/testbench.cc b/test/unit_tests/aievec_tests/aie2/i8_abs_v64_2/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i8_abs_v64_2/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i8_abs_v64_2/testbench.cc
index 74c406723a..03c073d83d 100644
--- a/test/unit_tests/aievec_tests/i8_abs_v64_2/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i8_abs_v64_2/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i8_add_reduce/defines.h b/test/unit_tests/aievec_tests/aie2/i8_add_reduce/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i8_add_reduce/defines.h
rename to test/unit_tests/aievec_tests/aie2/i8_add_reduce/defines.h
diff --git a/test/unit_tests/aievec_tests/i8_add_reduce/dut.cc b/test/unit_tests/aievec_tests/aie2/i8_add_reduce/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8_add_reduce/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i8_add_reduce/dut.cc
diff --git a/test/unit_tests/aievec_tests/i8_add_reduce/i8_add_reduce.mlir b/test/unit_tests/aievec_tests/aie2/i8_add_reduce/i8_add_reduce.mlir
similarity index 92%
rename from test/unit_tests/aievec_tests/i8_add_reduce/i8_add_reduce.mlir
rename to test/unit_tests/aievec_tests/aie2/i8_add_reduce/i8_add_reduce.mlir
index 946d81fe72..c17406a35d 100644
--- a/test/unit_tests/aievec_tests/i8_add_reduce/i8_add_reduce.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8_add_reduce/i8_add_reduce.mlir
@@ -2,7 +2,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i8_add_reduce/testbench.cc b/test/unit_tests/aievec_tests/aie2/i8_add_reduce/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i8_add_reduce/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i8_add_reduce/testbench.cc
index af34d65c17..2bc0f2a2b8 100644
--- a/test/unit_tests/aievec_tests/i8_add_reduce/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i8_add_reduce/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i8_i32_add_reduce/defines.h b/test/unit_tests/aievec_tests/aie2/i8_i32_add_reduce/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i8_i32_add_reduce/defines.h
rename to test/unit_tests/aievec_tests/aie2/i8_i32_add_reduce/defines.h
diff --git a/test/unit_tests/aievec_tests/i8_i32_add_reduce/dut.cc b/test/unit_tests/aievec_tests/aie2/i8_i32_add_reduce/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8_i32_add_reduce/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i8_i32_add_reduce/dut.cc
diff --git a/test/unit_tests/aievec_tests/i8_i32_add_reduce/i8_i32_add_reduce.mlir b/test/unit_tests/aievec_tests/aie2/i8_i32_add_reduce/i8_i32_add_reduce.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/i8_i32_add_reduce/i8_i32_add_reduce.mlir
rename to test/unit_tests/aievec_tests/aie2/i8_i32_add_reduce/i8_i32_add_reduce.mlir
index 5b5cccbec0..52e6dba199 100644
--- a/test/unit_tests/aievec_tests/i8_i32_add_reduce/i8_i32_add_reduce.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8_i32_add_reduce/i8_i32_add_reduce.mlir
@@ -2,7 +2,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i8_i32_add_reduce/testbench.cc b/test/unit_tests/aievec_tests/aie2/i8_i32_add_reduce/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i8_i32_add_reduce/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i8_i32_add_reduce/testbench.cc
index 29d39da663..804bee026f 100644
--- a/test/unit_tests/aievec_tests/i8_i32_add_reduce/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i8_i32_add_reduce/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i8_max_reduce/defines.h b/test/unit_tests/aievec_tests/aie2/i8_max_reduce/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i8_max_reduce/defines.h
rename to test/unit_tests/aievec_tests/aie2/i8_max_reduce/defines.h
diff --git a/test/unit_tests/aievec_tests/i8_max_reduce/dut.cc b/test/unit_tests/aievec_tests/aie2/i8_max_reduce/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8_max_reduce/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i8_max_reduce/dut.cc
diff --git a/test/unit_tests/aievec_tests/i8_max_reduce/i8_max_reduce-llvm.mlir b/test/unit_tests/aievec_tests/aie2/i8_max_reduce/i8_max_reduce-llvm.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i8_max_reduce/i8_max_reduce-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/i8_max_reduce/i8_max_reduce-llvm.mlir
index cf01f11640..fea4c8514c 100644
--- a/test/unit_tests/aievec_tests/i8_max_reduce/i8_max_reduce-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8_max_reduce/i8_max_reduce-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i8_max_reduce/i8_max_reduce.mlir b/test/unit_tests/aievec_tests/aie2/i8_max_reduce/i8_max_reduce.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i8_max_reduce/i8_max_reduce.mlir
rename to test/unit_tests/aievec_tests/aie2/i8_max_reduce/i8_max_reduce.mlir
index dea8c20e78..dd231acf43 100644
--- a/test/unit_tests/aievec_tests/i8_max_reduce/i8_max_reduce.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8_max_reduce/i8_max_reduce.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i8_max_reduce/testbench.cc b/test/unit_tests/aievec_tests/aie2/i8_max_reduce/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i8_max_reduce/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i8_max_reduce/testbench.cc
index 30fe5a7e48..37eb5cff40 100644
--- a/test/unit_tests/aievec_tests/i8_max_reduce/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i8_max_reduce/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i8_min_reduce/defines.h b/test/unit_tests/aievec_tests/aie2/i8_min_reduce/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i8_min_reduce/defines.h
rename to test/unit_tests/aievec_tests/aie2/i8_min_reduce/defines.h
diff --git a/test/unit_tests/aievec_tests/i8_min_reduce/dut.cc b/test/unit_tests/aievec_tests/aie2/i8_min_reduce/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8_min_reduce/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i8_min_reduce/dut.cc
diff --git a/test/unit_tests/aievec_tests/i8_min_reduce/i8_min_reduce-llvm.mlir b/test/unit_tests/aievec_tests/aie2/i8_min_reduce/i8_min_reduce-llvm.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i8_min_reduce/i8_min_reduce-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/i8_min_reduce/i8_min_reduce-llvm.mlir
index 40be3da261..98331dc225 100644
--- a/test/unit_tests/aievec_tests/i8_min_reduce/i8_min_reduce-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8_min_reduce/i8_min_reduce-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i8_min_reduce/i8_min_reduce.mlir b/test/unit_tests/aievec_tests/aie2/i8_min_reduce/i8_min_reduce.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i8_min_reduce/i8_min_reduce.mlir
rename to test/unit_tests/aievec_tests/aie2/i8_min_reduce/i8_min_reduce.mlir
index 5d72aed002..bcd8372bcf 100644
--- a/test/unit_tests/aievec_tests/i8_min_reduce/i8_min_reduce.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8_min_reduce/i8_min_reduce.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i8_min_reduce/testbench.cc b/test/unit_tests/aievec_tests/aie2/i8_min_reduce/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i8_min_reduce/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i8_min_reduce/testbench.cc
index 2c05e17ca2..cfeb5fdf72 100644
--- a/test/unit_tests/aievec_tests/i8_min_reduce/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i8_min_reduce/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i8xi8_add_elem/defines.h b/test/unit_tests/aievec_tests/aie2/i8xi8_add_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_add_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/i8xi8_add_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/i8xi8_add_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_add_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_add_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_add_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_add_elem/i8xi8_add_elem.mlir b/test/unit_tests/aievec_tests/aie2/i8xi8_add_elem/i8xi8_add_elem.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i8xi8_add_elem/i8xi8_add_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/i8xi8_add_elem/i8xi8_add_elem.mlir
index c64eac499e..9ae8c50e33 100644
--- a/test/unit_tests/aievec_tests/i8xi8_add_elem/i8xi8_add_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_add_elem/i8xi8_add_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i8xi8_add_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_add_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i8xi8_add_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_add_elem/testbench.cc
index f9fbe45903..4c3a9fabbe 100644
--- a/test/unit_tests/aievec_tests/i8xi8_add_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_add_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i8xi8_add_elem_2/defines.h b/test/unit_tests/aievec_tests/aie2/i8xi8_add_elem_2/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_add_elem_2/defines.h
rename to test/unit_tests/aievec_tests/aie2/i8xi8_add_elem_2/defines.h
diff --git a/test/unit_tests/aievec_tests/i8xi8_add_elem_2/dut.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_add_elem_2/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_add_elem_2/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_add_elem_2/dut.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_add_elem_2/i8xi8_add_elem.mlir b/test/unit_tests/aievec_tests/aie2/i8xi8_add_elem_2/i8xi8_add_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/i8xi8_add_elem_2/i8xi8_add_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/i8xi8_add_elem_2/i8xi8_add_elem.mlir
index 5c4a71e55f..78606f4f01 100644
--- a/test/unit_tests/aievec_tests/i8xi8_add_elem_2/i8xi8_add_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_add_elem_2/i8xi8_add_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i8xi8_add_elem_2/testbench.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_add_elem_2/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i8xi8_add_elem_2/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_add_elem_2/testbench.cc
index 75998adfc6..f395ee0713 100644
--- a/test/unit_tests/aievec_tests/i8xi8_add_elem_2/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_add_elem_2/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i8xi8_conv2d_1x3_after_polygeist_aie-ml/conv2d_i8_after_polygeist.mlir b/test/unit_tests/aievec_tests/aie2/i8xi8_conv2d_1x3_after_polygeist_aie-ml/conv2d_i8_after_polygeist.mlir
similarity index 88%
rename from test/unit_tests/aievec_tests/i8xi8_conv2d_1x3_after_polygeist_aie-ml/conv2d_i8_after_polygeist.mlir
rename to test/unit_tests/aievec_tests/aie2/i8xi8_conv2d_1x3_after_polygeist_aie-ml/conv2d_i8_after_polygeist.mlir
index a6e4ef8348..611cf82b4d 100644
--- a/test/unit_tests/aievec_tests/i8xi8_conv2d_1x3_after_polygeist_aie-ml/conv2d_i8_after_polygeist.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_conv2d_1x3_after_polygeist_aie-ml/conv2d_i8_after_polygeist.mlir
@@ -3,9 +3,9 @@
 
 // REQUIRES: valid_xchess_license
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=32" -aieml=true --aie-vectorize="shift=0 dup-factor=2" | aie-translate -aie2=true --aievec-to-cpp -o gen_aie-ml.cc
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. %S/i8xi8.cc work/kernel.o
-// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out"
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/i8xi8.cc work/kernel.o
+// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out"
 
 module attributes {dlti.dl_spec = #dlti.dl_spec<#dlti.dl_entry<"dlti.endianness", "little">, #dlti.dl_entry<i64, dense<64> : vector<2xi64>>, #dlti.dl_entry<f80, dense<128> : vector<2xi64>>, #dlti.dl_entry<i1, dense<8> : vector<2xi64>>, #dlti.dl_entry<i8, dense<8> : vector<2xi64>>, #dlti.dl_entry<i16, dense<16> : vector<2xi64>>, #dlti.dl_entry<i32, dense<32> : vector<2xi64>>, #dlti.dl_entry<f16, dense<16> : vector<2xi64>>, #dlti.dl_entry<f64, dense<64> : vector<2xi64>>, #dlti.dl_entry<f128, dense<128> : vector<2xi64>>>, llvm.data_layout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128", llvm.target_triple = "x86_64-unknown-linux-gnu", "polygeist.target-cpu" = "x86-64", "polygeist.target-features" = "+cx8,+fxsr,+mmx,+sse,+sse2,+x87", "polygeist.tune-cpu" = "generic"} {
   func.func @conv2d(%arg0: memref<?x288xi8>, %arg1: memref<?xi8>, %arg2: memref<?x256xi32>) attributes {llvm.linkage = #llvm.linkage<external>} {
diff --git a/test/unit_tests/aievec_tests/i8xi8_conv2d_1x3_after_polygeist_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie2/i8xi8_conv2d_1x3_after_polygeist_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_conv2d_1x3_after_polygeist_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie2/i8xi8_conv2d_1x3_after_polygeist_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i8xi8_conv2d_1x3_after_polygeist_aie-ml/data/refImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie2/i8xi8_conv2d_1x3_after_polygeist_aie-ml/data/refImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_conv2d_1x3_after_polygeist_aie-ml/data/refImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie2/i8xi8_conv2d_1x3_after_polygeist_aie-ml/data/refImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i8xi8_conv2d_1x3_after_polygeist_aie-ml/gen_aie-ml.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_conv2d_1x3_after_polygeist_aie-ml/gen_aie-ml.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_conv2d_1x3_after_polygeist_aie-ml/gen_aie-ml.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_conv2d_1x3_after_polygeist_aie-ml/gen_aie-ml.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_conv2d_1x3_after_polygeist_aie-ml/i8xi8.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_conv2d_1x3_after_polygeist_aie-ml/i8xi8.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_conv2d_1x3_after_polygeist_aie-ml/i8xi8.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_conv2d_1x3_after_polygeist_aie-ml/i8xi8.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_conv2d_1x3_after_polygeist_aie-ml/i8xi8.h b/test/unit_tests/aievec_tests/aie2/i8xi8_conv2d_1x3_after_polygeist_aie-ml/i8xi8.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_conv2d_1x3_after_polygeist_aie-ml/i8xi8.h
rename to test/unit_tests/aievec_tests/aie2/i8xi8_conv2d_1x3_after_polygeist_aie-ml/i8xi8.h
diff --git a/test/unit_tests/aievec_tests/i8xi8_conv2d_1x3_after_polygeist_aie-ml/kernel.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_conv2d_1x3_after_polygeist_aie-ml/kernel.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_conv2d_1x3_after_polygeist_aie-ml/kernel.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_conv2d_1x3_after_polygeist_aie-ml/kernel.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_max_elem/defines.h b/test/unit_tests/aievec_tests/aie2/i8xi8_max_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_max_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/i8xi8_max_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/i8xi8_max_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_max_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_max_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_max_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_max_elem/i8xi8_max_elem-llvm.mlir b/test/unit_tests/aievec_tests/aie2/i8xi8_max_elem/i8xi8_max_elem-llvm.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i8xi8_max_elem/i8xi8_max_elem-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/i8xi8_max_elem/i8xi8_max_elem-llvm.mlir
index 9745852914..abbce6ba6d 100644
--- a/test/unit_tests/aievec_tests/i8xi8_max_elem/i8xi8_max_elem-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_max_elem/i8xi8_max_elem-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i8xi8_max_elem/i8xi8_max_elem.mlir b/test/unit_tests/aievec_tests/aie2/i8xi8_max_elem/i8xi8_max_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/i8xi8_max_elem/i8xi8_max_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/i8xi8_max_elem/i8xi8_max_elem.mlir
index c1224982e7..53f9e83667 100644
--- a/test/unit_tests/aievec_tests/i8xi8_max_elem/i8xi8_max_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_max_elem/i8xi8_max_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=64" --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i8xi8_max_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_max_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i8xi8_max_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_max_elem/testbench.cc
index dbb320d53d..923f8a8c77 100644
--- a/test/unit_tests/aievec_tests/i8xi8_max_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_max_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i8xi8_min_elem/defines.h b/test/unit_tests/aievec_tests/aie2/i8xi8_min_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_min_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/i8xi8_min_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/i8xi8_min_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_min_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_min_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_min_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_min_elem/i8xi8_min_elem-llvm.mlir b/test/unit_tests/aievec_tests/aie2/i8xi8_min_elem/i8xi8_min_elem-llvm.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i8xi8_min_elem/i8xi8_min_elem-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/i8xi8_min_elem/i8xi8_min_elem-llvm.mlir
index 0b02971e0d..ab43092f0c 100644
--- a/test/unit_tests/aievec_tests/i8xi8_min_elem/i8xi8_min_elem-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_min_elem/i8xi8_min_elem-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i8xi8_min_elem/i8xi8_min_elem.mlir b/test/unit_tests/aievec_tests/aie2/i8xi8_min_elem/i8xi8_min_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/i8xi8_min_elem/i8xi8_min_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/i8xi8_min_elem/i8xi8_min_elem.mlir
index 351cb50b30..eda8d472a5 100644
--- a/test/unit_tests/aievec_tests/i8xi8_min_elem/i8xi8_min_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_min_elem/i8xi8_min_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=64" --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i8xi8_min_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_min_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i8xi8_min_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_min_elem/testbench.cc
index 457f7562c9..38c3dee152 100644
--- a/test/unit_tests/aievec_tests/i8xi8_min_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_min_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i8xi8_mul_elem/defines.h b/test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_mul_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/i8xi8_mul_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_mul_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_mul_elem/i8xi8_mul_elem-llvm-scalar.mlir b/test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem/i8xi8_mul_elem-llvm-scalar.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i8xi8_mul_elem/i8xi8_mul_elem-llvm-scalar.mlir
rename to test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem/i8xi8_mul_elem-llvm-scalar.mlir
index 2eaaac179d..02fee8e49d 100644
--- a/test/unit_tests/aievec_tests/i8xi8_mul_elem/i8xi8_mul_elem-llvm-scalar.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem/i8xi8_mul_elem-llvm-scalar.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i8xi8_mul_elem/i8xi8_mul_elem-llvm.mlir b/test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem/i8xi8_mul_elem-llvm.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i8xi8_mul_elem/i8xi8_mul_elem-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem/i8xi8_mul_elem-llvm.mlir
index 72a14d2e74..bd8d1ec089 100644
--- a/test/unit_tests/aievec_tests/i8xi8_mul_elem/i8xi8_mul_elem-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem/i8xi8_mul_elem-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i8xi8_mul_elem/i8xi8_mul_elem.mlir b/test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem/i8xi8_mul_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/i8xi8_mul_elem/i8xi8_mul_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem/i8xi8_mul_elem.mlir
index fe7740fc77..deee87652d 100644
--- a/test/unit_tests/aievec_tests/i8xi8_mul_elem/i8xi8_mul_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem/i8xi8_mul_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=32" --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i8xi8_mul_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i8xi8_mul_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem/testbench.cc
index b9190e5882..26c8505dc0 100644
--- a/test/unit_tests/aievec_tests/i8xi8_mul_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i8xi8_mul_elem_2/defines.h b/test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem_2/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_mul_elem_2/defines.h
rename to test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem_2/defines.h
diff --git a/test/unit_tests/aievec_tests/i8xi8_mul_elem_2/dut.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem_2/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_mul_elem_2/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem_2/dut.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_mul_elem_2/i8xi8_mul_elem-llvm-scalar.mlir b/test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem_2/i8xi8_mul_elem-llvm-scalar.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i8xi8_mul_elem_2/i8xi8_mul_elem-llvm-scalar.mlir
rename to test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem_2/i8xi8_mul_elem-llvm-scalar.mlir
index 598e7d2292..2c88c04208 100644
--- a/test/unit_tests/aievec_tests/i8xi8_mul_elem_2/i8xi8_mul_elem-llvm-scalar.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem_2/i8xi8_mul_elem-llvm-scalar.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i8xi8_mul_elem_2/i8xi8_mul_elem-llvm.mlir b/test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem_2/i8xi8_mul_elem-llvm.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i8xi8_mul_elem_2/i8xi8_mul_elem-llvm.mlir
rename to test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem_2/i8xi8_mul_elem-llvm.mlir
index 4d8b066559..a2b514aae4 100644
--- a/test/unit_tests/aievec_tests/i8xi8_mul_elem_2/i8xi8_mul_elem-llvm.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem_2/i8xi8_mul_elem-llvm.mlir
@@ -8,7 +8,7 @@
 // RUN: aie-translate llvmir.mlir %llvmir-to-ll% -o dut.ll
 // RUN: %PEANO_INSTALL_DIR/bin/clang %clang_aie2_args -c dut.ll -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args -DTO_LLVM +w work +o work -I%S -I. %S/testbench.cc dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i8xi8_mul_elem_2/i8xi8_mul_elem.mlir b/test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem_2/i8xi8_mul_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/i8xi8_mul_elem_2/i8xi8_mul_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem_2/i8xi8_mul_elem.mlir
index 8977afce8e..3c595105cb 100644
--- a/test/unit_tests/aievec_tests/i8xi8_mul_elem_2/i8xi8_mul_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem_2/i8xi8_mul_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=32" --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o dut.cc
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper %xchesscc_aie2_args +w work +o work -I%S -I. %S/testbench.cc work/dut.o
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i8xi8_mul_elem_2/testbench.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem_2/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i8xi8_mul_elem_2/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem_2/testbench.cc
index af18ccf310..09182e8b3a 100644
--- a/test/unit_tests/aievec_tests/i8xi8_mul_elem_2/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_mul_elem_2/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i8xi8_sel/defines.h b/test/unit_tests/aievec_tests/aie2/i8xi8_sel/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_sel/defines.h
rename to test/unit_tests/aievec_tests/aie2/i8xi8_sel/defines.h
diff --git a/test/unit_tests/aievec_tests/i8xi8_sel/dut.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_sel/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_sel/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_sel/dut.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_sel/i8xi8_sel.mlir b/test/unit_tests/aievec_tests/aie2/i8xi8_sel/i8xi8_sel.mlir
similarity index 92%
rename from test/unit_tests/aievec_tests/i8xi8_sel/i8xi8_sel.mlir
rename to test/unit_tests/aievec_tests/aie2/i8xi8_sel/i8xi8_sel.mlir
index eab08d1831..8429dd18c5 100644
--- a/test/unit_tests/aievec_tests/i8xi8_sel/i8xi8_sel.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_sel/i8xi8_sel.mlir
@@ -2,7 +2,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i8xi8_sel/testbench.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_sel/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i8xi8_sel/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_sel/testbench.cc
index 048c7d1386..5c450700c3 100644
--- a/test/unit_tests/aievec_tests/i8xi8_sel/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_sel/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_aie-ml/conv2d_uij_i8_noinit.mlir b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_aie-ml/conv2d_uij_i8_noinit.mlir
similarity index 83%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_aie-ml/conv2d_uij_i8_noinit.mlir
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_aie-ml/conv2d_uij_i8_noinit.mlir
index 348efa6d64..08e0768182 100644
--- a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_aie-ml/conv2d_uij_i8_noinit.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_aie-ml/conv2d_uij_i8_noinit.mlir
@@ -1,13 +1,13 @@
 // REQUIRES: valid_xchess_license
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=32" -aieml=true --aie-vectorize="shift=0 dup-factor=2" | aie-translate -aie2=true --aievec-to-cpp -o gen_aie-ml.cc
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. %S/i8xi8.cc work/kernel.o
-// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out"
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c %S/kernel.cc -o kernel.o
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/i8xi8.cc work/kernel.o
+// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out"
 
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=32" --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o convert_aie-ml.cc
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. -c %S/convert_kernel.cc -o convert_kernel.o
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. %S/i8xi8.cc work/convert_kernel.o
-// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out"
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c %S/convert_kernel.cc -o convert_kernel.o
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/i8xi8.cc work/convert_kernel.o
+// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out"
 
 func.func @conv2d (%A: memref<18x288xi8>, %B: memref<48xi8>, %C: memref<16x256xi8>) {
     affine.for %arg3 = 0 to 16 {
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_aie-ml/convert_aie-ml.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_aie-ml/convert_aie-ml.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_aie-ml/convert_aie-ml.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_aie-ml/convert_aie-ml.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_aie-ml/convert_kernel.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_aie-ml/convert_kernel.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_aie-ml/convert_kernel.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_aie-ml/convert_kernel.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_aie-ml/data/refImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_aie-ml/data/refImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_aie-ml/data/refImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_aie-ml/data/refImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_aie-ml/gen_aie-ml.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_aie-ml/gen_aie-ml.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_aie-ml/gen_aie-ml.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_aie-ml/gen_aie-ml.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_aie-ml/i8xi8.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_aie-ml/i8xi8.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_aie-ml/i8xi8.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_aie-ml/i8xi8.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_aie-ml/i8xi8.h b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_aie-ml/i8xi8.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_aie-ml/i8xi8.h
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_aie-ml/i8xi8.h
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_aie-ml/i8xi8_scalar.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_aie-ml/i8xi8_scalar.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_aie-ml/i8xi8_scalar.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_aie-ml/i8xi8_scalar.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_aie-ml/kernel.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_aie-ml/kernel.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_aie-ml/kernel.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_aie-ml/kernel.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_init_aie-ml/conv2d_uij_i8_init.mlir b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_init_aie-ml/conv2d_uij_i8_init.mlir
similarity index 90%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_init_aie-ml/conv2d_uij_i8_init.mlir
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_init_aie-ml/conv2d_uij_i8_init.mlir
index 646636a45a..221cefd05e 100644
--- a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_init_aie-ml/conv2d_uij_i8_init.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_init_aie-ml/conv2d_uij_i8_init.mlir
@@ -3,9 +3,9 @@
 
 // REQUIRES: valid_xchess_license
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=32" --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o convert_aie-ml.cc
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. -c %S/convert_kernel.cc -o convert_kernel.o
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. %S/i8xi8.cc work/convert_kernel.o
-// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out"
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c %S/convert_kernel.cc -o convert_kernel.o
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/i8xi8.cc work/convert_kernel.o
+// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out"
 
 func.func @conv2d (%A: memref<18x288xi8>, %B: memref<48xi8>, %C: memref<16x256xi8>) {
     affine.for %arg3 = 0 to 16 {
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_init_aie-ml/convert_aie-ml.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_init_aie-ml/convert_aie-ml.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_init_aie-ml/convert_aie-ml.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_init_aie-ml/convert_aie-ml.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_init_aie-ml/convert_kernel.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_init_aie-ml/convert_kernel.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_init_aie-ml/convert_kernel.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_init_aie-ml/convert_kernel.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_init_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_init_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_init_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_init_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_init_aie-ml/data/refImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_init_aie-ml/data/refImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_init_aie-ml/data/refImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_init_aie-ml/data/refImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_init_aie-ml/i8xi8.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_init_aie-ml/i8xi8.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_init_aie-ml/i8xi8.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_init_aie-ml/i8xi8.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_init_aie-ml/i8xi8.h b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_init_aie-ml/i8xi8.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_init_aie-ml/i8xi8.h
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_init_aie-ml/i8xi8.h
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_unsorted_aie-ml/conv2d_uij_i8_noinit_unsorted.mlir b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_unsorted_aie-ml/conv2d_uij_i8_noinit_unsorted.mlir
similarity index 90%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_unsorted_aie-ml/conv2d_uij_i8_noinit_unsorted.mlir
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_unsorted_aie-ml/conv2d_uij_i8_noinit_unsorted.mlir
index c5b6a83c81..452aac0fe1 100644
--- a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_unsorted_aie-ml/conv2d_uij_i8_noinit_unsorted.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_unsorted_aie-ml/conv2d_uij_i8_noinit_unsorted.mlir
@@ -3,9 +3,9 @@
 
 // REQUIRES: valid_xchess_license
 // RUN: aie-opt %s -affine-super-vectorize="virtual-vector-size=32" --convert-vector-to-aievec="aie-target=aie2" -lower-affine | aie-translate -aie2=true --aievec-to-cpp -o convert_aie-ml.cc
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. -c %S/convert_kernel.cc -o convert_kernel.o
-// RUN: xchesscc -f -g +s -p me -P %aietools/data/aie_ml/lib/ +w work +o work -I%S -I. %S/i8xi8.cc work/convert_kernel.o
-// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out"
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c %S/convert_kernel.cc -o convert_kernel.o
+// RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/i8xi8.cc work/convert_kernel.o
+// RUN: cp -r %S/data . && xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out"
 
 func.func @conv2d (%A: memref<18x288xi8>, %B: memref<48xi8>, %C: memref<16x256xi8>) {
     affine.for %arg3 = 0 to 16 {
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_unsorted_aie-ml/convert_aie-ml.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_unsorted_aie-ml/convert_aie-ml.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_unsorted_aie-ml/convert_aie-ml.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_unsorted_aie-ml/convert_aie-ml.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_unsorted_aie-ml/convert_kernel.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_unsorted_aie-ml/convert_kernel.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_unsorted_aie-ml/convert_kernel.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_unsorted_aie-ml/convert_kernel.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_unsorted_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_unsorted_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_unsorted_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_unsorted_aie-ml/data/kernelAndInImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_unsorted_aie-ml/data/refImage_256x16_k3_gaussblur.txt b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_unsorted_aie-ml/data/refImage_256x16_k3_gaussblur.txt
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_unsorted_aie-ml/data/refImage_256x16_k3_gaussblur.txt
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_unsorted_aie-ml/data/refImage_256x16_k3_gaussblur.txt
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_unsorted_aie-ml/i8xi8.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_unsorted_aie-ml/i8xi8.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_unsorted_aie-ml/i8xi8.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_unsorted_aie-ml/i8xi8.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_static_sized_memref_unsorted_aie-ml/i8xi8.h b/test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_unsorted_aie-ml/i8xi8.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_static_sized_memref_unsorted_aie-ml/i8xi8.h
rename to test/unit_tests/aievec_tests/aie2/i8xi8_static_sized_memref_unsorted_aie-ml/i8xi8.h
diff --git a/test/unit_tests/aievec_tests/i8xi8_sub_elem/defines.h b/test/unit_tests/aievec_tests/aie2/i8xi8_sub_elem/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_sub_elem/defines.h
rename to test/unit_tests/aievec_tests/aie2/i8xi8_sub_elem/defines.h
diff --git a/test/unit_tests/aievec_tests/i8xi8_sub_elem/dut.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_sub_elem/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_sub_elem/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_sub_elem/dut.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_sub_elem/i8xi8_sub_elem.mlir b/test/unit_tests/aievec_tests/aie2/i8xi8_sub_elem/i8xi8_sub_elem.mlir
similarity index 94%
rename from test/unit_tests/aievec_tests/i8xi8_sub_elem/i8xi8_sub_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/i8xi8_sub_elem/i8xi8_sub_elem.mlir
index 01d20a4475..6c544da869 100644
--- a/test/unit_tests/aievec_tests/i8xi8_sub_elem/i8xi8_sub_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_sub_elem/i8xi8_sub_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i8xi8_sub_elem/testbench.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_sub_elem/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i8xi8_sub_elem/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_sub_elem/testbench.cc
index d32911c3c4..5679c04255 100644
--- a/test/unit_tests/aievec_tests/i8xi8_sub_elem/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_sub_elem/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>
diff --git a/test/unit_tests/aievec_tests/i8xi8_sub_elem_2/defines.h b/test/unit_tests/aievec_tests/aie2/i8xi8_sub_elem_2/defines.h
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_sub_elem_2/defines.h
rename to test/unit_tests/aievec_tests/aie2/i8xi8_sub_elem_2/defines.h
diff --git a/test/unit_tests/aievec_tests/i8xi8_sub_elem_2/dut.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_sub_elem_2/dut.cc
similarity index 100%
rename from test/unit_tests/aievec_tests/i8xi8_sub_elem_2/dut.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_sub_elem_2/dut.cc
diff --git a/test/unit_tests/aievec_tests/i8xi8_sub_elem_2/i8xi8_sub_elem.mlir b/test/unit_tests/aievec_tests/aie2/i8xi8_sub_elem_2/i8xi8_sub_elem.mlir
similarity index 93%
rename from test/unit_tests/aievec_tests/i8xi8_sub_elem_2/i8xi8_sub_elem.mlir
rename to test/unit_tests/aievec_tests/aie2/i8xi8_sub_elem_2/i8xi8_sub_elem.mlir
index 79e593dc3a..d170a0e6f5 100644
--- a/test/unit_tests/aievec_tests/i8xi8_sub_elem_2/i8xi8_sub_elem.mlir
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_sub_elem_2/i8xi8_sub_elem.mlir
@@ -6,7 +6,7 @@
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. -c dut.cc -o dut.o
 // RUN: xchesscc_wrapper aie2 -f -g +s +w work +o work -I%S -I. %S/testbench.cc work/dut.o
 // RUN: mkdir -p data
-// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
+// RUN: xca_udm_dbg --aiearch aie-ml -qf -T -P %aietools/data/aie_ml/lib/ -t "%S/../../profiling.tcl ./work/a.out" >& xca_udm_dbg.stdout
 // RUN: FileCheck --input-file=./xca_udm_dbg.stdout %s
 // CHECK: TEST PASSED
 
diff --git a/test/unit_tests/aievec_tests/i8xi8_sub_elem_2/testbench.cc b/test/unit_tests/aievec_tests/aie2/i8xi8_sub_elem_2/testbench.cc
similarity index 97%
rename from test/unit_tests/aievec_tests/i8xi8_sub_elem_2/testbench.cc
rename to test/unit_tests/aievec_tests/aie2/i8xi8_sub_elem_2/testbench.cc
index 19c35a521d..888070d1ea 100644
--- a/test/unit_tests/aievec_tests/i8xi8_sub_elem_2/testbench.cc
+++ b/test/unit_tests/aievec_tests/aie2/i8xi8_sub_elem_2/testbench.cc
@@ -1,4 +1,4 @@
-#include "../common/testbench.h"
+#include "../../common/testbench.h"
 #include "defines.h"
 #include <algorithm>
 #include <cstdint>