diff --git a/Jet_fitting_3/doc/Jet_fitting_3/Concepts/SvdTraits.h b/Jet_fitting_3/doc/Jet_fitting_3/Concepts/SvdTraits.h
index 01230f9a162..5d2d6decc97 100644
--- a/Jet_fitting_3/doc/Jet_fitting_3/Concepts/SvdTraits.h
+++ b/Jet_fitting_3/doc/Jet_fitting_3/Concepts/SvdTraits.h
@@ -39,7 +39,7 @@ public:
   /*!
     The matrix type,  model of the concept `SvdTraits::Matrix`. 
   */ 
-  typedef unspecified_type matrix;
+  typedef unspecified_type Matrix;
   
   /// @} 
 
diff --git a/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/include/CGAL/Eigen_matrix.h b/Solver_interface/doc/Solver_interface/CGAL/Eigen_matrix.h
similarity index 97%
rename from Surface_mesh_parameterization/doc/Surface_mesh_parameterization/include/CGAL/Eigen_matrix.h
rename to Solver_interface/doc/Solver_interface/CGAL/Eigen_matrix.h
index db99a7ffa9c..2e952da270b 100644
--- a/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/include/CGAL/Eigen_matrix.h
+++ b/Solver_interface/doc/Solver_interface/CGAL/Eigen_matrix.h
@@ -2,7 +2,7 @@
 namespace CGAL {
 
 /*!
-\ingroup PkgSurfaceParameterizationAlgebra
+\ingroup PkgSolver
 
 The class `Eigen_sparse_matrix` is a C++ wrapper around \ref thirdpartyEigen "Eigen" matrix type `Eigen::SparseMatrix` 
 that represents general matrices, be they symmetric or not. 
diff --git a/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/include/CGAL/Eigen_solver_traits.h b/Solver_interface/doc/Solver_interface/CGAL/Eigen_solver_traits.h
similarity index 97%
rename from Surface_mesh_parameterization/doc/Surface_mesh_parameterization/include/CGAL/Eigen_solver_traits.h
rename to Solver_interface/doc/Solver_interface/CGAL/Eigen_solver_traits.h
index 9cec277b46b..289485d4aaf 100644
--- a/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/include/CGAL/Eigen_solver_traits.h
+++ b/Solver_interface/doc/Solver_interface/CGAL/Eigen_solver_traits.h
@@ -2,7 +2,7 @@
 namespace CGAL {
 
 /*!
-\ingroup PkgSurfaceParameterizationAlgebra
+\ingroup PkgSolver
 
 The class `Eigen_solver_traits` provides an interface to the sparse solvers of \ref thirdpartyEigen "Eigen".
 The version 3.1 (or greater) of \ref thirdpartyEigen "Eigen" must be available on the system. 
diff --git a/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/include/CGAL/Eigen_vector.h b/Solver_interface/doc/Solver_interface/CGAL/Eigen_vector.h
similarity index 94%
rename from Surface_mesh_parameterization/doc/Surface_mesh_parameterization/include/CGAL/Eigen_vector.h
rename to Solver_interface/doc/Solver_interface/CGAL/Eigen_vector.h
index 9b5a0b24521..1b220eb1ea6 100644
--- a/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/include/CGAL/Eigen_vector.h
+++ b/Solver_interface/doc/Solver_interface/CGAL/Eigen_vector.h
@@ -2,7 +2,7 @@
 namespace CGAL {
 
 /*!
-\ingroup PkgSurfaceParameterizationAlgebra
+\ingroup PkgSolver
 
 The class `Eigen_vector` is a C++ wrapper around \ref thirdpartyEigen "Eigen" vector, which is a simple array of numbers. 
 The version 3.1 (or greater) of \ref thirdpartyEigen "Eigen" must be available on the system. 
diff --git a/Surface_modeling/doc/Surface_modeling/Concepts/SparseLinearAlgebraTraitsWithFactor_d.h b/Solver_interface/doc/Solver_interface/Concepts/SparseLinearAlgebraTraitsWithFactor_d.h
similarity index 97%
rename from Surface_modeling/doc/Surface_modeling/Concepts/SparseLinearAlgebraTraitsWithFactor_d.h
rename to Solver_interface/doc/Solver_interface/Concepts/SparseLinearAlgebraTraitsWithFactor_d.h
index 2f64c66d578..dfaf510ebae 100644
--- a/Surface_modeling/doc/Surface_modeling/Concepts/SparseLinearAlgebraTraitsWithFactor_d.h
+++ b/Solver_interface/doc/Solver_interface/Concepts/SparseLinearAlgebraTraitsWithFactor_d.h
@@ -1,6 +1,6 @@
 
 /*!
-\ingroup PkgSurfaceModelingConcepts
+\ingroup PkgSolverConcepts
 \cgalConcept
 
 @brief Concept describing the set of requirements for a direct sparse linear system solver with factorization.
diff --git a/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/Concepts/SparseLinearAlgebraTraits_d.h b/Solver_interface/doc/Solver_interface/Concepts/SparseLinearAlgebraTraits_d.h
similarity index 98%
rename from Surface_mesh_parameterization/doc/Surface_mesh_parameterization/Concepts/SparseLinearAlgebraTraits_d.h
rename to Solver_interface/doc/Solver_interface/Concepts/SparseLinearAlgebraTraits_d.h
index e8872f54e03..f8e79aceddc 100644
--- a/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/Concepts/SparseLinearAlgebraTraits_d.h
+++ b/Solver_interface/doc/Solver_interface/Concepts/SparseLinearAlgebraTraits_d.h
@@ -1,6 +1,6 @@
 
 /*!
-\ingroup PkgSurfaceParameterizationConcepts
+\ingroup PkgSolverConcepts
 \cgalConcept
 
 The concept `SparseLinearAlgebraTraits_d` is used to solve sparse linear systems <I>A\f$ \times \f$ X = B</I>. 
diff --git a/Solver_interface/doc/Solver_interface/PackageDescription.txt b/Solver_interface/doc/Solver_interface/PackageDescription.txt
index 6bf4ec0a434..2977c94b4d2 100644
--- a/Solver_interface/doc/Solver_interface/PackageDescription.txt
+++ b/Solver_interface/doc/Solver_interface/PackageDescription.txt
@@ -30,8 +30,9 @@
 \cgalClassifedRefPages
 
 ## Concepts ##
-- `HalfedgeGraph`
 
+- `SparseLinearAlgebraTraits_d`
+- `SparseLinearAlgebraTraitsWithFactor_d`
 
 
 ## %CGAL Classes Adapted for the Graph API ##
diff --git a/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/PackageDescription.txt b/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/PackageDescription.txt
index 463a855a39d..9d2af5f10a9 100644
--- a/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/PackageDescription.txt
+++ b/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/PackageDescription.txt
@@ -31,7 +31,6 @@
 - `BorderParameterizer_3`
 - `ParameterizationMesh_3`
 - `ParameterizationPatchableMesh_3`
-- `SparseLinearAlgebraTraits_d`
 - `PolyhedronTraitsWithKernel_3`
 
 ## Surface Parameterization Methods ##
diff --git a/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/dependencies b/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/dependencies
index fce1616127d..bf0d8576788 100644
--- a/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/dependencies
+++ b/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/dependencies
@@ -6,3 +6,4 @@ Circulator
 Stream_support
 Polyhedron
 Kernel_d
+Solver_interface
diff --git a/Surface_modeling/doc/Surface_modeling/PackageDescription.txt b/Surface_modeling/doc/Surface_modeling/PackageDescription.txt
index f0c9b321e95..1f047cd016b 100644
--- a/Surface_modeling/doc/Surface_modeling/PackageDescription.txt
+++ b/Surface_modeling/doc/Surface_modeling/PackageDescription.txt
@@ -31,7 +31,6 @@ under positional constraints of some of its vertices, without requiring any addi
 ## Concepts ##
 - `DeformationClosestRotationTraits_3`
 - `RawPoint_3`
-- `SparseLinearAlgebraTraitsWithFactor_d`
 - `SurfaceModelingWeights`
 
 ## Algebraic Traits ##
diff --git a/Surface_modeling/doc/Surface_modeling/dependencies b/Surface_modeling/doc/Surface_modeling/dependencies
index 0988d1b453e..f39bf90fd2c 100644
--- a/Surface_modeling/doc/Surface_modeling/dependencies
+++ b/Surface_modeling/doc/Surface_modeling/dependencies
@@ -7,3 +7,5 @@ Stream_support
 Polyhedron
 BGL
 Surface_mesh_parameterization
+Solver_interface
+