diff --git a/tests/SConscript b/tests/SConscript
index 3a6422d..37ec95f 100644
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -81,7 +81,7 @@
 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 9db2cca..7f3001c 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 fb4944f..a9130cf 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 678549d..8c83507 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 54e202d..b725304 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 3d8ca2d..0910001 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 384e63b..75e625f 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 02c3ca9..c3a51b9 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 9e65fae..ba0dd14 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 f4772a8..298c9ca 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 0dfff86..c1247de 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 e5bf699..f90d089 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 d61e767..d6ec5b8 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 16fa8c0..8da2181 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 1aa958a..e851b34 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 fe20699..8597808 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 8dff97d..e98f5e9 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 103c73e..e7fe634 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 c2fdc75..4b4e959 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 0af3fdf..4426215 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 9b9c0c5..8bce60c 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 28d43cf..5855820 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 7b56cf6..aa531a1 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 4916c33..d63a5bc 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 6ba5fc1..d37cac0 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 2980e2f..3f3bb6e 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 d090d85..73386df 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 faf53c7..436138b 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 3f94841..246105e 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 dba20bb..f23fc20 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 923a29c..e807ad8 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 b5e3eb6..1f0a742 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 89c188f..488324d 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 38e08f7..ff33c9d 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 d3e2aac..c504e2e 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 72f082e..396e63e 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 9fdb0d2..31d7acf 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 c3e3efb..ef7657a 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 50677f6..6395e3b 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 943b2cd..7349bdf 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 2f0ec51..8d2149e 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 7bb9588..6f11dcb 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 dcd3da8..1c52907 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 37f538b..17dfe78 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 b45e935..0946358 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 bf076ef..120a5c4 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 2f22873..78ba0ea 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 67881d0..e7d83c7 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 693a61e..09badcf 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 351349e..7428fb5 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 1419251..890eef2 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 83ee049..6ce673a 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 7c871ae..6fa5f0c 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 1cff129..846ebf4 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 435717c..2bd5148 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 894260a..fe24f5b 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 f432f85..36b8e98 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 f8041b9..f075a69 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 9836502..3ffbc6a 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 49e0f41..6886c7e 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 0ea43a5..9a92175 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 7a9516a..c798162 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 fef1f6b..c027072a 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 1a6d6c0..c804fa6 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 a5d6fc9..7aa26c7 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
similarity index 100%
rename from tests/validation/CPP/AbsoluteDifference.cpp
rename to tests/validation/reference/AbsoluteDifference.cpp
diff --git a/tests/validation/CPP/AbsoluteDifference.h b/tests/validation/reference/AbsoluteDifference.h
similarity index 100%
rename from tests/validation/CPP/AbsoluteDifference.h
rename to tests/validation/reference/AbsoluteDifference.h
diff --git a/tests/validation/CPP/Accumulate.cpp b/tests/validation/reference/Accumulate.cpp
similarity index 100%
rename from tests/validation/CPP/Accumulate.cpp
rename to tests/validation/reference/Accumulate.cpp
diff --git a/tests/validation/CPP/Accumulate.h b/tests/validation/reference/Accumulate.h
similarity index 100%
rename from tests/validation/CPP/Accumulate.h
rename to tests/validation/reference/Accumulate.h
diff --git a/tests/validation/CPP/ActivationLayer.cpp b/tests/validation/reference/ActivationLayer.cpp
similarity index 100%
rename from tests/validation/CPP/ActivationLayer.cpp
rename to tests/validation/reference/ActivationLayer.cpp
diff --git a/tests/validation/CPP/ActivationLayer.h b/tests/validation/reference/ActivationLayer.h
similarity index 100%
rename from tests/validation/CPP/ActivationLayer.h
rename to tests/validation/reference/ActivationLayer.h
diff --git a/tests/validation/CPP/ArithmeticAddition.cpp b/tests/validation/reference/ArithmeticAddition.cpp
similarity index 100%
rename from tests/validation/CPP/ArithmeticAddition.cpp
rename to tests/validation/reference/ArithmeticAddition.cpp
diff --git a/tests/validation/CPP/ArithmeticAddition.h b/tests/validation/reference/ArithmeticAddition.h
similarity index 100%
rename from tests/validation/CPP/ArithmeticAddition.h
rename to tests/validation/reference/ArithmeticAddition.h
diff --git a/tests/validation/CPP/ArithmeticSubtraction.cpp b/tests/validation/reference/ArithmeticSubtraction.cpp
similarity index 100%
rename from tests/validation/CPP/ArithmeticSubtraction.cpp
rename to tests/validation/reference/ArithmeticSubtraction.cpp
diff --git a/tests/validation/CPP/ArithmeticSubtraction.h b/tests/validation/reference/ArithmeticSubtraction.h
similarity index 100%
rename from tests/validation/CPP/ArithmeticSubtraction.h
rename to tests/validation/reference/ArithmeticSubtraction.h
diff --git a/tests/validation/CPP/BatchNormalizationLayer.cpp b/tests/validation/reference/BatchNormalizationLayer.cpp
similarity index 100%
rename from tests/validation/CPP/BatchNormalizationLayer.cpp
rename to tests/validation/reference/BatchNormalizationLayer.cpp
diff --git a/tests/validation/CPP/BatchNormalizationLayer.h b/tests/validation/reference/BatchNormalizationLayer.h
similarity index 100%
rename from tests/validation/CPP/BatchNormalizationLayer.h
rename to tests/validation/reference/BatchNormalizationLayer.h
diff --git a/tests/validation/CPP/BitwiseAnd.cpp b/tests/validation/reference/BitwiseAnd.cpp
similarity index 100%
rename from tests/validation/CPP/BitwiseAnd.cpp
rename to tests/validation/reference/BitwiseAnd.cpp
diff --git a/tests/validation/CPP/BitwiseAnd.h b/tests/validation/reference/BitwiseAnd.h
similarity index 100%
rename from tests/validation/CPP/BitwiseAnd.h
rename to tests/validation/reference/BitwiseAnd.h
diff --git a/tests/validation/CPP/BitwiseNot.cpp b/tests/validation/reference/BitwiseNot.cpp
similarity index 100%
rename from tests/validation/CPP/BitwiseNot.cpp
rename to tests/validation/reference/BitwiseNot.cpp
diff --git a/tests/validation/CPP/BitwiseNot.h b/tests/validation/reference/BitwiseNot.h
similarity index 100%
rename from tests/validation/CPP/BitwiseNot.h
rename to tests/validation/reference/BitwiseNot.h
diff --git a/tests/validation/CPP/BitwiseOr.cpp b/tests/validation/reference/BitwiseOr.cpp
similarity index 100%
rename from tests/validation/CPP/BitwiseOr.cpp
rename to tests/validation/reference/BitwiseOr.cpp
diff --git a/tests/validation/CPP/BitwiseOr.h b/tests/validation/reference/BitwiseOr.h
similarity index 100%
rename from tests/validation/CPP/BitwiseOr.h
rename to tests/validation/reference/BitwiseOr.h
diff --git a/tests/validation/CPP/BitwiseXor.cpp b/tests/validation/reference/BitwiseXor.cpp
similarity index 100%
rename from tests/validation/CPP/BitwiseXor.cpp
rename to tests/validation/reference/BitwiseXor.cpp
diff --git a/tests/validation/CPP/BitwiseXor.h b/tests/validation/reference/BitwiseXor.h
similarity index 100%
rename from tests/validation/CPP/BitwiseXor.h
rename to tests/validation/reference/BitwiseXor.h
diff --git a/tests/validation/CPP/Box3x3.cpp b/tests/validation/reference/Box3x3.cpp
similarity index 100%
rename from tests/validation/CPP/Box3x3.cpp
rename to tests/validation/reference/Box3x3.cpp
diff --git a/tests/validation/CPP/Box3x3.h b/tests/validation/reference/Box3x3.h
similarity index 100%
rename from tests/validation/CPP/Box3x3.h
rename to tests/validation/reference/Box3x3.h
diff --git a/tests/validation/CPP/ConvolutionLayer.cpp b/tests/validation/reference/ConvolutionLayer.cpp
similarity index 98%
rename from tests/validation/CPP/ConvolutionLayer.cpp
rename to tests/validation/reference/ConvolutionLayer.cpp
index 3884a93..1066411 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
similarity index 100%
rename from tests/validation/CPP/ConvolutionLayer.h
rename to tests/validation/reference/ConvolutionLayer.h
diff --git a/tests/validation/CPP/DeconvolutionLayer.cpp b/tests/validation/reference/DeconvolutionLayer.cpp
similarity index 100%
rename from tests/validation/CPP/DeconvolutionLayer.cpp
rename to tests/validation/reference/DeconvolutionLayer.cpp
diff --git a/tests/validation/CPP/DeconvolutionLayer.h b/tests/validation/reference/DeconvolutionLayer.h
similarity index 100%
rename from tests/validation/CPP/DeconvolutionLayer.h
rename to tests/validation/reference/DeconvolutionLayer.h
diff --git a/tests/validation/CPP/DepthConcatenateLayer.cpp b/tests/validation/reference/DepthConcatenateLayer.cpp
similarity index 100%
rename from tests/validation/CPP/DepthConcatenateLayer.cpp
rename to tests/validation/reference/DepthConcatenateLayer.cpp
diff --git a/tests/validation/CPP/DepthConcatenateLayer.h b/tests/validation/reference/DepthConcatenateLayer.h
similarity index 100%
rename from tests/validation/CPP/DepthConcatenateLayer.h
rename to tests/validation/reference/DepthConcatenateLayer.h
diff --git a/tests/validation/CPP/DepthConvertLayer.cpp b/tests/validation/reference/DepthConvertLayer.cpp
similarity index 100%
rename from tests/validation/CPP/DepthConvertLayer.cpp
rename to tests/validation/reference/DepthConvertLayer.cpp
diff --git a/tests/validation/CPP/DepthConvertLayer.h b/tests/validation/reference/DepthConvertLayer.h
similarity index 100%
rename from tests/validation/CPP/DepthConvertLayer.h
rename to tests/validation/reference/DepthConvertLayer.h
diff --git a/tests/validation/CPP/DepthwiseConvolutionLayer.cpp b/tests/validation/reference/DepthwiseConvolutionLayer.cpp
similarity index 98%
rename from tests/validation/CPP/DepthwiseConvolutionLayer.cpp
rename to tests/validation/reference/DepthwiseConvolutionLayer.cpp
index 99baa4b..0e88d3d 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
similarity index 100%
rename from tests/validation/CPP/DepthwiseConvolutionLayer.h
rename to tests/validation/reference/DepthwiseConvolutionLayer.h
diff --git a/tests/validation/CPP/DepthwiseSeparableConvolutionLayer.cpp b/tests/validation/reference/DepthwiseSeparableConvolutionLayer.cpp
similarity index 100%
rename from tests/validation/CPP/DepthwiseSeparableConvolutionLayer.cpp
rename to tests/validation/reference/DepthwiseSeparableConvolutionLayer.cpp
diff --git a/tests/validation/CPP/DepthwiseSeparableConvolutionLayer.h b/tests/validation/reference/DepthwiseSeparableConvolutionLayer.h
similarity index 100%
rename from tests/validation/CPP/DepthwiseSeparableConvolutionLayer.h
rename to tests/validation/reference/DepthwiseSeparableConvolutionLayer.h
diff --git a/tests/validation/CPP/DequantizationLayer.cpp b/tests/validation/reference/DequantizationLayer.cpp
similarity index 100%
rename from tests/validation/CPP/DequantizationLayer.cpp
rename to tests/validation/reference/DequantizationLayer.cpp
diff --git a/tests/validation/CPP/DequantizationLayer.h b/tests/validation/reference/DequantizationLayer.h
similarity index 100%
rename from tests/validation/CPP/DequantizationLayer.h
rename to tests/validation/reference/DequantizationLayer.h
diff --git a/tests/validation/CPP/Dilate.cpp b/tests/validation/reference/Dilate.cpp
similarity index 100%
rename from tests/validation/CPP/Dilate.cpp
rename to tests/validation/reference/Dilate.cpp
diff --git a/tests/validation/CPP/Dilate.h b/tests/validation/reference/Dilate.h
similarity index 100%
rename from tests/validation/CPP/Dilate.h
rename to tests/validation/reference/Dilate.h
diff --git a/tests/validation/CPP/Erode.cpp b/tests/validation/reference/Erode.cpp
similarity index 100%
rename from tests/validation/CPP/Erode.cpp
rename to tests/validation/reference/Erode.cpp
diff --git a/tests/validation/CPP/Erode.h b/tests/validation/reference/Erode.h
similarity index 100%
rename from tests/validation/CPP/Erode.h
rename to tests/validation/reference/Erode.h
diff --git a/tests/validation/CPP/FixedPoint.cpp b/tests/validation/reference/FixedPoint.cpp
similarity index 100%
rename from tests/validation/CPP/FixedPoint.cpp
rename to tests/validation/reference/FixedPoint.cpp
diff --git a/tests/validation/CPP/FixedPoint.h b/tests/validation/reference/FixedPoint.h
similarity index 100%
rename from tests/validation/CPP/FixedPoint.h
rename to tests/validation/reference/FixedPoint.h
diff --git a/tests/validation/CPP/FixedPointPixelWiseMultiplication.cpp b/tests/validation/reference/FixedPointPixelWiseMultiplication.cpp
similarity index 100%
rename from tests/validation/CPP/FixedPointPixelWiseMultiplication.cpp
rename to tests/validation/reference/FixedPointPixelWiseMultiplication.cpp
diff --git a/tests/validation/CPP/FixedPointPixelWiseMultiplication.h b/tests/validation/reference/FixedPointPixelWiseMultiplication.h
similarity index 100%
rename from tests/validation/CPP/FixedPointPixelWiseMultiplication.h
rename to tests/validation/reference/FixedPointPixelWiseMultiplication.h
diff --git a/tests/validation/CPP/FlattenLayer.cpp b/tests/validation/reference/FlattenLayer.cpp
similarity index 100%
rename from tests/validation/CPP/FlattenLayer.cpp
rename to tests/validation/reference/FlattenLayer.cpp
diff --git a/tests/validation/CPP/FlattenLayer.h b/tests/validation/reference/FlattenLayer.h
similarity index 100%
rename from tests/validation/CPP/FlattenLayer.h
rename to tests/validation/reference/FlattenLayer.h
diff --git a/tests/validation/CPP/Floor.cpp b/tests/validation/reference/Floor.cpp
similarity index 100%
rename from tests/validation/CPP/Floor.cpp
rename to tests/validation/reference/Floor.cpp
diff --git a/tests/validation/CPP/Floor.h b/tests/validation/reference/Floor.h
similarity index 100%
rename from tests/validation/CPP/Floor.h
rename to tests/validation/reference/Floor.h
diff --git a/tests/validation/CPP/FullyConnectedLayer.cpp b/tests/validation/reference/FullyConnectedLayer.cpp
similarity index 98%
rename from tests/validation/CPP/FullyConnectedLayer.cpp
rename to tests/validation/reference/FullyConnectedLayer.cpp
index 6b618a9..c24881e 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
similarity index 100%
rename from tests/validation/CPP/FullyConnectedLayer.h
rename to tests/validation/reference/FullyConnectedLayer.h
diff --git a/tests/validation/CPP/GEMM.cpp b/tests/validation/reference/GEMM.cpp
similarity index 100%
rename from tests/validation/CPP/GEMM.cpp
rename to tests/validation/reference/GEMM.cpp
diff --git a/tests/validation/CPP/GEMM.h b/tests/validation/reference/GEMM.h
similarity index 100%
rename from tests/validation/CPP/GEMM.h
rename to tests/validation/reference/GEMM.h
diff --git a/tests/validation/CPP/GEMMInterleave4x4.h b/tests/validation/reference/GEMMInterleave4x4.h
similarity index 100%
rename from tests/validation/CPP/GEMMInterleave4x4.h
rename to tests/validation/reference/GEMMInterleave4x4.h
diff --git a/tests/validation/CPP/GEMMInterleaveBlocked.h b/tests/validation/reference/GEMMInterleaveBlocked.h
similarity index 100%
rename from tests/validation/CPP/GEMMInterleaveBlocked.h
rename to tests/validation/reference/GEMMInterleaveBlocked.h
diff --git a/tests/validation/CPP/GEMMLowp.cpp b/tests/validation/reference/GEMMLowp.cpp
similarity index 98%
rename from tests/validation/CPP/GEMMLowp.cpp
rename to tests/validation/reference/GEMMLowp.cpp
index 9287894..8e41aef 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
similarity index 100%
rename from tests/validation/CPP/GEMMLowp.h
rename to tests/validation/reference/GEMMLowp.h
diff --git a/tests/validation/CPP/Gaussian3x3.cpp b/tests/validation/reference/Gaussian3x3.cpp
similarity index 100%
rename from tests/validation/CPP/Gaussian3x3.cpp
rename to tests/validation/reference/Gaussian3x3.cpp
diff --git a/tests/validation/CPP/Gaussian3x3.h b/tests/validation/reference/Gaussian3x3.h
similarity index 100%
rename from tests/validation/CPP/Gaussian3x3.h
rename to tests/validation/reference/Gaussian3x3.h
diff --git a/tests/validation/CPP/Gaussian5x5.cpp b/tests/validation/reference/Gaussian5x5.cpp
similarity index 100%
rename from tests/validation/CPP/Gaussian5x5.cpp
rename to tests/validation/reference/Gaussian5x5.cpp
diff --git a/tests/validation/CPP/Gaussian5x5.h b/tests/validation/reference/Gaussian5x5.h
similarity index 100%
rename from tests/validation/CPP/Gaussian5x5.h
rename to tests/validation/reference/Gaussian5x5.h
diff --git a/tests/validation/CPP/GaussianPyramidHalf.cpp b/tests/validation/reference/GaussianPyramidHalf.cpp
similarity index 100%
rename from tests/validation/CPP/GaussianPyramidHalf.cpp
rename to tests/validation/reference/GaussianPyramidHalf.cpp
diff --git a/tests/validation/CPP/GaussianPyramidHalf.h b/tests/validation/reference/GaussianPyramidHalf.h
similarity index 100%
rename from tests/validation/CPP/GaussianPyramidHalf.h
rename to tests/validation/reference/GaussianPyramidHalf.h
diff --git a/tests/validation/CPP/HarrisCornerDetector.cpp b/tests/validation/reference/HarrisCornerDetector.cpp
similarity index 98%
rename from tests/validation/CPP/HarrisCornerDetector.cpp
rename to tests/validation/reference/HarrisCornerDetector.cpp
index 6cfcd8e..12afd95 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
similarity index 100%
rename from tests/validation/CPP/HarrisCornerDetector.h
rename to tests/validation/reference/HarrisCornerDetector.h
diff --git a/tests/validation/CPP/Histogram.cpp b/tests/validation/reference/Histogram.cpp
similarity index 100%
rename from tests/validation/CPP/Histogram.cpp
rename to tests/validation/reference/Histogram.cpp
diff --git a/tests/validation/CPP/Histogram.h b/tests/validation/reference/Histogram.h
similarity index 100%
rename from tests/validation/CPP/Histogram.h
rename to tests/validation/reference/Histogram.h
diff --git a/tests/validation/CPP/IntegralImage.cpp b/tests/validation/reference/IntegralImage.cpp
similarity index 100%
rename from tests/validation/CPP/IntegralImage.cpp
rename to tests/validation/reference/IntegralImage.cpp
diff --git a/tests/validation/CPP/IntegralImage.h b/tests/validation/reference/IntegralImage.h
similarity index 100%
rename from tests/validation/CPP/IntegralImage.h
rename to tests/validation/reference/IntegralImage.h
diff --git a/tests/validation/CPP/L2NormalizeLayer.cpp b/tests/validation/reference/L2NormalizeLayer.cpp
similarity index 100%
rename from tests/validation/CPP/L2NormalizeLayer.cpp
rename to tests/validation/reference/L2NormalizeLayer.cpp
diff --git a/tests/validation/CPP/L2NormalizeLayer.h b/tests/validation/reference/L2NormalizeLayer.h
similarity index 100%
rename from tests/validation/CPP/L2NormalizeLayer.h
rename to tests/validation/reference/L2NormalizeLayer.h
diff --git a/tests/validation/CPP/Magnitude.cpp b/tests/validation/reference/Magnitude.cpp
similarity index 100%
rename from tests/validation/CPP/Magnitude.cpp
rename to tests/validation/reference/Magnitude.cpp
diff --git a/tests/validation/CPP/Magnitude.h b/tests/validation/reference/Magnitude.h
similarity index 100%
rename from tests/validation/CPP/Magnitude.h
rename to tests/validation/reference/Magnitude.h
diff --git a/tests/validation/CPP/MeanStdDev.cpp b/tests/validation/reference/MeanStdDev.cpp
similarity index 100%
rename from tests/validation/CPP/MeanStdDev.cpp
rename to tests/validation/reference/MeanStdDev.cpp
diff --git a/tests/validation/CPP/MeanStdDev.h b/tests/validation/reference/MeanStdDev.h
similarity index 100%
rename from tests/validation/CPP/MeanStdDev.h
rename to tests/validation/reference/MeanStdDev.h
diff --git a/tests/validation/CPP/Median3x3.cpp b/tests/validation/reference/Median3x3.cpp
similarity index 100%
rename from tests/validation/CPP/Median3x3.cpp
rename to tests/validation/reference/Median3x3.cpp
diff --git a/tests/validation/CPP/Median3x3.h b/tests/validation/reference/Median3x3.h
similarity index 100%
rename from tests/validation/CPP/Median3x3.h
rename to tests/validation/reference/Median3x3.h
diff --git a/tests/validation/CPP/MinMaxLocation.cpp b/tests/validation/reference/MinMaxLocation.cpp
similarity index 100%
rename from tests/validation/CPP/MinMaxLocation.cpp
rename to tests/validation/reference/MinMaxLocation.cpp
diff --git a/tests/validation/CPP/MinMaxLocation.h b/tests/validation/reference/MinMaxLocation.h
similarity index 100%
rename from tests/validation/CPP/MinMaxLocation.h
rename to tests/validation/reference/MinMaxLocation.h
diff --git a/tests/validation/CPP/NonLinearFilter.cpp b/tests/validation/reference/NonLinearFilter.cpp
similarity index 100%
rename from tests/validation/CPP/NonLinearFilter.cpp
rename to tests/validation/reference/NonLinearFilter.cpp
diff --git a/tests/validation/CPP/NonLinearFilter.h b/tests/validation/reference/NonLinearFilter.h
similarity index 100%
rename from tests/validation/CPP/NonLinearFilter.h
rename to tests/validation/reference/NonLinearFilter.h
diff --git a/tests/validation/CPP/NonMaximaSuppression.cpp b/tests/validation/reference/NonMaximaSuppression.cpp
similarity index 100%
rename from tests/validation/CPP/NonMaximaSuppression.cpp
rename to tests/validation/reference/NonMaximaSuppression.cpp
diff --git a/tests/validation/CPP/NonMaximaSuppression.h b/tests/validation/reference/NonMaximaSuppression.h
similarity index 100%
rename from tests/validation/CPP/NonMaximaSuppression.h
rename to tests/validation/reference/NonMaximaSuppression.h
diff --git a/tests/validation/CPP/NormalizationLayer.cpp b/tests/validation/reference/NormalizationLayer.cpp
similarity index 100%
rename from tests/validation/CPP/NormalizationLayer.cpp
rename to tests/validation/reference/NormalizationLayer.cpp
diff --git a/tests/validation/CPP/NormalizationLayer.h b/tests/validation/reference/NormalizationLayer.h
similarity index 100%
rename from tests/validation/CPP/NormalizationLayer.h
rename to tests/validation/reference/NormalizationLayer.h
diff --git a/tests/validation/CPP/Phase.cpp b/tests/validation/reference/Phase.cpp
similarity index 100%
rename from tests/validation/CPP/Phase.cpp
rename to tests/validation/reference/Phase.cpp
diff --git a/tests/validation/CPP/Phase.h b/tests/validation/reference/Phase.h
similarity index 100%
rename from tests/validation/CPP/Phase.h
rename to tests/validation/reference/Phase.h
diff --git a/tests/validation/CPP/PixelWiseMultiplication.cpp b/tests/validation/reference/PixelWiseMultiplication.cpp
similarity index 100%
rename from tests/validation/CPP/PixelWiseMultiplication.cpp
rename to tests/validation/reference/PixelWiseMultiplication.cpp
diff --git a/tests/validation/CPP/PixelWiseMultiplication.h b/tests/validation/reference/PixelWiseMultiplication.h
similarity index 100%
rename from tests/validation/CPP/PixelWiseMultiplication.h
rename to tests/validation/reference/PixelWiseMultiplication.h
diff --git a/tests/validation/CPP/PoolingLayer.cpp b/tests/validation/reference/PoolingLayer.cpp
similarity index 100%
rename from tests/validation/CPP/PoolingLayer.cpp
rename to tests/validation/reference/PoolingLayer.cpp
diff --git a/tests/validation/CPP/PoolingLayer.h b/tests/validation/reference/PoolingLayer.h
similarity index 100%
rename from tests/validation/CPP/PoolingLayer.h
rename to tests/validation/reference/PoolingLayer.h
diff --git a/tests/validation/CPP/QuantizationLayer.cpp b/tests/validation/reference/QuantizationLayer.cpp
similarity index 100%
rename from tests/validation/CPP/QuantizationLayer.cpp
rename to tests/validation/reference/QuantizationLayer.cpp
diff --git a/tests/validation/CPP/QuantizationLayer.h b/tests/validation/reference/QuantizationLayer.h
similarity index 100%
rename from tests/validation/CPP/QuantizationLayer.h
rename to tests/validation/reference/QuantizationLayer.h
diff --git a/tests/validation/CPP/ReductionOperation.cpp b/tests/validation/reference/ReductionOperation.cpp
similarity index 100%
rename from tests/validation/CPP/ReductionOperation.cpp
rename to tests/validation/reference/ReductionOperation.cpp
diff --git a/tests/validation/CPP/ReductionOperation.h b/tests/validation/reference/ReductionOperation.h
similarity index 100%
rename from tests/validation/CPP/ReductionOperation.h
rename to tests/validation/reference/ReductionOperation.h
diff --git a/tests/validation/CPP/Remap.cpp b/tests/validation/reference/Remap.cpp
similarity index 100%
rename from tests/validation/CPP/Remap.cpp
rename to tests/validation/reference/Remap.cpp
diff --git a/tests/validation/CPP/Remap.h b/tests/validation/reference/Remap.h
similarity index 100%
rename from tests/validation/CPP/Remap.h
rename to tests/validation/reference/Remap.h
diff --git a/tests/validation/CPP/ReshapeLayer.cpp b/tests/validation/reference/ReshapeLayer.cpp
similarity index 100%
rename from tests/validation/CPP/ReshapeLayer.cpp
rename to tests/validation/reference/ReshapeLayer.cpp
diff --git a/tests/validation/CPP/ReshapeLayer.h b/tests/validation/reference/ReshapeLayer.h
similarity index 100%
rename from tests/validation/CPP/ReshapeLayer.h
rename to tests/validation/reference/ReshapeLayer.h
diff --git a/tests/validation/CPP/Scale.cpp b/tests/validation/reference/Scale.cpp
similarity index 100%
rename from tests/validation/CPP/Scale.cpp
rename to tests/validation/reference/Scale.cpp
diff --git a/tests/validation/CPP/Scale.h b/tests/validation/reference/Scale.h
similarity index 100%
rename from tests/validation/CPP/Scale.h
rename to tests/validation/reference/Scale.h
diff --git a/tests/validation/CPP/Scharr.cpp b/tests/validation/reference/Scharr.cpp
similarity index 100%
rename from tests/validation/CPP/Scharr.cpp
rename to tests/validation/reference/Scharr.cpp
diff --git a/tests/validation/CPP/Scharr.h b/tests/validation/reference/Scharr.h
similarity index 100%
rename from tests/validation/CPP/Scharr.h
rename to tests/validation/reference/Scharr.h
diff --git a/tests/validation/CPP/Sobel.cpp b/tests/validation/reference/Sobel.cpp
similarity index 100%
rename from tests/validation/CPP/Sobel.cpp
rename to tests/validation/reference/Sobel.cpp
diff --git a/tests/validation/CPP/Sobel.h b/tests/validation/reference/Sobel.h
similarity index 100%
rename from tests/validation/CPP/Sobel.h
rename to tests/validation/reference/Sobel.h
diff --git a/tests/validation/CPP/SoftmaxLayer.cpp b/tests/validation/reference/SoftmaxLayer.cpp
similarity index 100%
rename from tests/validation/CPP/SoftmaxLayer.cpp
rename to tests/validation/reference/SoftmaxLayer.cpp
diff --git a/tests/validation/CPP/SoftmaxLayer.h b/tests/validation/reference/SoftmaxLayer.h
similarity index 100%
rename from tests/validation/CPP/SoftmaxLayer.h
rename to tests/validation/reference/SoftmaxLayer.h
diff --git a/tests/validation/CPP/TableLookup.cpp b/tests/validation/reference/TableLookup.cpp
similarity index 100%
rename from tests/validation/CPP/TableLookup.cpp
rename to tests/validation/reference/TableLookup.cpp
diff --git a/tests/validation/CPP/TableLookup.h b/tests/validation/reference/TableLookup.h
similarity index 100%
rename from tests/validation/CPP/TableLookup.h
rename to tests/validation/reference/TableLookup.h
diff --git a/tests/validation/CPP/Threshold.cpp b/tests/validation/reference/Threshold.cpp
similarity index 100%
rename from tests/validation/CPP/Threshold.cpp
rename to tests/validation/reference/Threshold.cpp
diff --git a/tests/validation/CPP/Threshold.h b/tests/validation/reference/Threshold.h
similarity index 100%
rename from tests/validation/CPP/Threshold.h
rename to tests/validation/reference/Threshold.h
diff --git a/tests/validation/CPP/Transpose.cpp b/tests/validation/reference/Transpose.cpp
similarity index 100%
rename from tests/validation/CPP/Transpose.cpp
rename to tests/validation/reference/Transpose.cpp
diff --git a/tests/validation/CPP/Transpose.h b/tests/validation/reference/Transpose.h
similarity index 100%
rename from tests/validation/CPP/Transpose.h
rename to tests/validation/reference/Transpose.h
diff --git a/tests/validation/CPP/Utils.cpp b/tests/validation/reference/Utils.cpp
similarity index 100%
rename from tests/validation/CPP/Utils.cpp
rename to tests/validation/reference/Utils.cpp
diff --git a/tests/validation/CPP/Utils.h b/tests/validation/reference/Utils.h
similarity index 100%
rename from tests/validation/CPP/Utils.h
rename to tests/validation/reference/Utils.h
diff --git a/tests/validation/CPP/UtilsQuantizedAsymm.h b/tests/validation/reference/UtilsQuantizedAsymm.h
similarity index 100%
rename from tests/validation/CPP/UtilsQuantizedAsymm.h
rename to tests/validation/reference/UtilsQuantizedAsymm.h
diff --git a/tests/validation/CPP/WarpAffine.cpp b/tests/validation/reference/WarpAffine.cpp
similarity index 100%
rename from tests/validation/CPP/WarpAffine.cpp
rename to tests/validation/reference/WarpAffine.cpp
diff --git a/tests/validation/CPP/WarpAffine.h b/tests/validation/reference/WarpAffine.h
similarity index 100%
rename from tests/validation/CPP/WarpAffine.h
rename to tests/validation/reference/WarpAffine.h
diff --git a/tests/validation/CPP/WarpPerspective.cpp b/tests/validation/reference/WarpPerspective.cpp
similarity index 100%
rename from tests/validation/CPP/WarpPerspective.cpp
rename to tests/validation/reference/WarpPerspective.cpp
diff --git a/tests/validation/CPP/WarpPerspective.h b/tests/validation/reference/WarpPerspective.h
similarity index 100%
rename from tests/validation/CPP/WarpPerspective.h
rename to tests/validation/reference/WarpPerspective.h