diff --git a/CMakeLists.txt b/CMakeLists.txt
index a596a935c..7d05c9c19 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,7 +89,10 @@ find_program(FYPP_EXE fypp REQUIRED)
 
 link_libraries("${CMAKE_DL_LIBS}")
 set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON)
-list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/toolchain/cmake")
+list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/toolchain/cmake/regular")
+if (CMAKE_Fortran_COMPILER_ID STREQUAL "Cray")
+    list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/toolchain/cmake/cce")
+endif()
 
 
 # Compiler Flags: Here, we specify our own compiler flags for both release and
diff --git a/toolchain/cmake/FindcuTENSOR.cmake b/toolchain/cmake/FindcuTENSOR.cmake
deleted file mode 100644
index 827d07fe8..000000000
--- a/toolchain/cmake/FindcuTENSOR.cmake
+++ /dev/null
@@ -1,37 +0,0 @@
-# Attempt to find NVIDIA cuTENSOR
-# URL:  https://developer.nvidia.com/cutensor
-# DOCS: https://cmake.org/cmake/help/latest/command/find_library.html
-#       https://cmake.org/cmake/help/latest/module/FindPackageHandleStandardArgs.html
-
-cmake_minimum_required(VERSION 3.18)
-
-INCLUDE(FindPackageHandleStandardArgs)
-
-FIND_PACKAGE(CUDAToolkit)
-
-MESSAGE(STATUS "CUDAToolkit_LIBRARY_ROOT=${CUDAToolkit_LIBRARY_ROOT}")
-
-FIND_LIBRARY(cuTENSOR_LIBRARY
-    NAMES         cutensor
-    HINTS         "${CUDAToolkit_LIBRARY_ROOT}/../../math_libs"
-    NAMES_PER_DIR
-)
-
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(
-    cuTENSOR
-    REQUIRED_VARS
-        cuTENSOR_LIBRARY
-)
-
-IF (cuTENSOR_FOUND AND NOT TARGET cuTENSOR::cuTENSOR)
-    SET(cuTENSOR_LIBRARIES    "${cuTENSOR_LIBRARY}")
-    SET(cuTENSOR_INCLUDE_DIRS "${cuTENSOR_INCLUDE_DIR}")
-
-    ADD_LIBRARY(cuTENSOR::cuTENSOR UNKNOWN IMPORTED)
-
-    SET_TARGET_PROPERTIES(cuTENSOR::cuTENSOR PROPERTIES
-        IMPORTED_LOCATION             "${cuTENSOR_LIBRARIES}"
-        INTERFACE_INCLUDE_DIRECTORIES "${cuTENSOR_INCLUDE_DIRS}"
-    )
-ENDIF()
diff --git a/toolchain/cmake/FindHDF5.cmake b/toolchain/cmake/cce/FindHDF5.cmake
similarity index 100%
rename from toolchain/cmake/FindHDF5.cmake
rename to toolchain/cmake/cce/FindHDF5.cmake
diff --git a/toolchain/cmake/FindFFTW.cmake b/toolchain/cmake/regular/FindFFTW.cmake
similarity index 100%
rename from toolchain/cmake/FindFFTW.cmake
rename to toolchain/cmake/regular/FindFFTW.cmake
diff --git a/toolchain/cmake/FindSILO.cmake b/toolchain/cmake/regular/FindSILO.cmake
similarity index 100%
rename from toolchain/cmake/FindSILO.cmake
rename to toolchain/cmake/regular/FindSILO.cmake
diff --git a/toolchain/dependencies/CMakeLists.txt b/toolchain/dependencies/CMakeLists.txt
index f3387ac94..723e2e136 100644
--- a/toolchain/dependencies/CMakeLists.txt
+++ b/toolchain/dependencies/CMakeLists.txt
@@ -5,7 +5,10 @@ cmake_minimum_required(VERSION 3.12)
 
 project(MFC-Dependencies LANGUAGES C CXX Fortran)
 
-list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
+list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/regular")
+if (CMAKE_Fortran_COMPILER_ID STREQUAL "Cray")
+    list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/cce")
+endif()
 
 set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON)