COMPMID-556: Rename CPP folder to reference

Change-Id: I147644349547c4e3804a80b564a9ad95131ad2d0
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/111560
Reviewed-by: Michalis Spyrou <michalis.spyrou@arm.com>
Tested-by: BSG Visual Compute Jenkins server to access repositories on http://mpd-gerrit.cambridge.arm.com <bsgcomp@arm.com>

184 files changed, 78 insertions, 78 deletions

diff --git a/tests/SConscript b/tests/SConscript
index 3a6422d87b..37ec95f589 100644
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -81,7 +81,7 @@ files_benchmark = Glob('benchmark/*.cpp')
 files_validation = Glob('validation/*.cpp')
 
 # Always compile reference for validation
-files_validation += Glob('validation/CPP/*.cpp')
+files_validation += Glob('validation/reference/*.cpp')
 
 # Add unit tests
 files_validation += Glob('validation/UNIT/*/*.cpp')
diff --git a/tests/validation/CL/WarpAffine.cpp b/tests/validation/CL/WarpAffine.cpp
index 9db2ccaacc..7f3001cb57 100644
--- a/tests/validation/CL/WarpAffine.cpp
+++ b/tests/validation/CL/WarpAffine.cpp
@@ -35,9 +35,9 @@
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
-#include "tests/validation/CPP/Utils.h"
 #include "tests/validation/Validation.h"
 #include "tests/validation/fixtures/WarpAffineFixture.h"
+#include "tests/validation/reference/Utils.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/NEON/GaussianPyramid.cpp b/tests/validation/NEON/GaussianPyramid.cpp
index fb4944f9c3..a9130cfcf2 100644
--- a/tests/validation/NEON/GaussianPyramid.cpp
+++ b/tests/validation/NEON/GaussianPyramid.cpp
@@ -32,9 +32,9 @@
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
-#include "tests/validation/CPP/Utils.h"
 #include "tests/validation/Validation.h"
 #include "tests/validation/fixtures/GaussianPyramidHalfFixture.h"
+#include "tests/validation/reference/Utils.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/NEON/WarpAffine.cpp b/tests/validation/NEON/WarpAffine.cpp
index 678549d21e..8c83507e95 100644
--- a/tests/validation/NEON/WarpAffine.cpp
+++ b/tests/validation/NEON/WarpAffine.cpp
@@ -34,9 +34,9 @@
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Macros.h"
 #include "tests/framework/datasets/Datasets.h"
-#include "tests/validation/CPP/Utils.h"
 #include "tests/validation/Validation.h"
 #include "tests/validation/fixtures/WarpAffineFixture.h"
+#include "tests/validation/reference/Utils.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/AbsoluteDifferenceFixture.h b/tests/validation/fixtures/AbsoluteDifferenceFixture.h
index 54e202d087..b725304a4d 100644
--- a/tests/validation/fixtures/AbsoluteDifferenceFixture.h
+++ b/tests/validation/fixtures/AbsoluteDifferenceFixture.h
@@ -31,8 +31,8 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/AbsoluteDifference.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/AbsoluteDifference.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/AccumulateFixture.h b/tests/validation/fixtures/AccumulateFixture.h
index 3d8ca2dafc..091000175c 100644
--- a/tests/validation/fixtures/AccumulateFixture.h
+++ b/tests/validation/fixtures/AccumulateFixture.h
@@ -31,8 +31,8 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/Accumulate.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/Accumulate.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/ActivationLayerFixture.h b/tests/validation/fixtures/ActivationLayerFixture.h
index 384e63bf49..75e625f715 100644
--- a/tests/validation/fixtures/ActivationLayerFixture.h
+++ b/tests/validation/fixtures/ActivationLayerFixture.h
@@ -31,8 +31,8 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/ActivationLayer.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/ActivationLayer.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/ArithmeticAdditionFixture.h b/tests/validation/fixtures/ArithmeticAdditionFixture.h
index 02c3ca9716..c3a51b97d1 100644
--- a/tests/validation/fixtures/ArithmeticAdditionFixture.h
+++ b/tests/validation/fixtures/ArithmeticAdditionFixture.h
@@ -31,8 +31,8 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/ArithmeticAddition.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/ArithmeticAddition.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/ArithmeticSubtractionFixture.h b/tests/validation/fixtures/ArithmeticSubtractionFixture.h
index 9e65faef00..ba0dd14414 100644
--- a/tests/validation/fixtures/ArithmeticSubtractionFixture.h
+++ b/tests/validation/fixtures/ArithmeticSubtractionFixture.h
@@ -31,8 +31,8 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/ArithmeticSubtraction.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/ArithmeticSubtraction.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/BatchNormalizationLayerFixture.h b/tests/validation/fixtures/BatchNormalizationLayerFixture.h
index f4772a8dd9..298c9ca411 100644
--- a/tests/validation/fixtures/BatchNormalizationLayerFixture.h
+++ b/tests/validation/fixtures/BatchNormalizationLayerFixture.h
@@ -31,8 +31,8 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/BatchNormalizationLayer.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/BatchNormalizationLayer.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/BitwiseAndFixture.h b/tests/validation/fixtures/BitwiseAndFixture.h
index 0dfff868ab..c1247de6c4 100644
--- a/tests/validation/fixtures/BitwiseAndFixture.h
+++ b/tests/validation/fixtures/BitwiseAndFixture.h
@@ -31,7 +31,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/BitwiseAnd.h"
+#include "tests/validation/reference/BitwiseAnd.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/BitwiseNotFixture.h b/tests/validation/fixtures/BitwiseNotFixture.h
index e5bf69992e..f90d0895aa 100644
--- a/tests/validation/fixtures/BitwiseNotFixture.h
+++ b/tests/validation/fixtures/BitwiseNotFixture.h
@@ -31,7 +31,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/BitwiseNot.h"
+#include "tests/validation/reference/BitwiseNot.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/BitwiseOrFixture.h b/tests/validation/fixtures/BitwiseOrFixture.h
index d61e767bf3..d6ec5b8065 100644
--- a/tests/validation/fixtures/BitwiseOrFixture.h
+++ b/tests/validation/fixtures/BitwiseOrFixture.h
@@ -31,7 +31,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/BitwiseOr.h"
+#include "tests/validation/reference/BitwiseOr.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/BitwiseXorFixture.h b/tests/validation/fixtures/BitwiseXorFixture.h
index 16fa8c0422..8da2181fac 100644
--- a/tests/validation/fixtures/BitwiseXorFixture.h
+++ b/tests/validation/fixtures/BitwiseXorFixture.h
@@ -31,7 +31,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/BitwiseXor.h"
+#include "tests/validation/reference/BitwiseXor.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/Box3x3Fixture.h b/tests/validation/fixtures/Box3x3Fixture.h
index 1aa958a11b..e851b3418e 100644
--- a/tests/validation/fixtures/Box3x3Fixture.h
+++ b/tests/validation/fixtures/Box3x3Fixture.h
@@ -31,7 +31,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/Box3x3.h"
+#include "tests/validation/reference/Box3x3.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/ConvolutionLayerFixture.h b/tests/validation/fixtures/ConvolutionLayerFixture.h
index fe206997b8..859780812a 100644
--- a/tests/validation/fixtures/ConvolutionLayerFixture.h
+++ b/tests/validation/fixtures/ConvolutionLayerFixture.h
@@ -32,9 +32,9 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/ConvolutionLayer.h"
-#include "tests/validation/CPP/Utils.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/ConvolutionLayer.h"
+#include "tests/validation/reference/Utils.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/DeconvolutionLayerFixture.h b/tests/validation/fixtures/DeconvolutionLayerFixture.h
index 8dff97d83f..e98f5e93c0 100644
--- a/tests/validation/fixtures/DeconvolutionLayerFixture.h
+++ b/tests/validation/fixtures/DeconvolutionLayerFixture.h
@@ -28,8 +28,8 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/DeconvolutionLayer.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/DeconvolutionLayer.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/DepthConcatenateLayerFixture.h b/tests/validation/fixtures/DepthConcatenateLayerFixture.h
index 103c73e4ea..e7fe6340f7 100644
--- a/tests/validation/fixtures/DepthConcatenateLayerFixture.h
+++ b/tests/validation/fixtures/DepthConcatenateLayerFixture.h
@@ -31,8 +31,8 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/DepthConcatenateLayer.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/DepthConcatenateLayer.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/DepthConvertLayerFixture.h b/tests/validation/fixtures/DepthConvertLayerFixture.h
index c2fdc75bb4..4b4e959273 100644
--- a/tests/validation/fixtures/DepthConvertLayerFixture.h
+++ b/tests/validation/fixtures/DepthConvertLayerFixture.h
@@ -31,8 +31,8 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/DepthConvertLayer.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/DepthConvertLayer.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/DepthwiseConvolutionLayerFixture.h b/tests/validation/fixtures/DepthwiseConvolutionLayerFixture.h
index 0af3fdf6c4..4426215114 100644
--- a/tests/validation/fixtures/DepthwiseConvolutionLayerFixture.h
+++ b/tests/validation/fixtures/DepthwiseConvolutionLayerFixture.h
@@ -31,8 +31,8 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/DepthwiseConvolutionLayer.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/DepthwiseConvolutionLayer.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/DepthwiseSeparableConvolutionLayerFixture.h b/tests/validation/fixtures/DepthwiseSeparableConvolutionLayerFixture.h
index 9b9c0c5af7..8bce60caf2 100644
--- a/tests/validation/fixtures/DepthwiseSeparableConvolutionLayerFixture.h
+++ b/tests/validation/fixtures/DepthwiseSeparableConvolutionLayerFixture.h
@@ -31,8 +31,8 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/DepthwiseSeparableConvolutionLayer.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/DepthwiseSeparableConvolutionLayer.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/DequantizationLayerFixture.h b/tests/validation/fixtures/DequantizationLayerFixture.h
index 28d43cf754..5855820d86 100644
--- a/tests/validation/fixtures/DequantizationLayerFixture.h
+++ b/tests/validation/fixtures/DequantizationLayerFixture.h
@@ -32,7 +32,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/DequantizationLayer.h"
+#include "tests/validation/reference/DequantizationLayer.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/DilateFixture.h b/tests/validation/fixtures/DilateFixture.h
index 7b56cf6c90..aa531a10fe 100644
--- a/tests/validation/fixtures/DilateFixture.h
+++ b/tests/validation/fixtures/DilateFixture.h
@@ -31,7 +31,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/Dilate.h"
+#include "tests/validation/reference/Dilate.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/DirectConvolutionLayerFixture.h b/tests/validation/fixtures/DirectConvolutionLayerFixture.h
index 4916c3335b..d63a5bcdba 100644
--- a/tests/validation/fixtures/DirectConvolutionLayerFixture.h
+++ b/tests/validation/fixtures/DirectConvolutionLayerFixture.h
@@ -28,9 +28,9 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/ConvolutionLayer.h"
 #include "tests/validation/Helpers.h"
 #include "tests/validation/fixtures/ConvolutionLayerFixture.h"
+#include "tests/validation/reference/ConvolutionLayer.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/ErodeFixture.h b/tests/validation/fixtures/ErodeFixture.h
index 6ba5fc1e78..d37cac0298 100644
--- a/tests/validation/fixtures/ErodeFixture.h
+++ b/tests/validation/fixtures/ErodeFixture.h
@@ -31,7 +31,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/Erode.h"
+#include "tests/validation/reference/Erode.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/FixedPointFixture.h b/tests/validation/fixtures/FixedPointFixture.h
index 2980e2f324..3f3bb6e0b7 100644
--- a/tests/validation/fixtures/FixedPointFixture.h
+++ b/tests/validation/fixtures/FixedPointFixture.h
@@ -31,8 +31,8 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/FixedPoint.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/FixedPoint.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/FixedPointPixelWiseMultiplicationFixture.h b/tests/validation/fixtures/FixedPointPixelWiseMultiplicationFixture.h
index d090d8583d..73386dfc97 100644
--- a/tests/validation/fixtures/FixedPointPixelWiseMultiplicationFixture.h
+++ b/tests/validation/fixtures/FixedPointPixelWiseMultiplicationFixture.h
@@ -31,7 +31,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/FixedPointPixelWiseMultiplication.h"
+#include "tests/validation/reference/FixedPointPixelWiseMultiplication.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/FlattenLayerFixture.h b/tests/validation/fixtures/FlattenLayerFixture.h
index faf53c70a3..436138b8b4 100644
--- a/tests/validation/fixtures/FlattenLayerFixture.h
+++ b/tests/validation/fixtures/FlattenLayerFixture.h
@@ -33,7 +33,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/FlattenLayer.h"
+#include "tests/validation/reference/FlattenLayer.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/FloorFixture.h b/tests/validation/fixtures/FloorFixture.h
index 3f948412af..246105e365 100644
--- a/tests/validation/fixtures/FloorFixture.h
+++ b/tests/validation/fixtures/FloorFixture.h
@@ -32,7 +32,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/Floor.h"
+#include "tests/validation/reference/Floor.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/FullyConnectedLayerFixture.h b/tests/validation/fixtures/FullyConnectedLayerFixture.h
index dba20bb375..f23fc207a8 100644
--- a/tests/validation/fixtures/FullyConnectedLayerFixture.h
+++ b/tests/validation/fixtures/FullyConnectedLayerFixture.h
@@ -33,9 +33,9 @@
 #include "tests/RawTensor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/FullyConnectedLayer.h"
-#include "tests/validation/CPP/Utils.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/FullyConnectedLayer.h"
+#include "tests/validation/reference/Utils.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/GEMMFixture.h b/tests/validation/fixtures/GEMMFixture.h
index 923a29c7d0..e807ad8c06 100644
--- a/tests/validation/fixtures/GEMMFixture.h
+++ b/tests/validation/fixtures/GEMMFixture.h
@@ -31,8 +31,8 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/GEMM.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/GEMM.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/GEMMInterleave4x4Fixture.h b/tests/validation/fixtures/GEMMInterleave4x4Fixture.h
index b5e3eb6ee0..1f0a7429f1 100644
--- a/tests/validation/fixtures/GEMMInterleave4x4Fixture.h
+++ b/tests/validation/fixtures/GEMMInterleave4x4Fixture.h
@@ -31,8 +31,8 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/GEMMInterleave4x4.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/GEMMInterleave4x4.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/GEMMInterleaveBlockedFixture.h b/tests/validation/fixtures/GEMMInterleaveBlockedFixture.h
index 89c188f6a6..488324dcc8 100644
--- a/tests/validation/fixtures/GEMMInterleaveBlockedFixture.h
+++ b/tests/validation/fixtures/GEMMInterleaveBlockedFixture.h
@@ -31,8 +31,8 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/GEMMInterleaveBlocked.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/GEMMInterleaveBlocked.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/GEMMLowpAssemblyFixture.h b/tests/validation/fixtures/GEMMLowpAssemblyFixture.h
index 38e08f7992..ff33c9db39 100644
--- a/tests/validation/fixtures/GEMMLowpAssemblyFixture.h
+++ b/tests/validation/fixtures/GEMMLowpAssemblyFixture.h
@@ -31,8 +31,8 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/GEMMLowp.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/GEMMLowp.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/GEMMLowpFixture.h b/tests/validation/fixtures/GEMMLowpFixture.h
index d3e2aacbe1..c504e2e10d 100644
--- a/tests/validation/fixtures/GEMMLowpFixture.h
+++ b/tests/validation/fixtures/GEMMLowpFixture.h
@@ -31,8 +31,8 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/GEMMLowp.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/GEMMLowp.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/Gaussian3x3Fixture.h b/tests/validation/fixtures/Gaussian3x3Fixture.h
index 72f082e64c..396e63e73f 100644
--- a/tests/validation/fixtures/Gaussian3x3Fixture.h
+++ b/tests/validation/fixtures/Gaussian3x3Fixture.h
@@ -31,7 +31,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/Gaussian3x3.h"
+#include "tests/validation/reference/Gaussian3x3.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/Gaussian5x5Fixture.h b/tests/validation/fixtures/Gaussian5x5Fixture.h
index 9fdb0d2422..31d7acf0f1 100644
--- a/tests/validation/fixtures/Gaussian5x5Fixture.h
+++ b/tests/validation/fixtures/Gaussian5x5Fixture.h
@@ -31,7 +31,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/Gaussian5x5.h"
+#include "tests/validation/reference/Gaussian5x5.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/GaussianPyramidHalfFixture.h b/tests/validation/fixtures/GaussianPyramidHalfFixture.h
index c3e3efb6e6..ef7657a93c 100644
--- a/tests/validation/fixtures/GaussianPyramidHalfFixture.h
+++ b/tests/validation/fixtures/GaussianPyramidHalfFixture.h
@@ -33,7 +33,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/GaussianPyramidHalf.h"
+#include "tests/validation/reference/GaussianPyramidHalf.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/HarrisCornersFixture.h b/tests/validation/fixtures/HarrisCornersFixture.h
index 50677f6bf3..6395e3b6d8 100644
--- a/tests/validation/fixtures/HarrisCornersFixture.h
+++ b/tests/validation/fixtures/HarrisCornersFixture.h
@@ -30,8 +30,8 @@
 #include "tests/Globals.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/HarrisCornerDetector.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/HarrisCornerDetector.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/HistogramFixture.h b/tests/validation/fixtures/HistogramFixture.h
index 943b2cdde3..7349bdfae2 100644
--- a/tests/validation/fixtures/HistogramFixture.h
+++ b/tests/validation/fixtures/HistogramFixture.h
@@ -31,7 +31,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/Histogram.h"
+#include "tests/validation/reference/Histogram.h"
 #include "utils/Utils.h"
 
 #include <random>
diff --git a/tests/validation/fixtures/IntegralImageFixture.h b/tests/validation/fixtures/IntegralImageFixture.h
index 2f0ec51642..8d2149e1fd 100644
--- a/tests/validation/fixtures/IntegralImageFixture.h
+++ b/tests/validation/fixtures/IntegralImageFixture.h
@@ -31,7 +31,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/IntegralImage.h"
+#include "tests/validation/reference/IntegralImage.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/L2NormalizeLayerFixture.h b/tests/validation/fixtures/L2NormalizeLayerFixture.h
index 7bb95883f7..6f11dcb658 100644
--- a/tests/validation/fixtures/L2NormalizeLayerFixture.h
+++ b/tests/validation/fixtures/L2NormalizeLayerFixture.h
@@ -32,7 +32,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/L2NormalizeLayer.h"
+#include "tests/validation/reference/L2NormalizeLayer.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/MagnitudeFixture.h b/tests/validation/fixtures/MagnitudeFixture.h
index dcd3da8dfe..1c529070a8 100644
--- a/tests/validation/fixtures/MagnitudeFixture.h
+++ b/tests/validation/fixtures/MagnitudeFixture.h
@@ -30,7 +30,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/Magnitude.h"
+#include "tests/validation/reference/Magnitude.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/MeanStdDevFixture.h b/tests/validation/fixtures/MeanStdDevFixture.h
index 37f538b216..17dfe78dbd 100644
--- a/tests/validation/fixtures/MeanStdDevFixture.h
+++ b/tests/validation/fixtures/MeanStdDevFixture.h
@@ -27,7 +27,7 @@
 #include "tests/Globals.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/MeanStdDev.h"
+#include "tests/validation/reference/MeanStdDev.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/Median3x3Fixture.h b/tests/validation/fixtures/Median3x3Fixture.h
index b45e93585a..094635804b 100644
--- a/tests/validation/fixtures/Median3x3Fixture.h
+++ b/tests/validation/fixtures/Median3x3Fixture.h
@@ -31,7 +31,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/Median3x3.h"
+#include "tests/validation/reference/Median3x3.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/MinMaxLocationFixture.h b/tests/validation/fixtures/MinMaxLocationFixture.h
index bf076ef0ab..120a5c49c4 100644
--- a/tests/validation/fixtures/MinMaxLocationFixture.h
+++ b/tests/validation/fixtures/MinMaxLocationFixture.h
@@ -31,7 +31,7 @@
 #include "tests/Types.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/MinMaxLocation.h"
+#include "tests/validation/reference/MinMaxLocation.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/NonLinearFilterFixture.h b/tests/validation/fixtures/NonLinearFilterFixture.h
index 2f22873488..78ba0eaf86 100644
--- a/tests/validation/fixtures/NonLinearFilterFixture.h
+++ b/tests/validation/fixtures/NonLinearFilterFixture.h
@@ -31,8 +31,8 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/NonLinearFilter.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/NonLinearFilter.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/NormalizationLayerFixture.h b/tests/validation/fixtures/NormalizationLayerFixture.h
index 67881d0347..e7d83c7735 100644
--- a/tests/validation/fixtures/NormalizationLayerFixture.h
+++ b/tests/validation/fixtures/NormalizationLayerFixture.h
@@ -32,7 +32,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/NormalizationLayer.h"
+#include "tests/validation/reference/NormalizationLayer.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/PhaseFixture.h b/tests/validation/fixtures/PhaseFixture.h
index 693a61ed1a..09badcfd2a 100644
--- a/tests/validation/fixtures/PhaseFixture.h
+++ b/tests/validation/fixtures/PhaseFixture.h
@@ -30,7 +30,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/Phase.h"
+#include "tests/validation/reference/Phase.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/PixelWiseMultiplicationFixture.h b/tests/validation/fixtures/PixelWiseMultiplicationFixture.h
index 351349e64e..7428fb5cb7 100644
--- a/tests/validation/fixtures/PixelWiseMultiplicationFixture.h
+++ b/tests/validation/fixtures/PixelWiseMultiplicationFixture.h
@@ -31,7 +31,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/PixelWiseMultiplication.h"
+#include "tests/validation/reference/PixelWiseMultiplication.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/PoolingLayerFixture.h b/tests/validation/fixtures/PoolingLayerFixture.h
index 14192517fc..890eef2d4b 100644
--- a/tests/validation/fixtures/PoolingLayerFixture.h
+++ b/tests/validation/fixtures/PoolingLayerFixture.h
@@ -32,7 +32,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/PoolingLayer.h"
+#include "tests/validation/reference/PoolingLayer.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/QuantizationLayerFixture.h b/tests/validation/fixtures/QuantizationLayerFixture.h
index 83ee0495f3..6ce673a6f0 100644
--- a/tests/validation/fixtures/QuantizationLayerFixture.h
+++ b/tests/validation/fixtures/QuantizationLayerFixture.h
@@ -32,7 +32,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/QuantizationLayer.h"
+#include "tests/validation/reference/QuantizationLayer.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/ReductionOperationFixture.h b/tests/validation/fixtures/ReductionOperationFixture.h
index 7c871aed3b..6fa5f0c44f 100644
--- a/tests/validation/fixtures/ReductionOperationFixture.h
+++ b/tests/validation/fixtures/ReductionOperationFixture.h
@@ -32,7 +32,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/ReductionOperation.h"
+#include "tests/validation/reference/ReductionOperation.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/RemapFixture.h b/tests/validation/fixtures/RemapFixture.h
index 1cff1294ba..846ebf44a2 100644
--- a/tests/validation/fixtures/RemapFixture.h
+++ b/tests/validation/fixtures/RemapFixture.h
@@ -31,7 +31,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/Remap.h"
+#include "tests/validation/reference/Remap.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/ReshapeLayerFixture.h b/tests/validation/fixtures/ReshapeLayerFixture.h
index 435717cfbd..2bd514830f 100644
--- a/tests/validation/fixtures/ReshapeLayerFixture.h
+++ b/tests/validation/fixtures/ReshapeLayerFixture.h
@@ -31,7 +31,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/ReshapeLayer.h"
+#include "tests/validation/reference/ReshapeLayer.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/ScaleFixture.h b/tests/validation/fixtures/ScaleFixture.h
index 894260a02f..fe24f5bac5 100644
--- a/tests/validation/fixtures/ScaleFixture.h
+++ b/tests/validation/fixtures/ScaleFixture.h
@@ -31,7 +31,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/Scale.h"
+#include "tests/validation/reference/Scale.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/ScharrFixture.h b/tests/validation/fixtures/ScharrFixture.h
index f432f85032..36b8e98fb8 100644
--- a/tests/validation/fixtures/ScharrFixture.h
+++ b/tests/validation/fixtures/ScharrFixture.h
@@ -29,7 +29,7 @@
 #include "tests/Types.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/Scharr.h"
+#include "tests/validation/reference/Scharr.h"
 
 #include <memory>
 
diff --git a/tests/validation/fixtures/SobelFixture.h b/tests/validation/fixtures/SobelFixture.h
index f8041b9829..f075a69c40 100644
--- a/tests/validation/fixtures/SobelFixture.h
+++ b/tests/validation/fixtures/SobelFixture.h
@@ -32,7 +32,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/Sobel.h"
+#include "tests/validation/reference/Sobel.h"
 
 #include <memory>
 
diff --git a/tests/validation/fixtures/SoftmaxLayerFixture.h b/tests/validation/fixtures/SoftmaxLayerFixture.h
index 9836502cd2..3ffbc6aac7 100644
--- a/tests/validation/fixtures/SoftmaxLayerFixture.h
+++ b/tests/validation/fixtures/SoftmaxLayerFixture.h
@@ -32,7 +32,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/SoftmaxLayer.h"
+#include "tests/validation/reference/SoftmaxLayer.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/TableLookupFixture.h b/tests/validation/fixtures/TableLookupFixture.h
index 49e0f413ce..6886c7eca4 100644
--- a/tests/validation/fixtures/TableLookupFixture.h
+++ b/tests/validation/fixtures/TableLookupFixture.h
@@ -32,8 +32,8 @@
 #include "tests/RawLutAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/TableLookup.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/TableLookup.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/ThresholdFixture.h b/tests/validation/fixtures/ThresholdFixture.h
index 0ea43a5cb3..9a92175728 100644
--- a/tests/validation/fixtures/ThresholdFixture.h
+++ b/tests/validation/fixtures/ThresholdFixture.h
@@ -29,7 +29,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/Threshold.h"
+#include "tests/validation/reference/Threshold.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/TransposeFixture.h b/tests/validation/fixtures/TransposeFixture.h
index 7a9516a282..c798162a71 100644
--- a/tests/validation/fixtures/TransposeFixture.h
+++ b/tests/validation/fixtures/TransposeFixture.h
@@ -32,7 +32,7 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/Transpose.h"
+#include "tests/validation/reference/Transpose.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/WarpAffineFixture.h b/tests/validation/fixtures/WarpAffineFixture.h
index fef1f6b626..c027072a13 100644
--- a/tests/validation/fixtures/WarpAffineFixture.h
+++ b/tests/validation/fixtures/WarpAffineFixture.h
@@ -33,8 +33,8 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/Utils.h"
-#include "tests/validation/CPP/WarpAffine.h"
+#include "tests/validation/reference/Utils.h"
+#include "tests/validation/reference/WarpAffine.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/fixtures/WarpPerspectiveFixture.h b/tests/validation/fixtures/WarpPerspectiveFixture.h
index 1a6d6c035e..c804fa6da7 100644
--- a/tests/validation/fixtures/WarpPerspectiveFixture.h
+++ b/tests/validation/fixtures/WarpPerspectiveFixture.h
@@ -31,8 +31,8 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/Utils.h"
-#include "tests/validation/CPP/WarpPerspective.h"
+#include "tests/validation/reference/Utils.h"
+#include "tests/validation/reference/WarpPerspective.h"
 
 #include <random>
 
diff --git a/tests/validation/fixtures/WinogradLayerFixture.h b/tests/validation/fixtures/WinogradLayerFixture.h
index a5d6fc966d..7aa26c7143 100644
--- a/tests/validation/fixtures/WinogradLayerFixture.h
+++ b/tests/validation/fixtures/WinogradLayerFixture.h
@@ -32,9 +32,9 @@
 #include "tests/IAccessor.h"
 #include "tests/framework/Asserts.h"
 #include "tests/framework/Fixture.h"
-#include "tests/validation/CPP/ConvolutionLayer.h"
-#include "tests/validation/CPP/Utils.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/ConvolutionLayer.h"
+#include "tests/validation/reference/Utils.h"
 
 #include <random>
 
diff --git a/tests/validation/CPP/AbsoluteDifference.cpp b/tests/validation/reference/AbsoluteDifference.cpp
index f518e67324..f518e67324 100644
--- a/tests/validation/CPP/AbsoluteDifference.cpp
+++ b/tests/validation/reference/AbsoluteDifference.cpp
diff --git a/tests/validation/CPP/AbsoluteDifference.h b/tests/validation/reference/AbsoluteDifference.h
index b14da157df..b14da157df 100644
--- a/tests/validation/CPP/AbsoluteDifference.h
+++ b/tests/validation/reference/AbsoluteDifference.h
diff --git a/tests/validation/CPP/Accumulate.cpp b/tests/validation/reference/Accumulate.cpp
index 29a2007bbd..29a2007bbd 100644
--- a/tests/validation/CPP/Accumulate.cpp
+++ b/tests/validation/reference/Accumulate.cpp
diff --git a/tests/validation/CPP/Accumulate.h b/tests/validation/reference/Accumulate.h
index faa570bd05..faa570bd05 100644
--- a/tests/validation/CPP/Accumulate.h
+++ b/tests/validation/reference/Accumulate.h
diff --git a/tests/validation/CPP/ActivationLayer.cpp b/tests/validation/reference/ActivationLayer.cpp
index 2243e6ff59..2243e6ff59 100644
--- a/tests/validation/CPP/ActivationLayer.cpp
+++ b/tests/validation/reference/ActivationLayer.cpp
diff --git a/tests/validation/CPP/ActivationLayer.h b/tests/validation/reference/ActivationLayer.h
index 09f602ffa1..09f602ffa1 100644
--- a/tests/validation/CPP/ActivationLayer.h
+++ b/tests/validation/reference/ActivationLayer.h
diff --git a/tests/validation/CPP/ArithmeticAddition.cpp b/tests/validation/reference/ArithmeticAddition.cpp
index 82dd1437cd..82dd1437cd 100644
--- a/tests/validation/CPP/ArithmeticAddition.cpp
+++ b/tests/validation/reference/ArithmeticAddition.cpp
diff --git a/tests/validation/CPP/ArithmeticAddition.h b/tests/validation/reference/ArithmeticAddition.h
index 5902a6f529..5902a6f529 100644
--- a/tests/validation/CPP/ArithmeticAddition.h
+++ b/tests/validation/reference/ArithmeticAddition.h
diff --git a/tests/validation/CPP/ArithmeticSubtraction.cpp b/tests/validation/reference/ArithmeticSubtraction.cpp
index bed2d37090..bed2d37090 100644
--- a/tests/validation/CPP/ArithmeticSubtraction.cpp
+++ b/tests/validation/reference/ArithmeticSubtraction.cpp
diff --git a/tests/validation/CPP/ArithmeticSubtraction.h b/tests/validation/reference/ArithmeticSubtraction.h
index 9308314bda..9308314bda 100644
--- a/tests/validation/CPP/ArithmeticSubtraction.h
+++ b/tests/validation/reference/ArithmeticSubtraction.h
diff --git a/tests/validation/CPP/BatchNormalizationLayer.cpp b/tests/validation/reference/BatchNormalizationLayer.cpp
index e4446d1694..e4446d1694 100644
--- a/tests/validation/CPP/BatchNormalizationLayer.cpp
+++ b/tests/validation/reference/BatchNormalizationLayer.cpp
diff --git a/tests/validation/CPP/BatchNormalizationLayer.h b/tests/validation/reference/BatchNormalizationLayer.h
index 1a554adf7e..1a554adf7e 100644
--- a/tests/validation/CPP/BatchNormalizationLayer.h
+++ b/tests/validation/reference/BatchNormalizationLayer.h
diff --git a/tests/validation/CPP/BitwiseAnd.cpp b/tests/validation/reference/BitwiseAnd.cpp
index 6fc46b402b..6fc46b402b 100644
--- a/tests/validation/CPP/BitwiseAnd.cpp
+++ b/tests/validation/reference/BitwiseAnd.cpp
diff --git a/tests/validation/CPP/BitwiseAnd.h b/tests/validation/reference/BitwiseAnd.h
index eba2fd695f..eba2fd695f 100644
--- a/tests/validation/CPP/BitwiseAnd.h
+++ b/tests/validation/reference/BitwiseAnd.h
diff --git a/tests/validation/CPP/BitwiseNot.cpp b/tests/validation/reference/BitwiseNot.cpp
index 5a6a13b56c..5a6a13b56c 100644
--- a/tests/validation/CPP/BitwiseNot.cpp
+++ b/tests/validation/reference/BitwiseNot.cpp
diff --git a/tests/validation/CPP/BitwiseNot.h b/tests/validation/reference/BitwiseNot.h
index b4206f9388..b4206f9388 100644
--- a/tests/validation/CPP/BitwiseNot.h
+++ b/tests/validation/reference/BitwiseNot.h
diff --git a/tests/validation/CPP/BitwiseOr.cpp b/tests/validation/reference/BitwiseOr.cpp
index fc258d54f1..fc258d54f1 100644
--- a/tests/validation/CPP/BitwiseOr.cpp
+++ b/tests/validation/reference/BitwiseOr.cpp
diff --git a/tests/validation/CPP/BitwiseOr.h b/tests/validation/reference/BitwiseOr.h
index 39158cb411..39158cb411 100644
--- a/tests/validation/CPP/BitwiseOr.h
+++ b/tests/validation/reference/BitwiseOr.h
diff --git a/tests/validation/CPP/BitwiseXor.cpp b/tests/validation/reference/BitwiseXor.cpp
index b8d275d8b5..b8d275d8b5 100644
--- a/tests/validation/CPP/BitwiseXor.cpp
+++ b/tests/validation/reference/BitwiseXor.cpp
diff --git a/tests/validation/CPP/BitwiseXor.h b/tests/validation/reference/BitwiseXor.h
index 3e7721e843..3e7721e843 100644
--- a/tests/validation/CPP/BitwiseXor.h
+++ b/tests/validation/reference/BitwiseXor.h
diff --git a/tests/validation/CPP/Box3x3.cpp b/tests/validation/reference/Box3x3.cpp
index 8d304a8236..8d304a8236 100644
--- a/tests/validation/CPP/Box3x3.cpp
+++ b/tests/validation/reference/Box3x3.cpp
diff --git a/tests/validation/CPP/Box3x3.h b/tests/validation/reference/Box3x3.h
index 80ac451b93..80ac451b93 100644
--- a/tests/validation/CPP/Box3x3.h
+++ b/tests/validation/reference/Box3x3.h
diff --git a/tests/validation/CPP/ConvolutionLayer.cpp b/tests/validation/reference/ConvolutionLayer.cpp
index 3884a930a2..10664119fb 100644
--- a/tests/validation/CPP/ConvolutionLayer.cpp
+++ b/tests/validation/reference/ConvolutionLayer.cpp
@@ -23,10 +23,10 @@
  */
 #include "ConvolutionLayer.h"
 
-#include "tests/validation/CPP/Utils.h"
-#include "tests/validation/CPP/UtilsQuantizedAsymm.h"
 #include "tests/validation/FixedPoint.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/Utils.h"
+#include "tests/validation/reference/UtilsQuantizedAsymm.h"
 
 #include "tests/framework/Asserts.h"
 
diff --git a/tests/validation/CPP/ConvolutionLayer.h b/tests/validation/reference/ConvolutionLayer.h
index 57455ba401..57455ba401 100644
--- a/tests/validation/CPP/ConvolutionLayer.h
+++ b/tests/validation/reference/ConvolutionLayer.h
diff --git a/tests/validation/CPP/DeconvolutionLayer.cpp b/tests/validation/reference/DeconvolutionLayer.cpp
index 82c2188ade..82c2188ade 100644
--- a/tests/validation/CPP/DeconvolutionLayer.cpp
+++ b/tests/validation/reference/DeconvolutionLayer.cpp
diff --git a/tests/validation/CPP/DeconvolutionLayer.h b/tests/validation/reference/DeconvolutionLayer.h
index 8222e32027..8222e32027 100644
--- a/tests/validation/CPP/DeconvolutionLayer.h
+++ b/tests/validation/reference/DeconvolutionLayer.h
diff --git a/tests/validation/CPP/DepthConcatenateLayer.cpp b/tests/validation/reference/DepthConcatenateLayer.cpp
index 9a7248493d..9a7248493d 100644
--- a/tests/validation/CPP/DepthConcatenateLayer.cpp
+++ b/tests/validation/reference/DepthConcatenateLayer.cpp
diff --git a/tests/validation/CPP/DepthConcatenateLayer.h b/tests/validation/reference/DepthConcatenateLayer.h
index 3c486a8015..3c486a8015 100644
--- a/tests/validation/CPP/DepthConcatenateLayer.h
+++ b/tests/validation/reference/DepthConcatenateLayer.h
diff --git a/tests/validation/CPP/DepthConvertLayer.cpp b/tests/validation/reference/DepthConvertLayer.cpp
index dd095b8912..dd095b8912 100644
--- a/tests/validation/CPP/DepthConvertLayer.cpp
+++ b/tests/validation/reference/DepthConvertLayer.cpp
diff --git a/tests/validation/CPP/DepthConvertLayer.h b/tests/validation/reference/DepthConvertLayer.h
index 1446bfda5b..1446bfda5b 100644
--- a/tests/validation/CPP/DepthConvertLayer.h
+++ b/tests/validation/reference/DepthConvertLayer.h
diff --git a/tests/validation/CPP/DepthwiseConvolutionLayer.cpp b/tests/validation/reference/DepthwiseConvolutionLayer.cpp
index 99baa4b3c7..0e88d3dbd3 100644
--- a/tests/validation/CPP/DepthwiseConvolutionLayer.cpp
+++ b/tests/validation/reference/DepthwiseConvolutionLayer.cpp
@@ -26,10 +26,10 @@
 #include "ConvolutionLayer.h"
 #include "Utils.h"
 
-#include "tests/validation/CPP/Utils.h"
-#include "tests/validation/CPP/UtilsQuantizedAsymm.h"
 #include "tests/validation/FixedPoint.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/Utils.h"
+#include "tests/validation/reference/UtilsQuantizedAsymm.h"
 
 #include "arm_compute/core/utils/quantization/AsymmHelpers.h"
 
diff --git a/tests/validation/CPP/DepthwiseConvolutionLayer.h b/tests/validation/reference/DepthwiseConvolutionLayer.h
index df743a5b8e..df743a5b8e 100644
--- a/tests/validation/CPP/DepthwiseConvolutionLayer.h
+++ b/tests/validation/reference/DepthwiseConvolutionLayer.h
diff --git a/tests/validation/CPP/DepthwiseSeparableConvolutionLayer.cpp b/tests/validation/reference/DepthwiseSeparableConvolutionLayer.cpp
index ca6c168114..ca6c168114 100644
--- a/tests/validation/CPP/DepthwiseSeparableConvolutionLayer.cpp
+++ b/tests/validation/reference/DepthwiseSeparableConvolutionLayer.cpp
diff --git a/tests/validation/CPP/DepthwiseSeparableConvolutionLayer.h b/tests/validation/reference/DepthwiseSeparableConvolutionLayer.h
index 0fcce2c964..0fcce2c964 100644
--- a/tests/validation/CPP/DepthwiseSeparableConvolutionLayer.h
+++ b/tests/validation/reference/DepthwiseSeparableConvolutionLayer.h
diff --git a/tests/validation/CPP/DequantizationLayer.cpp b/tests/validation/reference/DequantizationLayer.cpp
index 33096a1d81..33096a1d81 100644
--- a/tests/validation/CPP/DequantizationLayer.cpp
+++ b/tests/validation/reference/DequantizationLayer.cpp
diff --git a/tests/validation/CPP/DequantizationLayer.h b/tests/validation/reference/DequantizationLayer.h
index 1a8adcf9d8..1a8adcf9d8 100644
--- a/tests/validation/CPP/DequantizationLayer.h
+++ b/tests/validation/reference/DequantizationLayer.h
diff --git a/tests/validation/CPP/Dilate.cpp b/tests/validation/reference/Dilate.cpp
index 0683a0a9a1..0683a0a9a1 100644
--- a/tests/validation/CPP/Dilate.cpp
+++ b/tests/validation/reference/Dilate.cpp
diff --git a/tests/validation/CPP/Dilate.h b/tests/validation/reference/Dilate.h
index 6586cbf841..6586cbf841 100644
--- a/tests/validation/CPP/Dilate.h
+++ b/tests/validation/reference/Dilate.h
diff --git a/tests/validation/CPP/Erode.cpp b/tests/validation/reference/Erode.cpp
index 5e8b36f47b..5e8b36f47b 100644
--- a/tests/validation/CPP/Erode.cpp
+++ b/tests/validation/reference/Erode.cpp
diff --git a/tests/validation/CPP/Erode.h b/tests/validation/reference/Erode.h
index 5e27513471..5e27513471 100644
--- a/tests/validation/CPP/Erode.h
+++ b/tests/validation/reference/Erode.h
diff --git a/tests/validation/CPP/FixedPoint.cpp b/tests/validation/reference/FixedPoint.cpp
index a016093ed6..a016093ed6 100644
--- a/tests/validation/CPP/FixedPoint.cpp
+++ b/tests/validation/reference/FixedPoint.cpp
diff --git a/tests/validation/CPP/FixedPoint.h b/tests/validation/reference/FixedPoint.h
index f0117f9dd0..f0117f9dd0 100644
--- a/tests/validation/CPP/FixedPoint.h
+++ b/tests/validation/reference/FixedPoint.h
diff --git a/tests/validation/CPP/FixedPointPixelWiseMultiplication.cpp b/tests/validation/reference/FixedPointPixelWiseMultiplication.cpp
index 636919b1ff..636919b1ff 100644
--- a/tests/validation/CPP/FixedPointPixelWiseMultiplication.cpp
+++ b/tests/validation/reference/FixedPointPixelWiseMultiplication.cpp
diff --git a/tests/validation/CPP/FixedPointPixelWiseMultiplication.h b/tests/validation/reference/FixedPointPixelWiseMultiplication.h
index 124a33c9da..124a33c9da 100644
--- a/tests/validation/CPP/FixedPointPixelWiseMultiplication.h
+++ b/tests/validation/reference/FixedPointPixelWiseMultiplication.h
diff --git a/tests/validation/CPP/FlattenLayer.cpp b/tests/validation/reference/FlattenLayer.cpp
index 611701d8cf..611701d8cf 100644
--- a/tests/validation/CPP/FlattenLayer.cpp
+++ b/tests/validation/reference/FlattenLayer.cpp
diff --git a/tests/validation/CPP/FlattenLayer.h b/tests/validation/reference/FlattenLayer.h
index b1286fe2bd..b1286fe2bd 100644
--- a/tests/validation/CPP/FlattenLayer.h
+++ b/tests/validation/reference/FlattenLayer.h
diff --git a/tests/validation/CPP/Floor.cpp b/tests/validation/reference/Floor.cpp
index 1c739448b7..1c739448b7 100644
--- a/tests/validation/CPP/Floor.cpp
+++ b/tests/validation/reference/Floor.cpp
diff --git a/tests/validation/CPP/Floor.h b/tests/validation/reference/Floor.h
index d95ee303fc..d95ee303fc 100644
--- a/tests/validation/CPP/Floor.h
+++ b/tests/validation/reference/Floor.h
diff --git a/tests/validation/CPP/FullyConnectedLayer.cpp b/tests/validation/reference/FullyConnectedLayer.cpp
index 6b618a955c..c24881e2b4 100644
--- a/tests/validation/CPP/FullyConnectedLayer.cpp
+++ b/tests/validation/reference/FullyConnectedLayer.cpp
@@ -24,8 +24,8 @@
 #include "FullyConnectedLayer.h"
 
 #include "arm_compute/core/Types.h"
-#include "tests/validation/CPP/UtilsQuantizedAsymm.h"
 #include "tests/validation/FixedPoint.h"
+#include "tests/validation/reference/UtilsQuantizedAsymm.h"
 
 #include "arm_compute/core/utils/quantization/AsymmHelpers.h"
 
diff --git a/tests/validation/CPP/FullyConnectedLayer.h b/tests/validation/reference/FullyConnectedLayer.h
index 1dfb496924..1dfb496924 100644
--- a/tests/validation/CPP/FullyConnectedLayer.h
+++ b/tests/validation/reference/FullyConnectedLayer.h
diff --git a/tests/validation/CPP/GEMM.cpp b/tests/validation/reference/GEMM.cpp
index 77d025ec8e..77d025ec8e 100644
--- a/tests/validation/CPP/GEMM.cpp
+++ b/tests/validation/reference/GEMM.cpp
diff --git a/tests/validation/CPP/GEMM.h b/tests/validation/reference/GEMM.h
index cda792bf8b..cda792bf8b 100644
--- a/tests/validation/CPP/GEMM.h
+++ b/tests/validation/reference/GEMM.h
diff --git a/tests/validation/CPP/GEMMInterleave4x4.h b/tests/validation/reference/GEMMInterleave4x4.h
index e6b09afb9a..e6b09afb9a 100644
--- a/tests/validation/CPP/GEMMInterleave4x4.h
+++ b/tests/validation/reference/GEMMInterleave4x4.h
diff --git a/tests/validation/CPP/GEMMInterleaveBlocked.h b/tests/validation/reference/GEMMInterleaveBlocked.h
index ff5a0d647c..ff5a0d647c 100644
--- a/tests/validation/CPP/GEMMInterleaveBlocked.h
+++ b/tests/validation/reference/GEMMInterleaveBlocked.h
diff --git a/tests/validation/CPP/GEMMLowp.cpp b/tests/validation/reference/GEMMLowp.cpp
index 92878947c8..8e41aef46a 100644
--- a/tests/validation/CPP/GEMMLowp.cpp
+++ b/tests/validation/reference/GEMMLowp.cpp
@@ -24,7 +24,7 @@
 #include "GEMMLowp.h"
 
 #include "arm_compute/core/Types.h"
-#include "tests/validation/CPP/UtilsQuantizedAsymm.h"
+#include "tests/validation/reference/UtilsQuantizedAsymm.h"
 
 #include <limits>
 
diff --git a/tests/validation/CPP/GEMMLowp.h b/tests/validation/reference/GEMMLowp.h
index a3d0bebe3f..a3d0bebe3f 100644
--- a/tests/validation/CPP/GEMMLowp.h
+++ b/tests/validation/reference/GEMMLowp.h
diff --git a/tests/validation/CPP/Gaussian3x3.cpp b/tests/validation/reference/Gaussian3x3.cpp
index c71eade5c1..c71eade5c1 100644
--- a/tests/validation/CPP/Gaussian3x3.cpp
+++ b/tests/validation/reference/Gaussian3x3.cpp
diff --git a/tests/validation/CPP/Gaussian3x3.h b/tests/validation/reference/Gaussian3x3.h
index 85a7acdbfc..85a7acdbfc 100644
--- a/tests/validation/CPP/Gaussian3x3.h
+++ b/tests/validation/reference/Gaussian3x3.h
diff --git a/tests/validation/CPP/Gaussian5x5.cpp b/tests/validation/reference/Gaussian5x5.cpp
index 55bb287fbe..55bb287fbe 100644
--- a/tests/validation/CPP/Gaussian5x5.cpp
+++ b/tests/validation/reference/Gaussian5x5.cpp
diff --git a/tests/validation/CPP/Gaussian5x5.h b/tests/validation/reference/Gaussian5x5.h
index df981c70b0..df981c70b0 100644
--- a/tests/validation/CPP/Gaussian5x5.h
+++ b/tests/validation/reference/Gaussian5x5.h
diff --git a/tests/validation/CPP/GaussianPyramidHalf.cpp b/tests/validation/reference/GaussianPyramidHalf.cpp
index 0a68dedaee..0a68dedaee 100644
--- a/tests/validation/CPP/GaussianPyramidHalf.cpp
+++ b/tests/validation/reference/GaussianPyramidHalf.cpp
diff --git a/tests/validation/CPP/GaussianPyramidHalf.h b/tests/validation/reference/GaussianPyramidHalf.h
index abd29e1700..abd29e1700 100644
--- a/tests/validation/CPP/GaussianPyramidHalf.h
+++ b/tests/validation/reference/GaussianPyramidHalf.h
diff --git a/tests/validation/CPP/HarrisCornerDetector.cpp b/tests/validation/reference/HarrisCornerDetector.cpp
index 6cfcd8ecc5..12afd95efa 100644
--- a/tests/validation/CPP/HarrisCornerDetector.cpp
+++ b/tests/validation/reference/HarrisCornerDetector.cpp
@@ -24,9 +24,9 @@
 #include "HarrisCornerDetector.h"
 
 #include "Utils.h"
-#include "tests/validation/CPP/NonMaximaSuppression.h"
-#include "tests/validation/CPP/Sobel.h"
 #include "tests/validation/Helpers.h"
+#include "tests/validation/reference/NonMaximaSuppression.h"
+#include "tests/validation/reference/Sobel.h"
 
 namespace arm_compute
 {
diff --git a/tests/validation/CPP/HarrisCornerDetector.h b/tests/validation/reference/HarrisCornerDetector.h
index 042e8570c2..042e8570c2 100644
--- a/tests/validation/CPP/HarrisCornerDetector.h
+++ b/tests/validation/reference/HarrisCornerDetector.h
diff --git a/tests/validation/CPP/Histogram.cpp b/tests/validation/reference/Histogram.cpp
index 594c4fb81f..594c4fb81f 100644
--- a/tests/validation/CPP/Histogram.cpp
+++ b/tests/validation/reference/Histogram.cpp
diff --git a/tests/validation/CPP/Histogram.h b/tests/validation/reference/Histogram.h
index 7ec16693aa..7ec16693aa 100644
--- a/tests/validation/CPP/Histogram.h
+++ b/tests/validation/reference/Histogram.h
diff --git a/tests/validation/CPP/IntegralImage.cpp b/tests/validation/reference/IntegralImage.cpp
index 8d07e995b5..8d07e995b5 100644
--- a/tests/validation/CPP/IntegralImage.cpp
+++ b/tests/validation/reference/IntegralImage.cpp
diff --git a/tests/validation/CPP/IntegralImage.h b/tests/validation/reference/IntegralImage.h
index c766aae89e..c766aae89e 100644
--- a/tests/validation/CPP/IntegralImage.h
+++ b/tests/validation/reference/IntegralImage.h
diff --git a/tests/validation/CPP/L2NormalizeLayer.cpp b/tests/validation/reference/L2NormalizeLayer.cpp
index 99f4e8a6e6..99f4e8a6e6 100644
--- a/tests/validation/CPP/L2NormalizeLayer.cpp
+++ b/tests/validation/reference/L2NormalizeLayer.cpp
diff --git a/tests/validation/CPP/L2NormalizeLayer.h b/tests/validation/reference/L2NormalizeLayer.h
index 1db3ae6174..1db3ae6174 100644
--- a/tests/validation/CPP/L2NormalizeLayer.h
+++ b/tests/validation/reference/L2NormalizeLayer.h
diff --git a/tests/validation/CPP/Magnitude.cpp b/tests/validation/reference/Magnitude.cpp
index f0002bfb33..f0002bfb33 100644
--- a/tests/validation/CPP/Magnitude.cpp
+++ b/tests/validation/reference/Magnitude.cpp
diff --git a/tests/validation/CPP/Magnitude.h b/tests/validation/reference/Magnitude.h
index 75620712e3..75620712e3 100644
--- a/tests/validation/CPP/Magnitude.h
+++ b/tests/validation/reference/Magnitude.h
diff --git a/tests/validation/CPP/MeanStdDev.cpp b/tests/validation/reference/MeanStdDev.cpp
index 4a39b13d56..4a39b13d56 100644
--- a/tests/validation/CPP/MeanStdDev.cpp
+++ b/tests/validation/reference/MeanStdDev.cpp
diff --git a/tests/validation/CPP/MeanStdDev.h b/tests/validation/reference/MeanStdDev.h
index 6b89ae0656..6b89ae0656 100644
--- a/tests/validation/CPP/MeanStdDev.h
+++ b/tests/validation/reference/MeanStdDev.h
diff --git a/tests/validation/CPP/Median3x3.cpp b/tests/validation/reference/Median3x3.cpp
index 91a787a0a3..91a787a0a3 100644
--- a/tests/validation/CPP/Median3x3.cpp
+++ b/tests/validation/reference/Median3x3.cpp
diff --git a/tests/validation/CPP/Median3x3.h b/tests/validation/reference/Median3x3.h
index 8345daa5e0..8345daa5e0 100644
--- a/tests/validation/CPP/Median3x3.h
+++ b/tests/validation/reference/Median3x3.h
diff --git a/tests/validation/CPP/MinMaxLocation.cpp b/tests/validation/reference/MinMaxLocation.cpp
index 427adebc61..427adebc61 100644
--- a/tests/validation/CPP/MinMaxLocation.cpp
+++ b/tests/validation/reference/MinMaxLocation.cpp
diff --git a/tests/validation/CPP/MinMaxLocation.h b/tests/validation/reference/MinMaxLocation.h
index ebaf90b131..ebaf90b131 100644
--- a/tests/validation/CPP/MinMaxLocation.h
+++ b/tests/validation/reference/MinMaxLocation.h
diff --git a/tests/validation/CPP/NonLinearFilter.cpp b/tests/validation/reference/NonLinearFilter.cpp
index 8669c9c776..8669c9c776 100644
--- a/tests/validation/CPP/NonLinearFilter.cpp
+++ b/tests/validation/reference/NonLinearFilter.cpp
diff --git a/tests/validation/CPP/NonLinearFilter.h b/tests/validation/reference/NonLinearFilter.h
index 1df47c85be..1df47c85be 100644
--- a/tests/validation/CPP/NonLinearFilter.h
+++ b/tests/validation/reference/NonLinearFilter.h
diff --git a/tests/validation/CPP/NonMaximaSuppression.cpp b/tests/validation/reference/NonMaximaSuppression.cpp
index eab5cecfc8..eab5cecfc8 100644
--- a/tests/validation/CPP/NonMaximaSuppression.cpp
+++ b/tests/validation/reference/NonMaximaSuppression.cpp
diff --git a/tests/validation/CPP/NonMaximaSuppression.h b/tests/validation/reference/NonMaximaSuppression.h
index 2086abfe83..2086abfe83 100644
--- a/tests/validation/CPP/NonMaximaSuppression.h
+++ b/tests/validation/reference/NonMaximaSuppression.h
diff --git a/tests/validation/CPP/NormalizationLayer.cpp b/tests/validation/reference/NormalizationLayer.cpp
index 226af96fe3..226af96fe3 100644
--- a/tests/validation/CPP/NormalizationLayer.cpp
+++ b/tests/validation/reference/NormalizationLayer.cpp
diff --git a/tests/validation/CPP/NormalizationLayer.h b/tests/validation/reference/NormalizationLayer.h
index 3f624ff30a..3f624ff30a 100644
--- a/tests/validation/CPP/NormalizationLayer.h
+++ b/tests/validation/reference/NormalizationLayer.h
diff --git a/tests/validation/CPP/Phase.cpp b/tests/validation/reference/Phase.cpp
index 7827cd2989..7827cd2989 100644
--- a/tests/validation/CPP/Phase.cpp
+++ b/tests/validation/reference/Phase.cpp
diff --git a/tests/validation/CPP/Phase.h b/tests/validation/reference/Phase.h
index d322d53e02..d322d53e02 100644
--- a/tests/validation/CPP/Phase.h
+++ b/tests/validation/reference/Phase.h
diff --git a/tests/validation/CPP/PixelWiseMultiplication.cpp b/tests/validation/reference/PixelWiseMultiplication.cpp
index b3647fc9ce..b3647fc9ce 100644
--- a/tests/validation/CPP/PixelWiseMultiplication.cpp
+++ b/tests/validation/reference/PixelWiseMultiplication.cpp
diff --git a/tests/validation/CPP/PixelWiseMultiplication.h b/tests/validation/reference/PixelWiseMultiplication.h
index 1dce154719..1dce154719 100644
--- a/tests/validation/CPP/PixelWiseMultiplication.h
+++ b/tests/validation/reference/PixelWiseMultiplication.h
diff --git a/tests/validation/CPP/PoolingLayer.cpp b/tests/validation/reference/PoolingLayer.cpp
index 1a7dd4cbb7..1a7dd4cbb7 100644
--- a/tests/validation/CPP/PoolingLayer.cpp
+++ b/tests/validation/reference/PoolingLayer.cpp
diff --git a/tests/validation/CPP/PoolingLayer.h b/tests/validation/reference/PoolingLayer.h
index 334054a0eb..334054a0eb 100644
--- a/tests/validation/CPP/PoolingLayer.h
+++ b/tests/validation/reference/PoolingLayer.h
diff --git a/tests/validation/CPP/QuantizationLayer.cpp b/tests/validation/reference/QuantizationLayer.cpp
index d7ce490209..d7ce490209 100644
--- a/tests/validation/CPP/QuantizationLayer.cpp
+++ b/tests/validation/reference/QuantizationLayer.cpp
diff --git a/tests/validation/CPP/QuantizationLayer.h b/tests/validation/reference/QuantizationLayer.h
index 7c5572ccf8..7c5572ccf8 100644
--- a/tests/validation/CPP/QuantizationLayer.h
+++ b/tests/validation/reference/QuantizationLayer.h
diff --git a/tests/validation/CPP/ReductionOperation.cpp b/tests/validation/reference/ReductionOperation.cpp
index acfcc09cea..acfcc09cea 100644
--- a/tests/validation/CPP/ReductionOperation.cpp
+++ b/tests/validation/reference/ReductionOperation.cpp
diff --git a/tests/validation/CPP/ReductionOperation.h b/tests/validation/reference/ReductionOperation.h
index 6da6436686..6da6436686 100644
--- a/tests/validation/CPP/ReductionOperation.h
+++ b/tests/validation/reference/ReductionOperation.h
diff --git a/tests/validation/CPP/Remap.cpp b/tests/validation/reference/Remap.cpp
index bef5962fbf..bef5962fbf 100644
--- a/tests/validation/CPP/Remap.cpp
+++ b/tests/validation/reference/Remap.cpp
diff --git a/tests/validation/CPP/Remap.h b/tests/validation/reference/Remap.h
index 918ba95d3c..918ba95d3c 100644
--- a/tests/validation/CPP/Remap.h
+++ b/tests/validation/reference/Remap.h
diff --git a/tests/validation/CPP/ReshapeLayer.cpp b/tests/validation/reference/ReshapeLayer.cpp
index 42f06e4f5a..42f06e4f5a 100644
--- a/tests/validation/CPP/ReshapeLayer.cpp
+++ b/tests/validation/reference/ReshapeLayer.cpp
diff --git a/tests/validation/CPP/ReshapeLayer.h b/tests/validation/reference/ReshapeLayer.h
index fc6c716d7a..fc6c716d7a 100644
--- a/tests/validation/CPP/ReshapeLayer.h
+++ b/tests/validation/reference/ReshapeLayer.h
diff --git a/tests/validation/CPP/Scale.cpp b/tests/validation/reference/Scale.cpp
index 727325f675..727325f675 100644
--- a/tests/validation/CPP/Scale.cpp
+++ b/tests/validation/reference/Scale.cpp
diff --git a/tests/validation/CPP/Scale.h b/tests/validation/reference/Scale.h
index 566e30af10..566e30af10 100644
--- a/tests/validation/CPP/Scale.h
+++ b/tests/validation/reference/Scale.h
diff --git a/tests/validation/CPP/Scharr.cpp b/tests/validation/reference/Scharr.cpp
index 98e4d62dba..98e4d62dba 100644
--- a/tests/validation/CPP/Scharr.cpp
+++ b/tests/validation/reference/Scharr.cpp
diff --git a/tests/validation/CPP/Scharr.h b/tests/validation/reference/Scharr.h
index 8f383811cf..8f383811cf 100644
--- a/tests/validation/CPP/Scharr.h
+++ b/tests/validation/reference/Scharr.h
diff --git a/tests/validation/CPP/Sobel.cpp b/tests/validation/reference/Sobel.cpp
index ff0e11d3a8..ff0e11d3a8 100644
--- a/tests/validation/CPP/Sobel.cpp
+++ b/tests/validation/reference/Sobel.cpp
diff --git a/tests/validation/CPP/Sobel.h b/tests/validation/reference/Sobel.h
index 9099f1a932..9099f1a932 100644
--- a/tests/validation/CPP/Sobel.h
+++ b/tests/validation/reference/Sobel.h
diff --git a/tests/validation/CPP/SoftmaxLayer.cpp b/tests/validation/reference/SoftmaxLayer.cpp
index 8e8cc1bd25..8e8cc1bd25 100644
--- a/tests/validation/CPP/SoftmaxLayer.cpp
+++ b/tests/validation/reference/SoftmaxLayer.cpp
diff --git a/tests/validation/CPP/SoftmaxLayer.h b/tests/validation/reference/SoftmaxLayer.h
index ab79bc4850..ab79bc4850 100644
--- a/tests/validation/CPP/SoftmaxLayer.h
+++ b/tests/validation/reference/SoftmaxLayer.h
diff --git a/tests/validation/CPP/TableLookup.cpp b/tests/validation/reference/TableLookup.cpp
index 7f105d99ca..7f105d99ca 100644
--- a/tests/validation/CPP/TableLookup.cpp
+++ b/tests/validation/reference/TableLookup.cpp
diff --git a/tests/validation/CPP/TableLookup.h b/tests/validation/reference/TableLookup.h
index 3fdecac660..3fdecac660 100644
--- a/tests/validation/CPP/TableLookup.h
+++ b/tests/validation/reference/TableLookup.h
diff --git a/tests/validation/CPP/Threshold.cpp b/tests/validation/reference/Threshold.cpp
index d0ef31df04..d0ef31df04 100644
--- a/tests/validation/CPP/Threshold.cpp
+++ b/tests/validation/reference/Threshold.cpp
diff --git a/tests/validation/CPP/Threshold.h b/tests/validation/reference/Threshold.h
index fbe2dba19b..fbe2dba19b 100644
--- a/tests/validation/CPP/Threshold.h
+++ b/tests/validation/reference/Threshold.h
diff --git a/tests/validation/CPP/Transpose.cpp b/tests/validation/reference/Transpose.cpp
index 9f2e62e1aa..9f2e62e1aa 100644
--- a/tests/validation/CPP/Transpose.cpp
+++ b/tests/validation/reference/Transpose.cpp
diff --git a/tests/validation/CPP/Transpose.h b/tests/validation/reference/Transpose.h
index 3f42f41253..3f42f41253 100644
--- a/tests/validation/CPP/Transpose.h
+++ b/tests/validation/reference/Transpose.h
diff --git a/tests/validation/CPP/Utils.cpp b/tests/validation/reference/Utils.cpp
index d163e8436f..d163e8436f 100644
--- a/tests/validation/CPP/Utils.cpp
+++ b/tests/validation/reference/Utils.cpp
diff --git a/tests/validation/CPP/Utils.h b/tests/validation/reference/Utils.h
index 2aa77c6ff7..2aa77c6ff7 100644
--- a/tests/validation/CPP/Utils.h
+++ b/tests/validation/reference/Utils.h
diff --git a/tests/validation/CPP/UtilsQuantizedAsymm.h b/tests/validation/reference/UtilsQuantizedAsymm.h
index b7b69d588a..b7b69d588a 100644
--- a/tests/validation/CPP/UtilsQuantizedAsymm.h
+++ b/tests/validation/reference/UtilsQuantizedAsymm.h
diff --git a/tests/validation/CPP/WarpAffine.cpp b/tests/validation/reference/WarpAffine.cpp
index 7b903b7661..7b903b7661 100644
--- a/tests/validation/CPP/WarpAffine.cpp
+++ b/tests/validation/reference/WarpAffine.cpp
diff --git a/tests/validation/CPP/WarpAffine.h b/tests/validation/reference/WarpAffine.h
index 973b1b2e29..973b1b2e29 100644
--- a/tests/validation/CPP/WarpAffine.h
+++ b/tests/validation/reference/WarpAffine.h
diff --git a/tests/validation/CPP/WarpPerspective.cpp b/tests/validation/reference/WarpPerspective.cpp
index 7a50253d69..7a50253d69 100644
--- a/tests/validation/CPP/WarpPerspective.cpp
+++ b/tests/validation/reference/WarpPerspective.cpp
diff --git a/tests/validation/CPP/WarpPerspective.h b/tests/validation/reference/WarpPerspective.h
index 2367f4d6dc..2367f4d6dc 100644
--- a/tests/validation/CPP/WarpPerspective.h
+++ b/tests/validation/reference/WarpPerspective.h