diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 12a23cd2b..1546a5a43 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  alpaka_cmake_flags: "-Dalpaka_COMPILE_PEDANTIC=ON -Dalpaka_DOCS=ON -Dalpaka_TESTING=ON -Dalpaka_BENCHMARKS=ON -Dalpaka_EXAMPLES=ON -DBUILD_TESTING=ON -Dalpaka_HEADERCHECKS=ON -Dalpaka_LOG=dynamic -Dalpaka_FAST_MATH=OFF"
+  alpaka_cmake_flags: "-Dalpaka_COMPILE_PEDANTIC=ON -Dalpaka_DOCS=ON -Dalpaka_TESTS=ON -Dalpaka_BENCHMARKS=ON -Dalpaka_EXAMPLES=ON -DBUILD_TESTING=ON -Dalpaka_HEADERCHECKS=ON -Dalpaka_LOG=dynamic -Dalpaka_FAST_MATH=OFF"
 
 jobs:
   pre-commit:
@@ -103,7 +103,7 @@ jobs:
         run: |
           apt-get update
           apt-get install -y cmake build-essential ninja-build git
-          export "SANITIZERS_DIR=$(pwd)/sanitizers"
+          export "SANITIZERS_DIR=$(pwd)/sanitizer"
           echo "ASAN_OPTIONS=suppressions=${SANITIZERS_DIR}/asan_suppressions.txt" >> $GITHUB_ENV
           echo "TSAN_OPTIONS=suppressions=${SANITIZERS_DIR}/tsan_suppressions.txt,ignore_noninstrumented_modules=1" >> $GITHUB_ENV
           echo "LSAN_OPTIONS=suppressions=${SANITIZERS_DIR}/lsan_suppressions.txt" >> $GITHUB_ENV
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb301e3d2..2d284c120 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,14 +43,14 @@ project(
 set(_alpaka_ROOT_DIR ${alpaka_SOURCE_DIR})
 
 # Compiler feature tests.
-set(_alpaka_FEATURE_TESTS_DIR "${_alpaka_ROOT_DIR}/cmake/tests")
+set(_alpaka_FEATURE_TESTS_DIR "${_alpaka_ROOT_DIR}/cmake/test")
 set(_alpaka_CMAKE_DIR "${_alpaka_ROOT_DIR}/cmake")
-set(_alpaka_TESTING_DIR "${_alpaka_ROOT_DIR}/tests")
+set(_alpaka_TESTS_DIR "${_alpaka_ROOT_DIR}/test")
 # Set include directories
 set(_alpaka_INCLUDE_DIRECTORY "${_alpaka_ROOT_DIR}/include")
 
 # CMake Options
-option(alpaka_TESTING "Enable/Disable testing" OFF)
+option(alpaka_TESTS "Enable/Disable testing" OFF)
 option(alpaka_DOCS "Enable/Disable documentation code snippet testing" OFF)
 option(alpaka_BENCHMARKS "Enable/Disable benchmarks" OFF)
 option(alpaka_EXAMPLES "Enable/Disable examples" OFF)
@@ -59,15 +59,15 @@ option(alpaka_HEADERCHECKS "Enable/Disable header check tests" OFF)
 # only check for compiler support if this cmake is called with add_subdirectory or examples, benchmarks, ... should be compiled too
 if(
     NOT PROJECT_NAME STREQUAL CMAKE_PROJECT_NAME
-    OR (alpaka_TESTING OR alpaka_DOCS OR alpaka_BENCHMARKS OR alpaka_EXAMPLES OR alpaka_HEADERCHECKS)
+    OR (alpaka_TESTS OR alpaka_DOCS OR alpaka_BENCHMARKS OR alpaka_EXAMPLES OR alpaka_HEADERCHECKS)
 )
     include(${_alpaka_CMAKE_DIR}/alpakaCommon.cmake)
 endif()
 
-if(alpaka_TESTING)
+if(alpaka_TESTS)
     include(CTest)
     enable_testing()
-    add_subdirectory("${_alpaka_TESTING_DIR}")
+    add_subdirectory("${_alpaka_TESTS_DIR}")
 endif()
 
 if(alpaka_DOCS)
@@ -122,7 +122,7 @@ configure_package_config_file(
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/alpakaConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/alpaka)
 
 # copy tests to the installation
-install(DIRECTORY ${_alpaka_TESTING_DIR} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} USE_SOURCE_PERMISSIONS)
+install(DIRECTORY ${_alpaka_TESTS_DIR} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} USE_SOURCE_PERMISSIONS)
 
 # Files required to validate optional features std::atomic_ref and std::simd
 install(FILES "${_alpaka_FEATURE_TESTS_DIR}/StdAtomicRef.cpp" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/alpaka/tests)
diff --git a/CMakePresets.json b/CMakePresets.json
index 80a5c3e8d..7154d37cb 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -12,7 +12,7 @@
       "binaryDir": "${sourceDir}/build/${presetName}",
       "cacheVariables": {
         "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
-        "alpaka_TESTING": "ON",
+        "alpaka_TESTS": "ON",
         "alpaka_EXAMPLES": "ON",
         "alpaka_BENCHMARKS": "ON"
       }
diff --git a/cmake/alpakaConfig.cmake.in b/cmake/alpakaConfig.cmake.in
index 7908ae6a5..dd284046f 100644
--- a/cmake/alpakaConfig.cmake.in
+++ b/cmake/alpakaConfig.cmake.in
@@ -14,8 +14,8 @@ set(_alpaka_ROOT_DIR "@CMAKE_INSTALL_PREFIX@")
 set(_alpaka_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}")
 
 # Tests, this is required because the used compiler can differ compared to the compiler used for installation.
-set(_alpaka_FEATURE_TESTS_DIR "${_alpaka_CMAKE_DIR}/tests")
-set(_alpaka_TESTING_DIR "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATAROOTDIR@/tests")
+set(_alpaka_FEATURE_TESTS_DIR "${_alpaka_CMAKE_DIR}/test")
+set(_alpaka_TESTS_DIR "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATAROOTDIR@/test")
 
 set(_alpaka_INCLUDE_DIRECTORY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@")
 
@@ -24,10 +24,10 @@ include("${_alpaka_CMAKE_DIR}/alpakaCommon.cmake")
 check_required_components(alpaka)
 
 # CMake Options to activate testing with the currently selected environment
-option(alpaka_TESTING "Enable/Disable testing" OFF)
+option(alpaka_TESTS "Enable/Disable testing" OFF)
 
-if(alpaka_TESTING)
+if(alpaka_TESTS)
     include(CTest)
     enable_testing()
-    add_subdirectory("${_alpaka_TESTING_DIR}" "${CMAKE_BINARY_DIR}/alpaka/tests")
+    add_subdirectory("${_alpaka_TESTS_DIR}" "${CMAKE_BINARY_DIR}/alpaka/test")
 endif()
diff --git a/cmake/alpakaPrepareForAddSubdirectoryUsage.cmake b/cmake/alpakaPrepareForAddSubdirectoryUsage.cmake
index ea2480ace..40c1c4ad4 100644
--- a/cmake/alpakaPrepareForAddSubdirectoryUsage.cmake
+++ b/cmake/alpakaPrepareForAddSubdirectoryUsage.cmake
@@ -10,9 +10,9 @@
 set(_alpaka_ROOT_DIR "${alpaka_SOURCE_DIR}")
 
 # Compiler feature tests.
-set(_alpaka_FEATURE_TESTS_DIR "${_alpaka_ROOT_DIR}/cmake/tests")
+set(_alpaka_FEATURE_TESTS_DIR "${_alpaka_ROOT_DIR}/cmake/test")
 set(_alpaka_CMAKE_DIR "${_alpaka_ROOT_DIR}/cmake")
-set(_alpaka_TESTING_DIR "${_alpaka_ROOT_DIR}/tests")
+set(_alpaka_TESTS_DIR "${_alpaka_ROOT_DIR}/test")
 # Set include directories
 set(_alpaka_INCLUDE_DIRECTORY "${_alpaka_ROOT_DIR}/include")
 
diff --git a/cmake/finalize.cmake b/cmake/finalize.cmake
index 748b3d64c..026b7e650 100644
--- a/cmake/finalize.cmake
+++ b/cmake/finalize.cmake
@@ -225,7 +225,7 @@ function(alpaka_internal_finalize target)
         target_compile_definitions(${target} PRIVATE ALPAKA_CMAKE_TARGET_ALPAKA_FINALIZE_CALLED)
     endif()
 
-    # conditionally add sanitizers if not compiling with cuda/hip/oneapi
+    # conditionally add sanitizer if not compiling with cuda/hip/oneapi
     if(index_cuda EQUAL -1 AND index_hip EQUAL -1 AND index_oneapi EQUAL -1)
         if(alpaka_ASAN)
             message(STATUS "Linking ASAN to ${target}")
diff --git a/cmake/tests/StdAtomicRef.cpp b/cmake/test/StdAtomicRef.cpp
similarity index 100%
rename from cmake/tests/StdAtomicRef.cpp
rename to cmake/test/StdAtomicRef.cpp
diff --git a/cmake/tests/StdSimd.cpp b/cmake/test/StdSimd.cpp
similarity index 100%
rename from cmake/tests/StdSimd.cpp
rename to cmake/test/StdSimd.cpp
diff --git a/docs/source/advanced/cmake.rst b/docs/source/advanced/cmake.rst
index 816e382f8..7d6164a61 100644
--- a/docs/source/advanced/cmake.rst
+++ b/docs/source/advanced/cmake.rst
@@ -105,7 +105,7 @@ Arguments
      Set the C++ standard version.
 
 
-``alpaka_TESTING``
+``alpaka_TESTS``
   .. code-block:: markdown
 
      Build the testing tree with the current environment.
@@ -121,7 +121,7 @@ Arguments
   .. code-block:: markdown
 
      If `ON` use Catch2 to pre-installed on system else fetch Catch2 via CMake's fetch content.
-     This option is only available of `alpaka_TESTING` or `alpaka_BENCHMARKS` is `ON`.
+     This option is only available of `alpaka_TESTS` or `alpaka_BENCHMARKS` is `ON`.
 
 ``alpaka_FAST_MATH``
   .. code-block:: markdown
@@ -372,7 +372,7 @@ alpaka is providing CMake targets based on the optional activated dependencies `
 ^^^^^^^^^^^^^^^^^^^
 
 - Set include dependencies.
-- Activate header code based on the CMake option ``alpaka_EXEC_*`` (required for examples/tests/benchmarks).
+- Activate header code based on the CMake option ``alpaka_EXEC_*`` (required for examples/test/benchmarks).
 - Set the ``CXX`` standard.
 
 .. _alpaka-host:
diff --git a/docs/source/basic/install.rst b/docs/source/basic/install.rst
index 8512e7e1d..f88a199dd 100644
--- a/docs/source/basic/install.rst
+++ b/docs/source/basic/install.rst
@@ -221,7 +221,7 @@ The recipies shown here assume you have installed spack packages for specific co
 .. code-block::
 
   # ..
-  cmake ../alpaka3 -Dalpaka_TESTING=ON
+  cmake ../alpaka3 -Dalpaka_TESTS=ON
   cmake --build . --parallel
   ctest
 
@@ -238,7 +238,7 @@ If OpenMP is available on the system, additionally the executor `cpuOmpBlocks` c
 If oneAPI TBB is available on the system, additionally the executor `cpuTbbBlocks` can be used to run on all cores of the CPU.
 CMake option `alpaka_DEP_*` controls whether a parallelization framework is used and introduces a dependency on third-party libraries.
 This allows the usage of the coresponding executor e.g. `gpuCuda`, `gpuHip` or `oneApi`
-`alpaka_EXEC_*` activates or deactivates which execution schemas will be used for examples/tests and benchmarks.
+`alpaka_EXEC_*` activates or deactivates which execution schemas will be used for examples/test and benchmarks.
 
 **compile for CPU only (serial and OpenMP):**
 
@@ -250,7 +250,7 @@ This allows the usage of the coresponding executor e.g. `gpuCuda`, `gpuHip` or `
   # -Dalpaka_DEP_OMP=ON is implicitly set, if the compiler not support OpenMP only serial code will be generated
   # Assuming alpaka source is in ../alpaka3 with respect to the current directory
   #
-  cmake ../alpaka3 -Dalpaka_TESTING=ON -Dalpaka_BENCHMARKS=ON -Dalpaka_EXAMPLES=ON -DBUILD_TESTING=ON
+  cmake ../alpaka3 -Dalpaka_TESTS=ON -Dalpaka_BENCHMARKS=ON -Dalpaka_EXAMPLES=ON -DBUILD_TESTING=ON
   cmake --build . --parallel
   ctest --output-on-failure
 
@@ -261,7 +261,7 @@ This allows the usage of the coresponding executor e.g. `gpuCuda`, `gpuHip` or `
   spack load cmake@3.29.1
   spack load intel-oneapi-tbb@2021.10.0
 
-  cmake ../alpaka3 -Dalpaka_TESTING=ON -Dalpaka_BENCHMARKS=ON -Dalpaka_EXAMPLES=ON -Dalpaka_DEP_TBB=ON -Dalpaka_DEP_OMP=OFF
+  cmake ../alpaka3 -Dalpaka_TESTS=ON -Dalpaka_BENCHMARKS=ON -Dalpaka_EXAMPLES=ON -Dalpaka_DEP_TBB=ON -Dalpaka_DEP_OMP=OFF
   cmake --build . --parallel
   ctest --output-on-failure
 
@@ -273,7 +273,7 @@ This allows the usage of the coresponding executor e.g. `gpuCuda`, `gpuHip` or `
   spack load cuda@12.4.0
 
   # use -DCMAKE_CUDA_ARCHITECTURES=80 to set the GPU architecture
-  cmake ../alpaka3 -Dalpaka_TESTING=ON -Dalpaka_BENCHMARKS=ON -Dalpaka_EXAMPLES=ON -Dalpaka_DEP_OMP=OFF -Dalpaka_DEP_CUDA=ON -Dalpaka_EXEC_CpuSerial=OFF
+  cmake ../alpaka3 -Dalpaka_TESTS=ON -Dalpaka_BENCHMARKS=ON -Dalpaka_EXAMPLES=ON -Dalpaka_DEP_OMP=OFF -Dalpaka_DEP_CUDA=ON -Dalpaka_EXEC_CpuSerial=OFF
   cmake --build . --parallel
   ctest --output-on-failure
 
@@ -287,7 +287,7 @@ This allows the usage of the coresponding executor e.g. `gpuCuda`, `gpuHip` or `
 
   # use -DCMAKE_HIP_ARCHITECTURES=gfx906 to set the GPU architecture
   # for older CMake version sometimes the architecture must be set with -DAMDGPU_TARGETS=gfx906
-  cmake ../alpaka3 -Dalpaka_TESTING=ON -Dalpaka_BENCHMARKS=ON -Dalpaka_EXAMPLES=ON -Dalpaka_DEP_OMP=OFF -Dalpaka_DEP_HIP=ON -Dalpaka_EXEC_CpuSerial=OFF
+  cmake ../alpaka3 -Dalpaka_TESTS=ON -Dalpaka_BENCHMARKS=ON -Dalpaka_EXAMPLES=ON -Dalpaka_DEP_OMP=OFF -Dalpaka_DEP_HIP=ON -Dalpaka_EXEC_CpuSerial=OFF
   cmake --build . --parallel
   ctest --output-on-failure
 
@@ -311,7 +311,7 @@ This allows the usage of the coresponding executor e.g. `gpuCuda`, `gpuHip` or `
   # Cpu ISA e.g. avx,avx2, avx512
   # Nvidia only the sm number is needed e.g. 80
   # Amd full qualifier is required e.g. gfx906
-  cmake ../alpaka3 -DCMAKE_CXX_COMPILER=icpx -Dalpaka_TESTING=ON -Dalpaka_BENCHMARKS=ON -Dalpaka_EXAMPLES=ON -Dalpaka_DEP_ONEAPI=ON -Dalpaka_DEP_OMP=OFF -Dalpaka_EXEC_CpuSerial=OFF
+  cmake ../alpaka3 -DCMAKE_CXX_COMPILER=icpx -Dalpaka_TESTS=ON -Dalpaka_BENCHMARKS=ON -Dalpaka_EXAMPLES=ON -Dalpaka_DEP_ONEAPI=ON -Dalpaka_DEP_OMP=OFF -Dalpaka_EXEC_CpuSerial=OFF
   cmake --build . --parallel
   ctest --output-on-failure
 
diff --git a/docs/source/conf.py b/docs/source/conf.py
index af143561c..3eee45838 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -11,7 +11,7 @@ def generate_single_header(app, exception):
     os.makedirs(single_header_path, exist_ok=True)
 
     # Path to your script
-    script_path = os.path.abspath(os.path.join(app.srcdir, '..', '..', 'scripts', 'create-single-header.sh'))
+    script_path = os.path.abspath(os.path.join(app.srcdir, '..', '..', 'script', 'create-single-header.sh'))
 
     # Call the script with the destination folder as argument
     subprocess.run([script_path, single_header_path], check=True)
diff --git a/sanitizers/README.md b/sanitizer/README.md
similarity index 100%
rename from sanitizers/README.md
rename to sanitizer/README.md
diff --git a/sanitizers/asan_suppressions.txt b/sanitizer/asan_suppressions.txt
similarity index 100%
rename from sanitizers/asan_suppressions.txt
rename to sanitizer/asan_suppressions.txt
diff --git a/sanitizers/lsan_suppressions.txt b/sanitizer/lsan_suppressions.txt
similarity index 100%
rename from sanitizers/lsan_suppressions.txt
rename to sanitizer/lsan_suppressions.txt
diff --git a/sanitizers/tsan_suppressions.txt b/sanitizer/tsan_suppressions.txt
similarity index 100%
rename from sanitizers/tsan_suppressions.txt
rename to sanitizer/tsan_suppressions.txt
diff --git a/sanitizers/ubsan_suppressions.txt b/sanitizer/ubsan_suppressions.txt
similarity index 100%
rename from sanitizers/ubsan_suppressions.txt
rename to sanitizer/ubsan_suppressions.txt
diff --git a/scripts/create-single-header.sh b/script/create-single-header.sh
similarity index 100%
rename from scripts/create-single-header.sh
rename to script/create-single-header.sh
diff --git a/tests/CMakeLists.txt b/test/CMakeLists.txt
similarity index 100%
rename from tests/CMakeLists.txt
rename to test/CMakeLists.txt
diff --git a/tests/include/alpakaTest/testMacros.hpp b/test/include/alpakaTest/testMacros.hpp
similarity index 100%
rename from tests/include/alpakaTest/testMacros.hpp
rename to test/include/alpakaTest/testMacros.hpp
diff --git a/tests/unit/algorithm/concurrent.cpp b/test/unit/algorithm/concurrent.cpp
similarity index 100%
rename from tests/unit/algorithm/concurrent.cpp
rename to test/unit/algorithm/concurrent.cpp
diff --git a/tests/unit/algorithm/iota.cpp b/test/unit/algorithm/iota.cpp
similarity index 100%
rename from tests/unit/algorithm/iota.cpp
rename to test/unit/algorithm/iota.cpp
diff --git a/tests/unit/algorithm/reduce.cpp b/test/unit/algorithm/reduce.cpp
similarity index 100%
rename from tests/unit/algorithm/reduce.cpp
rename to test/unit/algorithm/reduce.cpp
diff --git a/tests/unit/algorithm/scan.cpp b/test/unit/algorithm/scan.cpp
similarity index 100%
rename from tests/unit/algorithm/scan.cpp
rename to test/unit/algorithm/scan.cpp
diff --git a/tests/unit/algorithm/transform.cpp b/test/unit/algorithm/transform.cpp
similarity index 100%
rename from tests/unit/algorithm/transform.cpp
rename to test/unit/algorithm/transform.cpp
diff --git a/tests/unit/algorithm/transformReduce.cpp b/test/unit/algorithm/transformReduce.cpp
similarity index 100%
rename from tests/unit/algorithm/transformReduce.cpp
rename to test/unit/algorithm/transformReduce.cpp
diff --git a/tests/unit/atomic/atomic.cpp b/test/unit/atomic/atomic.cpp
similarity index 100%
rename from tests/unit/atomic/atomic.cpp
rename to test/unit/atomic/atomic.cpp
diff --git a/tests/unit/atomic/atomicAdd.cpp b/test/unit/atomic/atomicAdd.cpp
similarity index 100%
rename from tests/unit/atomic/atomicAdd.cpp
rename to test/unit/atomic/atomicAdd.cpp
diff --git a/tests/unit/atomic/atomicHelpers.hpp b/test/unit/atomic/atomicHelpers.hpp
similarity index 100%
rename from tests/unit/atomic/atomicHelpers.hpp
rename to test/unit/atomic/atomicHelpers.hpp
diff --git a/tests/unit/block/block.cpp b/test/unit/block/block.cpp
similarity index 100%
rename from tests/unit/block/block.cpp
rename to test/unit/block/block.cpp
diff --git a/tests/unit/concepts/concepts.cpp b/test/unit/concepts/concepts.cpp
similarity index 100%
rename from tests/unit/concepts/concepts.cpp
rename to test/unit/concepts/concepts.cpp
diff --git a/tests/unit/core/config.cpp b/test/unit/core/config.cpp
similarity index 100%
rename from tests/unit/core/config.cpp
rename to test/unit/core/config.cpp
diff --git a/tests/unit/cvecKernelCall/cvecKernelCall.cpp b/test/unit/cvecKernelCall/cvecKernelCall.cpp
similarity index 100%
rename from tests/unit/cvecKernelCall/cvecKernelCall.cpp
rename to test/unit/cvecKernelCall/cvecKernelCall.cpp
diff --git a/tests/unit/deviceGlobalMem/deviceGlobalMem.cpp b/test/unit/deviceGlobalMem/deviceGlobalMem.cpp
similarity index 100%
rename from tests/unit/deviceGlobalMem/deviceGlobalMem.cpp
rename to test/unit/deviceGlobalMem/deviceGlobalMem.cpp
diff --git a/tests/unit/dict/dict.cpp b/test/unit/dict/dict.cpp
similarity index 100%
rename from tests/unit/dict/dict.cpp
rename to test/unit/dict/dict.cpp
diff --git a/tests/unit/event/event.cpp b/test/unit/event/event.cpp
similarity index 100%
rename from tests/unit/event/event.cpp
rename to test/unit/event/event.cpp
diff --git a/tests/unit/event/eventHelper.hpp b/test/unit/event/eventHelper.hpp
similarity index 100%
rename from tests/unit/event/eventHelper.hpp
rename to test/unit/event/eventHelper.hpp
diff --git a/tests/unit/handle/handle.cpp b/test/unit/handle/handle.cpp
similarity index 100%
rename from tests/unit/handle/handle.cpp
rename to test/unit/handle/handle.cpp
diff --git a/tests/unit/intrinsic/clz.cpp b/test/unit/intrinsic/clz.cpp
similarity index 100%
rename from tests/unit/intrinsic/clz.cpp
rename to test/unit/intrinsic/clz.cpp
diff --git a/tests/unit/intrinsic/ffs.cpp b/test/unit/intrinsic/ffs.cpp
similarity index 100%
rename from tests/unit/intrinsic/ffs.cpp
rename to test/unit/intrinsic/ffs.cpp
diff --git a/tests/unit/intrinsic/popc.cpp b/test/unit/intrinsic/popc.cpp
similarity index 100%
rename from tests/unit/intrinsic/popc.cpp
rename to test/unit/intrinsic/popc.cpp
diff --git a/tests/unit/math/ADL.cpp b/test/unit/math/ADL.cpp
similarity index 100%
rename from tests/unit/math/ADL.cpp
rename to test/unit/math/ADL.cpp
diff --git a/tests/unit/math/Buffer.hpp b/test/unit/math/Buffer.hpp
similarity index 100%
rename from tests/unit/math/Buffer.hpp
rename to test/unit/math/Buffer.hpp
diff --git a/tests/unit/math/ComplexDouble.cpp b/test/unit/math/ComplexDouble.cpp
similarity index 100%
rename from tests/unit/math/ComplexDouble.cpp
rename to test/unit/math/ComplexDouble.cpp
diff --git a/tests/unit/math/ComplexFloat.cpp b/test/unit/math/ComplexFloat.cpp
similarity index 100%
rename from tests/unit/math/ComplexFloat.cpp
rename to test/unit/math/ComplexFloat.cpp
diff --git a/tests/unit/math/DataGen.hpp b/test/unit/math/DataGen.hpp
similarity index 100%
rename from tests/unit/math/DataGen.hpp
rename to test/unit/math/DataGen.hpp
diff --git a/tests/unit/math/Defines.hpp b/test/unit/math/Defines.hpp
similarity index 100%
rename from tests/unit/math/Defines.hpp
rename to test/unit/math/Defines.hpp
diff --git a/tests/unit/math/Double.cpp b/test/unit/math/Double.cpp
similarity index 100%
rename from tests/unit/math/Double.cpp
rename to test/unit/math/Double.cpp
diff --git a/tests/unit/math/Float.cpp b/test/unit/math/Float.cpp
similarity index 100%
rename from tests/unit/math/Float.cpp
rename to test/unit/math/Float.cpp
diff --git a/tests/unit/math/Functor.hpp b/test/unit/math/Functor.hpp
similarity index 100%
rename from tests/unit/math/Functor.hpp
rename to test/unit/math/Functor.hpp
diff --git a/tests/unit/math/TestTemplate.hpp b/test/unit/math/TestTemplate.hpp
similarity index 100%
rename from tests/unit/math/TestTemplate.hpp
rename to test/unit/math/TestTemplate.hpp
diff --git a/tests/unit/math/executeOnComputeDevice.hpp b/test/unit/math/executeOnComputeDevice.hpp
similarity index 100%
rename from tests/unit/math/executeOnComputeDevice.hpp
rename to test/unit/math/executeOnComputeDevice.hpp
diff --git a/tests/unit/math/isSpecialIEEE.cpp b/test/unit/math/isSpecialIEEE.cpp
similarity index 100%
rename from tests/unit/math/isSpecialIEEE.cpp
rename to test/unit/math/isSpecialIEEE.cpp
diff --git a/tests/unit/math/powMixedTypes.cpp b/test/unit/math/powMixedTypes.cpp
similarity index 100%
rename from tests/unit/math/powMixedTypes.cpp
rename to test/unit/math/powMixedTypes.cpp
diff --git a/tests/unit/math/sincos.cpp b/test/unit/math/sincos.cpp
similarity index 100%
rename from tests/unit/math/sincos.cpp
rename to test/unit/math/sincos.cpp
diff --git a/tests/unit/mem/alloc.cpp b/test/unit/mem/alloc.cpp
similarity index 100%
rename from tests/unit/mem/alloc.cpp
rename to test/unit/mem/alloc.cpp
diff --git a/tests/unit/mem/allocDeferred.cpp b/test/unit/mem/allocDeferred.cpp
similarity index 100%
rename from tests/unit/mem/allocDeferred.cpp
rename to test/unit/mem/allocDeferred.cpp
diff --git a/tests/unit/mem/concepts.cpp b/test/unit/mem/concepts.cpp
similarity index 100%
rename from tests/unit/mem/concepts.cpp
rename to test/unit/mem/concepts.cpp
diff --git a/tests/unit/mem/constCorrectness.cpp b/test/unit/mem/constCorrectness.cpp
similarity index 100%
rename from tests/unit/mem/constCorrectness.cpp
rename to test/unit/mem/constCorrectness.cpp
diff --git a/tests/unit/mem/idxRange.cpp b/test/unit/mem/idxRange.cpp
similarity index 100%
rename from tests/unit/mem/idxRange.cpp
rename to test/unit/mem/idxRange.cpp
diff --git a/tests/unit/mem/keepAlive.cpp b/test/unit/mem/keepAlive.cpp
similarity index 100%
rename from tests/unit/mem/keepAlive.cpp
rename to test/unit/mem/keepAlive.cpp
diff --git a/tests/unit/mem/lifetime.cpp b/test/unit/mem/lifetime.cpp
similarity index 100%
rename from tests/unit/mem/lifetime.cpp
rename to test/unit/mem/lifetime.cpp
diff --git a/tests/unit/mem/mdIterator.cpp b/test/unit/mem/mdIterator.cpp
similarity index 100%
rename from tests/unit/mem/mdIterator.cpp
rename to test/unit/mem/mdIterator.cpp
diff --git a/tests/unit/mem/memFenceBasic.cpp b/test/unit/mem/memFenceBasic.cpp
similarity index 100%
rename from tests/unit/mem/memFenceBasic.cpp
rename to test/unit/mem/memFenceBasic.cpp
diff --git a/tests/unit/mem/memFenceProducerConsumer.cpp b/test/unit/mem/memFenceProducerConsumer.cpp
similarity index 100%
rename from tests/unit/mem/memFenceProducerConsumer.cpp
rename to test/unit/mem/memFenceProducerConsumer.cpp
diff --git a/tests/unit/mem/memcpy.cpp b/test/unit/mem/memcpy.cpp
similarity index 100%
rename from tests/unit/mem/memcpy.cpp
rename to test/unit/mem/memcpy.cpp
diff --git a/tests/unit/mem/subDataStorage.cpp b/test/unit/mem/subDataStorage.cpp
similarity index 100%
rename from tests/unit/mem/subDataStorage.cpp
rename to test/unit/mem/subDataStorage.cpp
diff --git a/tests/unit/platform/platform.cpp b/test/unit/platform/platform.cpp
similarity index 100%
rename from tests/unit/platform/platform.cpp
rename to test/unit/platform/platform.cpp
diff --git a/tests/unit/precision/precision.cpp b/test/unit/precision/precision.cpp
similarity index 100%
rename from tests/unit/precision/precision.cpp
rename to test/unit/precision/precision.cpp
diff --git a/tests/unit/queue/blockingQueue.cpp b/test/unit/queue/blockingQueue.cpp
similarity index 100%
rename from tests/unit/queue/blockingQueue.cpp
rename to test/unit/queue/blockingQueue.cpp
diff --git a/tests/unit/queue/kernelMD.cpp b/test/unit/queue/kernelMD.cpp
similarity index 100%
rename from tests/unit/queue/kernelMD.cpp
rename to test/unit/queue/kernelMD.cpp
diff --git a/tests/unit/queue/queue.cpp b/test/unit/queue/queue.cpp
similarity index 100%
rename from tests/unit/queue/queue.cpp
rename to test/unit/queue/queue.cpp
diff --git a/tests/unit/rand/uniformReal.cpp b/test/unit/rand/uniformReal.cpp
similarity index 100%
rename from tests/unit/rand/uniformReal.cpp
rename to test/unit/rand/uniformReal.cpp
diff --git a/tests/unit/sharedMem/sharedMem.cpp b/test/unit/sharedMem/sharedMem.cpp
similarity index 100%
rename from tests/unit/sharedMem/sharedMem.cpp
rename to test/unit/sharedMem/sharedMem.cpp
diff --git a/tests/unit/simd/alignment.cpp b/test/unit/simd/alignment.cpp
similarity index 100%
rename from tests/unit/simd/alignment.cpp
rename to test/unit/simd/alignment.cpp
diff --git a/tests/unit/simd/simd.cpp b/test/unit/simd/simd.cpp
similarity index 100%
rename from tests/unit/simd/simd.cpp
rename to test/unit/simd/simd.cpp
diff --git a/tests/unit/simd/simdMask.cpp b/test/unit/simd/simdMask.cpp
similarity index 100%
rename from tests/unit/simd/simdMask.cpp
rename to test/unit/simd/simdMask.cpp
diff --git a/tests/unit/simd/where.cpp b/test/unit/simd/where.cpp
similarity index 100%
rename from tests/unit/simd/where.cpp
rename to test/unit/simd/where.cpp
diff --git a/tests/unit/tuple/tuple.cpp b/test/unit/tuple/tuple.cpp
similarity index 100%
rename from tests/unit/tuple/tuple.cpp
rename to test/unit/tuple/tuple.cpp
diff --git a/tests/unit/vec/concepts.cpp b/test/unit/vec/concepts.cpp
similarity index 100%
rename from tests/unit/vec/concepts.cpp
rename to test/unit/vec/concepts.cpp
diff --git a/tests/unit/vec/vec.cpp b/test/unit/vec/vec.cpp
similarity index 100%
rename from tests/unit/vec/vec.cpp
rename to test/unit/vec/vec.cpp
diff --git a/tests/unit/wait/device.cpp b/test/unit/wait/device.cpp
similarity index 100%
rename from tests/unit/wait/device.cpp
rename to test/unit/wait/device.cpp
diff --git a/tests/unit/warp/activemask.cpp b/test/unit/warp/activemask.cpp
similarity index 100%
rename from tests/unit/warp/activemask.cpp
rename to test/unit/warp/activemask.cpp
diff --git a/tests/unit/warp/all.cpp b/test/unit/warp/all.cpp
similarity index 100%
rename from tests/unit/warp/all.cpp
rename to test/unit/warp/all.cpp
diff --git a/tests/unit/warp/any.cpp b/test/unit/warp/any.cpp
similarity index 100%
rename from tests/unit/warp/any.cpp
rename to test/unit/warp/any.cpp
diff --git a/tests/unit/warp/ballot.cpp b/test/unit/warp/ballot.cpp
similarity index 100%
rename from tests/unit/warp/ballot.cpp
rename to test/unit/warp/ballot.cpp
diff --git a/tests/unit/warp/getSize.cpp b/test/unit/warp/getSize.cpp
similarity index 100%
rename from tests/unit/warp/getSize.cpp
rename to test/unit/warp/getSize.cpp
diff --git a/tests/unit/warp/iota.cpp b/test/unit/warp/iota.cpp
similarity index 100%
rename from tests/unit/warp/iota.cpp
rename to test/unit/warp/iota.cpp
diff --git a/tests/unit/warp/shfl.cpp b/test/unit/warp/shfl.cpp
similarity index 100%
rename from tests/unit/warp/shfl.cpp
rename to test/unit/warp/shfl.cpp
diff --git a/tests/unit/warp/shfl_down.cpp b/test/unit/warp/shfl_down.cpp
similarity index 100%
rename from tests/unit/warp/shfl_down.cpp
rename to test/unit/warp/shfl_down.cpp
diff --git a/tests/unit/warp/shfl_up.cpp b/test/unit/warp/shfl_up.cpp
similarity index 100%
rename from tests/unit/warp/shfl_up.cpp
rename to test/unit/warp/shfl_up.cpp
diff --git a/tests/unit/warp/shfl_xor.cpp b/test/unit/warp/shfl_xor.cpp
similarity index 100%
rename from tests/unit/warp/shfl_xor.cpp
rename to test/unit/warp/shfl_xor.cpp
diff --git a/tests/unit/warp/utils.hpp b/test/unit/warp/utils.hpp
similarity index 100%
rename from tests/unit/warp/utils.hpp
rename to test/unit/warp/utils.hpp