diff --git a/src/dfpm/CMakeLists.txt b/src/dfpm/CMakeLists.txt
index ed070c7..0e530ad 100644
--- a/src/dfpm/CMakeLists.txt
+++ b/src/dfpm/CMakeLists.txt
@@ -1,60 +1,62 @@
 #   DFPM
 # ========
 
 add_custom_target(dfpm_incl SOURCES
     types.hpp
 
     1dtransport/diffusion_parameters.hpp
 
     mesh.hpp
     meshes/mesh1dfwd.hpp
     meshes/mesh1d.hpp
     meshes/uniform_mesh1d.hpp
     meshes/generic_mesh1d.hpp
     meshes/axisymmetric_uniform_mesh1d.hpp
     meshes/axisymmetric_mesh1d.hpp
 )
 
 set(DFPMLIB
     1dtransport/diffusion.cpp # HELP I'm alooonnnne !!!
 )
 
 add_library(dfpm SHARED ${DFPMLIB})
 install(TARGETS dfpm
     LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR}
 )
 
 # includes
 # --------
 
-set(DFPM_INCLUDE_LIST
-    types.hpp
-
-    1dtransport/diffusion_parameters.hpp
-
-    mesh.hpp
+set(DFPM_MESH_INCLUDE_LIST
     meshes/mesh1dfwd.hpp
     meshes/mesh1d.hpp
     meshes/uniform_mesh1d.hpp
     meshes/generic_mesh1d.hpp
     meshes/axisymmetric_uniform_mesh1d.hpp
     meshes/axisymmetric_mesh1d.hpp
-
-    1dtransport/diffusion.hpp
 )
 
-install(FILES ${DFPM_INCLUDE_LIST}
+install(FILES types.hpp mesh.hpp
     DESTINATION ${INCLUDE_INSTALL_DIR}/dfpm
 )
 
+install(FILES 1dtransport/diffusion_parameters.hpp 1dtransport/diffusion.hpp
+    DESTINATION ${INCLUDE_INSTALL_DIR}/dfpm/1dtransport
+)
+
+install(FILES ${DFPM_MESH_INCLUDE_LIST}
+    DESTINATION ${INCLUDE_INSTALL_DIR}/dfpm/meshes
+)
+
+
 # static libraries
 # ----------------
 
 if(SPECMICP_BUILD_STATIC)
     add_library(dfpm_static STATIC ${DFPMLIB})
     set_target_properties(dfpm_static  PROPERTIES OUTPUT_NAME dfpm)
 
     install(TARGETS dfpm_static
         ARCHIVE DESTINATION ${STATIC_LIBRARY_INSTALL_DIR}
     )
 endif()
diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
index 5a44035..ea05db0 100644
--- a/src/utils/CMakeLists.txt
+++ b/src/utils/CMakeLists.txt
@@ -1,61 +1,68 @@
 add_custom_target(utils_inc SOURCES
     log.hpp
 
     # sparse solvers
     # --------------
     sparse_solvers/sparse_solver.hpp
     sparse_solvers/sparse_solver_base.hpp
     sparse_solvers/sparse_solver_structs.hpp
     sparse_solvers/sparse_qr.hpp
     sparse_solvers/sparse_lu.hpp
     sparse_solvers/sparse_bicgstab.hpp
     sparse_solvers/sparse_gmres.hpp
 
     options_handler.hpp
     perfs_handler.hpp
 
     moving_average.hpp
 
     timer.hpp
 
     # input/output
 
     io/units.hpp
     io/meshes.hpp
     io/reactive_transport.hpp
     io/saturated_react.hpp
 
 )
 
 set(UTILS_INCLUDE_LIST
     log.hpp
     options_handler.hpp
     perfs_handler.hpp
     moving_average.hpp
     timer.hpp
+)
+
+set(UTILS_SPARSE_INCLUDE_LIST
     # sparse solvers
     # --------------
     sparse_solvers/sparse_solver.hpp
     sparse_solvers/sparse_solver_base.hpp
     sparse_solvers/sparse_solver_structs.hpp
     sparse_solvers/sparse_qr.hpp
     sparse_solvers/sparse_lu.hpp
     sparse_solvers/sparse_bicgstab.hpp
     sparse_solvers/sparse_gmres.hpp
 )
 
 set(UTILS_IO_INCLUDE_LIST
     io/units.hpp
     io/meshes.hpp
     io/reactive_transport.hpp
     io/saturated_react.hpp
 )
 
 install(FILES ${UTILS_INCLUDE_LIST}
     DESTINATION ${INCLUDE_INSTALL_DIR}/utils
 )
 
+install(FILES ${UTILS_SPARSE_INCLUDE_LIST}
+    DESTINATION ${INCLUDE_INSTALL_DIR}/utils/sparse_solvers
+)
+
 install(FILES ${UTILS_IO_INCLUDE_LIST}
     DESTINATION ${INCLUDE_INSTALL_DIR}/utils/io
 )