diff --git a/SimpleTests/MatrixTests/CMakeLists.txt b/SimpleTests/MatrixTests/CMakeLists.txt
index 2ac436a683df9cacf07bfe89736c2665d750381a..e31f2b12a3af522e6b2903f47863100c18181914 100644
--- a/SimpleTests/MatrixTests/CMakeLists.txt
+++ b/SimpleTests/MatrixTests/CMakeLists.txt
@@ -21,6 +21,7 @@ ADD_EXECUTABLE( MatMult
         ${SOURCES}
         ${HEADERS}
 )
+SET_TARGET_PROPERTIES(MatMult PROPERTIES FOLDER SimpleTests)
 
 # Create the executable
 ADD_EXECUTABLE( MatTestRemoveRowsCols
@@ -28,6 +29,7 @@ ADD_EXECUTABLE( MatTestRemoveRowsCols
         ${SOURCES}
         ${HEADERS}
 )
+SET_TARGET_PROPERTIES(MatTestRemoveRowsCols PROPERTIES FOLDER SimpleTests)
 
 IF (METIS_FOUND)
 	ADD_EXECUTABLE( MatVecMultPerm
@@ -35,6 +37,7 @@ IF (METIS_FOUND)
 	        ${SOURCES}
         	${HEADERS}
 	)
+	SET_TARGET_PROPERTIES(MatVecMultPerm PROPERTIES FOLDER SimpleTests)
 
 	TARGET_LINK_LIBRARIES ( MatVecMultPerm
 		Base
@@ -48,6 +51,7 @@ IF (METIS_FOUND)
 	        ${SOURCES}
         	${HEADERS}
 	)
+	SET_TARGET_PROPERTIES(MatVecMultNDPermOpenMP PROPERTIES FOLDER SimpleTests)
 
 	TARGET_LINK_LIBRARIES ( MatVecMultNDPermOpenMP
 		Base
diff --git a/SimpleTests/SolverTests/CMakeLists.txt b/SimpleTests/SolverTests/CMakeLists.txt
index 1c5784a7e1aff04e7b6e690be1bbd591541be6a8..ff23854b4b52bab47164a474d0f4aec10b329d46 100644
--- a/SimpleTests/SolverTests/CMakeLists.txt
+++ b/SimpleTests/SolverTests/CMakeLists.txt
@@ -24,24 +24,28 @@ ADD_EXECUTABLE( ConjugateGradientUnpreconditioned
         ${SOURCES}
         ${HEADERS}
 )
+SET_TARGET_PROPERTIES(ConjugateGradientUnpreconditioned PROPERTIES FOLDER SimpleTests)
 
 ADD_EXECUTABLE( ConjugateGradientDiagPrecond
         ConjugateGradientDiagonalPreconditioned.cpp
         ${SOURCES}
         ${HEADERS}
 )
+SET_TARGET_PROPERTIES(ConjugateGradientDiagPrecond PROPERTIES FOLDER SimpleTests)
 
 ADD_EXECUTABLE( BiCGStabDiagPrecond
 	BiCGStabDiagPrecond.cpp
         ${SOURCES}
         ${HEADERS}
 )
+SET_TARGET_PROPERTIES(BiCGStabDiagPrecond PROPERTIES FOLDER SimpleTests)
 
 ADD_EXECUTABLE( GMResDiagPrecond
 	GMResDiagPrecond.cpp
         ${SOURCES}
         ${HEADERS}
 )
+SET_TARGET_PROPERTIES(GMResDiagPrecond PROPERTIES FOLDER SimpleTests)
 
 
 IF (WIN32)
diff --git a/scripts/docs/Doxyfile.in b/scripts/docs/Doxyfile.in
index 7e970d9ebd68a44cf325579f136dd2e798a0d846..12d1b21be842b88ceda0196d4015751d00e1eaa7 100644
--- a/scripts/docs/Doxyfile.in
+++ b/scripts/docs/Doxyfile.in
@@ -575,7 +575,8 @@ WARN_LOGFILE           =
 
 INPUT                  = ${CMAKE_SOURCE_DIR}/Base \
                          ${CMAKE_SOURCE_DIR}/GeoLib \
-                         ${CMAKE_SOURCE_DIR}/MathLib
+                         ${CMAKE_SOURCE_DIR}/MathLib \
+                         ${CMAKE_SOURCE_DIR}/MeshLib
 
 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is