diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index 4fc17f47a..5fea5685f 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -261,11 +261,11 @@ if(USE_BDA_BRIDGE)
     list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/opencl/openclWellContributions.cpp)
   endif()
   if(ROCALUTION_FOUND)
-    list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/rocalutionSolverBackend.cpp)
+    list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/rocm/rocalutionSolverBackend.cpp)
   endif()
   if(rocsparse_FOUND AND rocblas_FOUND)
-    list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/rocsparseSolverBackend.cpp)
-    list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/rocsparseWellContributions.cpp)
+    list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.cpp)
+    list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/rocm/rocsparseWellContributions.cpp)
   endif()
   if(CUDA_FOUND)
     list (APPEND MAIN_SOURCE_FILES opm/simulators/linalg/bda/cuda/cusparseSolverBackend.cu)
@@ -666,9 +666,9 @@ if (USE_BDA_BRIDGE)
     opm/simulators/linalg/bda/opencl/openclWellContributions.hpp
     opm/simulators/linalg/bda/Matrix.hpp
     opm/simulators/linalg/bda/MultisegmentWellContribution.hpp
-    opm/simulators/linalg/bda/rocalutionSolverBackend.hpp
-    opm/simulators/linalg/bda/rocsparseSolverBackend.hpp
-    opm/simulators/linalg/bda/rocsparseWellContributions.hpp
+    opm/simulators/linalg/bda/rocm/rocalutionSolverBackend.hpp
+    opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.hpp
+    opm/simulators/linalg/bda/rocm/rocsparseWellContributions.hpp
     opm/simulators/linalg/bda/WellContributions.hpp
     opm/simulators/linalg/ISTLSolverBda.hpp
   )
diff --git a/opm/simulators/linalg/bda/BdaBridge.cpp b/opm/simulators/linalg/bda/BdaBridge.cpp
index b20071433..223ad5df6 100644
--- a/opm/simulators/linalg/bda/BdaBridge.cpp
+++ b/opm/simulators/linalg/bda/BdaBridge.cpp
@@ -47,7 +47,7 @@
 #endif
 
 #if HAVE_ROCSPARSE
-#include <opm/simulators/linalg/bda/rocsparseSolverBackend.hpp>
+#include <opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.hpp>
 #endif
 
 typedef Dune::InverseOperatorResult InverseOperatorResult;
diff --git a/opm/simulators/linalg/bda/WellContributions.cpp b/opm/simulators/linalg/bda/WellContributions.cpp
index 424758bb4..1ed177eba 100644
--- a/opm/simulators/linalg/bda/WellContributions.cpp
+++ b/opm/simulators/linalg/bda/WellContributions.cpp
@@ -34,7 +34,7 @@
 #endif
 
 #ifdef HAVE_ROCSPARSE
-#include <opm/simulators/linalg/bda/rocsparseWellContributions.hpp>
+#include <opm/simulators/linalg/bda/rocm/rocsparseWellContributions.hpp>
 #endif
 
 namespace Opm {
diff --git a/opm/simulators/linalg/bda/rocalutionSolverBackend.cpp b/opm/simulators/linalg/bda/rocm/rocalutionSolverBackend.cpp
similarity index 99%
rename from opm/simulators/linalg/bda/rocalutionSolverBackend.cpp
rename to opm/simulators/linalg/bda/rocm/rocalutionSolverBackend.cpp
index 03ce6fcba..4882c452c 100644
--- a/opm/simulators/linalg/bda/rocalutionSolverBackend.cpp
+++ b/opm/simulators/linalg/bda/rocm/rocalutionSolverBackend.cpp
@@ -37,7 +37,7 @@
 
 #undef HAVE_CUDA
 
-#include <opm/simulators/linalg/bda/rocalutionSolverBackend.hpp>
+#include <opm/simulators/linalg/bda/rocm/rocalutionSolverBackend.hpp>
 
 #include <rocalution.hpp>
 #include <base/matrix_formats_ind.hpp> // check if blocks are interpreted as row-major or column-major
diff --git a/opm/simulators/linalg/bda/rocalutionSolverBackend.hpp b/opm/simulators/linalg/bda/rocm/rocalutionSolverBackend.hpp
similarity index 100%
rename from opm/simulators/linalg/bda/rocalutionSolverBackend.hpp
rename to opm/simulators/linalg/bda/rocm/rocalutionSolverBackend.hpp
diff --git a/opm/simulators/linalg/bda/rocsparseSolverBackend.cpp b/opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.cpp
similarity index 99%
rename from opm/simulators/linalg/bda/rocsparseSolverBackend.cpp
rename to opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.cpp
index 9860f5728..0b4e1ddf2 100644
--- a/opm/simulators/linalg/bda/rocsparseSolverBackend.cpp
+++ b/opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.cpp
@@ -36,8 +36,8 @@
 
 #undef HAVE_CUDA
 
-#include <opm/simulators/linalg/bda/rocsparseSolverBackend.hpp>
-#include <opm/simulators/linalg/bda/rocsparseWellContributions.hpp>
+#include <opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.hpp>
+#include <opm/simulators/linalg/bda/rocm/rocsparseWellContributions.hpp>
 
 #include <opm/simulators/linalg/bda/BdaResult.hpp>
 
diff --git a/opm/simulators/linalg/bda/rocsparseSolverBackend.hpp b/opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.hpp
similarity index 100%
rename from opm/simulators/linalg/bda/rocsparseSolverBackend.hpp
rename to opm/simulators/linalg/bda/rocm/rocsparseSolverBackend.hpp
diff --git a/opm/simulators/linalg/bda/rocsparseWellContributions.cpp b/opm/simulators/linalg/bda/rocm/rocsparseWellContributions.cpp
similarity index 99%
rename from opm/simulators/linalg/bda/rocsparseWellContributions.cpp
rename to opm/simulators/linalg/bda/rocm/rocsparseWellContributions.cpp
index 01bdc7bd5..da0f452ad 100644
--- a/opm/simulators/linalg/bda/rocsparseWellContributions.cpp
+++ b/opm/simulators/linalg/bda/rocm/rocsparseWellContributions.cpp
@@ -29,7 +29,7 @@
 
 #undef HAVE_CUDA
 
-#include <opm/simulators/linalg/bda/rocsparseWellContributions.hpp>
+#include <opm/simulators/linalg/bda/rocm/rocsparseWellContributions.hpp>
 
 #ifdef HIP_HAVE_CUDA_DEFINED
 #define HAVE_CUDA HIP_HAVE_CUDA_DEFINED
diff --git a/opm/simulators/linalg/bda/rocsparseWellContributions.hpp b/opm/simulators/linalg/bda/rocm/rocsparseWellContributions.hpp
similarity index 100%
rename from opm/simulators/linalg/bda/rocsparseWellContributions.hpp
rename to opm/simulators/linalg/bda/rocm/rocsparseWellContributions.hpp