diff --git a/gtestsuite/testsuite/level2/gemv/gemv_IIT_ERS.cpp b/gtestsuite/testsuite/level2/gemv/IIT_ERS/gemv_IIT_ERS.cpp
similarity index 99%
rename from gtestsuite/testsuite/level2/gemv/gemv_IIT_ERS.cpp
rename to gtestsuite/testsuite/level2/gemv/IIT_ERS/gemv_IIT_ERS.cpp
index cb0d74b97..fc42e88fe 100644
--- a/gtestsuite/testsuite/level2/gemv/gemv_IIT_ERS.cpp
+++ b/gtestsuite/testsuite/level2/gemv/IIT_ERS/gemv_IIT_ERS.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_gemv.h"
+#include "level2/gemv/test_gemv.h"
 #include "common/wrong_inputs_helpers.h"
 #include "common/testing_helpers.h"
 #include "inc/check_error.h"
diff --git a/gtestsuite/testsuite/level2/gemv/cgemv_evt_testing.cpp b/gtestsuite/testsuite/level2/gemv/cgemv/cgemv_evt_testing.cpp
similarity index 99%
rename from gtestsuite/testsuite/level2/gemv/cgemv_evt_testing.cpp
rename to gtestsuite/testsuite/level2/gemv/cgemv/cgemv_evt_testing.cpp
index fae832d5c..dc39ed0f9 100644
--- a/gtestsuite/testsuite/level2/gemv/cgemv_evt_testing.cpp
+++ b/gtestsuite/testsuite/level2/gemv/cgemv/cgemv_evt_testing.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_gemv.h"
+#include "level2/gemv/test_gemv.h"
 
 using  T = scomplex;
 using RT = testinghelpers::type_info<T>::real_type;
diff --git a/gtestsuite/testsuite/level2/gemv/cgemv_generic.cpp b/gtestsuite/testsuite/level2/gemv/cgemv/cgemv_generic.cpp
similarity index 99%
rename from gtestsuite/testsuite/level2/gemv/cgemv_generic.cpp
rename to gtestsuite/testsuite/level2/gemv/cgemv/cgemv_generic.cpp
index ffb0f72a9..d0ffe8d37 100644
--- a/gtestsuite/testsuite/level2/gemv/cgemv_generic.cpp
+++ b/gtestsuite/testsuite/level2/gemv/cgemv/cgemv_generic.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_gemv.h"
+#include "level2/gemv/test_gemv.h"
 
 using T = scomplex;
 
diff --git a/gtestsuite/testsuite/level2/gemv/dgemv_evt_testing.cpp b/gtestsuite/testsuite/level2/gemv/dgemv/dgemv_evt_testing.cpp
similarity index 99%
rename from gtestsuite/testsuite/level2/gemv/dgemv_evt_testing.cpp
rename to gtestsuite/testsuite/level2/gemv/dgemv/dgemv_evt_testing.cpp
index 0eb4476d3..89dc04e06 100644
--- a/gtestsuite/testsuite/level2/gemv/dgemv_evt_testing.cpp
+++ b/gtestsuite/testsuite/level2/gemv/dgemv/dgemv_evt_testing.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_gemv.h"
+#include "level2/gemv/test_gemv.h"
 
 using T = double;
 static T AOCL_NaN = std::numeric_limits<T>::quiet_NaN();
diff --git a/gtestsuite/testsuite/level2/gemv/dgemv_generic.cpp b/gtestsuite/testsuite/level2/gemv/dgemv/dgemv_generic.cpp
similarity index 99%
rename from gtestsuite/testsuite/level2/gemv/dgemv_generic.cpp
rename to gtestsuite/testsuite/level2/gemv/dgemv/dgemv_generic.cpp
index 7b919b485..97ec1b03e 100644
--- a/gtestsuite/testsuite/level2/gemv/dgemv_generic.cpp
+++ b/gtestsuite/testsuite/level2/gemv/dgemv/dgemv_generic.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_gemv.h"
+#include "level2/gemv/test_gemv.h"
 
 using T = double;
 
diff --git a/gtestsuite/testsuite/level2/gemv/sgemv_evt_testing.cpp b/gtestsuite/testsuite/level2/gemv/sgemv/sgemv_evt_testing.cpp
similarity index 99%
rename from gtestsuite/testsuite/level2/gemv/sgemv_evt_testing.cpp
rename to gtestsuite/testsuite/level2/gemv/sgemv/sgemv_evt_testing.cpp
index affd3d8f8..3611217f7 100644
--- a/gtestsuite/testsuite/level2/gemv/sgemv_evt_testing.cpp
+++ b/gtestsuite/testsuite/level2/gemv/sgemv/sgemv_evt_testing.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_gemv.h"
+#include "level2/gemv/test_gemv.h"
 
 using T = float;
 static T AOCL_NaN = std::numeric_limits<T>::quiet_NaN();
diff --git a/gtestsuite/testsuite/level2/gemv/sgemv_generic.cpp b/gtestsuite/testsuite/level2/gemv/sgemv/sgemv_generic.cpp
similarity index 99%
rename from gtestsuite/testsuite/level2/gemv/sgemv_generic.cpp
rename to gtestsuite/testsuite/level2/gemv/sgemv/sgemv_generic.cpp
index 1041926bd..db181ff12 100644
--- a/gtestsuite/testsuite/level2/gemv/sgemv_generic.cpp
+++ b/gtestsuite/testsuite/level2/gemv/sgemv/sgemv_generic.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_gemv.h"
+#include "level2/gemv/test_gemv.h"
 
 using T = float;
 class sgemvGeneric :
diff --git a/gtestsuite/testsuite/level2/gemv/zgemv_evt_testing.cpp b/gtestsuite/testsuite/level2/gemv/zgemv/zgemv_evt_testing.cpp
similarity index 99%
rename from gtestsuite/testsuite/level2/gemv/zgemv_evt_testing.cpp
rename to gtestsuite/testsuite/level2/gemv/zgemv/zgemv_evt_testing.cpp
index fc444b281..91874651d 100644
--- a/gtestsuite/testsuite/level2/gemv/zgemv_evt_testing.cpp
+++ b/gtestsuite/testsuite/level2/gemv/zgemv/zgemv_evt_testing.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_gemv.h"
+#include "level2/gemv/test_gemv.h"
 
 using  T = dcomplex;
 using RT = testinghelpers::type_info<T>::real_type;
diff --git a/gtestsuite/testsuite/level2/gemv/zgemv_generic.cpp b/gtestsuite/testsuite/level2/gemv/zgemv/zgemv_generic.cpp
similarity index 99%
rename from gtestsuite/testsuite/level2/gemv/zgemv_generic.cpp
rename to gtestsuite/testsuite/level2/gemv/zgemv/zgemv_generic.cpp
index 8ddf48953..572953ba3 100644
--- a/gtestsuite/testsuite/level2/gemv/zgemv_generic.cpp
+++ b/gtestsuite/testsuite/level2/gemv/zgemv/zgemv_generic.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_gemv.h"
+#include "level2/gemv/test_gemv.h"
 
 using T = dcomplex;
 
diff --git a/gtestsuite/testsuite/level2/trsv/IIT_ERS_test.cpp b/gtestsuite/testsuite/level2/trsv/IIT_ERS/trsv_IIT_ERS_test.cpp_
similarity index 100%
rename from gtestsuite/testsuite/level2/trsv/IIT_ERS_test.cpp
rename to gtestsuite/testsuite/level2/trsv/IIT_ERS/trsv_IIT_ERS_test.cpp_
diff --git a/gtestsuite/testsuite/level2/trsv/ctrsv_generic.cpp b/gtestsuite/testsuite/level2/trsv/ctrsv/ctrsv_generic.cpp
similarity index 99%
rename from gtestsuite/testsuite/level2/trsv/ctrsv_generic.cpp
rename to gtestsuite/testsuite/level2/trsv/ctrsv/ctrsv_generic.cpp
index 2ced26269..c4aea44b6 100644
--- a/gtestsuite/testsuite/level2/trsv/ctrsv_generic.cpp
+++ b/gtestsuite/testsuite/level2/trsv/ctrsv/ctrsv_generic.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_trsv.h"
+#include "level2/trsv/test_trsv.h"
 
 class ctrsvTest :
         public ::testing::TestWithParam<std::tuple<char,
diff --git a/gtestsuite/testsuite/level2/trsv/dtrsv_evt_testing.cpp b/gtestsuite/testsuite/level2/trsv/dtrsv/dtrsv_evt_testing.cpp
similarity index 99%
rename from gtestsuite/testsuite/level2/trsv/dtrsv_evt_testing.cpp
rename to gtestsuite/testsuite/level2/trsv/dtrsv/dtrsv_evt_testing.cpp
index 641ee6c5d..d348ae7cc 100644
--- a/gtestsuite/testsuite/level2/trsv/dtrsv_evt_testing.cpp
+++ b/gtestsuite/testsuite/level2/trsv/dtrsv/dtrsv_evt_testing.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_trsv.h"
+#include "level2/trsv/test_trsv.h"
 
 class dtrsvEVT :
         public ::testing::TestWithParam<std::tuple<char,          // storage format
diff --git a/gtestsuite/testsuite/level2/trsv/dtrsv_generic.cpp b/gtestsuite/testsuite/level2/trsv/dtrsv/dtrsv_generic.cpp
similarity index 99%
rename from gtestsuite/testsuite/level2/trsv/dtrsv_generic.cpp
rename to gtestsuite/testsuite/level2/trsv/dtrsv/dtrsv_generic.cpp
index 0c388f163..16af8546e 100644
--- a/gtestsuite/testsuite/level2/trsv/dtrsv_generic.cpp
+++ b/gtestsuite/testsuite/level2/trsv/dtrsv/dtrsv_generic.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_trsv.h"
+#include "level2/trsv/test_trsv.h"
 
 class dtrsvAPI :
         public ::testing::TestWithParam<std::tuple<char,         // storage format
diff --git a/gtestsuite/testsuite/level2/trsv/strsv_generic.cpp b/gtestsuite/testsuite/level2/trsv/strsv/strsv_generic.cpp
similarity index 99%
rename from gtestsuite/testsuite/level2/trsv/strsv_generic.cpp
rename to gtestsuite/testsuite/level2/trsv/strsv/strsv_generic.cpp
index 007a43132..4cd2f004a 100644
--- a/gtestsuite/testsuite/level2/trsv/strsv_generic.cpp
+++ b/gtestsuite/testsuite/level2/trsv/strsv/strsv_generic.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_trsv.h"
+#include "level2/trsv/test_trsv.h"
 
 class strsvTest :
         public ::testing::TestWithParam<std::tuple<char,
diff --git a/gtestsuite/testsuite/level2/trsv/ztrsv_evt_testing.cpp b/gtestsuite/testsuite/level2/trsv/ztrsv/ztrsv_evt_testing.cpp
similarity index 99%
rename from gtestsuite/testsuite/level2/trsv/ztrsv_evt_testing.cpp
rename to gtestsuite/testsuite/level2/trsv/ztrsv/ztrsv_evt_testing.cpp
index 9eaec1572..542c0504c 100644
--- a/gtestsuite/testsuite/level2/trsv/ztrsv_evt_testing.cpp
+++ b/gtestsuite/testsuite/level2/trsv/ztrsv/ztrsv_evt_testing.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_trsv.h"
+#include "level2/trsv/test_trsv.h"
 
 class ztrsvEVT :
         public ::testing::TestWithParam<std::tuple<char,          // storage format
diff --git a/gtestsuite/testsuite/level2/trsv/ztrsv_generic.cpp b/gtestsuite/testsuite/level2/trsv/ztrsv/ztrsv_generic.cpp
similarity index 99%
rename from gtestsuite/testsuite/level2/trsv/ztrsv_generic.cpp
rename to gtestsuite/testsuite/level2/trsv/ztrsv/ztrsv_generic.cpp
index eff0e334a..fa6f51ec6 100644
--- a/gtestsuite/testsuite/level2/trsv/ztrsv_generic.cpp
+++ b/gtestsuite/testsuite/level2/trsv/ztrsv/ztrsv_generic.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_trsv.h"
+#include "level2/trsv/test_trsv.h"
 
 class ztrsvAPI :
         public ::testing::TestWithParam<std::tuple<char,       // storage format
diff --git a/gtestsuite/testsuite/level3/gemm/IIT_ERS_test.cpp b/gtestsuite/testsuite/level3/gemm/IIT_ERS/gemm_IIT_ERS_test.cpp
similarity index 99%
rename from gtestsuite/testsuite/level3/gemm/IIT_ERS_test.cpp
rename to gtestsuite/testsuite/level3/gemm/IIT_ERS/gemm_IIT_ERS_test.cpp
index a594973ba..33922aeb9 100644
--- a/gtestsuite/testsuite/level3/gemm/IIT_ERS_test.cpp
+++ b/gtestsuite/testsuite/level3/gemm/IIT_ERS/gemm_IIT_ERS_test.cpp
@@ -34,7 +34,7 @@
 
 #include <gtest/gtest.h>
 #include "common/testing_helpers.h"
-#include "gemm.h"
+#include "level3/gemm/test_gemm.h"
 #include "inc/check_error.h"
 #include "common/wrong_inputs_helpers.h"
 
diff --git a/gtestsuite/testsuite/level3/gemm/cgemm_evt_testing.cpp b/gtestsuite/testsuite/level3/gemm/cgemm/cgemm_evt_testing.cpp
similarity index 99%
rename from gtestsuite/testsuite/level3/gemm/cgemm_evt_testing.cpp
rename to gtestsuite/testsuite/level3/gemm/cgemm/cgemm_evt_testing.cpp
index 8660bb145..66344ce4a 100644
--- a/gtestsuite/testsuite/level3/gemm/cgemm_evt_testing.cpp
+++ b/gtestsuite/testsuite/level3/gemm/cgemm/cgemm_evt_testing.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_gemm.h"
+#include "level3/gemm/test_gemm.h"
 
 using T = scomplex;
 
diff --git a/gtestsuite/testsuite/level3/gemm/cgemm_generic.cpp b/gtestsuite/testsuite/level3/gemm/cgemm/cgemm_generic.cpp
similarity index 99%
rename from gtestsuite/testsuite/level3/gemm/cgemm_generic.cpp
rename to gtestsuite/testsuite/level3/gemm/cgemm/cgemm_generic.cpp
index 136d108d4..6b5b2c538 100644
--- a/gtestsuite/testsuite/level3/gemm/cgemm_generic.cpp
+++ b/gtestsuite/testsuite/level3/gemm/cgemm/cgemm_generic.cpp
@@ -33,7 +33,8 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_gemm.h"
+#include "level3/gemm/test_gemm.h"
+
 class cgemmAPI :
         public ::testing::TestWithParam<std::tuple<char,       // storage format
                                                    char,       // transa
diff --git a/gtestsuite/testsuite/level3/gemm/dgemm_evt_testing.cpp b/gtestsuite/testsuite/level3/gemm/dgemm/dgemm_evt_testing.cpp
similarity index 99%
rename from gtestsuite/testsuite/level3/gemm/dgemm_evt_testing.cpp
rename to gtestsuite/testsuite/level3/gemm/dgemm/dgemm_evt_testing.cpp
index 99c887758..6cb5b3ef1 100644
--- a/gtestsuite/testsuite/level3/gemm/dgemm_evt_testing.cpp
+++ b/gtestsuite/testsuite/level3/gemm/dgemm/dgemm_evt_testing.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_gemm.h"
+#include "level3/gemm/test_gemm.h"
 
 class DGEMMEVT :
         public ::testing::TestWithParam<std::tuple<char,       // storage format
diff --git a/gtestsuite/testsuite/level3/gemm/dgemm_generic.cpp b/gtestsuite/testsuite/level3/gemm/dgemm/dgemm_generic.cpp
similarity index 99%
rename from gtestsuite/testsuite/level3/gemm/dgemm_generic.cpp
rename to gtestsuite/testsuite/level3/gemm/dgemm/dgemm_generic.cpp
index 7e4d422a8..ae90db2d6 100644
--- a/gtestsuite/testsuite/level3/gemm/dgemm_generic.cpp
+++ b/gtestsuite/testsuite/level3/gemm/dgemm/dgemm_generic.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_gemm.h"
+#include "level3/gemm/test_gemm.h"
 
 class DGEMMTest :
         public ::testing::TestWithParam<std::tuple<char,
diff --git a/gtestsuite/testsuite/level3/gemm/dgemm_ovr_undr.cpp b/gtestsuite/testsuite/level3/gemm/dgemm/dgemm_ovr_undr.cpp
similarity index 99%
rename from gtestsuite/testsuite/level3/gemm/dgemm_ovr_undr.cpp
rename to gtestsuite/testsuite/level3/gemm/dgemm/dgemm_ovr_undr.cpp
index d3581c9d4..4ddef5a18 100644
--- a/gtestsuite/testsuite/level3/gemm/dgemm_ovr_undr.cpp
+++ b/gtestsuite/testsuite/level3/gemm/dgemm/dgemm_ovr_undr.cpp
@@ -33,8 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_gemm.h"
-
+#include "level3/gemm/test_gemm.h"
 
 class DGEMMOvrUndr :
         public ::testing::TestWithParam<std::tuple<char,    // storage format
diff --git a/gtestsuite/testsuite/level3/gemm/sgemm_evt_testing.cpp b/gtestsuite/testsuite/level3/gemm/sgemm/sgemm_evt_testing.cpp
similarity index 99%
rename from gtestsuite/testsuite/level3/gemm/sgemm_evt_testing.cpp
rename to gtestsuite/testsuite/level3/gemm/sgemm/sgemm_evt_testing.cpp
index f28f45c15..f2b4cf180 100644
--- a/gtestsuite/testsuite/level3/gemm/sgemm_evt_testing.cpp
+++ b/gtestsuite/testsuite/level3/gemm/sgemm/sgemm_evt_testing.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_gemm.h"
+#include "level3/gemm/test_gemm.h"
 
 class sgemmEVT :
         public ::testing::TestWithParam<std::tuple<char,       // storage format
diff --git a/gtestsuite/testsuite/level3/gemm/sgemm_generic.cpp b/gtestsuite/testsuite/level3/gemm/sgemm/sgemm_generic.cpp
similarity index 99%
rename from gtestsuite/testsuite/level3/gemm/sgemm_generic.cpp
rename to gtestsuite/testsuite/level3/gemm/sgemm/sgemm_generic.cpp
index a7728c615..dea24e6ad 100644
--- a/gtestsuite/testsuite/level3/gemm/sgemm_generic.cpp
+++ b/gtestsuite/testsuite/level3/gemm/sgemm/sgemm_generic.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_gemm.h"
+#include "level3/gemm/test_gemm.h"
 
 class SGemm :
         public ::testing::TestWithParam<std::tuple<char,
diff --git a/gtestsuite/testsuite/level3/gemm/zgemm_evt_testing.cpp b/gtestsuite/testsuite/level3/gemm/zgemm/zgemm_evt_testing.cpp
similarity index 99%
rename from gtestsuite/testsuite/level3/gemm/zgemm_evt_testing.cpp
rename to gtestsuite/testsuite/level3/gemm/zgemm/zgemm_evt_testing.cpp
index a94327b15..880b1f20e 100644
--- a/gtestsuite/testsuite/level3/gemm/zgemm_evt_testing.cpp
+++ b/gtestsuite/testsuite/level3/gemm/zgemm/zgemm_evt_testing.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_gemm.h"
+#include "level3/gemm/test_gemm.h"
 
 using T = dcomplex;
 
diff --git a/gtestsuite/testsuite/level3/gemm/zgemm_generic.cpp b/gtestsuite/testsuite/level3/gemm/zgemm/zgemm_generic.cpp
similarity index 99%
rename from gtestsuite/testsuite/level3/gemm/zgemm_generic.cpp
rename to gtestsuite/testsuite/level3/gemm/zgemm/zgemm_generic.cpp
index 4f5c759b1..d7bba775f 100644
--- a/gtestsuite/testsuite/level3/gemm/zgemm_generic.cpp
+++ b/gtestsuite/testsuite/level3/gemm/zgemm/zgemm_generic.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-        #include "test_gemm.h"
+#include "level3/gemm/test_gemm.h"
 
 class ZGEMMAPI :
         public ::testing::TestWithParam<std::tuple<char,       // storage format
diff --git a/gtestsuite/testsuite/level3/trsm/IIT_ERS_test.cpp b/gtestsuite/testsuite/level3/trsm/IIT_ERS/trsm_IIT_ERS_test.cpp
similarity index 99%
rename from gtestsuite/testsuite/level3/trsm/IIT_ERS_test.cpp
rename to gtestsuite/testsuite/level3/trsm/IIT_ERS/trsm_IIT_ERS_test.cpp
index 1c02a7f1a..55e646f4b 100644
--- a/gtestsuite/testsuite/level3/trsm/IIT_ERS_test.cpp
+++ b/gtestsuite/testsuite/level3/trsm/IIT_ERS/trsm_IIT_ERS_test.cpp
@@ -32,7 +32,7 @@
 
 */
 
-#include "trsm.h"
+#include "level3/trsm/trsm.h"
 #include "inc/check_error.h"
 #include "common/testing_helpers.h"
 #include "common/wrong_inputs_helpers.h"
diff --git a/gtestsuite/testsuite/level3/trsm/ctrsm_evt_testing.cpp b/gtestsuite/testsuite/level3/trsm/ctrsm/ctrsm_evt_testing.cpp
similarity index 99%
rename from gtestsuite/testsuite/level3/trsm/ctrsm_evt_testing.cpp
rename to gtestsuite/testsuite/level3/trsm/ctrsm/ctrsm_evt_testing.cpp
index c395cce6d..ad068eea2 100644
--- a/gtestsuite/testsuite/level3/trsm/ctrsm_evt_testing.cpp
+++ b/gtestsuite/testsuite/level3/trsm/ctrsm/ctrsm_evt_testing.cpp
@@ -33,8 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_trsm.h"
-
+#include "level3/trsm/test_trsm.h"
 
 class ctrsmEVT :
         public ::testing::TestWithParam<std::tuple<char,              // storage format
diff --git a/gtestsuite/testsuite/level3/trsm/ctrsm_generic.cpp b/gtestsuite/testsuite/level3/trsm/ctrsm/ctrsm_generic.cpp
similarity index 99%
rename from gtestsuite/testsuite/level3/trsm/ctrsm_generic.cpp
rename to gtestsuite/testsuite/level3/trsm/ctrsm/ctrsm_generic.cpp
index 0e1ae0c48..7d1cc76a1 100644
--- a/gtestsuite/testsuite/level3/trsm/ctrsm_generic.cpp
+++ b/gtestsuite/testsuite/level3/trsm/ctrsm/ctrsm_generic.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_trsm.h"
+#include "level3/trsm/test_trsm.h"
 
 class ctrsmAPI :
         public ::testing::TestWithParam<std::tuple<char,          // storage format
diff --git a/gtestsuite/testsuite/level3/trsm/dtrsm_evt_testing.cpp b/gtestsuite/testsuite/level3/trsm/dtrsm/dtrsm_evt_testing.cpp
similarity index 99%
rename from gtestsuite/testsuite/level3/trsm/dtrsm_evt_testing.cpp
rename to gtestsuite/testsuite/level3/trsm/dtrsm/dtrsm_evt_testing.cpp
index 8d24d0522..587fbc141 100644
--- a/gtestsuite/testsuite/level3/trsm/dtrsm_evt_testing.cpp
+++ b/gtestsuite/testsuite/level3/trsm/dtrsm/dtrsm_evt_testing.cpp
@@ -33,8 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_trsm.h"
-
+#include "level3/trsm/test_trsm.h"
 
 class dtrsmEVTTest :
         public ::testing::TestWithParam<std::tuple<char,
diff --git a/gtestsuite/testsuite/level3/trsm/dtrsm_generic.cpp b/gtestsuite/testsuite/level3/trsm/dtrsm/dtrsm_generic.cpp
similarity index 99%
rename from gtestsuite/testsuite/level3/trsm/dtrsm_generic.cpp
rename to gtestsuite/testsuite/level3/trsm/dtrsm/dtrsm_generic.cpp
index dd25778b9..a4c68118c 100644
--- a/gtestsuite/testsuite/level3/trsm/dtrsm_generic.cpp
+++ b/gtestsuite/testsuite/level3/trsm/dtrsm/dtrsm_generic.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_trsm.h"
+#include "level3/trsm/test_trsm.h"
 
 class dtrsmTest :
         public ::testing::TestWithParam<std::tuple<char,          // storage format
diff --git a/gtestsuite/testsuite/level3/trsm/strsm_evt_testing.cpp b/gtestsuite/testsuite/level3/trsm/strsm/strsm_evt_testing.cpp
similarity index 99%
rename from gtestsuite/testsuite/level3/trsm/strsm_evt_testing.cpp
rename to gtestsuite/testsuite/level3/trsm/strsm/strsm_evt_testing.cpp
index 80c508d3d..605419024 100644
--- a/gtestsuite/testsuite/level3/trsm/strsm_evt_testing.cpp
+++ b/gtestsuite/testsuite/level3/trsm/strsm/strsm_evt_testing.cpp
@@ -33,8 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_trsm.h"
-
+#include "level3/trsm/test_trsm.h"
 
 class strsmEVT :
         public ::testing::TestWithParam<std::tuple<char,           // storage
diff --git a/gtestsuite/testsuite/level3/trsm/strsm_generic.cpp b/gtestsuite/testsuite/level3/trsm/strsm/strsm_generic.cpp
similarity index 99%
rename from gtestsuite/testsuite/level3/trsm/strsm_generic.cpp
rename to gtestsuite/testsuite/level3/trsm/strsm/strsm_generic.cpp
index 063446a1c..224d0dd64 100644
--- a/gtestsuite/testsuite/level3/trsm/strsm_generic.cpp
+++ b/gtestsuite/testsuite/level3/trsm/strsm/strsm_generic.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_trsm.h"
+#include "level3/trsm/test_trsm.h"
 
 class strsmAPI :
         public ::testing::TestWithParam<std::tuple<char,          // storage format
diff --git a/gtestsuite/testsuite/level3/trsm/ztrsm_evt_testing.cpp b/gtestsuite/testsuite/level3/trsm/ztrsm/ztrsm_evt_testing.cpp
similarity index 99%
rename from gtestsuite/testsuite/level3/trsm/ztrsm_evt_testing.cpp
rename to gtestsuite/testsuite/level3/trsm/ztrsm/ztrsm_evt_testing.cpp
index 48305a8b4..8984df18c 100644
--- a/gtestsuite/testsuite/level3/trsm/ztrsm_evt_testing.cpp
+++ b/gtestsuite/testsuite/level3/trsm/ztrsm/ztrsm_evt_testing.cpp
@@ -33,8 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_trsm.h"
-
+#include "level3/trsm/test_trsm.h"
 
 class ztrsmEVT :
         public ::testing::TestWithParam<std::tuple<char,            // storage format
diff --git a/gtestsuite/testsuite/level3/trsm/ztrsm_generic.cpp b/gtestsuite/testsuite/level3/trsm/ztrsm/ztrsm_generic.cpp
similarity index 99%
rename from gtestsuite/testsuite/level3/trsm/ztrsm_generic.cpp
rename to gtestsuite/testsuite/level3/trsm/ztrsm/ztrsm_generic.cpp
index 69e4f5362..70c6a7cce 100644
--- a/gtestsuite/testsuite/level3/trsm/ztrsm_generic.cpp
+++ b/gtestsuite/testsuite/level3/trsm/ztrsm/ztrsm_generic.cpp
@@ -33,7 +33,7 @@
 */
 
 #include <gtest/gtest.h>
-#include "test_trsm.h"
+#include "level3/trsm/test_trsm.h"
 
 class ztrsmAPI :
         public ::testing::TestWithParam<std::tuple<char,