diff --git a/modules/cblas.cmake b/modules/math/cblas.cmake
similarity index 100%
rename from modules/cblas.cmake
rename to modules/math/cblas.cmake
diff --git a/modules/lapacke.cmake b/modules/math/lapacke.cmake
similarity index 100%
rename from modules/lapacke.cmake
rename to modules/math/lapacke.cmake
diff --git a/test/cxx_cblas/cmake/autocmake.cfg b/test/cxx_cblas/cmake/autocmake.cfg
index dec63b8..b0d3897 100644
--- a/test/cxx_cblas/cmake/autocmake.cfg
+++ b/test/cxx_cblas/cmake/autocmake.cfg
@@ -5,8 +5,8 @@ min_cmake_version: 2.8
 [cxx]
 source: ../../../modules/cxx.cmake
 
-[cblas]
-source: ../../../modules/cblas.cmake
+[math]
+source: ../../../modules/math/cblas.cmake
 
 [default_build_paths]
 source: ../../../modules/default_build_paths.cmake
diff --git a/test/cxx_lapacke/cmake/autocmake.cfg b/test/cxx_lapacke/cmake/autocmake.cfg
index e1745b6..fb1bd2b 100644
--- a/test/cxx_lapacke/cmake/autocmake.cfg
+++ b/test/cxx_lapacke/cmake/autocmake.cfg
@@ -5,11 +5,9 @@ min_cmake_version: 2.8
 [cxx]
 source: ../../../modules/cxx.cmake
 
-[cblas]
-source: ../../../modules/cblas.cmake
-
-[lapacke]
-source: ../../../modules/lapacke.cmake
+[math]
+source: ../../../modules/math/cblas.cmake
+source: ../../../modules/math/lapacke.cmake
 
 [default_build_paths]
 source: ../../../modules/default_build_paths.cmake