diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 386bc3d7..192ff0e6 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -2,16 +2,9 @@ name: CMake CI
 
 on:
   push:
-    paths-exclude:
-    - '.github/workflows/make.yml'
-    - '.gitignore'
-    - 'README'
-    - '**README'
-    - 'LICENSE'
-    - '**Makefile'
-    - 'SLmake.inc.example'
+    branches: [master]
   pull_request:
-    paths-exclude:
+    paths-ignore:
     - '.github/workflows/make.yml'
     - '.gitignore'
     - 'README'
@@ -20,10 +13,14 @@ on:
     - '**Makefile'
     - 'SLmake.inc.example'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   CFLAGS: "-Wall -pedantic"
   FFLAGS: "-fcheck=all,no-bounds"
-  BUILD_TYPE: Release
+  CMAKE_BUILD_TYPE: Release
   MPIEXEC_PREFLAGS: "--oversubscribe"
 
 defaults:
@@ -33,15 +30,22 @@ defaults:
 jobs:
 
   build-all:
+    name: >
+      CMake ${{ matrix.cmake }}
     runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        # CMake versions to test:
+        # - minimum and maximum in the `cmake_minimum_required`
+        #   (if needed expand this to add all intermediate values
+        #    for *temporary* CI testing)
+        # - latest version
+        cmake: ["3.26", "4.0", latest]
+      fail-fast: false
     steps:
 
     - name: Checkout ScaLAPACK
-      uses: actions/checkout@v2
-
-    - name: Install ninja-build tool
-      uses: seanmiddleditch/gha-setup-ninja@v3
+      uses: actions/checkout@v4
 
     - name: Setup MPI
       # uses: mpi4py/setup-mpi@v1
@@ -51,29 +55,32 @@ jobs:
 
     - name: Install BLAS and LAPACK
       run: sudo apt -y install libblas-dev liblapack-dev
-        
+
+    - name: Setup CMake
+      uses: jwlawson/actions-setup-cmake@v2
+      with:
+        cmake-version: ${{ matrix.cmake }}
+
     - name: CMake configuration
+      # TODO: Use cmake presets for newer versions
+      # TODO: Simplify the defaults to not require configuration
       run: >
-        cmake -B build
-        -G Ninja
-        -D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
-        -D CMAKE_INSTALL_PREFIX=${{github.workspace}}/scalapack_install
-        -D BUILD_SHARED_LIBS=ON
-        -D SCALAPACK_BUILD_TESTS=ON
-        -D MPIEXEC_PREFLAGS=${{env.MPIEXEC_PREFLAGS}}
-        
+        cmake -B build \
+          -G Ninja \
+          -DCMAKE_BUILD_TYPE=${{env.CMAKE_BUILD_TYPE}} \
+          -DBUILD_SHARED_LIBS=ON \
+          -DSCALAPACK_BUILD_TESTS=ON \
+          -DMPIEXEC_PREFLAGS=${{env.MPIEXEC_PREFLAGS}}
+
     - name: Build
-      working-directory: ${{github.workspace}}/build
-      run: |
-        ctest -D ExperimentalStart
-        ctest -D ExperimentalConfigure
-        ctest -D ExperimentalBuild
+      run: >
+        cmake --build build
 
     - name: Test
+      # CMake<3.20 does not have -B option
       working-directory: ${{github.workspace}}/build
-      run: |
-        ctest -D ExperimentalTest --schedule-random --output-on-failure --timeout 180
-        ctest -D ExperimentalSubmit
-        
+      run: >
+        ctest --output-on-failure -j $(nproc)
+
     - name: Install
-      run: cmake --build build --target install
+      run: cmake --install build --prefix scalapack_install
diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml
index 5c49e618..dbb0e50f 100644
--- a/.github/workflows/make.yml
+++ b/.github/workflows/make.yml
@@ -2,16 +2,9 @@ name: Makefile CI
 
 on:
   push:
-    paths-exclude:
-    - '.github/workflows/cmake.yml'
-    - '.gitignore'
-    - 'README'
-    - '**README'
-    - 'LICENSE'
-    - 'CMAKE**'
-    - '**CMakeLists.txt'
+    branches: [master]
   pull_request:
-    paths-exclude:
+    paths-ignore:
     - '.github/workflows/cmake.yml'
     - '.gitignore'
     - 'README'
@@ -20,6 +13,10 @@ on:
     - 'CMAKE**'
     - '**CMakeLists.txt'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 defaults:
   run:
     shell: bash
diff --git a/BLACS/INSTALL/CMakeLists.txt b/BLACS/INSTALL/CMakeLists.txt
index c75773cd..acbb7430 100644
--- a/BLACS/INSTALL/CMakeLists.txt
+++ b/BLACS/INSTALL/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.26...4.0)
 project(INSTALL C Fortran)
 
 add_executable(xintface Fintface.f Cintface.c)
diff --git a/CMAKE/CTestCustom.cmake.in b/CMAKE/CTestCustom.cmake.in
deleted file mode 100644
index ab940fa7..00000000
--- a/CMAKE/CTestCustom.cmake.in
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# For further details regarding this file, 
-# see http://www.vtk.org/Wiki/CMake_Testing_With_CTest#Customizing_CTest
-#
-
-SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE   0)
-SET(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE   0)
-SET(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS        500)
-SET(CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS      500)
-
-# Files to explicitly exclude from code coverage
-SET(CTEST_CUSTOM_COVERAGE_EXCLUDE
- ${CTEST_CUSTOM_COVERAGE_EXCLUDE}
- 
- # Exclude the testing code itself from code coverage
- "/TESTING/"
-)
-
-# Warnings to explicitly ignore
-SET(CTEST_CUSTOM_WARNING_EXCEPTION
-  ${CTEST_CUSTOM_WARNING_EXCEPTION}
-
-  # Common warning when linking ATLAS built with GNU Fortran 4.1 and building 
-  # with GNU Fortran 4.4.  It can be safely ignored.
-  "libgfortran.*may conflict with libgfortran"
-
-  # Harmless warning often seen on IRIX
-  "WARNING 84 : .*libm.* is not used for resolving any symbol"
-
-  # Warnings caused by sun compilers when building code to only run on your 
-  # native platform
-  "xarch=native on this architecture implies -xarch=.*which generates code that does not run"
-  
-  # Harmless warnings from the Intel compiler on Windows
-  "ipo: warning #11010: file format not recognized for .*\\.exe\\.embed\\.manifest\\.res"
-  "LINK : warning LNK4224: /INCREMENTAL:YES is no longer supported;  ignored"
-
-  # Warnings caused by string truncation in the test code.  The truncation is 
-  # intentional
-  "Character string truncated to length 1 on assignment"
-)
-
diff --git a/CMAKE/scalapack-config-build.cmake.in b/CMAKE/scalapack-config-build.cmake.in
deleted file mode 100644
index 4afc2731..00000000
--- a/CMAKE/scalapack-config-build.cmake.in
+++ /dev/null
@@ -1 +0,0 @@
-include("@SCALAPACK_BINARY_DIR@/scalapack-targets.cmake")
diff --git a/CMAKE/scalapack-config-install.cmake.in b/CMAKE/scalapack-config-install.cmake.in
deleted file mode 100644
index 560cf624..00000000
--- a/CMAKE/scalapack-config-install.cmake.in
+++ /dev/null
@@ -1,2 +0,0 @@
-get_filename_component(_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-include(${_SELF_DIR}/scalapack-targets.cmake)
diff --git a/CMAKE/scalapack-config-version.cmake.in b/CMAKE/scalapack-config-version.cmake.in
deleted file mode 100644
index afba17ee..00000000
--- a/CMAKE/scalapack-config-version.cmake.in
+++ /dev/null
@@ -1,8 +0,0 @@
-set(PACKAGE_VERSION "@SCALAPACK_VERSION@")
-if(NOT ${PACKAGE_FIND_VERSION} VERSION_GREATER ${PACKAGE_VERSION})
-  set(PACKAGE_VERSION_COMPATIBLE 1)
-  if(${PACKAGE_FIND_VERSION} VERSION_EQUAL ${PACKAGE_VERSION})
-    set(PACKAGE_VERSION_EXACT 1)
-  endif()
-endif()
-
diff --git a/CMAKE/scalapackConfig.cmake.in b/CMAKE/scalapackConfig.cmake.in
new file mode 100644
index 00000000..34ac2613
--- /dev/null
+++ b/CMAKE/scalapackConfig.cmake.in
@@ -0,0 +1,21 @@
+cmake_minimum_required(VERSION 3.17...4.0)
+
+@PACKAGE_INIT@
+
+include(${CMAKE_CURRENT_LIST_DIR}/scalapackTargets.cmake)
+
+# Deprecated compatibility shims
+if(TARGET scalapack::scalapack)
+    add_library(scalapack INTERFACE IMPORTED)
+    target_link_libraries(scalapack INTERFACE scalapack::scalapack)
+    set_target_properties(scalapack PROPERTIES
+        DEPRECATION "Target scalapack is deprecated, use scalapack::scalapack instead."
+    )
+endif()
+if(TARGET scalapack::scalapack-F)
+    add_library(scalapack-F INTERFACE IMPORTED)
+    target_link_libraries(scalapack-F INTERFACE scalapack::scalapack-F)
+    set_target_properties(scalapack-F PROPERTIES
+        DEPRECATION "Target scalapack-F is deprecated, use scalapack::scalapack-F instead."
+    )
+endif()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d599305..6c651fb1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,14 +1,7 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.26...4.0)
 
 project(SCALAPACK VERSION 2.2.2 LANGUAGES C Fortran)
 
-# Configure the warning and code coverage suppression file
-configure_file(
-  "${SCALAPACK_SOURCE_DIR}/CMAKE/CTestCustom.cmake.in"
-  "${SCALAPACK_BINARY_DIR}/CTestCustom.cmake"
-  COPYONLY
-)
-
 # Add the CMake directory for custon CMake modules
 set(CMAKE_MODULE_PATH "${SCALAPACK_SOURCE_DIR}/CMAKE" ${CMAKE_MODULE_PATH})
 
@@ -77,18 +70,17 @@ if (UNIX)
    endif ()
 endif ()
 
+# TODO: Remove this macro
 macro(SCALAPACK_install_library lib)
-  install(TARGETS ${lib} EXPORT scalapack-targets
-    RUNTIME DESTINATION Testing
-  )
+install(TARGETS ${lib}
+    EXPORT scalapackTargets
+)
 endmacro()
 
 # --------------------------------------------------
 # Testing
 SET(DART_TESTING_TIMEOUT 600)
 
-enable_testing()
-include(CTest)
 enable_testing()
 # --------------------------------------------------
 
@@ -237,6 +229,7 @@ append_subdir_files(src-C "SRC")
 
 if (NOT MSVC)
    add_library(scalapack ${blacs} ${tools} ${tools-C} ${extra_lapack} ${pblas} ${pblas-F} ${ptzblas} ${ptools} ${pbblas} ${redist} ${src} ${src-C})
+   add_library(scalapack::scalapack ALIAS scalapack)
    set_target_properties(scalapack PROPERTIES
     VERSION ${SCALAPACK_VERSION}
     SOVERSION ${SCALAPACK_VERSION_MAJOR}.${SCALAPACK_VERSION_MINOR})
@@ -245,11 +238,13 @@ if (NOT MSVC)
 else () # Need to separate Fortran and C Code
    OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON )
    add_library(scalapack ${blacs} ${tools-C} ${pblas} ${ptools} ${redist} ${src-C})
+   add_library(scalapack::scalapack ALIAS scalapack)
    set_target_properties(scalapack PROPERTIES
     VERSION ${SCALAPACK_VERSION}
     SOVERSION ${SCALAPACK_VERSION_MAJOR}.${SCALAPACK_VERSION_MINOR})
    target_link_libraries( scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_C)
    add_library(scalapack-F ${pblas-F} ${pbblas} ${ptzblas} ${tools} ${src} ${extra_lapack} )
+   add_library(scalapack::scalapack-F ALIAS scalapack-F)
    set_target_properties(scalapack-F PROPERTIES
     VERSION ${SCALAPACK_VERSION}
     SOVERSION ${SCALAPACK_VERSION_MAJOR}.${SCALAPACK_VERSION_MINOR})
@@ -265,6 +260,16 @@ endif()
 option(SCALAPACK_BUILD_TESTS "Build all tests of the ScaLAPACK library" ON)
 if(${SCALAPACK_BUILD_TESTS})
   add_subdirectory(TESTING)
+  # Make sure that the build artifacts are exported for the test-suite
+  foreach(target IN ITEMS scalapack scalapack-F)
+      if(TARGET ${target})
+          export(TARGETS ${target}
+              FILE scalapackTargets.cmake
+              NAMESPACE scalapack::
+              APPEND
+          )
+      endif()
+  endforeach()
 endif()
 
 # --------------------------------------------------
@@ -299,8 +304,6 @@ INCLUDE(CPack)
 # --------------------------------------------------
 
 
-export(TARGETS scalapack FILE scalapack-targets.cmake)
-
 if( NOT LAPACK_FOUND )
  install(FILES
   ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES}
@@ -308,24 +311,29 @@ if( NOT LAPACK_FOUND )
    )
 endif( NOT LAPACK_FOUND )
 
-configure_file(${SCALAPACK_SOURCE_DIR}/CMAKE/scalapack-config-version.cmake.in
-  ${SCALAPACK_BINARY_DIR}/scalapack-config-version.cmake @ONLY)
-configure_file(${SCALAPACK_SOURCE_DIR}/CMAKE/scalapack-config-build.cmake.in
-  ${SCALAPACK_BINARY_DIR}/scalapack-config.cmake @ONLY)
+include(CMakePackageConfigHelpers)
+configure_package_config_file(
+    CMAKE/scalapackConfig.cmake.in
+    scalapackConfig.cmake
+    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/scalapack
+)
+write_basic_package_version_file(
+    scalapackConfigVersion.cmake
+    COMPATIBILITY SameMajorVersion
+)
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scalapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/scalapack.pc)
- install(FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/scalapack.pc
-  DESTINATION ${PKG_CONFIG_DIR}
-   )
+install(EXPORT scalapackTargets
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/scalapack
+    NAMESPACE scalapack
+)
 
-configure_file(${SCALAPACK_SOURCE_DIR}/CMAKE/scalapack-config-install.cmake.in
-  ${SCALAPACK_BINARY_DIR}/CMakeFiles/scalapack-config.cmake @ONLY)
+configure_file(scalapack.pc.in scalapack.pc @ONLY)
 install(FILES
-  ${SCALAPACK_BINARY_DIR}/CMakeFiles/scalapack-config.cmake
-  ${SCALAPACK_BINARY_DIR}/scalapack-config-version.cmake
-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/scalapack-${SCALAPACK_VERSION}
-  )
-
-install(EXPORT scalapack-targets
-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/scalapack-${SCALAPACK_VERSION})
+    ${CMAKE_CURRENT_BINARY_DIR}/scalapack.pc
+    DESTINATION ${PKG_CONFIG_DIR}
+)
+install(FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/scalapackConfig.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/scalapackConfigVersion.cmake
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/scalapack
+)
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
deleted file mode 100644
index 751db235..00000000
--- a/CTestConfig.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-## This file should be placed in the root directory of your project.
-## Then modify the CMakeLists.txt file in the root directory of your
-## project to incorporate the testing dashboard.
-## # The following are required to uses Dart and the Cdash dashboard
-##   ENABLE_TESTING()
-##   INCLUDE(CTest)
-set(CTEST_PROJECT_NAME "ScaLAPACK")
-set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
-
-set(CTEST_DROP_METHOD "http")
-set(CTEST_DROP_SITE "icl.cs.utk.edu/cdash")
-set(CTEST_DROP_LOCATION "/submit.php?project=ScaLAPACK")
-set(CTEST_DROP_SITE_CDASH TRUE)
diff --git a/TESTING/CMakeLists.txt b/TESTING/CMakeLists.txt
index ae69afc6..a76b13ab 100644
--- a/TESTING/CMakeLists.txt
+++ b/TESTING/CMakeLists.txt
@@ -1,110 +1,20 @@
-add_subdirectory(LIN)
-add_subdirectory(EIG)
+cmake_minimum_required(VERSION 3.26...4.0)
 
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/TESTING)
+project(scalapack-tests
+    LANGUAGES C Fortran
+)
 
-file(COPY BLLT.dat DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-file(COPY BLU.dat DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-file(COPY BRD.dat DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-file(COPY EVC.dat DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-file(COPY HRD.dat DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-file(COPY INV.dat DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-file(COPY LLT.dat DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-file(COPY LS.dat DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-file(COPY LU.dat DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-file(COPY NEP.dat DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-file(COPY QR.dat DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-file(COPY SEP.dat DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-file(COPY SEPR.dat DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-file(COPY SVD.dat DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-file(COPY TRD.dat DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+if(NOT TARGET scalapack::scalapack)
+    find_package(scalapack REQUIRED CONFIG)
+endif()
 
-add_test(xslu ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xslu)
-add_test(xdlu ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xdlu)
-add_test(xclu ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xclu)
-add_test(xzlu ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xzlu)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+include(scalapack_tests_helpers)
 
-add_test(xsdblu ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xsdblu)
-add_test(xddblu ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xddblu)
-add_test(xcdblu ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xcdblu)
-add_test(xzdblu ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xzdblu)
+enable_testing()
 
-add_test(xsdtlu ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xsdtlu)
-add_test(xddtlu ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xddtlu)
-add_test(xcdtlu ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xcdtlu)
-add_test(xzdtlu ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xzdtlu)
-
-add_test(xsgblu ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xsgblu)
-add_test(xdgblu ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xdgblu)
-add_test(xcgblu ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xcgblu)
-add_test(xzgblu ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xzgblu)
-
-add_test(xsllt ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xsllt)
-add_test(xdllt ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xdllt)
-add_test(xcllt ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xcllt)
-add_test(xzllt ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xzllt)
-
-add_test(xspbllt ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xspbllt)
-add_test(xdpbllt ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xdpbllt)
-add_test(xcpbllt ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xcpbllt)
-add_test(xzpbllt ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xzpbllt)
-
-add_test(xsptllt ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xsptllt)
-add_test(xdptllt ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xdptllt)
-add_test(xcptllt ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xcptllt)
-add_test(xzptllt ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xzptllt)
-
-add_test(xsinv ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xsinv)
-add_test(xdinv ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xdinv)
-add_test(xcinv ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xcinv)
-add_test(xzinv ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xzinv)
-
-add_test(xsqr ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xsqr)
-add_test(xdqr ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xdqr)
-add_test(xcqr ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xcqr)
-add_test(xzqr ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xzqr)
-
-add_test(xsbrd ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xsbrd)
-add_test(xdbrd ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xdbrd)
-add_test(xcbrd ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xcbrd)
-add_test(xzbrd ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xzbrd)
-
-add_test(xshrd ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xshrd)
-add_test(xdhrd ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xdhrd)
-add_test(xchrd ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xchrd)
-add_test(xzhrd ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xzhrd)
-
-add_test(xstrd ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xstrd)
-add_test(xdtrd ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xdtrd)
-add_test(xctrd ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xctrd)
-add_test(xztrd ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xztrd)
-
-add_test(xssvd ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ${MPIEXEC_PREFLAGS} ./xssvd)
-add_test(xdsvd ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ${MPIEXEC_PREFLAGS} ./xdsvd)
-
-add_test(xssep ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ${MPIEXEC_PREFLAGS} ./xssep)
-add_test(xdsep ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ${MPIEXEC_PREFLAGS} ./xdsep)
-add_test(xcsep ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ${MPIEXEC_PREFLAGS} ./xcsep)
-add_test(xzsep ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ${MPIEXEC_PREFLAGS} ./xzsep)
-
-add_test(xsgsep ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ${MPIEXEC_PREFLAGS} ./xsgsep)
-add_test(xdgsep ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ${MPIEXEC_PREFLAGS} ./xdgsep)
-add_test(xcgsep ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ${MPIEXEC_PREFLAGS} ./xcgsep)
-add_test(xzgsep ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ${MPIEXEC_PREFLAGS} ./xzgsep)
-
-add_test(xsnep ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xsnep)
-add_test(xdnep ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xdnep)
-add_test(xcnep ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xcnep)
-add_test(xznep ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xznep)
-
-add_test(xcevc ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xcevc)
-add_test(xzevc ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xzevc)
-
-add_test(xssyevr ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ${MPIEXEC_PREFLAGS} ./xssyevr)
-add_test(xdsyevr ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ${MPIEXEC_PREFLAGS} ./xdsyevr)
-add_test(xcheevr ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ${MPIEXEC_PREFLAGS} ./xcheevr)
-add_test(xzheevr ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ${MPIEXEC_PREFLAGS} ./xzheevr)
-
-add_test(xshseqr ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xshseqr)
-add_test(xdhseqr ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} ./xdhseqr)
+# Old test-suite
+add_subdirectory(traditional)
 
+# Packaging tests
+add_subdirectory(package)
diff --git a/TESTING/LIN/CMakeLists.txt b/TESTING/LIN/CMakeLists.txt
deleted file mode 100644
index 481776f5..00000000
--- a/TESTING/LIN/CMakeLists.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/TESTING)
-
-set (smatgen psmatgen.f pmatgeninc.f)
-set (dmatgen pdmatgen.f pmatgeninc.f)
-set (cmatgen pcmatgen.f pmatgeninc.f)
-set (zmatgen pzmatgen.f pmatgeninc.f)
-
-set (slinchk pslaschk.f pslafchk.f)
-set (dlinchk pdlaschk.f pdlafchk.f)
-set (clinchk pclaschk.f pclafchk.f)
-set (zlinchk pzlaschk.f pzlafchk.f)
-
-add_executable(xslu psludriver.f psluinfo.f psgetrrv.f ${smatgen} ${slinchk})
-add_executable(xdlu pdludriver.f pdluinfo.f pdgetrrv.f ${dmatgen} ${dlinchk})
-add_executable(xclu pcludriver.f pcluinfo.f pcgetrrv.f ${cmatgen} ${clinchk})
-add_executable(xzlu pzludriver.f pzluinfo.f pzgetrrv.f ${zmatgen} ${zlinchk})
-
-add_executable(xsdblu psdbdriver.f psdbinfo.f psdblaschk.f psdbmv1.f psbmatgen.f ${smatgen})
-add_executable(xddblu pddbdriver.f pddbinfo.f pddblaschk.f pddbmv1.f pdbmatgen.f ${dmatgen})
-add_executable(xcdblu pcdbdriver.f pcdbinfo.f pcdblaschk.f pcdbmv1.f pcbmatgen.f ${cmatgen})
-add_executable(xzdblu pzdbdriver.f pzdbinfo.f pzdblaschk.f pzdbmv1.f pzbmatgen.f ${zmatgen})
-
-add_executable(xsdtlu psdtdriver.f psdtinfo.f psdtlaschk.f psdbmv1.f psbmatgen.f ${smatgen})
-add_executable(xddtlu pddtdriver.f pddtinfo.f pddtlaschk.f pddbmv1.f pdbmatgen.f ${dmatgen})
-add_executable(xcdtlu pcdtdriver.f pcdtinfo.f pcdtlaschk.f pcdbmv1.f pcbmatgen.f ${cmatgen})
-add_executable(xzdtlu pzdtdriver.f pzdtinfo.f pzdtlaschk.f pzdbmv1.f pzbmatgen.f ${zmatgen})
-
-add_executable(xsgblu psgbdriver.f psgbinfo.f psdblaschk.f psgbmv1.f psbmatgen.f ${smatgen})
-add_executable(xdgblu pdgbdriver.f pdgbinfo.f pddblaschk.f pdgbmv1.f pdbmatgen.f ${dmatgen})
-add_executable(xcgblu pcgbdriver.f pcgbinfo.f pcdblaschk.f pcgbmv1.f pcbmatgen.f ${cmatgen})
-add_executable(xzgblu pzgbdriver.f pzgbinfo.f pzdblaschk.f pzgbmv1.f pzbmatgen.f ${zmatgen})
-
-add_executable(xsllt pslltdriver.f pslltinfo.f pspotrrv.f ${smatgen} ${slinchk})
-add_executable(xdllt pdlltdriver.f pdlltinfo.f pdpotrrv.f ${dmatgen} ${dlinchk})
-add_executable(xcllt pclltdriver.f pclltinfo.f pcpotrrv.f ${cmatgen} ${clinchk})
-add_executable(xzllt pzlltdriver.f pzlltinfo.f pzpotrrv.f ${zmatgen} ${zlinchk})
-
-add_executable(xspbllt pspbdriver.f pspbinfo.f pspblaschk.f pspbmv1.f psbmatgen.f ${smatgen})
-add_executable(xdpbllt pdpbdriver.f pdpbinfo.f pdpblaschk.f pdpbmv1.f pdbmatgen.f ${dmatgen})
-add_executable(xcpbllt pcpbdriver.f pcpbinfo.f pcpblaschk.f pcpbmv1.f pcbmatgen.f ${cmatgen})
-add_executable(xzpbllt pzpbdriver.f pzpbinfo.f pzpblaschk.f pzpbmv1.f pzbmatgen.f ${zmatgen})
-
-add_executable(xsptllt psptdriver.f psptinfo.f psptlaschk.f pspbmv1.f psbmatgen.f ${smatgen})
-add_executable(xdptllt pdptdriver.f pdptinfo.f pdptlaschk.f pdpbmv1.f pdbmatgen.f ${dmatgen})
-add_executable(xcptllt pcptdriver.f pcptinfo.f pcptlaschk.f pcpbmv1.f pcbmatgen.f ${cmatgen})
-add_executable(xzptllt pzptdriver.f pzptinfo.f pzptlaschk.f pzpbmv1.f pzbmatgen.f ${zmatgen})
-
-add_executable(xsinv psinvdriver.f psinvinfo.f psinvchk.f ${smatgen})
-add_executable(xdinv pdinvdriver.f pdinvinfo.f pdinvchk.f ${dmatgen})
-add_executable(xcinv pcinvdriver.f pcinvinfo.f pcinvchk.f ${cmatgen})
-add_executable(xzinv pzinvdriver.f pzinvinfo.f pzinvchk.f ${zmatgen})
-
-add_executable(xsqr psqrdriver.f psqrinfo.f psgeqrrv.f psgeqlrv.f psgelqrv.f psgerqrv.f pstzrzrv.f pslafchk.f ${smatgen})
-add_executable(xdqr pdqrdriver.f pdqrinfo.f pdgeqrrv.f pdgeqlrv.f pdgelqrv.f pdgerqrv.f pdtzrzrv.f pdlafchk.f ${dmatgen})
-add_executable(xcqr pcqrdriver.f pcqrinfo.f pcgeqrrv.f pcgeqlrv.f pcgelqrv.f pcgerqrv.f pctzrzrv.f pclafchk.f ${cmatgen})
-add_executable(xzqr pzqrdriver.f pzqrinfo.f pzgeqrrv.f pzgeqlrv.f pzgelqrv.f pzgerqrv.f pztzrzrv.f pzlafchk.f ${zmatgen})
-
-add_executable(xsls pslsdriver.f pslsinfo.f psqrt13.f psqrt14.f psqrt16.f psqrt17.f ${smatgen})
-add_executable(xdls pdlsdriver.f pdlsinfo.f pdqrt13.f pdqrt14.f pdqrt16.f pdqrt17.f ${dmatgen})
-add_executable(xcls pclsdriver.f pclsinfo.f pcqrt13.f pcqrt14.f pcqrt16.f pcqrt17.f ${cmatgen})
-add_executable(xzls pzlsdriver.f pzlsinfo.f pzqrt13.f pzqrt14.f pzqrt16.f pzqrt17.f ${zmatgen})
-
-
-target_link_libraries(xslu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xdlu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xclu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xzlu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-
-target_link_libraries(xsdblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xddblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xcdblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xzdblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-
-target_link_libraries(xsdtlu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xddtlu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xcdtlu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xzdtlu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-
-target_link_libraries(xsgblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xdgblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xcgblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xzgblu scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-
-target_link_libraries(xsllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xdllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xcllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xzllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-
-target_link_libraries(xspbllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xdpbllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xcpbllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xzpbllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-
-target_link_libraries(xsptllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xdptllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xcptllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xzptllt scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-
-target_link_libraries(xsinv scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xdinv scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xcinv scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xzinv scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-
-target_link_libraries(xsqr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xdqr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xcqr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xzqr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-
-target_link_libraries(xsls scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xdls scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xcls scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xzls scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-
-if ("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
-    set( CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy" )  # local to this directory
-endif()
diff --git a/TESTING/cmake/scalapack_tests_helpers.cmake b/TESTING/cmake/scalapack_tests_helpers.cmake
new file mode 100644
index 00000000..6a7d83b3
--- /dev/null
+++ b/TESTING/cmake/scalapack_tests_helpers.cmake
@@ -0,0 +1,77 @@
+cmake_minimum_required(VERSION 3.26...4.0)
+include_guard()
+
+function(scalapack_add_test test)
+    #[===[.md
+    # scalapack_add_test
+
+    Internal helper for adding functional tests of entire CMake projects
+
+    ## Synopsis
+    ```cmake
+    scalapack_add_test(<name>
+        [TEST_NAME <test_name>]
+        [CMAKE_ARGS <arg1> ...]
+        [LABELS <label1> ...]
+    )
+    ```
+
+    ## Options
+
+    `<name>`
+    : Test project to be configured
+
+      This is a subfolder relative to `${CMAKE_CURRENT_SOURCE_DIR}` containing the
+      test project with `CMakeLists.txt`
+
+    `TEST_NAME` [Default: `<name>`]
+    : Unique name of the ctest test name being created
+
+    `CMAKE_ARGS`
+    : Additional CMake args passed to the configure step
+    ]===]
+
+    set(ARGS_Options)
+    set(ARGS_OneValue
+        TEST_NAME
+    )
+    set(ARGS_MultiValue
+        CMAKE_ARGS
+        LABELS
+    )
+    cmake_parse_arguments(PARSE_ARGV 1 ARGS "${ARGS_Options}" "${ARGS_OneValue}" "${ARGS_MultiValue}")
+    # Check required/optional arguments
+    if(NOT DEFINED ARGS_TEST_NAME)
+        set(ARGS_TEST_NAME ${test})
+    endif()
+
+    if(SCALAPACK_SOURCE_DIR)
+        # If scalapack is built as part of the same project, use the build artifacts
+        list(APPEND ARGS_CMAKE_ARGS
+            -Dscalapack_ROOT=${SCALAPACK_BINARY_DIR}
+        )
+    else()
+        # Otherwise use `scalapack_DIR` which is created after the `find_package`
+        list(APPEND ARGS_CMAKE_ARGS
+            -Dscalapack_ROOT=${scalapack_DIR}
+        )
+    endif()
+    # Propagate the compilers used
+    list(APPEND ARGS_CMAKE_ARGS
+        -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+        -DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER}
+    )
+
+    add_test(NAME ${ARGS_TEST_NAME}
+        COMMAND ${CMAKE_CTEST_COMMAND} --build-and-test ${CMAKE_CURRENT_SOURCE_DIR}/${test}
+        ${CMAKE_CURRENT_BINARY_DIR}/${test}
+        # Use the same build environment as the current runner
+        --build-generator "${CMAKE_GENERATOR}"
+        --build-options
+            ${ARGS_CMAKE_ARGS}
+        --test-command ${CMAKE_CTEST_COMMAND}
+            --test-dir ${CMAKE_CURRENT_BINARY_DIR}/${test}
+            --no-tests=ignore
+            --output-on-failure
+    )
+endfunction()
diff --git a/TESTING/package/CMakeLists.txt b/TESTING/package/CMakeLists.txt
new file mode 100644
index 00000000..bef1d17b
--- /dev/null
+++ b/TESTING/package/CMakeLists.txt
@@ -0,0 +1,2 @@
+scalapack_add_test(find_package)
+scalapack_add_test(deprecated_targets)
diff --git a/TESTING/package/deprecated_targets/CMakeLists.txt b/TESTING/package/deprecated_targets/CMakeLists.txt
new file mode 100644
index 00000000..ad6f30a5
--- /dev/null
+++ b/TESTING/package/deprecated_targets/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.26...4.0)
+
+project(test_find_package
+    LANGUAGES C Fortran
+)
+
+find_package(scalapack REQUIRED CONFIG)
+
+# TODO: Add a proper smoke test
+if(NOT TARGET scalapack)
+    message(FATAL_ERROR "scalapack target not present")
+endif()
+
+enable_testing()
diff --git a/TESTING/package/find_package/CMakeLists.txt b/TESTING/package/find_package/CMakeLists.txt
new file mode 100644
index 00000000..a035b0cd
--- /dev/null
+++ b/TESTING/package/find_package/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required(VERSION 3.26...4.0)
+
+project(test_find_package
+    LANGUAGES C Fortran
+)
+
+find_package(scalapack REQUIRED CONFIG)
+
+# TODO: Add a proper smoke test
+if(NOT TARGET scalapack::scalapack)
+    message(FATAL_ERROR "scalapack::scalapack target not present")
+endif()
+
+enable_testing()
diff --git a/TESTING/BLLT.dat b/TESTING/traditional/BLLT.dat
similarity index 100%
rename from TESTING/BLLT.dat
rename to TESTING/traditional/BLLT.dat
diff --git a/TESTING/BLU.dat b/TESTING/traditional/BLU.dat
similarity index 100%
rename from TESTING/BLU.dat
rename to TESTING/traditional/BLU.dat
diff --git a/TESTING/BRD.dat b/TESTING/traditional/BRD.dat
similarity index 100%
rename from TESTING/BRD.dat
rename to TESTING/traditional/BRD.dat
diff --git a/TESTING/traditional/CMakeLists.txt b/TESTING/traditional/CMakeLists.txt
new file mode 100644
index 00000000..d8cb7575
--- /dev/null
+++ b/TESTING/traditional/CMakeLists.txt
@@ -0,0 +1,56 @@
+foreach(file_dat IN ITEMS
+    BLLT.dat
+    BLU.dat
+    BRD.dat
+    EVC.dat
+    HRD.dat
+    INV.dat
+    LLT.dat
+    LS.dat
+    LU.dat
+    NEP.dat
+    QR.dat
+    SEP.dat
+    SEPR.dat
+    SVD.dat
+    TRD.dat
+)
+    configure_file(${file_dat} ${file_dat} COPYONLY)
+endforeach()
+
+set(traditional_test_workdir ${CMAKE_CURRENT_BINARY_DIR})
+function(add_traditional_test test num_proc)
+    add_test(NAME ${test}
+        COMMAND
+            ${MPIEXEC}
+                ${MPIEXEC_NUMPROC_FLAG} ${num_proc}
+                ${MPIEXEC_PREFLAGS}
+                $<TARGET_FILE:${test}>
+        WORKING_DIRECTORY ${traditional_test_workdir}
+    )
+    set_tests_properties(${test} PROPERTIES
+        PROCESSORS ${num_proc}
+    )
+endfunction()
+
+# If gfortran >= 10
+set(genex_gfortran_10
+    "$<AND:$<Fortran_COMPILER_ID:GNU>,$<VERSION_GREATER_EQUAL:$<Fortran_COMPILER_VERSION>,10>>"
+)
+function(setup_test_target)
+    foreach(target IN LISTS ARGN)
+        target_link_libraries(${target} PRIVATE
+            scalapack::scalapack
+            ${LAPACK_LIBRARIES}
+            ${BLAS_LIBRARIES}
+            MPI::MPI_Fortran
+        )
+        target_compile_options(${target} PRIVATE
+            "$<${genex_gfortran_10}:-std=legacy>"
+        )
+    endforeach()
+endfunction()
+
+add_subdirectory(LIN)
+add_subdirectory(EIG)
+
diff --git a/TESTING/EIG/CMakeLists.txt b/TESTING/traditional/EIG/CMakeLists.txt
similarity index 55%
rename from TESTING/EIG/CMakeLists.txt
rename to TESTING/traditional/EIG/CMakeLists.txt
index 69ebc224..935646d6 100644
--- a/TESTING/EIG/CMakeLists.txt
+++ b/TESTING/traditional/EIG/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/TESTING)
-
 set (smatgen psmatgen.f pmatgeninc.f)
 set (dmatgen pdmatgen.f pmatgeninc.f)
 set (cmatgen pcmatgen.f pmatgeninc.f)
@@ -53,50 +51,52 @@ pzsepchk.f pzsepqtq.f pzlatms.f pzseprtst.f pdsepinfo.f pzlagsy.f pzlasizesep.f
 add_executable(xshseqr pshseqrdriver.f psmatgen2.f ${cmatgen})
 add_executable(xdhseqr pdhseqrdriver.f pdmatgen2.f ${cmatgen})
 
-target_link_libraries(xsbrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xdbrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xcbrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xzbrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-
-target_link_libraries(xshrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xdhrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xchrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xzhrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-
-target_link_libraries(xstrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xdtrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xctrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xztrd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-
-target_link_libraries(xssvd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xdsvd scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-
-target_link_libraries(xssep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xdsep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xcsep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xzsep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-
-target_link_libraries(xsgsep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xdgsep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xcgsep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xzgsep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-
-target_link_libraries(xsnep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xdnep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xcnep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xznep scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-
-target_link_libraries(xcevc scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xzevc scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-
-target_link_libraries(xssyevr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xdsyevr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xcheevr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xzheevr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-
-target_link_libraries(xshseqr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-target_link_libraries(xdhseqr scalapack ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} MPI::MPI_Fortran)
-
-if ("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
-    set( CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -std=legacy" )  # local to this directory
-endif()
+# Test sets that use 2 processors
+set(test_set_2
+    xsbrd
+    xdbrd
+    xcbrd
+    xzbrd
+    xshrd
+    xdhrd
+    xchrd
+    xzhrd
+    xstrd
+    xdtrd
+    xctrd
+    xztrd
+    xsnep
+    xdnep
+    xcnep
+    xznep
+    xcevc
+    xzevc
+    xshseqr
+    xdhseqr
+)
+
+foreach(test IN LISTS test_set_2)
+    add_traditional_test(${test} 2)
+endforeach()
+
+# Test sets that use 4 processors
+set(test_set_4
+    xssvd
+    xdsvd
+    xssep
+    xdsep
+    xcsep
+    xzsep
+    xsgsep
+    xdgsep
+    xcgsep
+    xzgsep
+    xssyevr
+    xdsyevr
+    xcheevr
+    xzheevr
+)
+foreach(test IN LISTS test_set_4)
+    add_traditional_test(${test} 4)
+endforeach()
+setup_test_target(${test_set_2} ${test_set_4})
diff --git a/TESTING/EIG/Makefile b/TESTING/traditional/EIG/Makefile
similarity index 100%
rename from TESTING/EIG/Makefile
rename to TESTING/traditional/EIG/Makefile
diff --git a/TESTING/EIG/listing b/TESTING/traditional/EIG/listing
similarity index 100%
rename from TESTING/EIG/listing
rename to TESTING/traditional/EIG/listing
diff --git a/TESTING/EIG/pcbrddriver.f b/TESTING/traditional/EIG/pcbrddriver.f
similarity index 100%
rename from TESTING/EIG/pcbrddriver.f
rename to TESTING/traditional/EIG/pcbrddriver.f
diff --git a/TESTING/EIG/pcbrdinfo.f b/TESTING/traditional/EIG/pcbrdinfo.f
similarity index 100%
rename from TESTING/EIG/pcbrdinfo.f
rename to TESTING/traditional/EIG/pcbrdinfo.f
diff --git a/TESTING/EIG/pcevcdriver.f b/TESTING/traditional/EIG/pcevcdriver.f
similarity index 100%
rename from TESTING/EIG/pcevcdriver.f
rename to TESTING/traditional/EIG/pcevcdriver.f
diff --git a/TESTING/EIG/pcevcinfo.f b/TESTING/traditional/EIG/pcevcinfo.f
similarity index 100%
rename from TESTING/EIG/pcevcinfo.f
rename to TESTING/traditional/EIG/pcevcinfo.f
diff --git a/TESTING/EIG/pcgebdrv.f b/TESTING/traditional/EIG/pcgebdrv.f
similarity index 100%
rename from TESTING/EIG/pcgebdrv.f
rename to TESTING/traditional/EIG/pcgebdrv.f
diff --git a/TESTING/EIG/pcgehdrv.f b/TESTING/traditional/EIG/pcgehdrv.f
similarity index 100%
rename from TESTING/EIG/pcgehdrv.f
rename to TESTING/traditional/EIG/pcgehdrv.f
diff --git a/TESTING/EIG/pcget22.f b/TESTING/traditional/EIG/pcget22.f
similarity index 100%
rename from TESTING/EIG/pcget22.f
rename to TESTING/traditional/EIG/pcget22.f
diff --git a/TESTING/EIG/pcgsepchk.f b/TESTING/traditional/EIG/pcgsepchk.f
similarity index 100%
rename from TESTING/EIG/pcgsepchk.f
rename to TESTING/traditional/EIG/pcgsepchk.f
diff --git a/TESTING/EIG/pcgsepdriver.f b/TESTING/traditional/EIG/pcgsepdriver.f
similarity index 100%
rename from TESTING/EIG/pcgsepdriver.f
rename to TESTING/traditional/EIG/pcgsepdriver.f
diff --git a/TESTING/EIG/pcgsepreq.f b/TESTING/traditional/EIG/pcgsepreq.f
similarity index 100%
rename from TESTING/EIG/pcgsepreq.f
rename to TESTING/traditional/EIG/pcgsepreq.f
diff --git a/TESTING/EIG/pcgsepsubtst.f b/TESTING/traditional/EIG/pcgsepsubtst.f
similarity index 100%
rename from TESTING/EIG/pcgsepsubtst.f
rename to TESTING/traditional/EIG/pcgsepsubtst.f
diff --git a/TESTING/EIG/pcgseptst.f b/TESTING/traditional/EIG/pcgseptst.f
similarity index 100%
rename from TESTING/EIG/pcgseptst.f
rename to TESTING/traditional/EIG/pcgseptst.f
diff --git a/TESTING/EIG/pchetdrv.f b/TESTING/traditional/EIG/pchetdrv.f
similarity index 100%
rename from TESTING/EIG/pchetdrv.f
rename to TESTING/traditional/EIG/pchetdrv.f
diff --git a/TESTING/EIG/pchrddriver.f b/TESTING/traditional/EIG/pchrddriver.f
similarity index 100%
rename from TESTING/EIG/pchrddriver.f
rename to TESTING/traditional/EIG/pchrddriver.f
diff --git a/TESTING/EIG/pchrdinfo.f b/TESTING/traditional/EIG/pchrdinfo.f
similarity index 100%
rename from TESTING/EIG/pchrdinfo.f
rename to TESTING/traditional/EIG/pchrdinfo.f
diff --git a/TESTING/EIG/pclafchk.f b/TESTING/traditional/EIG/pclafchk.f
similarity index 100%
rename from TESTING/EIG/pclafchk.f
rename to TESTING/traditional/EIG/pclafchk.f
diff --git a/TESTING/EIG/pclagsy.f b/TESTING/traditional/EIG/pclagsy.f
similarity index 100%
rename from TESTING/EIG/pclagsy.f
rename to TESTING/traditional/EIG/pclagsy.f
diff --git a/TESTING/EIG/pclasizegsep.f b/TESTING/traditional/EIG/pclasizegsep.f
similarity index 100%
rename from TESTING/EIG/pclasizegsep.f
rename to TESTING/traditional/EIG/pclasizegsep.f
diff --git a/TESTING/EIG/pclasizeheevr.f b/TESTING/traditional/EIG/pclasizeheevr.f
similarity index 100%
rename from TESTING/EIG/pclasizeheevr.f
rename to TESTING/traditional/EIG/pclasizeheevr.f
diff --git a/TESTING/EIG/pclasizeheevx.f b/TESTING/traditional/EIG/pclasizeheevx.f
similarity index 100%
rename from TESTING/EIG/pclasizeheevx.f
rename to TESTING/traditional/EIG/pclasizeheevx.f
diff --git a/TESTING/EIG/pclasizesep.f b/TESTING/traditional/EIG/pclasizesep.f
similarity index 100%
rename from TESTING/EIG/pclasizesep.f
rename to TESTING/traditional/EIG/pclasizesep.f
diff --git a/TESTING/EIG/pclasizesepr.f b/TESTING/traditional/EIG/pclasizesepr.f
similarity index 100%
rename from TESTING/EIG/pclasizesepr.f
rename to TESTING/traditional/EIG/pclasizesepr.f
diff --git a/TESTING/EIG/pclatms.f b/TESTING/traditional/EIG/pclatms.f
similarity index 100%
rename from TESTING/EIG/pclatms.f
rename to TESTING/traditional/EIG/pclatms.f
diff --git a/TESTING/EIG/pclatran.f b/TESTING/traditional/EIG/pclatran.f
similarity index 100%
rename from TESTING/EIG/pclatran.f
rename to TESTING/traditional/EIG/pclatran.f
diff --git a/TESTING/EIG/pcmatgen.f b/TESTING/traditional/EIG/pcmatgen.f
similarity index 100%
rename from TESTING/EIG/pcmatgen.f
rename to TESTING/traditional/EIG/pcmatgen.f
diff --git a/TESTING/EIG/pcnepdriver.f b/TESTING/traditional/EIG/pcnepdriver.f
similarity index 100%
rename from TESTING/EIG/pcnepdriver.f
rename to TESTING/traditional/EIG/pcnepdriver.f
diff --git a/TESTING/EIG/pcnepfchk.f b/TESTING/traditional/EIG/pcnepfchk.f
similarity index 100%
rename from TESTING/EIG/pcnepfchk.f
rename to TESTING/traditional/EIG/pcnepfchk.f
diff --git a/TESTING/EIG/pcnepinfo.f b/TESTING/traditional/EIG/pcnepinfo.f
similarity index 100%
rename from TESTING/EIG/pcnepinfo.f
rename to TESTING/traditional/EIG/pcnepinfo.f
diff --git a/TESTING/EIG/pcrptseptst.f b/TESTING/traditional/EIG/pcrptseptst.f
similarity index 100%
rename from TESTING/EIG/pcrptseptst.f
rename to TESTING/traditional/EIG/pcrptseptst.f
diff --git a/TESTING/EIG/pcsdpsubtst.f b/TESTING/traditional/EIG/pcsdpsubtst.f
similarity index 100%
rename from TESTING/EIG/pcsdpsubtst.f
rename to TESTING/traditional/EIG/pcsdpsubtst.f
diff --git a/TESTING/EIG/pcsepchk.f b/TESTING/traditional/EIG/pcsepchk.f
similarity index 100%
rename from TESTING/EIG/pcsepchk.f
rename to TESTING/traditional/EIG/pcsepchk.f
diff --git a/TESTING/EIG/pcsepdriver.f b/TESTING/traditional/EIG/pcsepdriver.f
similarity index 100%
rename from TESTING/EIG/pcsepdriver.f
rename to TESTING/traditional/EIG/pcsepdriver.f
diff --git a/TESTING/EIG/pcsepqtq.f b/TESTING/traditional/EIG/pcsepqtq.f
similarity index 100%
rename from TESTING/EIG/pcsepqtq.f
rename to TESTING/traditional/EIG/pcsepqtq.f
diff --git a/TESTING/EIG/pcseprdriver.f b/TESTING/traditional/EIG/pcseprdriver.f
similarity index 100%
rename from TESTING/EIG/pcseprdriver.f
rename to TESTING/traditional/EIG/pcseprdriver.f
diff --git a/TESTING/EIG/pcsepreq.f b/TESTING/traditional/EIG/pcsepreq.f
similarity index 100%
rename from TESTING/EIG/pcsepreq.f
rename to TESTING/traditional/EIG/pcsepreq.f
diff --git a/TESTING/EIG/pcseprreq.f b/TESTING/traditional/EIG/pcseprreq.f
similarity index 100%
rename from TESTING/EIG/pcseprreq.f
rename to TESTING/traditional/EIG/pcseprreq.f
diff --git a/TESTING/EIG/pcseprsubtst.f b/TESTING/traditional/EIG/pcseprsubtst.f
similarity index 100%
rename from TESTING/EIG/pcseprsubtst.f
rename to TESTING/traditional/EIG/pcseprsubtst.f
diff --git a/TESTING/EIG/pcseprtst.f b/TESTING/traditional/EIG/pcseprtst.f
similarity index 100%
rename from TESTING/EIG/pcseprtst.f
rename to TESTING/traditional/EIG/pcseprtst.f
diff --git a/TESTING/EIG/pcsepsubtst.f b/TESTING/traditional/EIG/pcsepsubtst.f
similarity index 100%
rename from TESTING/EIG/pcsepsubtst.f
rename to TESTING/traditional/EIG/pcsepsubtst.f
diff --git a/TESTING/EIG/pcseptst.f b/TESTING/traditional/EIG/pcseptst.f
similarity index 100%
rename from TESTING/EIG/pcseptst.f
rename to TESTING/traditional/EIG/pcseptst.f
diff --git a/TESTING/EIG/pctrddriver.f b/TESTING/traditional/EIG/pctrddriver.f
similarity index 100%
rename from TESTING/EIG/pctrddriver.f
rename to TESTING/traditional/EIG/pctrddriver.f
diff --git a/TESTING/EIG/pctrdinfo.f b/TESTING/traditional/EIG/pctrdinfo.f
similarity index 100%
rename from TESTING/EIG/pctrdinfo.f
rename to TESTING/traditional/EIG/pctrdinfo.f
diff --git a/TESTING/EIG/pcttrdtester.f b/TESTING/traditional/EIG/pcttrdtester.f
similarity index 100%
rename from TESTING/EIG/pcttrdtester.f
rename to TESTING/traditional/EIG/pcttrdtester.f
diff --git a/TESTING/EIG/pdbrddriver.f b/TESTING/traditional/EIG/pdbrddriver.f
similarity index 100%
rename from TESTING/EIG/pdbrddriver.f
rename to TESTING/traditional/EIG/pdbrddriver.f
diff --git a/TESTING/EIG/pdbrdinfo.f b/TESTING/traditional/EIG/pdbrdinfo.f
similarity index 100%
rename from TESTING/EIG/pdbrdinfo.f
rename to TESTING/traditional/EIG/pdbrdinfo.f
diff --git a/TESTING/EIG/pdgebdrv.f b/TESTING/traditional/EIG/pdgebdrv.f
similarity index 100%
rename from TESTING/EIG/pdgebdrv.f
rename to TESTING/traditional/EIG/pdgebdrv.f
diff --git a/TESTING/EIG/pdgehdrv.f b/TESTING/traditional/EIG/pdgehdrv.f
similarity index 100%
rename from TESTING/EIG/pdgehdrv.f
rename to TESTING/traditional/EIG/pdgehdrv.f
diff --git a/TESTING/EIG/pdgrptseptst.f b/TESTING/traditional/EIG/pdgrptseptst.f
similarity index 100%
rename from TESTING/EIG/pdgrptseptst.f
rename to TESTING/traditional/EIG/pdgrptseptst.f
diff --git a/TESTING/EIG/pdgsepchk.f b/TESTING/traditional/EIG/pdgsepchk.f
similarity index 100%
rename from TESTING/EIG/pdgsepchk.f
rename to TESTING/traditional/EIG/pdgsepchk.f
diff --git a/TESTING/EIG/pdgsepdriver.f b/TESTING/traditional/EIG/pdgsepdriver.f
similarity index 100%
rename from TESTING/EIG/pdgsepdriver.f
rename to TESTING/traditional/EIG/pdgsepdriver.f
diff --git a/TESTING/EIG/pdgsepreq.f b/TESTING/traditional/EIG/pdgsepreq.f
similarity index 100%
rename from TESTING/EIG/pdgsepreq.f
rename to TESTING/traditional/EIG/pdgsepreq.f
diff --git a/TESTING/EIG/pdgsepsubtst.f b/TESTING/traditional/EIG/pdgsepsubtst.f
similarity index 100%
rename from TESTING/EIG/pdgsepsubtst.f
rename to TESTING/traditional/EIG/pdgsepsubtst.f
diff --git a/TESTING/EIG/pdgseptst.f b/TESTING/traditional/EIG/pdgseptst.f
similarity index 100%
rename from TESTING/EIG/pdgseptst.f
rename to TESTING/traditional/EIG/pdgseptst.f
diff --git a/TESTING/EIG/pdhrddriver.f b/TESTING/traditional/EIG/pdhrddriver.f
similarity index 100%
rename from TESTING/EIG/pdhrddriver.f
rename to TESTING/traditional/EIG/pdhrddriver.f
diff --git a/TESTING/EIG/pdhrdinfo.f b/TESTING/traditional/EIG/pdhrdinfo.f
similarity index 100%
rename from TESTING/EIG/pdhrdinfo.f
rename to TESTING/traditional/EIG/pdhrdinfo.f
diff --git a/TESTING/EIG/pdhseqrdriver.f b/TESTING/traditional/EIG/pdhseqrdriver.f
similarity index 100%
rename from TESTING/EIG/pdhseqrdriver.f
rename to TESTING/traditional/EIG/pdhseqrdriver.f
diff --git a/TESTING/EIG/pdlafchk.f b/TESTING/traditional/EIG/pdlafchk.f
similarity index 100%
rename from TESTING/EIG/pdlafchk.f
rename to TESTING/traditional/EIG/pdlafchk.f
diff --git a/TESTING/EIG/pdlagge.f b/TESTING/traditional/EIG/pdlagge.f
similarity index 100%
rename from TESTING/EIG/pdlagge.f
rename to TESTING/traditional/EIG/pdlagge.f
diff --git a/TESTING/EIG/pdlagsy.f b/TESTING/traditional/EIG/pdlagsy.f
similarity index 100%
rename from TESTING/EIG/pdlagsy.f
rename to TESTING/traditional/EIG/pdlagsy.f
diff --git a/TESTING/EIG/pdlasizegsep.f b/TESTING/traditional/EIG/pdlasizegsep.f
similarity index 100%
rename from TESTING/EIG/pdlasizegsep.f
rename to TESTING/traditional/EIG/pdlasizegsep.f
diff --git a/TESTING/EIG/pdlasizesep.f b/TESTING/traditional/EIG/pdlasizesep.f
similarity index 100%
rename from TESTING/EIG/pdlasizesep.f
rename to TESTING/traditional/EIG/pdlasizesep.f
diff --git a/TESTING/EIG/pdlasizesepr.f b/TESTING/traditional/EIG/pdlasizesepr.f
similarity index 100%
rename from TESTING/EIG/pdlasizesepr.f
rename to TESTING/traditional/EIG/pdlasizesepr.f
diff --git a/TESTING/EIG/pdlasizesqp.f b/TESTING/traditional/EIG/pdlasizesqp.f
similarity index 100%
rename from TESTING/EIG/pdlasizesqp.f
rename to TESTING/traditional/EIG/pdlasizesqp.f
diff --git a/TESTING/EIG/pdlasizesyev.f b/TESTING/traditional/EIG/pdlasizesyev.f
similarity index 100%
rename from TESTING/EIG/pdlasizesyev.f
rename to TESTING/traditional/EIG/pdlasizesyev.f
diff --git a/TESTING/EIG/pdlasizesyevr.f b/TESTING/traditional/EIG/pdlasizesyevr.f
similarity index 100%
rename from TESTING/EIG/pdlasizesyevr.f
rename to TESTING/traditional/EIG/pdlasizesyevr.f
diff --git a/TESTING/EIG/pdlasizesyevx.f b/TESTING/traditional/EIG/pdlasizesyevx.f
similarity index 100%
rename from TESTING/EIG/pdlasizesyevx.f
rename to TESTING/traditional/EIG/pdlasizesyevx.f
diff --git a/TESTING/EIG/pdlatms.f b/TESTING/traditional/EIG/pdlatms.f
similarity index 100%
rename from TESTING/EIG/pdlatms.f
rename to TESTING/traditional/EIG/pdlatms.f
diff --git a/TESTING/EIG/pdlatran.f b/TESTING/traditional/EIG/pdlatran.f
similarity index 100%
rename from TESTING/EIG/pdlatran.f
rename to TESTING/traditional/EIG/pdlatran.f
diff --git a/TESTING/EIG/pdmatgen.f b/TESTING/traditional/EIG/pdmatgen.f
similarity index 100%
rename from TESTING/EIG/pdmatgen.f
rename to TESTING/traditional/EIG/pdmatgen.f
diff --git a/TESTING/EIG/pdmatgen2.f b/TESTING/traditional/EIG/pdmatgen2.f
similarity index 100%
rename from TESTING/EIG/pdmatgen2.f
rename to TESTING/traditional/EIG/pdmatgen2.f
diff --git a/TESTING/EIG/pdnepdriver.f b/TESTING/traditional/EIG/pdnepdriver.f
similarity index 100%
rename from TESTING/EIG/pdnepdriver.f
rename to TESTING/traditional/EIG/pdnepdriver.f
diff --git a/TESTING/EIG/pdnepfchk.f b/TESTING/traditional/EIG/pdnepfchk.f
similarity index 100%
rename from TESTING/EIG/pdnepfchk.f
rename to TESTING/traditional/EIG/pdnepfchk.f
diff --git a/TESTING/EIG/pdnepinfo.f b/TESTING/traditional/EIG/pdnepinfo.f
similarity index 100%
rename from TESTING/EIG/pdnepinfo.f
rename to TESTING/traditional/EIG/pdnepinfo.f
diff --git a/TESTING/EIG/pdrptseptst.f b/TESTING/traditional/EIG/pdrptseptst.f
similarity index 100%
rename from TESTING/EIG/pdrptseptst.f
rename to TESTING/traditional/EIG/pdrptseptst.f
diff --git a/TESTING/EIG/pdsdpsubtst.f b/TESTING/traditional/EIG/pdsdpsubtst.f
similarity index 100%
rename from TESTING/EIG/pdsdpsubtst.f
rename to TESTING/traditional/EIG/pdsdpsubtst.f
diff --git a/TESTING/EIG/pdsepchk.f b/TESTING/traditional/EIG/pdsepchk.f
similarity index 100%
rename from TESTING/EIG/pdsepchk.f
rename to TESTING/traditional/EIG/pdsepchk.f
diff --git a/TESTING/EIG/pdsepdriver.f b/TESTING/traditional/EIG/pdsepdriver.f
similarity index 100%
rename from TESTING/EIG/pdsepdriver.f
rename to TESTING/traditional/EIG/pdsepdriver.f
diff --git a/TESTING/EIG/pdsepinfo.f b/TESTING/traditional/EIG/pdsepinfo.f
similarity index 100%
rename from TESTING/EIG/pdsepinfo.f
rename to TESTING/traditional/EIG/pdsepinfo.f
diff --git a/TESTING/EIG/pdsepqtq.f b/TESTING/traditional/EIG/pdsepqtq.f
similarity index 100%
rename from TESTING/EIG/pdsepqtq.f
rename to TESTING/traditional/EIG/pdsepqtq.f
diff --git a/TESTING/EIG/pdseprdriver.f b/TESTING/traditional/EIG/pdseprdriver.f
similarity index 100%
rename from TESTING/EIG/pdseprdriver.f
rename to TESTING/traditional/EIG/pdseprdriver.f
diff --git a/TESTING/EIG/pdsepreq.f b/TESTING/traditional/EIG/pdsepreq.f
similarity index 100%
rename from TESTING/EIG/pdsepreq.f
rename to TESTING/traditional/EIG/pdsepreq.f
diff --git a/TESTING/EIG/pdseprreq.f b/TESTING/traditional/EIG/pdseprreq.f
similarity index 100%
rename from TESTING/EIG/pdseprreq.f
rename to TESTING/traditional/EIG/pdseprreq.f
diff --git a/TESTING/EIG/pdseprsubtst.f b/TESTING/traditional/EIG/pdseprsubtst.f
similarity index 100%
rename from TESTING/EIG/pdseprsubtst.f
rename to TESTING/traditional/EIG/pdseprsubtst.f
diff --git a/TESTING/EIG/pdseprtst.f b/TESTING/traditional/EIG/pdseprtst.f
similarity index 100%
rename from TESTING/EIG/pdseprtst.f
rename to TESTING/traditional/EIG/pdseprtst.f
diff --git a/TESTING/EIG/pdsepsubtst.f b/TESTING/traditional/EIG/pdsepsubtst.f
similarity index 100%
rename from TESTING/EIG/pdsepsubtst.f
rename to TESTING/traditional/EIG/pdsepsubtst.f
diff --git a/TESTING/EIG/pdseptst.f b/TESTING/traditional/EIG/pdseptst.f
similarity index 100%
rename from TESTING/EIG/pdseptst.f
rename to TESTING/traditional/EIG/pdseptst.f
diff --git a/TESTING/EIG/pdsqpsubtst.f b/TESTING/traditional/EIG/pdsqpsubtst.f
similarity index 100%
rename from TESTING/EIG/pdsqpsubtst.f
rename to TESTING/traditional/EIG/pdsqpsubtst.f
diff --git a/TESTING/EIG/pdsvdchk.f b/TESTING/traditional/EIG/pdsvdchk.f
similarity index 100%
rename from TESTING/EIG/pdsvdchk.f
rename to TESTING/traditional/EIG/pdsvdchk.f
diff --git a/TESTING/EIG/pdsvdcmp.f b/TESTING/traditional/EIG/pdsvdcmp.f
similarity index 100%
rename from TESTING/EIG/pdsvdcmp.f
rename to TESTING/traditional/EIG/pdsvdcmp.f
diff --git a/TESTING/EIG/pdsvddriver.f b/TESTING/traditional/EIG/pdsvddriver.f
similarity index 100%
rename from TESTING/EIG/pdsvddriver.f
rename to TESTING/traditional/EIG/pdsvddriver.f
diff --git a/TESTING/EIG/pdsvdtst.f b/TESTING/traditional/EIG/pdsvdtst.f
similarity index 100%
rename from TESTING/EIG/pdsvdtst.f
rename to TESTING/traditional/EIG/pdsvdtst.f
diff --git a/TESTING/EIG/pdsytdrv.f b/TESTING/traditional/EIG/pdsytdrv.f
similarity index 100%
rename from TESTING/EIG/pdsytdrv.f
rename to TESTING/traditional/EIG/pdsytdrv.f
diff --git a/TESTING/EIG/pdtrddriver.f b/TESTING/traditional/EIG/pdtrddriver.f
similarity index 100%
rename from TESTING/EIG/pdtrddriver.f
rename to TESTING/traditional/EIG/pdtrddriver.f
diff --git a/TESTING/EIG/pdtrdinfo.f b/TESTING/traditional/EIG/pdtrdinfo.f
similarity index 100%
rename from TESTING/EIG/pdtrdinfo.f
rename to TESTING/traditional/EIG/pdtrdinfo.f
diff --git a/TESTING/EIG/pdttrdtester.f b/TESTING/traditional/EIG/pdttrdtester.f
similarity index 100%
rename from TESTING/EIG/pdttrdtester.f
rename to TESTING/traditional/EIG/pdttrdtester.f
diff --git a/TESTING/EIG/pmatgeninc.f b/TESTING/traditional/EIG/pmatgeninc.f
similarity index 100%
rename from TESTING/EIG/pmatgeninc.f
rename to TESTING/traditional/EIG/pmatgeninc.f
diff --git a/TESTING/EIG/psbrddriver.f b/TESTING/traditional/EIG/psbrddriver.f
similarity index 100%
rename from TESTING/EIG/psbrddriver.f
rename to TESTING/traditional/EIG/psbrddriver.f
diff --git a/TESTING/EIG/psbrdinfo.f b/TESTING/traditional/EIG/psbrdinfo.f
similarity index 100%
rename from TESTING/EIG/psbrdinfo.f
rename to TESTING/traditional/EIG/psbrdinfo.f
diff --git a/TESTING/EIG/psgebdrv.f b/TESTING/traditional/EIG/psgebdrv.f
similarity index 100%
rename from TESTING/EIG/psgebdrv.f
rename to TESTING/traditional/EIG/psgebdrv.f
diff --git a/TESTING/EIG/psgehdrv.f b/TESTING/traditional/EIG/psgehdrv.f
similarity index 100%
rename from TESTING/EIG/psgehdrv.f
rename to TESTING/traditional/EIG/psgehdrv.f
diff --git a/TESTING/EIG/psgrptseptst.f b/TESTING/traditional/EIG/psgrptseptst.f
similarity index 100%
rename from TESTING/EIG/psgrptseptst.f
rename to TESTING/traditional/EIG/psgrptseptst.f
diff --git a/TESTING/EIG/psgsepchk.f b/TESTING/traditional/EIG/psgsepchk.f
similarity index 100%
rename from TESTING/EIG/psgsepchk.f
rename to TESTING/traditional/EIG/psgsepchk.f
diff --git a/TESTING/EIG/psgsepdriver.f b/TESTING/traditional/EIG/psgsepdriver.f
similarity index 100%
rename from TESTING/EIG/psgsepdriver.f
rename to TESTING/traditional/EIG/psgsepdriver.f
diff --git a/TESTING/EIG/psgsepreq.f b/TESTING/traditional/EIG/psgsepreq.f
similarity index 100%
rename from TESTING/EIG/psgsepreq.f
rename to TESTING/traditional/EIG/psgsepreq.f
diff --git a/TESTING/EIG/psgsepsubtst.f b/TESTING/traditional/EIG/psgsepsubtst.f
similarity index 100%
rename from TESTING/EIG/psgsepsubtst.f
rename to TESTING/traditional/EIG/psgsepsubtst.f
diff --git a/TESTING/EIG/psgseptst.f b/TESTING/traditional/EIG/psgseptst.f
similarity index 100%
rename from TESTING/EIG/psgseptst.f
rename to TESTING/traditional/EIG/psgseptst.f
diff --git a/TESTING/EIG/pshrddriver.f b/TESTING/traditional/EIG/pshrddriver.f
similarity index 100%
rename from TESTING/EIG/pshrddriver.f
rename to TESTING/traditional/EIG/pshrddriver.f
diff --git a/TESTING/EIG/pshrdinfo.f b/TESTING/traditional/EIG/pshrdinfo.f
similarity index 100%
rename from TESTING/EIG/pshrdinfo.f
rename to TESTING/traditional/EIG/pshrdinfo.f
diff --git a/TESTING/EIG/pshseqrdriver.f b/TESTING/traditional/EIG/pshseqrdriver.f
similarity index 100%
rename from TESTING/EIG/pshseqrdriver.f
rename to TESTING/traditional/EIG/pshseqrdriver.f
diff --git a/TESTING/EIG/pslafchk.f b/TESTING/traditional/EIG/pslafchk.f
similarity index 100%
rename from TESTING/EIG/pslafchk.f
rename to TESTING/traditional/EIG/pslafchk.f
diff --git a/TESTING/EIG/pslagge.f b/TESTING/traditional/EIG/pslagge.f
similarity index 100%
rename from TESTING/EIG/pslagge.f
rename to TESTING/traditional/EIG/pslagge.f
diff --git a/TESTING/EIG/pslagsy.f b/TESTING/traditional/EIG/pslagsy.f
similarity index 100%
rename from TESTING/EIG/pslagsy.f
rename to TESTING/traditional/EIG/pslagsy.f
diff --git a/TESTING/EIG/pslasizegsep.f b/TESTING/traditional/EIG/pslasizegsep.f
similarity index 100%
rename from TESTING/EIG/pslasizegsep.f
rename to TESTING/traditional/EIG/pslasizegsep.f
diff --git a/TESTING/EIG/pslasizesep.f b/TESTING/traditional/EIG/pslasizesep.f
similarity index 100%
rename from TESTING/EIG/pslasizesep.f
rename to TESTING/traditional/EIG/pslasizesep.f
diff --git a/TESTING/EIG/pslasizesepr.f b/TESTING/traditional/EIG/pslasizesepr.f
similarity index 100%
rename from TESTING/EIG/pslasizesepr.f
rename to TESTING/traditional/EIG/pslasizesepr.f
diff --git a/TESTING/EIG/pslasizesqp.f b/TESTING/traditional/EIG/pslasizesqp.f
similarity index 100%
rename from TESTING/EIG/pslasizesqp.f
rename to TESTING/traditional/EIG/pslasizesqp.f
diff --git a/TESTING/EIG/pslasizesyev.f b/TESTING/traditional/EIG/pslasizesyev.f
similarity index 100%
rename from TESTING/EIG/pslasizesyev.f
rename to TESTING/traditional/EIG/pslasizesyev.f
diff --git a/TESTING/EIG/pslasizesyevr.f b/TESTING/traditional/EIG/pslasizesyevr.f
similarity index 100%
rename from TESTING/EIG/pslasizesyevr.f
rename to TESTING/traditional/EIG/pslasizesyevr.f
diff --git a/TESTING/EIG/pslasizesyevx.f b/TESTING/traditional/EIG/pslasizesyevx.f
similarity index 100%
rename from TESTING/EIG/pslasizesyevx.f
rename to TESTING/traditional/EIG/pslasizesyevx.f
diff --git a/TESTING/EIG/pslatms.f b/TESTING/traditional/EIG/pslatms.f
similarity index 100%
rename from TESTING/EIG/pslatms.f
rename to TESTING/traditional/EIG/pslatms.f
diff --git a/TESTING/EIG/pslatran.f b/TESTING/traditional/EIG/pslatran.f
similarity index 100%
rename from TESTING/EIG/pslatran.f
rename to TESTING/traditional/EIG/pslatran.f
diff --git a/TESTING/EIG/psmatgen.f b/TESTING/traditional/EIG/psmatgen.f
similarity index 100%
rename from TESTING/EIG/psmatgen.f
rename to TESTING/traditional/EIG/psmatgen.f
diff --git a/TESTING/EIG/psmatgen2.f b/TESTING/traditional/EIG/psmatgen2.f
similarity index 100%
rename from TESTING/EIG/psmatgen2.f
rename to TESTING/traditional/EIG/psmatgen2.f
diff --git a/TESTING/EIG/psnepdriver.f b/TESTING/traditional/EIG/psnepdriver.f
similarity index 100%
rename from TESTING/EIG/psnepdriver.f
rename to TESTING/traditional/EIG/psnepdriver.f
diff --git a/TESTING/EIG/psnepfchk.f b/TESTING/traditional/EIG/psnepfchk.f
similarity index 100%
rename from TESTING/EIG/psnepfchk.f
rename to TESTING/traditional/EIG/psnepfchk.f
diff --git a/TESTING/EIG/psnepinfo.f b/TESTING/traditional/EIG/psnepinfo.f
similarity index 100%
rename from TESTING/EIG/psnepinfo.f
rename to TESTING/traditional/EIG/psnepinfo.f
diff --git a/TESTING/EIG/psrptseptst.f b/TESTING/traditional/EIG/psrptseptst.f
similarity index 100%
rename from TESTING/EIG/psrptseptst.f
rename to TESTING/traditional/EIG/psrptseptst.f
diff --git a/TESTING/EIG/pssdpsubtst.f b/TESTING/traditional/EIG/pssdpsubtst.f
similarity index 100%
rename from TESTING/EIG/pssdpsubtst.f
rename to TESTING/traditional/EIG/pssdpsubtst.f
diff --git a/TESTING/EIG/pssepchk.f b/TESTING/traditional/EIG/pssepchk.f
similarity index 100%
rename from TESTING/EIG/pssepchk.f
rename to TESTING/traditional/EIG/pssepchk.f
diff --git a/TESTING/EIG/pssepdriver.f b/TESTING/traditional/EIG/pssepdriver.f
similarity index 100%
rename from TESTING/EIG/pssepdriver.f
rename to TESTING/traditional/EIG/pssepdriver.f
diff --git a/TESTING/EIG/pssepinfo.f b/TESTING/traditional/EIG/pssepinfo.f
similarity index 100%
rename from TESTING/EIG/pssepinfo.f
rename to TESTING/traditional/EIG/pssepinfo.f
diff --git a/TESTING/EIG/pssepqtq.f b/TESTING/traditional/EIG/pssepqtq.f
similarity index 100%
rename from TESTING/EIG/pssepqtq.f
rename to TESTING/traditional/EIG/pssepqtq.f
diff --git a/TESTING/EIG/psseprdriver.f b/TESTING/traditional/EIG/psseprdriver.f
similarity index 100%
rename from TESTING/EIG/psseprdriver.f
rename to TESTING/traditional/EIG/psseprdriver.f
diff --git a/TESTING/EIG/pssepreq.f b/TESTING/traditional/EIG/pssepreq.f
similarity index 100%
rename from TESTING/EIG/pssepreq.f
rename to TESTING/traditional/EIG/pssepreq.f
diff --git a/TESTING/EIG/psseprreq.f b/TESTING/traditional/EIG/psseprreq.f
similarity index 100%
rename from TESTING/EIG/psseprreq.f
rename to TESTING/traditional/EIG/psseprreq.f
diff --git a/TESTING/EIG/psseprsubtst.f b/TESTING/traditional/EIG/psseprsubtst.f
similarity index 100%
rename from TESTING/EIG/psseprsubtst.f
rename to TESTING/traditional/EIG/psseprsubtst.f
diff --git a/TESTING/EIG/psseprtst.f b/TESTING/traditional/EIG/psseprtst.f
similarity index 100%
rename from TESTING/EIG/psseprtst.f
rename to TESTING/traditional/EIG/psseprtst.f
diff --git a/TESTING/EIG/pssepsubtst.f b/TESTING/traditional/EIG/pssepsubtst.f
similarity index 100%
rename from TESTING/EIG/pssepsubtst.f
rename to TESTING/traditional/EIG/pssepsubtst.f
diff --git a/TESTING/EIG/psseptst.f b/TESTING/traditional/EIG/psseptst.f
similarity index 100%
rename from TESTING/EIG/psseptst.f
rename to TESTING/traditional/EIG/psseptst.f
diff --git a/TESTING/EIG/pssqpsubtst.f b/TESTING/traditional/EIG/pssqpsubtst.f
similarity index 100%
rename from TESTING/EIG/pssqpsubtst.f
rename to TESTING/traditional/EIG/pssqpsubtst.f
diff --git a/TESTING/EIG/pssvdchk.f b/TESTING/traditional/EIG/pssvdchk.f
similarity index 100%
rename from TESTING/EIG/pssvdchk.f
rename to TESTING/traditional/EIG/pssvdchk.f
diff --git a/TESTING/EIG/pssvdcmp.f b/TESTING/traditional/EIG/pssvdcmp.f
similarity index 100%
rename from TESTING/EIG/pssvdcmp.f
rename to TESTING/traditional/EIG/pssvdcmp.f
diff --git a/TESTING/EIG/pssvddriver.f b/TESTING/traditional/EIG/pssvddriver.f
similarity index 100%
rename from TESTING/EIG/pssvddriver.f
rename to TESTING/traditional/EIG/pssvddriver.f
diff --git a/TESTING/EIG/pssvdtst.f b/TESTING/traditional/EIG/pssvdtst.f
similarity index 100%
rename from TESTING/EIG/pssvdtst.f
rename to TESTING/traditional/EIG/pssvdtst.f
diff --git a/TESTING/EIG/pssytdrv.f b/TESTING/traditional/EIG/pssytdrv.f
similarity index 100%
rename from TESTING/EIG/pssytdrv.f
rename to TESTING/traditional/EIG/pssytdrv.f
diff --git a/TESTING/EIG/pstrddriver.f b/TESTING/traditional/EIG/pstrddriver.f
similarity index 100%
rename from TESTING/EIG/pstrddriver.f
rename to TESTING/traditional/EIG/pstrddriver.f
diff --git a/TESTING/EIG/pstrdinfo.f b/TESTING/traditional/EIG/pstrdinfo.f
similarity index 100%
rename from TESTING/EIG/pstrdinfo.f
rename to TESTING/traditional/EIG/pstrdinfo.f
diff --git a/TESTING/EIG/psttrdtester.f b/TESTING/traditional/EIG/psttrdtester.f
similarity index 100%
rename from TESTING/EIG/psttrdtester.f
rename to TESTING/traditional/EIG/psttrdtester.f
diff --git a/TESTING/EIG/pzbrddriver.f b/TESTING/traditional/EIG/pzbrddriver.f
similarity index 100%
rename from TESTING/EIG/pzbrddriver.f
rename to TESTING/traditional/EIG/pzbrddriver.f
diff --git a/TESTING/EIG/pzbrdinfo.f b/TESTING/traditional/EIG/pzbrdinfo.f
similarity index 100%
rename from TESTING/EIG/pzbrdinfo.f
rename to TESTING/traditional/EIG/pzbrdinfo.f
diff --git a/TESTING/EIG/pzevcdriver.f b/TESTING/traditional/EIG/pzevcdriver.f
similarity index 100%
rename from TESTING/EIG/pzevcdriver.f
rename to TESTING/traditional/EIG/pzevcdriver.f
diff --git a/TESTING/EIG/pzevcinfo.f b/TESTING/traditional/EIG/pzevcinfo.f
similarity index 100%
rename from TESTING/EIG/pzevcinfo.f
rename to TESTING/traditional/EIG/pzevcinfo.f
diff --git a/TESTING/EIG/pzgebdrv.f b/TESTING/traditional/EIG/pzgebdrv.f
similarity index 100%
rename from TESTING/EIG/pzgebdrv.f
rename to TESTING/traditional/EIG/pzgebdrv.f
diff --git a/TESTING/EIG/pzgehdrv.f b/TESTING/traditional/EIG/pzgehdrv.f
similarity index 100%
rename from TESTING/EIG/pzgehdrv.f
rename to TESTING/traditional/EIG/pzgehdrv.f
diff --git a/TESTING/EIG/pzget22.f b/TESTING/traditional/EIG/pzget22.f
similarity index 100%
rename from TESTING/EIG/pzget22.f
rename to TESTING/traditional/EIG/pzget22.f
diff --git a/TESTING/EIG/pzgsepchk.f b/TESTING/traditional/EIG/pzgsepchk.f
similarity index 100%
rename from TESTING/EIG/pzgsepchk.f
rename to TESTING/traditional/EIG/pzgsepchk.f
diff --git a/TESTING/EIG/pzgsepdriver.f b/TESTING/traditional/EIG/pzgsepdriver.f
similarity index 100%
rename from TESTING/EIG/pzgsepdriver.f
rename to TESTING/traditional/EIG/pzgsepdriver.f
diff --git a/TESTING/EIG/pzgsepreq.f b/TESTING/traditional/EIG/pzgsepreq.f
similarity index 100%
rename from TESTING/EIG/pzgsepreq.f
rename to TESTING/traditional/EIG/pzgsepreq.f
diff --git a/TESTING/EIG/pzgsepsubtst.f b/TESTING/traditional/EIG/pzgsepsubtst.f
similarity index 100%
rename from TESTING/EIG/pzgsepsubtst.f
rename to TESTING/traditional/EIG/pzgsepsubtst.f
diff --git a/TESTING/EIG/pzgseptst.f b/TESTING/traditional/EIG/pzgseptst.f
similarity index 100%
rename from TESTING/EIG/pzgseptst.f
rename to TESTING/traditional/EIG/pzgseptst.f
diff --git a/TESTING/EIG/pzhetdrv.f b/TESTING/traditional/EIG/pzhetdrv.f
similarity index 100%
rename from TESTING/EIG/pzhetdrv.f
rename to TESTING/traditional/EIG/pzhetdrv.f
diff --git a/TESTING/EIG/pzhrddriver.f b/TESTING/traditional/EIG/pzhrddriver.f
similarity index 100%
rename from TESTING/EIG/pzhrddriver.f
rename to TESTING/traditional/EIG/pzhrddriver.f
diff --git a/TESTING/EIG/pzhrdinfo.f b/TESTING/traditional/EIG/pzhrdinfo.f
similarity index 100%
rename from TESTING/EIG/pzhrdinfo.f
rename to TESTING/traditional/EIG/pzhrdinfo.f
diff --git a/TESTING/EIG/pzlafchk.f b/TESTING/traditional/EIG/pzlafchk.f
similarity index 100%
rename from TESTING/EIG/pzlafchk.f
rename to TESTING/traditional/EIG/pzlafchk.f
diff --git a/TESTING/EIG/pzlagsy.f b/TESTING/traditional/EIG/pzlagsy.f
similarity index 100%
rename from TESTING/EIG/pzlagsy.f
rename to TESTING/traditional/EIG/pzlagsy.f
diff --git a/TESTING/EIG/pzlasizegsep.f b/TESTING/traditional/EIG/pzlasizegsep.f
similarity index 100%
rename from TESTING/EIG/pzlasizegsep.f
rename to TESTING/traditional/EIG/pzlasizegsep.f
diff --git a/TESTING/EIG/pzlasizeheevr.f b/TESTING/traditional/EIG/pzlasizeheevr.f
similarity index 100%
rename from TESTING/EIG/pzlasizeheevr.f
rename to TESTING/traditional/EIG/pzlasizeheevr.f
diff --git a/TESTING/EIG/pzlasizeheevx.f b/TESTING/traditional/EIG/pzlasizeheevx.f
similarity index 100%
rename from TESTING/EIG/pzlasizeheevx.f
rename to TESTING/traditional/EIG/pzlasizeheevx.f
diff --git a/TESTING/EIG/pzlasizesep.f b/TESTING/traditional/EIG/pzlasizesep.f
similarity index 100%
rename from TESTING/EIG/pzlasizesep.f
rename to TESTING/traditional/EIG/pzlasizesep.f
diff --git a/TESTING/EIG/pzlasizesepr.f b/TESTING/traditional/EIG/pzlasizesepr.f
similarity index 100%
rename from TESTING/EIG/pzlasizesepr.f
rename to TESTING/traditional/EIG/pzlasizesepr.f
diff --git a/TESTING/EIG/pzlatms.f b/TESTING/traditional/EIG/pzlatms.f
similarity index 100%
rename from TESTING/EIG/pzlatms.f
rename to TESTING/traditional/EIG/pzlatms.f
diff --git a/TESTING/EIG/pzlatran.f b/TESTING/traditional/EIG/pzlatran.f
similarity index 100%
rename from TESTING/EIG/pzlatran.f
rename to TESTING/traditional/EIG/pzlatran.f
diff --git a/TESTING/EIG/pzmatgen.f b/TESTING/traditional/EIG/pzmatgen.f
similarity index 100%
rename from TESTING/EIG/pzmatgen.f
rename to TESTING/traditional/EIG/pzmatgen.f
diff --git a/TESTING/EIG/pznepdriver.f b/TESTING/traditional/EIG/pznepdriver.f
similarity index 100%
rename from TESTING/EIG/pznepdriver.f
rename to TESTING/traditional/EIG/pznepdriver.f
diff --git a/TESTING/EIG/pznepfchk.f b/TESTING/traditional/EIG/pznepfchk.f
similarity index 100%
rename from TESTING/EIG/pznepfchk.f
rename to TESTING/traditional/EIG/pznepfchk.f
diff --git a/TESTING/EIG/pznepinfo.f b/TESTING/traditional/EIG/pznepinfo.f
similarity index 100%
rename from TESTING/EIG/pznepinfo.f
rename to TESTING/traditional/EIG/pznepinfo.f
diff --git a/TESTING/EIG/pzrptseptst.f b/TESTING/traditional/EIG/pzrptseptst.f
similarity index 100%
rename from TESTING/EIG/pzrptseptst.f
rename to TESTING/traditional/EIG/pzrptseptst.f
diff --git a/TESTING/EIG/pzsdpsubtst.f b/TESTING/traditional/EIG/pzsdpsubtst.f
similarity index 100%
rename from TESTING/EIG/pzsdpsubtst.f
rename to TESTING/traditional/EIG/pzsdpsubtst.f
diff --git a/TESTING/EIG/pzsepchk.f b/TESTING/traditional/EIG/pzsepchk.f
similarity index 100%
rename from TESTING/EIG/pzsepchk.f
rename to TESTING/traditional/EIG/pzsepchk.f
diff --git a/TESTING/EIG/pzsepdriver.f b/TESTING/traditional/EIG/pzsepdriver.f
similarity index 100%
rename from TESTING/EIG/pzsepdriver.f
rename to TESTING/traditional/EIG/pzsepdriver.f
diff --git a/TESTING/EIG/pzsepqtq.f b/TESTING/traditional/EIG/pzsepqtq.f
similarity index 100%
rename from TESTING/EIG/pzsepqtq.f
rename to TESTING/traditional/EIG/pzsepqtq.f
diff --git a/TESTING/EIG/pzseprdriver.f b/TESTING/traditional/EIG/pzseprdriver.f
similarity index 100%
rename from TESTING/EIG/pzseprdriver.f
rename to TESTING/traditional/EIG/pzseprdriver.f
diff --git a/TESTING/EIG/pzsepreq.f b/TESTING/traditional/EIG/pzsepreq.f
similarity index 100%
rename from TESTING/EIG/pzsepreq.f
rename to TESTING/traditional/EIG/pzsepreq.f
diff --git a/TESTING/EIG/pzseprreq.f b/TESTING/traditional/EIG/pzseprreq.f
similarity index 100%
rename from TESTING/EIG/pzseprreq.f
rename to TESTING/traditional/EIG/pzseprreq.f
diff --git a/TESTING/EIG/pzseprsubtst.f b/TESTING/traditional/EIG/pzseprsubtst.f
similarity index 100%
rename from TESTING/EIG/pzseprsubtst.f
rename to TESTING/traditional/EIG/pzseprsubtst.f
diff --git a/TESTING/EIG/pzseprtst.f b/TESTING/traditional/EIG/pzseprtst.f
similarity index 100%
rename from TESTING/EIG/pzseprtst.f
rename to TESTING/traditional/EIG/pzseprtst.f
diff --git a/TESTING/EIG/pzsepsubtst.f b/TESTING/traditional/EIG/pzsepsubtst.f
similarity index 100%
rename from TESTING/EIG/pzsepsubtst.f
rename to TESTING/traditional/EIG/pzsepsubtst.f
diff --git a/TESTING/EIG/pzseptst.f b/TESTING/traditional/EIG/pzseptst.f
similarity index 100%
rename from TESTING/EIG/pzseptst.f
rename to TESTING/traditional/EIG/pzseptst.f
diff --git a/TESTING/EIG/pztrddriver.f b/TESTING/traditional/EIG/pztrddriver.f
similarity index 100%
rename from TESTING/EIG/pztrddriver.f
rename to TESTING/traditional/EIG/pztrddriver.f
diff --git a/TESTING/EIG/pztrdinfo.f b/TESTING/traditional/EIG/pztrdinfo.f
similarity index 100%
rename from TESTING/EIG/pztrdinfo.f
rename to TESTING/traditional/EIG/pztrdinfo.f
diff --git a/TESTING/EIG/pzttrdtester.f b/TESTING/traditional/EIG/pzttrdtester.f
similarity index 100%
rename from TESTING/EIG/pzttrdtester.f
rename to TESTING/traditional/EIG/pzttrdtester.f
diff --git a/TESTING/EIG/xpjlaenv.f b/TESTING/traditional/EIG/xpjlaenv.f
similarity index 100%
rename from TESTING/EIG/xpjlaenv.f
rename to TESTING/traditional/EIG/xpjlaenv.f
diff --git a/TESTING/EVC.dat b/TESTING/traditional/EVC.dat
similarity index 100%
rename from TESTING/EVC.dat
rename to TESTING/traditional/EVC.dat
diff --git a/TESTING/HRD.dat b/TESTING/traditional/HRD.dat
similarity index 100%
rename from TESTING/HRD.dat
rename to TESTING/traditional/HRD.dat
diff --git a/TESTING/INV.dat b/TESTING/traditional/INV.dat
similarity index 100%
rename from TESTING/INV.dat
rename to TESTING/traditional/INV.dat
diff --git a/TESTING/traditional/LIN/CMakeLists.txt b/TESTING/traditional/LIN/CMakeLists.txt
new file mode 100644
index 00000000..03a7db3f
--- /dev/null
+++ b/TESTING/traditional/LIN/CMakeLists.txt
@@ -0,0 +1,106 @@
+set (smatgen psmatgen.f pmatgeninc.f)
+set (dmatgen pdmatgen.f pmatgeninc.f)
+set (cmatgen pcmatgen.f pmatgeninc.f)
+set (zmatgen pzmatgen.f pmatgeninc.f)
+
+set (slinchk pslaschk.f pslafchk.f)
+set (dlinchk pdlaschk.f pdlafchk.f)
+set (clinchk pclaschk.f pclafchk.f)
+set (zlinchk pzlaschk.f pzlafchk.f)
+
+add_executable(xslu psludriver.f psluinfo.f psgetrrv.f ${smatgen} ${slinchk})
+add_executable(xdlu pdludriver.f pdluinfo.f pdgetrrv.f ${dmatgen} ${dlinchk})
+add_executable(xclu pcludriver.f pcluinfo.f pcgetrrv.f ${cmatgen} ${clinchk})
+add_executable(xzlu pzludriver.f pzluinfo.f pzgetrrv.f ${zmatgen} ${zlinchk})
+
+add_executable(xsdblu psdbdriver.f psdbinfo.f psdblaschk.f psdbmv1.f psbmatgen.f ${smatgen})
+add_executable(xddblu pddbdriver.f pddbinfo.f pddblaschk.f pddbmv1.f pdbmatgen.f ${dmatgen})
+add_executable(xcdblu pcdbdriver.f pcdbinfo.f pcdblaschk.f pcdbmv1.f pcbmatgen.f ${cmatgen})
+add_executable(xzdblu pzdbdriver.f pzdbinfo.f pzdblaschk.f pzdbmv1.f pzbmatgen.f ${zmatgen})
+
+add_executable(xsdtlu psdtdriver.f psdtinfo.f psdtlaschk.f psdbmv1.f psbmatgen.f ${smatgen})
+add_executable(xddtlu pddtdriver.f pddtinfo.f pddtlaschk.f pddbmv1.f pdbmatgen.f ${dmatgen})
+add_executable(xcdtlu pcdtdriver.f pcdtinfo.f pcdtlaschk.f pcdbmv1.f pcbmatgen.f ${cmatgen})
+add_executable(xzdtlu pzdtdriver.f pzdtinfo.f pzdtlaschk.f pzdbmv1.f pzbmatgen.f ${zmatgen})
+
+add_executable(xsgblu psgbdriver.f psgbinfo.f psdblaschk.f psgbmv1.f psbmatgen.f ${smatgen})
+add_executable(xdgblu pdgbdriver.f pdgbinfo.f pddblaschk.f pdgbmv1.f pdbmatgen.f ${dmatgen})
+add_executable(xcgblu pcgbdriver.f pcgbinfo.f pcdblaschk.f pcgbmv1.f pcbmatgen.f ${cmatgen})
+add_executable(xzgblu pzgbdriver.f pzgbinfo.f pzdblaschk.f pzgbmv1.f pzbmatgen.f ${zmatgen})
+
+add_executable(xsllt pslltdriver.f pslltinfo.f pspotrrv.f ${smatgen} ${slinchk})
+add_executable(xdllt pdlltdriver.f pdlltinfo.f pdpotrrv.f ${dmatgen} ${dlinchk})
+add_executable(xcllt pclltdriver.f pclltinfo.f pcpotrrv.f ${cmatgen} ${clinchk})
+add_executable(xzllt pzlltdriver.f pzlltinfo.f pzpotrrv.f ${zmatgen} ${zlinchk})
+
+add_executable(xspbllt pspbdriver.f pspbinfo.f pspblaschk.f pspbmv1.f psbmatgen.f ${smatgen})
+add_executable(xdpbllt pdpbdriver.f pdpbinfo.f pdpblaschk.f pdpbmv1.f pdbmatgen.f ${dmatgen})
+add_executable(xcpbllt pcpbdriver.f pcpbinfo.f pcpblaschk.f pcpbmv1.f pcbmatgen.f ${cmatgen})
+add_executable(xzpbllt pzpbdriver.f pzpbinfo.f pzpblaschk.f pzpbmv1.f pzbmatgen.f ${zmatgen})
+
+add_executable(xsptllt psptdriver.f psptinfo.f psptlaschk.f pspbmv1.f psbmatgen.f ${smatgen})
+add_executable(xdptllt pdptdriver.f pdptinfo.f pdptlaschk.f pdpbmv1.f pdbmatgen.f ${dmatgen})
+add_executable(xcptllt pcptdriver.f pcptinfo.f pcptlaschk.f pcpbmv1.f pcbmatgen.f ${cmatgen})
+add_executable(xzptllt pzptdriver.f pzptinfo.f pzptlaschk.f pzpbmv1.f pzbmatgen.f ${zmatgen})
+
+add_executable(xsinv psinvdriver.f psinvinfo.f psinvchk.f ${smatgen})
+add_executable(xdinv pdinvdriver.f pdinvinfo.f pdinvchk.f ${dmatgen})
+add_executable(xcinv pcinvdriver.f pcinvinfo.f pcinvchk.f ${cmatgen})
+add_executable(xzinv pzinvdriver.f pzinvinfo.f pzinvchk.f ${zmatgen})
+
+add_executable(xsqr psqrdriver.f psqrinfo.f psgeqrrv.f psgeqlrv.f psgelqrv.f psgerqrv.f pstzrzrv.f pslafchk.f ${smatgen})
+add_executable(xdqr pdqrdriver.f pdqrinfo.f pdgeqrrv.f pdgeqlrv.f pdgelqrv.f pdgerqrv.f pdtzrzrv.f pdlafchk.f ${dmatgen})
+add_executable(xcqr pcqrdriver.f pcqrinfo.f pcgeqrrv.f pcgeqlrv.f pcgelqrv.f pcgerqrv.f pctzrzrv.f pclafchk.f ${cmatgen})
+add_executable(xzqr pzqrdriver.f pzqrinfo.f pzgeqrrv.f pzgeqlrv.f pzgelqrv.f pzgerqrv.f pztzrzrv.f pzlafchk.f ${zmatgen})
+
+add_executable(xsls pslsdriver.f pslsinfo.f psqrt13.f psqrt14.f psqrt16.f psqrt17.f ${smatgen})
+add_executable(xdls pdlsdriver.f pdlsinfo.f pdqrt13.f pdqrt14.f pdqrt16.f pdqrt17.f ${dmatgen})
+add_executable(xcls pclsdriver.f pclsinfo.f pcqrt13.f pcqrt14.f pcqrt16.f pcqrt17.f ${cmatgen})
+add_executable(xzls pzlsdriver.f pzlsinfo.f pzqrt13.f pzqrt14.f pzqrt16.f pzqrt17.f ${zmatgen})
+
+set(test_set
+    xslu
+    xdlu
+    xclu
+    xzlu
+    xsdblu
+    xddblu
+    xcdblu
+    xzdblu
+    xsdtlu
+    xddtlu
+    xcdtlu
+    xzdtlu
+    xsgblu
+    xdgblu
+    xcgblu
+    xzgblu
+    xsllt
+    xdllt
+    xcllt
+    xzllt
+    xspbllt
+    xdpbllt
+    xcpbllt
+    xzpbllt
+    xsptllt
+    xdptllt
+    xcptllt
+    xzptllt
+    xsinv
+    xdinv
+    xcinv
+    xzinv
+    xsqr
+    xdqr
+    xcqr
+    xzqr
+    xsls
+    xdls
+    xcls
+    xzls
+)
+foreach(test IN LISTS test_set)
+    add_traditional_test(${test} 2)
+endforeach()
+setup_test_target(${test_set})
diff --git a/TESTING/LIN/Makefile b/TESTING/traditional/LIN/Makefile
similarity index 100%
rename from TESTING/LIN/Makefile
rename to TESTING/traditional/LIN/Makefile
diff --git a/TESTING/LIN/pcbmatgen.f b/TESTING/traditional/LIN/pcbmatgen.f
similarity index 100%
rename from TESTING/LIN/pcbmatgen.f
rename to TESTING/traditional/LIN/pcbmatgen.f
diff --git a/TESTING/LIN/pcdbdriver.f b/TESTING/traditional/LIN/pcdbdriver.f
similarity index 100%
rename from TESTING/LIN/pcdbdriver.f
rename to TESTING/traditional/LIN/pcdbdriver.f
diff --git a/TESTING/LIN/pcdbinfo.f b/TESTING/traditional/LIN/pcdbinfo.f
similarity index 100%
rename from TESTING/LIN/pcdbinfo.f
rename to TESTING/traditional/LIN/pcdbinfo.f
diff --git a/TESTING/LIN/pcdblaschk.f b/TESTING/traditional/LIN/pcdblaschk.f
similarity index 100%
rename from TESTING/LIN/pcdblaschk.f
rename to TESTING/traditional/LIN/pcdblaschk.f
diff --git a/TESTING/LIN/pcdbmv1.f b/TESTING/traditional/LIN/pcdbmv1.f
similarity index 100%
rename from TESTING/LIN/pcdbmv1.f
rename to TESTING/traditional/LIN/pcdbmv1.f
diff --git a/TESTING/LIN/pcdtdriver.f b/TESTING/traditional/LIN/pcdtdriver.f
similarity index 100%
rename from TESTING/LIN/pcdtdriver.f
rename to TESTING/traditional/LIN/pcdtdriver.f
diff --git a/TESTING/LIN/pcdtinfo.f b/TESTING/traditional/LIN/pcdtinfo.f
similarity index 100%
rename from TESTING/LIN/pcdtinfo.f
rename to TESTING/traditional/LIN/pcdtinfo.f
diff --git a/TESTING/LIN/pcdtlaschk.f b/TESTING/traditional/LIN/pcdtlaschk.f
similarity index 100%
rename from TESTING/LIN/pcdtlaschk.f
rename to TESTING/traditional/LIN/pcdtlaschk.f
diff --git a/TESTING/LIN/pcgbdriver.f b/TESTING/traditional/LIN/pcgbdriver.f
similarity index 100%
rename from TESTING/LIN/pcgbdriver.f
rename to TESTING/traditional/LIN/pcgbdriver.f
diff --git a/TESTING/LIN/pcgbinfo.f b/TESTING/traditional/LIN/pcgbinfo.f
similarity index 100%
rename from TESTING/LIN/pcgbinfo.f
rename to TESTING/traditional/LIN/pcgbinfo.f
diff --git a/TESTING/LIN/pcgbmv1.f b/TESTING/traditional/LIN/pcgbmv1.f
similarity index 100%
rename from TESTING/LIN/pcgbmv1.f
rename to TESTING/traditional/LIN/pcgbmv1.f
diff --git a/TESTING/LIN/pcgelqrv.f b/TESTING/traditional/LIN/pcgelqrv.f
similarity index 100%
rename from TESTING/LIN/pcgelqrv.f
rename to TESTING/traditional/LIN/pcgelqrv.f
diff --git a/TESTING/LIN/pcgeqlrv.f b/TESTING/traditional/LIN/pcgeqlrv.f
similarity index 100%
rename from TESTING/LIN/pcgeqlrv.f
rename to TESTING/traditional/LIN/pcgeqlrv.f
diff --git a/TESTING/LIN/pcgeqrrv.f b/TESTING/traditional/LIN/pcgeqrrv.f
similarity index 100%
rename from TESTING/LIN/pcgeqrrv.f
rename to TESTING/traditional/LIN/pcgeqrrv.f
diff --git a/TESTING/LIN/pcgerqrv.f b/TESTING/traditional/LIN/pcgerqrv.f
similarity index 100%
rename from TESTING/LIN/pcgerqrv.f
rename to TESTING/traditional/LIN/pcgerqrv.f
diff --git a/TESTING/LIN/pcgetrrv.f b/TESTING/traditional/LIN/pcgetrrv.f
similarity index 100%
rename from TESTING/LIN/pcgetrrv.f
rename to TESTING/traditional/LIN/pcgetrrv.f
diff --git a/TESTING/LIN/pcinvchk.f b/TESTING/traditional/LIN/pcinvchk.f
similarity index 100%
rename from TESTING/LIN/pcinvchk.f
rename to TESTING/traditional/LIN/pcinvchk.f
diff --git a/TESTING/LIN/pcinvdriver.f b/TESTING/traditional/LIN/pcinvdriver.f
similarity index 100%
rename from TESTING/LIN/pcinvdriver.f
rename to TESTING/traditional/LIN/pcinvdriver.f
diff --git a/TESTING/LIN/pcinvinfo.f b/TESTING/traditional/LIN/pcinvinfo.f
similarity index 100%
rename from TESTING/LIN/pcinvinfo.f
rename to TESTING/traditional/LIN/pcinvinfo.f
diff --git a/TESTING/LIN/pclafchk.f b/TESTING/traditional/LIN/pclafchk.f
similarity index 100%
rename from TESTING/LIN/pclafchk.f
rename to TESTING/traditional/LIN/pclafchk.f
diff --git a/TESTING/LIN/pclaschk.f b/TESTING/traditional/LIN/pclaschk.f
similarity index 100%
rename from TESTING/LIN/pclaschk.f
rename to TESTING/traditional/LIN/pclaschk.f
diff --git a/TESTING/LIN/pclltdriver.f b/TESTING/traditional/LIN/pclltdriver.f
similarity index 100%
rename from TESTING/LIN/pclltdriver.f
rename to TESTING/traditional/LIN/pclltdriver.f
diff --git a/TESTING/LIN/pclltinfo.f b/TESTING/traditional/LIN/pclltinfo.f
similarity index 100%
rename from TESTING/LIN/pclltinfo.f
rename to TESTING/traditional/LIN/pclltinfo.f
diff --git a/TESTING/LIN/pclsdriver.f b/TESTING/traditional/LIN/pclsdriver.f
similarity index 100%
rename from TESTING/LIN/pclsdriver.f
rename to TESTING/traditional/LIN/pclsdriver.f
diff --git a/TESTING/LIN/pclsinfo.f b/TESTING/traditional/LIN/pclsinfo.f
similarity index 100%
rename from TESTING/LIN/pclsinfo.f
rename to TESTING/traditional/LIN/pclsinfo.f
diff --git a/TESTING/LIN/pcludriver.f b/TESTING/traditional/LIN/pcludriver.f
similarity index 100%
rename from TESTING/LIN/pcludriver.f
rename to TESTING/traditional/LIN/pcludriver.f
diff --git a/TESTING/LIN/pcluinfo.f b/TESTING/traditional/LIN/pcluinfo.f
similarity index 100%
rename from TESTING/LIN/pcluinfo.f
rename to TESTING/traditional/LIN/pcluinfo.f
diff --git a/TESTING/LIN/pcmatgen.f b/TESTING/traditional/LIN/pcmatgen.f
similarity index 100%
rename from TESTING/LIN/pcmatgen.f
rename to TESTING/traditional/LIN/pcmatgen.f
diff --git a/TESTING/LIN/pcpbdriver.f b/TESTING/traditional/LIN/pcpbdriver.f
similarity index 100%
rename from TESTING/LIN/pcpbdriver.f
rename to TESTING/traditional/LIN/pcpbdriver.f
diff --git a/TESTING/LIN/pcpbinfo.f b/TESTING/traditional/LIN/pcpbinfo.f
similarity index 100%
rename from TESTING/LIN/pcpbinfo.f
rename to TESTING/traditional/LIN/pcpbinfo.f
diff --git a/TESTING/LIN/pcpblaschk.f b/TESTING/traditional/LIN/pcpblaschk.f
similarity index 100%
rename from TESTING/LIN/pcpblaschk.f
rename to TESTING/traditional/LIN/pcpblaschk.f
diff --git a/TESTING/LIN/pcpbmv1.f b/TESTING/traditional/LIN/pcpbmv1.f
similarity index 100%
rename from TESTING/LIN/pcpbmv1.f
rename to TESTING/traditional/LIN/pcpbmv1.f
diff --git a/TESTING/LIN/pcpotrrv.f b/TESTING/traditional/LIN/pcpotrrv.f
similarity index 100%
rename from TESTING/LIN/pcpotrrv.f
rename to TESTING/traditional/LIN/pcpotrrv.f
diff --git a/TESTING/LIN/pcptdriver.f b/TESTING/traditional/LIN/pcptdriver.f
similarity index 100%
rename from TESTING/LIN/pcptdriver.f
rename to TESTING/traditional/LIN/pcptdriver.f
diff --git a/TESTING/LIN/pcptinfo.f b/TESTING/traditional/LIN/pcptinfo.f
similarity index 100%
rename from TESTING/LIN/pcptinfo.f
rename to TESTING/traditional/LIN/pcptinfo.f
diff --git a/TESTING/LIN/pcptlaschk.f b/TESTING/traditional/LIN/pcptlaschk.f
similarity index 100%
rename from TESTING/LIN/pcptlaschk.f
rename to TESTING/traditional/LIN/pcptlaschk.f
diff --git a/TESTING/LIN/pcqrdriver.f b/TESTING/traditional/LIN/pcqrdriver.f
similarity index 100%
rename from TESTING/LIN/pcqrdriver.f
rename to TESTING/traditional/LIN/pcqrdriver.f
diff --git a/TESTING/LIN/pcqrinfo.f b/TESTING/traditional/LIN/pcqrinfo.f
similarity index 100%
rename from TESTING/LIN/pcqrinfo.f
rename to TESTING/traditional/LIN/pcqrinfo.f
diff --git a/TESTING/LIN/pcqrt13.f b/TESTING/traditional/LIN/pcqrt13.f
similarity index 100%
rename from TESTING/LIN/pcqrt13.f
rename to TESTING/traditional/LIN/pcqrt13.f
diff --git a/TESTING/LIN/pcqrt14.f b/TESTING/traditional/LIN/pcqrt14.f
similarity index 100%
rename from TESTING/LIN/pcqrt14.f
rename to TESTING/traditional/LIN/pcqrt14.f
diff --git a/TESTING/LIN/pcqrt16.f b/TESTING/traditional/LIN/pcqrt16.f
similarity index 100%
rename from TESTING/LIN/pcqrt16.f
rename to TESTING/traditional/LIN/pcqrt16.f
diff --git a/TESTING/LIN/pcqrt17.f b/TESTING/traditional/LIN/pcqrt17.f
similarity index 100%
rename from TESTING/LIN/pcqrt17.f
rename to TESTING/traditional/LIN/pcqrt17.f
diff --git a/TESTING/LIN/pctzrzrv.f b/TESTING/traditional/LIN/pctzrzrv.f
similarity index 100%
rename from TESTING/LIN/pctzrzrv.f
rename to TESTING/traditional/LIN/pctzrzrv.f
diff --git a/TESTING/LIN/pdbmatgen.f b/TESTING/traditional/LIN/pdbmatgen.f
similarity index 100%
rename from TESTING/LIN/pdbmatgen.f
rename to TESTING/traditional/LIN/pdbmatgen.f
diff --git a/TESTING/LIN/pddbdriver.f b/TESTING/traditional/LIN/pddbdriver.f
similarity index 100%
rename from TESTING/LIN/pddbdriver.f
rename to TESTING/traditional/LIN/pddbdriver.f
diff --git a/TESTING/LIN/pddbinfo.f b/TESTING/traditional/LIN/pddbinfo.f
similarity index 100%
rename from TESTING/LIN/pddbinfo.f
rename to TESTING/traditional/LIN/pddbinfo.f
diff --git a/TESTING/LIN/pddblaschk.f b/TESTING/traditional/LIN/pddblaschk.f
similarity index 100%
rename from TESTING/LIN/pddblaschk.f
rename to TESTING/traditional/LIN/pddblaschk.f
diff --git a/TESTING/LIN/pddbmv1.f b/TESTING/traditional/LIN/pddbmv1.f
similarity index 100%
rename from TESTING/LIN/pddbmv1.f
rename to TESTING/traditional/LIN/pddbmv1.f
diff --git a/TESTING/LIN/pddtdriver.f b/TESTING/traditional/LIN/pddtdriver.f
similarity index 100%
rename from TESTING/LIN/pddtdriver.f
rename to TESTING/traditional/LIN/pddtdriver.f
diff --git a/TESTING/LIN/pddtinfo.f b/TESTING/traditional/LIN/pddtinfo.f
similarity index 100%
rename from TESTING/LIN/pddtinfo.f
rename to TESTING/traditional/LIN/pddtinfo.f
diff --git a/TESTING/LIN/pddtlaschk.f b/TESTING/traditional/LIN/pddtlaschk.f
similarity index 100%
rename from TESTING/LIN/pddtlaschk.f
rename to TESTING/traditional/LIN/pddtlaschk.f
diff --git a/TESTING/LIN/pdgbdriver.f b/TESTING/traditional/LIN/pdgbdriver.f
similarity index 100%
rename from TESTING/LIN/pdgbdriver.f
rename to TESTING/traditional/LIN/pdgbdriver.f
diff --git a/TESTING/LIN/pdgbinfo.f b/TESTING/traditional/LIN/pdgbinfo.f
similarity index 100%
rename from TESTING/LIN/pdgbinfo.f
rename to TESTING/traditional/LIN/pdgbinfo.f
diff --git a/TESTING/LIN/pdgbmv1.f b/TESTING/traditional/LIN/pdgbmv1.f
similarity index 100%
rename from TESTING/LIN/pdgbmv1.f
rename to TESTING/traditional/LIN/pdgbmv1.f
diff --git a/TESTING/LIN/pdgelqrv.f b/TESTING/traditional/LIN/pdgelqrv.f
similarity index 100%
rename from TESTING/LIN/pdgelqrv.f
rename to TESTING/traditional/LIN/pdgelqrv.f
diff --git a/TESTING/LIN/pdgeqlrv.f b/TESTING/traditional/LIN/pdgeqlrv.f
similarity index 100%
rename from TESTING/LIN/pdgeqlrv.f
rename to TESTING/traditional/LIN/pdgeqlrv.f
diff --git a/TESTING/LIN/pdgeqrrv.f b/TESTING/traditional/LIN/pdgeqrrv.f
similarity index 100%
rename from TESTING/LIN/pdgeqrrv.f
rename to TESTING/traditional/LIN/pdgeqrrv.f
diff --git a/TESTING/LIN/pdgerqrv.f b/TESTING/traditional/LIN/pdgerqrv.f
similarity index 100%
rename from TESTING/LIN/pdgerqrv.f
rename to TESTING/traditional/LIN/pdgerqrv.f
diff --git a/TESTING/LIN/pdgetrrv.f b/TESTING/traditional/LIN/pdgetrrv.f
similarity index 100%
rename from TESTING/LIN/pdgetrrv.f
rename to TESTING/traditional/LIN/pdgetrrv.f
diff --git a/TESTING/LIN/pdinvchk.f b/TESTING/traditional/LIN/pdinvchk.f
similarity index 100%
rename from TESTING/LIN/pdinvchk.f
rename to TESTING/traditional/LIN/pdinvchk.f
diff --git a/TESTING/LIN/pdinvdriver.f b/TESTING/traditional/LIN/pdinvdriver.f
similarity index 100%
rename from TESTING/LIN/pdinvdriver.f
rename to TESTING/traditional/LIN/pdinvdriver.f
diff --git a/TESTING/LIN/pdinvinfo.f b/TESTING/traditional/LIN/pdinvinfo.f
similarity index 100%
rename from TESTING/LIN/pdinvinfo.f
rename to TESTING/traditional/LIN/pdinvinfo.f
diff --git a/TESTING/LIN/pdlafchk.f b/TESTING/traditional/LIN/pdlafchk.f
similarity index 100%
rename from TESTING/LIN/pdlafchk.f
rename to TESTING/traditional/LIN/pdlafchk.f
diff --git a/TESTING/LIN/pdlaschk.f b/TESTING/traditional/LIN/pdlaschk.f
similarity index 100%
rename from TESTING/LIN/pdlaschk.f
rename to TESTING/traditional/LIN/pdlaschk.f
diff --git a/TESTING/LIN/pdlltdriver.f b/TESTING/traditional/LIN/pdlltdriver.f
similarity index 100%
rename from TESTING/LIN/pdlltdriver.f
rename to TESTING/traditional/LIN/pdlltdriver.f
diff --git a/TESTING/LIN/pdlltinfo.f b/TESTING/traditional/LIN/pdlltinfo.f
similarity index 100%
rename from TESTING/LIN/pdlltinfo.f
rename to TESTING/traditional/LIN/pdlltinfo.f
diff --git a/TESTING/LIN/pdlsdriver.f b/TESTING/traditional/LIN/pdlsdriver.f
similarity index 100%
rename from TESTING/LIN/pdlsdriver.f
rename to TESTING/traditional/LIN/pdlsdriver.f
diff --git a/TESTING/LIN/pdlsinfo.f b/TESTING/traditional/LIN/pdlsinfo.f
similarity index 100%
rename from TESTING/LIN/pdlsinfo.f
rename to TESTING/traditional/LIN/pdlsinfo.f
diff --git a/TESTING/LIN/pdludriver.f b/TESTING/traditional/LIN/pdludriver.f
similarity index 100%
rename from TESTING/LIN/pdludriver.f
rename to TESTING/traditional/LIN/pdludriver.f
diff --git a/TESTING/LIN/pdluinfo.f b/TESTING/traditional/LIN/pdluinfo.f
similarity index 100%
rename from TESTING/LIN/pdluinfo.f
rename to TESTING/traditional/LIN/pdluinfo.f
diff --git a/TESTING/LIN/pdmatgen.f b/TESTING/traditional/LIN/pdmatgen.f
similarity index 100%
rename from TESTING/LIN/pdmatgen.f
rename to TESTING/traditional/LIN/pdmatgen.f
diff --git a/TESTING/LIN/pdpbdriver.f b/TESTING/traditional/LIN/pdpbdriver.f
similarity index 100%
rename from TESTING/LIN/pdpbdriver.f
rename to TESTING/traditional/LIN/pdpbdriver.f
diff --git a/TESTING/LIN/pdpbinfo.f b/TESTING/traditional/LIN/pdpbinfo.f
similarity index 100%
rename from TESTING/LIN/pdpbinfo.f
rename to TESTING/traditional/LIN/pdpbinfo.f
diff --git a/TESTING/LIN/pdpblaschk.f b/TESTING/traditional/LIN/pdpblaschk.f
similarity index 100%
rename from TESTING/LIN/pdpblaschk.f
rename to TESTING/traditional/LIN/pdpblaschk.f
diff --git a/TESTING/LIN/pdpbmv1.f b/TESTING/traditional/LIN/pdpbmv1.f
similarity index 100%
rename from TESTING/LIN/pdpbmv1.f
rename to TESTING/traditional/LIN/pdpbmv1.f
diff --git a/TESTING/LIN/pdpotrrv.f b/TESTING/traditional/LIN/pdpotrrv.f
similarity index 100%
rename from TESTING/LIN/pdpotrrv.f
rename to TESTING/traditional/LIN/pdpotrrv.f
diff --git a/TESTING/LIN/pdptdriver.f b/TESTING/traditional/LIN/pdptdriver.f
similarity index 100%
rename from TESTING/LIN/pdptdriver.f
rename to TESTING/traditional/LIN/pdptdriver.f
diff --git a/TESTING/LIN/pdptinfo.f b/TESTING/traditional/LIN/pdptinfo.f
similarity index 100%
rename from TESTING/LIN/pdptinfo.f
rename to TESTING/traditional/LIN/pdptinfo.f
diff --git a/TESTING/LIN/pdptlaschk.f b/TESTING/traditional/LIN/pdptlaschk.f
similarity index 100%
rename from TESTING/LIN/pdptlaschk.f
rename to TESTING/traditional/LIN/pdptlaschk.f
diff --git a/TESTING/LIN/pdqrdriver.f b/TESTING/traditional/LIN/pdqrdriver.f
similarity index 100%
rename from TESTING/LIN/pdqrdriver.f
rename to TESTING/traditional/LIN/pdqrdriver.f
diff --git a/TESTING/LIN/pdqrinfo.f b/TESTING/traditional/LIN/pdqrinfo.f
similarity index 100%
rename from TESTING/LIN/pdqrinfo.f
rename to TESTING/traditional/LIN/pdqrinfo.f
diff --git a/TESTING/LIN/pdqrt13.f b/TESTING/traditional/LIN/pdqrt13.f
similarity index 100%
rename from TESTING/LIN/pdqrt13.f
rename to TESTING/traditional/LIN/pdqrt13.f
diff --git a/TESTING/LIN/pdqrt14.f b/TESTING/traditional/LIN/pdqrt14.f
similarity index 100%
rename from TESTING/LIN/pdqrt14.f
rename to TESTING/traditional/LIN/pdqrt14.f
diff --git a/TESTING/LIN/pdqrt16.f b/TESTING/traditional/LIN/pdqrt16.f
similarity index 100%
rename from TESTING/LIN/pdqrt16.f
rename to TESTING/traditional/LIN/pdqrt16.f
diff --git a/TESTING/LIN/pdqrt17.f b/TESTING/traditional/LIN/pdqrt17.f
similarity index 100%
rename from TESTING/LIN/pdqrt17.f
rename to TESTING/traditional/LIN/pdqrt17.f
diff --git a/TESTING/LIN/pdtzrzrv.f b/TESTING/traditional/LIN/pdtzrzrv.f
similarity index 100%
rename from TESTING/LIN/pdtzrzrv.f
rename to TESTING/traditional/LIN/pdtzrzrv.f
diff --git a/TESTING/LIN/pmatgeninc.f b/TESTING/traditional/LIN/pmatgeninc.f
similarity index 100%
rename from TESTING/LIN/pmatgeninc.f
rename to TESTING/traditional/LIN/pmatgeninc.f
diff --git a/TESTING/LIN/psbmatgen.f b/TESTING/traditional/LIN/psbmatgen.f
similarity index 100%
rename from TESTING/LIN/psbmatgen.f
rename to TESTING/traditional/LIN/psbmatgen.f
diff --git a/TESTING/LIN/psdbdriver.f b/TESTING/traditional/LIN/psdbdriver.f
similarity index 100%
rename from TESTING/LIN/psdbdriver.f
rename to TESTING/traditional/LIN/psdbdriver.f
diff --git a/TESTING/LIN/psdbinfo.f b/TESTING/traditional/LIN/psdbinfo.f
similarity index 100%
rename from TESTING/LIN/psdbinfo.f
rename to TESTING/traditional/LIN/psdbinfo.f
diff --git a/TESTING/LIN/psdblaschk.f b/TESTING/traditional/LIN/psdblaschk.f
similarity index 100%
rename from TESTING/LIN/psdblaschk.f
rename to TESTING/traditional/LIN/psdblaschk.f
diff --git a/TESTING/LIN/psdbmv1.f b/TESTING/traditional/LIN/psdbmv1.f
similarity index 100%
rename from TESTING/LIN/psdbmv1.f
rename to TESTING/traditional/LIN/psdbmv1.f
diff --git a/TESTING/LIN/psdtdriver.f b/TESTING/traditional/LIN/psdtdriver.f
similarity index 100%
rename from TESTING/LIN/psdtdriver.f
rename to TESTING/traditional/LIN/psdtdriver.f
diff --git a/TESTING/LIN/psdtinfo.f b/TESTING/traditional/LIN/psdtinfo.f
similarity index 100%
rename from TESTING/LIN/psdtinfo.f
rename to TESTING/traditional/LIN/psdtinfo.f
diff --git a/TESTING/LIN/psdtlaschk.f b/TESTING/traditional/LIN/psdtlaschk.f
similarity index 100%
rename from TESTING/LIN/psdtlaschk.f
rename to TESTING/traditional/LIN/psdtlaschk.f
diff --git a/TESTING/LIN/psgbdriver.f b/TESTING/traditional/LIN/psgbdriver.f
similarity index 100%
rename from TESTING/LIN/psgbdriver.f
rename to TESTING/traditional/LIN/psgbdriver.f
diff --git a/TESTING/LIN/psgbinfo.f b/TESTING/traditional/LIN/psgbinfo.f
similarity index 100%
rename from TESTING/LIN/psgbinfo.f
rename to TESTING/traditional/LIN/psgbinfo.f
diff --git a/TESTING/LIN/psgbmv1.f b/TESTING/traditional/LIN/psgbmv1.f
similarity index 100%
rename from TESTING/LIN/psgbmv1.f
rename to TESTING/traditional/LIN/psgbmv1.f
diff --git a/TESTING/LIN/psgelqrv.f b/TESTING/traditional/LIN/psgelqrv.f
similarity index 100%
rename from TESTING/LIN/psgelqrv.f
rename to TESTING/traditional/LIN/psgelqrv.f
diff --git a/TESTING/LIN/psgeqlrv.f b/TESTING/traditional/LIN/psgeqlrv.f
similarity index 100%
rename from TESTING/LIN/psgeqlrv.f
rename to TESTING/traditional/LIN/psgeqlrv.f
diff --git a/TESTING/LIN/psgeqrrv.f b/TESTING/traditional/LIN/psgeqrrv.f
similarity index 100%
rename from TESTING/LIN/psgeqrrv.f
rename to TESTING/traditional/LIN/psgeqrrv.f
diff --git a/TESTING/LIN/psgerqrv.f b/TESTING/traditional/LIN/psgerqrv.f
similarity index 100%
rename from TESTING/LIN/psgerqrv.f
rename to TESTING/traditional/LIN/psgerqrv.f
diff --git a/TESTING/LIN/psgetrrv.f b/TESTING/traditional/LIN/psgetrrv.f
similarity index 100%
rename from TESTING/LIN/psgetrrv.f
rename to TESTING/traditional/LIN/psgetrrv.f
diff --git a/TESTING/LIN/psinvchk.f b/TESTING/traditional/LIN/psinvchk.f
similarity index 100%
rename from TESTING/LIN/psinvchk.f
rename to TESTING/traditional/LIN/psinvchk.f
diff --git a/TESTING/LIN/psinvdriver.f b/TESTING/traditional/LIN/psinvdriver.f
similarity index 100%
rename from TESTING/LIN/psinvdriver.f
rename to TESTING/traditional/LIN/psinvdriver.f
diff --git a/TESTING/LIN/psinvinfo.f b/TESTING/traditional/LIN/psinvinfo.f
similarity index 100%
rename from TESTING/LIN/psinvinfo.f
rename to TESTING/traditional/LIN/psinvinfo.f
diff --git a/TESTING/LIN/pslafchk.f b/TESTING/traditional/LIN/pslafchk.f
similarity index 100%
rename from TESTING/LIN/pslafchk.f
rename to TESTING/traditional/LIN/pslafchk.f
diff --git a/TESTING/LIN/pslaschk.f b/TESTING/traditional/LIN/pslaschk.f
similarity index 100%
rename from TESTING/LIN/pslaschk.f
rename to TESTING/traditional/LIN/pslaschk.f
diff --git a/TESTING/LIN/pslltdriver.f b/TESTING/traditional/LIN/pslltdriver.f
similarity index 100%
rename from TESTING/LIN/pslltdriver.f
rename to TESTING/traditional/LIN/pslltdriver.f
diff --git a/TESTING/LIN/pslltinfo.f b/TESTING/traditional/LIN/pslltinfo.f
similarity index 100%
rename from TESTING/LIN/pslltinfo.f
rename to TESTING/traditional/LIN/pslltinfo.f
diff --git a/TESTING/LIN/pslsdriver.f b/TESTING/traditional/LIN/pslsdriver.f
similarity index 100%
rename from TESTING/LIN/pslsdriver.f
rename to TESTING/traditional/LIN/pslsdriver.f
diff --git a/TESTING/LIN/pslsinfo.f b/TESTING/traditional/LIN/pslsinfo.f
similarity index 100%
rename from TESTING/LIN/pslsinfo.f
rename to TESTING/traditional/LIN/pslsinfo.f
diff --git a/TESTING/LIN/psludriver.f b/TESTING/traditional/LIN/psludriver.f
similarity index 100%
rename from TESTING/LIN/psludriver.f
rename to TESTING/traditional/LIN/psludriver.f
diff --git a/TESTING/LIN/psluinfo.f b/TESTING/traditional/LIN/psluinfo.f
similarity index 100%
rename from TESTING/LIN/psluinfo.f
rename to TESTING/traditional/LIN/psluinfo.f
diff --git a/TESTING/LIN/psmatgen.f b/TESTING/traditional/LIN/psmatgen.f
similarity index 100%
rename from TESTING/LIN/psmatgen.f
rename to TESTING/traditional/LIN/psmatgen.f
diff --git a/TESTING/LIN/pspbdriver.f b/TESTING/traditional/LIN/pspbdriver.f
similarity index 100%
rename from TESTING/LIN/pspbdriver.f
rename to TESTING/traditional/LIN/pspbdriver.f
diff --git a/TESTING/LIN/pspbinfo.f b/TESTING/traditional/LIN/pspbinfo.f
similarity index 100%
rename from TESTING/LIN/pspbinfo.f
rename to TESTING/traditional/LIN/pspbinfo.f
diff --git a/TESTING/LIN/pspblaschk.f b/TESTING/traditional/LIN/pspblaschk.f
similarity index 100%
rename from TESTING/LIN/pspblaschk.f
rename to TESTING/traditional/LIN/pspblaschk.f
diff --git a/TESTING/LIN/pspbmv1.f b/TESTING/traditional/LIN/pspbmv1.f
similarity index 100%
rename from TESTING/LIN/pspbmv1.f
rename to TESTING/traditional/LIN/pspbmv1.f
diff --git a/TESTING/LIN/pspotrrv.f b/TESTING/traditional/LIN/pspotrrv.f
similarity index 100%
rename from TESTING/LIN/pspotrrv.f
rename to TESTING/traditional/LIN/pspotrrv.f
diff --git a/TESTING/LIN/psptdriver.f b/TESTING/traditional/LIN/psptdriver.f
similarity index 100%
rename from TESTING/LIN/psptdriver.f
rename to TESTING/traditional/LIN/psptdriver.f
diff --git a/TESTING/LIN/psptinfo.f b/TESTING/traditional/LIN/psptinfo.f
similarity index 100%
rename from TESTING/LIN/psptinfo.f
rename to TESTING/traditional/LIN/psptinfo.f
diff --git a/TESTING/LIN/psptlaschk.f b/TESTING/traditional/LIN/psptlaschk.f
similarity index 100%
rename from TESTING/LIN/psptlaschk.f
rename to TESTING/traditional/LIN/psptlaschk.f
diff --git a/TESTING/LIN/psqrdriver.f b/TESTING/traditional/LIN/psqrdriver.f
similarity index 100%
rename from TESTING/LIN/psqrdriver.f
rename to TESTING/traditional/LIN/psqrdriver.f
diff --git a/TESTING/LIN/psqrinfo.f b/TESTING/traditional/LIN/psqrinfo.f
similarity index 100%
rename from TESTING/LIN/psqrinfo.f
rename to TESTING/traditional/LIN/psqrinfo.f
diff --git a/TESTING/LIN/psqrt13.f b/TESTING/traditional/LIN/psqrt13.f
similarity index 100%
rename from TESTING/LIN/psqrt13.f
rename to TESTING/traditional/LIN/psqrt13.f
diff --git a/TESTING/LIN/psqrt14.f b/TESTING/traditional/LIN/psqrt14.f
similarity index 100%
rename from TESTING/LIN/psqrt14.f
rename to TESTING/traditional/LIN/psqrt14.f
diff --git a/TESTING/LIN/psqrt16.f b/TESTING/traditional/LIN/psqrt16.f
similarity index 100%
rename from TESTING/LIN/psqrt16.f
rename to TESTING/traditional/LIN/psqrt16.f
diff --git a/TESTING/LIN/psqrt17.f b/TESTING/traditional/LIN/psqrt17.f
similarity index 100%
rename from TESTING/LIN/psqrt17.f
rename to TESTING/traditional/LIN/psqrt17.f
diff --git a/TESTING/LIN/pstzrzrv.f b/TESTING/traditional/LIN/pstzrzrv.f
similarity index 100%
rename from TESTING/LIN/pstzrzrv.f
rename to TESTING/traditional/LIN/pstzrzrv.f
diff --git a/TESTING/LIN/pzbmatgen.f b/TESTING/traditional/LIN/pzbmatgen.f
similarity index 100%
rename from TESTING/LIN/pzbmatgen.f
rename to TESTING/traditional/LIN/pzbmatgen.f
diff --git a/TESTING/LIN/pzdbdriver.f b/TESTING/traditional/LIN/pzdbdriver.f
similarity index 100%
rename from TESTING/LIN/pzdbdriver.f
rename to TESTING/traditional/LIN/pzdbdriver.f
diff --git a/TESTING/LIN/pzdbinfo.f b/TESTING/traditional/LIN/pzdbinfo.f
similarity index 100%
rename from TESTING/LIN/pzdbinfo.f
rename to TESTING/traditional/LIN/pzdbinfo.f
diff --git a/TESTING/LIN/pzdblaschk.f b/TESTING/traditional/LIN/pzdblaschk.f
similarity index 100%
rename from TESTING/LIN/pzdblaschk.f
rename to TESTING/traditional/LIN/pzdblaschk.f
diff --git a/TESTING/LIN/pzdbmv1.f b/TESTING/traditional/LIN/pzdbmv1.f
similarity index 100%
rename from TESTING/LIN/pzdbmv1.f
rename to TESTING/traditional/LIN/pzdbmv1.f
diff --git a/TESTING/LIN/pzdtdriver.f b/TESTING/traditional/LIN/pzdtdriver.f
similarity index 100%
rename from TESTING/LIN/pzdtdriver.f
rename to TESTING/traditional/LIN/pzdtdriver.f
diff --git a/TESTING/LIN/pzdtinfo.f b/TESTING/traditional/LIN/pzdtinfo.f
similarity index 100%
rename from TESTING/LIN/pzdtinfo.f
rename to TESTING/traditional/LIN/pzdtinfo.f
diff --git a/TESTING/LIN/pzdtlaschk.f b/TESTING/traditional/LIN/pzdtlaschk.f
similarity index 100%
rename from TESTING/LIN/pzdtlaschk.f
rename to TESTING/traditional/LIN/pzdtlaschk.f
diff --git a/TESTING/LIN/pzgbdriver.f b/TESTING/traditional/LIN/pzgbdriver.f
similarity index 100%
rename from TESTING/LIN/pzgbdriver.f
rename to TESTING/traditional/LIN/pzgbdriver.f
diff --git a/TESTING/LIN/pzgbinfo.f b/TESTING/traditional/LIN/pzgbinfo.f
similarity index 100%
rename from TESTING/LIN/pzgbinfo.f
rename to TESTING/traditional/LIN/pzgbinfo.f
diff --git a/TESTING/LIN/pzgbmv1.f b/TESTING/traditional/LIN/pzgbmv1.f
similarity index 100%
rename from TESTING/LIN/pzgbmv1.f
rename to TESTING/traditional/LIN/pzgbmv1.f
diff --git a/TESTING/LIN/pzgelqrv.f b/TESTING/traditional/LIN/pzgelqrv.f
similarity index 100%
rename from TESTING/LIN/pzgelqrv.f
rename to TESTING/traditional/LIN/pzgelqrv.f
diff --git a/TESTING/LIN/pzgeqlrv.f b/TESTING/traditional/LIN/pzgeqlrv.f
similarity index 100%
rename from TESTING/LIN/pzgeqlrv.f
rename to TESTING/traditional/LIN/pzgeqlrv.f
diff --git a/TESTING/LIN/pzgeqrrv.f b/TESTING/traditional/LIN/pzgeqrrv.f
similarity index 100%
rename from TESTING/LIN/pzgeqrrv.f
rename to TESTING/traditional/LIN/pzgeqrrv.f
diff --git a/TESTING/LIN/pzgerqrv.f b/TESTING/traditional/LIN/pzgerqrv.f
similarity index 100%
rename from TESTING/LIN/pzgerqrv.f
rename to TESTING/traditional/LIN/pzgerqrv.f
diff --git a/TESTING/LIN/pzgetrrv.f b/TESTING/traditional/LIN/pzgetrrv.f
similarity index 100%
rename from TESTING/LIN/pzgetrrv.f
rename to TESTING/traditional/LIN/pzgetrrv.f
diff --git a/TESTING/LIN/pzinvchk.f b/TESTING/traditional/LIN/pzinvchk.f
similarity index 100%
rename from TESTING/LIN/pzinvchk.f
rename to TESTING/traditional/LIN/pzinvchk.f
diff --git a/TESTING/LIN/pzinvdriver.f b/TESTING/traditional/LIN/pzinvdriver.f
similarity index 100%
rename from TESTING/LIN/pzinvdriver.f
rename to TESTING/traditional/LIN/pzinvdriver.f
diff --git a/TESTING/LIN/pzinvinfo.f b/TESTING/traditional/LIN/pzinvinfo.f
similarity index 100%
rename from TESTING/LIN/pzinvinfo.f
rename to TESTING/traditional/LIN/pzinvinfo.f
diff --git a/TESTING/LIN/pzlafchk.f b/TESTING/traditional/LIN/pzlafchk.f
similarity index 100%
rename from TESTING/LIN/pzlafchk.f
rename to TESTING/traditional/LIN/pzlafchk.f
diff --git a/TESTING/LIN/pzlaschk.f b/TESTING/traditional/LIN/pzlaschk.f
similarity index 100%
rename from TESTING/LIN/pzlaschk.f
rename to TESTING/traditional/LIN/pzlaschk.f
diff --git a/TESTING/LIN/pzlltdriver.f b/TESTING/traditional/LIN/pzlltdriver.f
similarity index 100%
rename from TESTING/LIN/pzlltdriver.f
rename to TESTING/traditional/LIN/pzlltdriver.f
diff --git a/TESTING/LIN/pzlltinfo.f b/TESTING/traditional/LIN/pzlltinfo.f
similarity index 100%
rename from TESTING/LIN/pzlltinfo.f
rename to TESTING/traditional/LIN/pzlltinfo.f
diff --git a/TESTING/LIN/pzlsdriver.f b/TESTING/traditional/LIN/pzlsdriver.f
similarity index 100%
rename from TESTING/LIN/pzlsdriver.f
rename to TESTING/traditional/LIN/pzlsdriver.f
diff --git a/TESTING/LIN/pzlsinfo.f b/TESTING/traditional/LIN/pzlsinfo.f
similarity index 100%
rename from TESTING/LIN/pzlsinfo.f
rename to TESTING/traditional/LIN/pzlsinfo.f
diff --git a/TESTING/LIN/pzludriver.f b/TESTING/traditional/LIN/pzludriver.f
similarity index 100%
rename from TESTING/LIN/pzludriver.f
rename to TESTING/traditional/LIN/pzludriver.f
diff --git a/TESTING/LIN/pzluinfo.f b/TESTING/traditional/LIN/pzluinfo.f
similarity index 100%
rename from TESTING/LIN/pzluinfo.f
rename to TESTING/traditional/LIN/pzluinfo.f
diff --git a/TESTING/LIN/pzmatgen.f b/TESTING/traditional/LIN/pzmatgen.f
similarity index 100%
rename from TESTING/LIN/pzmatgen.f
rename to TESTING/traditional/LIN/pzmatgen.f
diff --git a/TESTING/LIN/pzpbdriver.f b/TESTING/traditional/LIN/pzpbdriver.f
similarity index 100%
rename from TESTING/LIN/pzpbdriver.f
rename to TESTING/traditional/LIN/pzpbdriver.f
diff --git a/TESTING/LIN/pzpbinfo.f b/TESTING/traditional/LIN/pzpbinfo.f
similarity index 100%
rename from TESTING/LIN/pzpbinfo.f
rename to TESTING/traditional/LIN/pzpbinfo.f
diff --git a/TESTING/LIN/pzpblaschk.f b/TESTING/traditional/LIN/pzpblaschk.f
similarity index 100%
rename from TESTING/LIN/pzpblaschk.f
rename to TESTING/traditional/LIN/pzpblaschk.f
diff --git a/TESTING/LIN/pzpbmv1.f b/TESTING/traditional/LIN/pzpbmv1.f
similarity index 100%
rename from TESTING/LIN/pzpbmv1.f
rename to TESTING/traditional/LIN/pzpbmv1.f
diff --git a/TESTING/LIN/pzpotrrv.f b/TESTING/traditional/LIN/pzpotrrv.f
similarity index 100%
rename from TESTING/LIN/pzpotrrv.f
rename to TESTING/traditional/LIN/pzpotrrv.f
diff --git a/TESTING/LIN/pzptdriver.f b/TESTING/traditional/LIN/pzptdriver.f
similarity index 100%
rename from TESTING/LIN/pzptdriver.f
rename to TESTING/traditional/LIN/pzptdriver.f
diff --git a/TESTING/LIN/pzptinfo.f b/TESTING/traditional/LIN/pzptinfo.f
similarity index 100%
rename from TESTING/LIN/pzptinfo.f
rename to TESTING/traditional/LIN/pzptinfo.f
diff --git a/TESTING/LIN/pzptlaschk.f b/TESTING/traditional/LIN/pzptlaschk.f
similarity index 100%
rename from TESTING/LIN/pzptlaschk.f
rename to TESTING/traditional/LIN/pzptlaschk.f
diff --git a/TESTING/LIN/pzqrdriver.f b/TESTING/traditional/LIN/pzqrdriver.f
similarity index 100%
rename from TESTING/LIN/pzqrdriver.f
rename to TESTING/traditional/LIN/pzqrdriver.f
diff --git a/TESTING/LIN/pzqrinfo.f b/TESTING/traditional/LIN/pzqrinfo.f
similarity index 100%
rename from TESTING/LIN/pzqrinfo.f
rename to TESTING/traditional/LIN/pzqrinfo.f
diff --git a/TESTING/LIN/pzqrt13.f b/TESTING/traditional/LIN/pzqrt13.f
similarity index 100%
rename from TESTING/LIN/pzqrt13.f
rename to TESTING/traditional/LIN/pzqrt13.f
diff --git a/TESTING/LIN/pzqrt14.f b/TESTING/traditional/LIN/pzqrt14.f
similarity index 100%
rename from TESTING/LIN/pzqrt14.f
rename to TESTING/traditional/LIN/pzqrt14.f
diff --git a/TESTING/LIN/pzqrt16.f b/TESTING/traditional/LIN/pzqrt16.f
similarity index 100%
rename from TESTING/LIN/pzqrt16.f
rename to TESTING/traditional/LIN/pzqrt16.f
diff --git a/TESTING/LIN/pzqrt17.f b/TESTING/traditional/LIN/pzqrt17.f
similarity index 100%
rename from TESTING/LIN/pzqrt17.f
rename to TESTING/traditional/LIN/pzqrt17.f
diff --git a/TESTING/LIN/pztzrzrv.f b/TESTING/traditional/LIN/pztzrzrv.f
similarity index 100%
rename from TESTING/LIN/pztzrzrv.f
rename to TESTING/traditional/LIN/pztzrzrv.f
diff --git a/TESTING/LLT.dat b/TESTING/traditional/LLT.dat
similarity index 100%
rename from TESTING/LLT.dat
rename to TESTING/traditional/LLT.dat
diff --git a/TESTING/LS.dat b/TESTING/traditional/LS.dat
similarity index 100%
rename from TESTING/LS.dat
rename to TESTING/traditional/LS.dat
diff --git a/TESTING/LU.dat b/TESTING/traditional/LU.dat
similarity index 100%
rename from TESTING/LU.dat
rename to TESTING/traditional/LU.dat
diff --git a/TESTING/NEP.dat b/TESTING/traditional/NEP.dat
similarity index 100%
rename from TESTING/NEP.dat
rename to TESTING/traditional/NEP.dat
diff --git a/TESTING/QR.dat b/TESTING/traditional/QR.dat
similarity index 100%
rename from TESTING/QR.dat
rename to TESTING/traditional/QR.dat
diff --git a/TESTING/SEP.dat b/TESTING/traditional/SEP.dat
similarity index 100%
rename from TESTING/SEP.dat
rename to TESTING/traditional/SEP.dat
diff --git a/TESTING/SEPR.dat b/TESTING/traditional/SEPR.dat
similarity index 100%
rename from TESTING/SEPR.dat
rename to TESTING/traditional/SEPR.dat
diff --git a/TESTING/SVD.dat b/TESTING/traditional/SVD.dat
similarity index 100%
rename from TESTING/SVD.dat
rename to TESTING/traditional/SVD.dat
diff --git a/TESTING/TRD.dat b/TESTING/traditional/TRD.dat
similarity index 100%
rename from TESTING/TRD.dat
rename to TESTING/traditional/TRD.dat