diff --git a/tests/hipify-clang/headers_test_01.cu b/tests/hipify-clang/unit_tests/headers/headers_test_01.cu
similarity index 100%
rename from tests/hipify-clang/headers_test_01.cu
rename to tests/hipify-clang/unit_tests/headers/headers_test_01.cu
diff --git a/tests/hipify-clang/headers_test_02.cu b/tests/hipify-clang/unit_tests/headers/headers_test_02.cu
similarity index 100%
rename from tests/hipify-clang/headers_test_02.cu
rename to tests/hipify-clang/unit_tests/headers/headers_test_02.cu
diff --git a/tests/hipify-clang/headers_test_03.cu b/tests/hipify-clang/unit_tests/headers/headers_test_03.cu
similarity index 100%
rename from tests/hipify-clang/headers_test_03.cu
rename to tests/hipify-clang/unit_tests/headers/headers_test_03.cu
diff --git a/tests/hipify-clang/headers_test_04.cu b/tests/hipify-clang/unit_tests/headers/headers_test_04.cu
similarity index 100%
rename from tests/hipify-clang/headers_test_04.cu
rename to tests/hipify-clang/unit_tests/headers/headers_test_04.cu
diff --git a/tests/hipify-clang/headers_test_05.cu b/tests/hipify-clang/unit_tests/headers/headers_test_05.cu
similarity index 100%
rename from tests/hipify-clang/headers_test_05.cu
rename to tests/hipify-clang/unit_tests/headers/headers_test_05.cu
diff --git a/tests/hipify-clang/headers_test_06.cu b/tests/hipify-clang/unit_tests/headers/headers_test_06.cu
similarity index 100%
rename from tests/hipify-clang/headers_test_06.cu
rename to tests/hipify-clang/unit_tests/headers/headers_test_06.cu
diff --git a/tests/hipify-clang/headers_test_07.cu b/tests/hipify-clang/unit_tests/headers/headers_test_07.cu
similarity index 100%
rename from tests/hipify-clang/headers_test_07.cu
rename to tests/hipify-clang/unit_tests/headers/headers_test_07.cu
diff --git a/tests/hipify-clang/headers_test_08.cu b/tests/hipify-clang/unit_tests/headers/headers_test_08.cu
similarity index 100%
rename from tests/hipify-clang/headers_test_08.cu
rename to tests/hipify-clang/unit_tests/headers/headers_test_08.cu
diff --git a/tests/hipify-clang/headers_test_09.cu b/tests/hipify-clang/unit_tests/headers/headers_test_09.cu
similarity index 100%
rename from tests/hipify-clang/headers_test_09.cu
rename to tests/hipify-clang/unit_tests/headers/headers_test_09.cu
diff --git a/tests/hipify-clang/cuBLAS/cublas_0_based_indexing.cu b/tests/hipify-clang/unit_tests/libraries/cuBLAS/cublas_0_based_indexing.cu
similarity index 100%
rename from tests/hipify-clang/cuBLAS/cublas_0_based_indexing.cu
rename to tests/hipify-clang/unit_tests/libraries/cuBLAS/cublas_0_based_indexing.cu
diff --git a/tests/hipify-clang/cuBLAS/cublas_1_based_indexing.cu b/tests/hipify-clang/unit_tests/libraries/cuBLAS/cublas_1_based_indexing.cu
similarity index 100%
rename from tests/hipify-clang/cuBLAS/cublas_1_based_indexing.cu
rename to tests/hipify-clang/unit_tests/libraries/cuBLAS/cublas_1_based_indexing.cu
diff --git a/tests/hipify-clang/cuBLAS/cublas_sgemm_matrix_multiplication.cu b/tests/hipify-clang/unit_tests/libraries/cuBLAS/cublas_sgemm_matrix_multiplication.cu
similarity index 100%
rename from tests/hipify-clang/cuBLAS/cublas_sgemm_matrix_multiplication.cu
rename to tests/hipify-clang/unit_tests/libraries/cuBLAS/cublas_sgemm_matrix_multiplication.cu
diff --git a/tests/hipify-clang/cuComplex/cuComplex_Julia.cu b/tests/hipify-clang/unit_tests/libraries/cuComplex/cuComplex_Julia.cu
similarity index 100%
rename from tests/hipify-clang/cuComplex/cuComplex_Julia.cu
rename to tests/hipify-clang/unit_tests/libraries/cuComplex/cuComplex_Julia.cu
diff --git a/tests/hipify-clang/cuDNN/cudnn_convolution_forward.cu b/tests/hipify-clang/unit_tests/libraries/cuDNN/cudnn_convolution_forward.cu
similarity index 100%
rename from tests/hipify-clang/cuDNN/cudnn_convolution_forward.cu
rename to tests/hipify-clang/unit_tests/libraries/cuDNN/cudnn_convolution_forward.cu
diff --git a/tests/hipify-clang/cuDNN/cudnn_softmax.cu b/tests/hipify-clang/unit_tests/libraries/cuDNN/cudnn_softmax.cu
similarity index 100%
rename from tests/hipify-clang/cuDNN/cudnn_softmax.cu
rename to tests/hipify-clang/unit_tests/libraries/cuDNN/cudnn_softmax.cu
diff --git a/tests/hipify-clang/cuFFT/simple_cufft.cu b/tests/hipify-clang/unit_tests/libraries/cuFFT/simple_cufft.cu
similarity index 100%
rename from tests/hipify-clang/cuFFT/simple_cufft.cu
rename to tests/hipify-clang/unit_tests/libraries/cuFFT/simple_cufft.cu
diff --git a/tests/hipify-clang/cuRAND/benchmark_curand_generate.cpp b/tests/hipify-clang/unit_tests/libraries/cuRAND/benchmark_curand_generate.cpp
similarity index 100%
rename from tests/hipify-clang/cuRAND/benchmark_curand_generate.cpp
rename to tests/hipify-clang/unit_tests/libraries/cuRAND/benchmark_curand_generate.cpp
diff --git a/tests/hipify-clang/cuRAND/benchmark_curand_kernel.cpp b/tests/hipify-clang/unit_tests/libraries/cuRAND/benchmark_curand_kernel.cpp
similarity index 100%
rename from tests/hipify-clang/cuRAND/benchmark_curand_kernel.cpp
rename to tests/hipify-clang/unit_tests/libraries/cuRAND/benchmark_curand_kernel.cpp
diff --git a/tests/hipify-clang/cuRAND/cmdparser.hpp b/tests/hipify-clang/unit_tests/libraries/cuRAND/cmdparser.hpp
similarity index 100%
rename from tests/hipify-clang/cuRAND/cmdparser.hpp
rename to tests/hipify-clang/unit_tests/libraries/cuRAND/cmdparser.hpp
diff --git a/tests/hipify-clang/cuRAND/poisson_api_example.cu b/tests/hipify-clang/unit_tests/libraries/cuRAND/poisson_api_example.cu
similarity index 100%
rename from tests/hipify-clang/cuRAND/poisson_api_example.cu
rename to tests/hipify-clang/unit_tests/libraries/cuRAND/poisson_api_example.cu
diff --git a/tests/hipify-clang/cuSPARSE/cuSPARSE_01.cu b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_01.cu
similarity index 100%
rename from tests/hipify-clang/cuSPARSE/cuSPARSE_01.cu
rename to tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_01.cu
diff --git a/tests/hipify-clang/cuSPARSE/cuSPARSE_02.cu b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_02.cu
similarity index 100%
rename from tests/hipify-clang/cuSPARSE/cuSPARSE_02.cu
rename to tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_02.cu
diff --git a/tests/hipify-clang/cuSPARSE/cuSPARSE_03.cu b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_03.cu
similarity index 100%
rename from tests/hipify-clang/cuSPARSE/cuSPARSE_03.cu
rename to tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_03.cu
diff --git a/tests/hipify-clang/cuSPARSE/cuSPARSE_04.cu b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_04.cu
similarity index 100%
rename from tests/hipify-clang/cuSPARSE/cuSPARSE_04.cu
rename to tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_04.cu
diff --git a/tests/hipify-clang/cuSPARSE/cuSPARSE_05.cu b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_05.cu
similarity index 100%
rename from tests/hipify-clang/cuSPARSE/cuSPARSE_05.cu
rename to tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_05.cu
diff --git a/tests/hipify-clang/cuSPARSE/cuSPARSE_06.cu b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_06.cu
similarity index 100%
rename from tests/hipify-clang/cuSPARSE/cuSPARSE_06.cu
rename to tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_06.cu
diff --git a/tests/hipify-clang/cuSPARSE/cuSPARSE_07.cu b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_07.cu
similarity index 100%
rename from tests/hipify-clang/cuSPARSE/cuSPARSE_07.cu
rename to tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_07.cu
diff --git a/tests/hipify-clang/cuSPARSE/cuSPARSE_08.cu b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_08.cu
similarity index 100%
rename from tests/hipify-clang/cuSPARSE/cuSPARSE_08.cu
rename to tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_08.cu
diff --git a/tests/hipify-clang/cuSPARSE/cuSPARSE_09.cu b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_09.cu
similarity index 100%
rename from tests/hipify-clang/cuSPARSE/cuSPARSE_09.cu
rename to tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_09.cu
diff --git a/tests/hipify-clang/cuSPARSE/cuSPARSE_10.cu b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_10.cu
similarity index 100%
rename from tests/hipify-clang/cuSPARSE/cuSPARSE_10.cu
rename to tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_10.cu
diff --git a/tests/hipify-clang/cuSPARSE/cuSPARSE_11.cu b/tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_11.cu
similarity index 100%
rename from tests/hipify-clang/cuSPARSE/cuSPARSE_11.cu
rename to tests/hipify-clang/unit_tests/libraries/cuSPARSE/cuSPARSE_11.cu
diff --git a/tests/hipify-clang/allocators.cu b/tests/hipify-clang/unit_tests/samples/allocators.cu
similarity index 100%
rename from tests/hipify-clang/allocators.cu
rename to tests/hipify-clang/unit_tests/samples/allocators.cu
diff --git a/tests/hipify-clang/axpy.cu b/tests/hipify-clang/unit_tests/samples/axpy.cu
similarity index 100%
rename from tests/hipify-clang/axpy.cu
rename to tests/hipify-clang/unit_tests/samples/axpy.cu
diff --git a/tests/hipify-clang/coalescing.cu b/tests/hipify-clang/unit_tests/samples/coalescing.cu
similarity index 100%
rename from tests/hipify-clang/coalescing.cu
rename to tests/hipify-clang/unit_tests/samples/coalescing.cu
diff --git a/tests/hipify-clang/cudaRegister.cu b/tests/hipify-clang/unit_tests/samples/cudaRegister.cu
similarity index 100%
rename from tests/hipify-clang/cudaRegister.cu
rename to tests/hipify-clang/unit_tests/samples/cudaRegister.cu
diff --git a/tests/hipify-clang/dynamic_shared_memory.cu b/tests/hipify-clang/unit_tests/samples/dynamic_shared_memory.cu
similarity index 100%
rename from tests/hipify-clang/dynamic_shared_memory.cu
rename to tests/hipify-clang/unit_tests/samples/dynamic_shared_memory.cu
diff --git a/tests/hipify-clang/intro.cu b/tests/hipify-clang/unit_tests/samples/intro.cu
similarity index 100%
rename from tests/hipify-clang/intro.cu
rename to tests/hipify-clang/unit_tests/samples/intro.cu
diff --git a/tests/hipify-clang/square.cu b/tests/hipify-clang/unit_tests/samples/square.cu
similarity index 100%
rename from tests/hipify-clang/square.cu
rename to tests/hipify-clang/unit_tests/samples/square.cu
diff --git a/tests/hipify-clang/static_shared_memory.cu b/tests/hipify-clang/unit_tests/samples/static_shared_memory.cu
similarity index 100%
rename from tests/hipify-clang/static_shared_memory.cu
rename to tests/hipify-clang/unit_tests/samples/static_shared_memory.cu
diff --git a/tests/hipify-clang/vec_add.cu b/tests/hipify-clang/unit_tests/samples/vec_add.cu
similarity index 100%
rename from tests/hipify-clang/vec_add.cu
rename to tests/hipify-clang/unit_tests/samples/vec_add.cu