diff --git a/SimpleTests/MatrixTests/DenseGaussEliminationChecker.cpp b/SimpleTests/MatrixTests/DenseGaussEliminationChecker.cpp
index b878c4678fd9c56f415bdc95f7d6fa3c84e909d3..418b1781c5d4346991953eb9808c8f611f5e9960 100644
--- a/SimpleTests/MatrixTests/DenseGaussEliminationChecker.cpp
+++ b/SimpleTests/MatrixTests/DenseGaussEliminationChecker.cpp
@@ -13,18 +13,13 @@
 #include <fstream>
 #include <sstream>
 
-// BaseLib/tclap
-#include "tclap/CmdLine.h"
-// ThirdParty/logog
-#include "logog/include/logog.hpp"
-#include "logog/include/formatter.hpp"
+#include <tclap/CmdLine.h>
+#include <logog/include/logog.hpp>
+#include <logog/include/formatter.hpp>
 
-// BaseLib
-#include "LogogSimpleFormatter.h"
-
-// MathLib
-#include "LinAlg/Dense/DenseMatrix.h"
-#include "LinAlg/Solvers/GaussAlgorithm.h"
+#include "BaseLib/LogogSimpleFormatter.h"
+#include "MathLib/LinAlg/Dense/DenseMatrix.h"
+#include "MathLib/LinAlg/Solvers/GaussAlgorithm.h"
 
 int main(int argc, char *argv[])
 {
diff --git a/SimpleTests/MatrixTests/MatMult.cpp b/SimpleTests/MatrixTests/MatMult.cpp
index 4302e9ac3dced9eae624ef0f626d6b4aacfd16b3..ad0e4a98b54486c70e72da8c43a560240fe606b4 100644
--- a/SimpleTests/MatrixTests/MatMult.cpp
+++ b/SimpleTests/MatrixTests/MatMult.cpp
@@ -17,30 +17,28 @@
 #include <cmath>
 #include <limits>
 #include <cstdlib>
-#include "sparse.h"
-#include "LinAlg/Sparse/CRSMatrix.h"
-#include "LinAlg/Sparse/CRSMatrixOpenMP.h"
-#include "LinAlg/Sparse/CRSMatrixPThreads.h"
-
-// BaseLib
-#include "RunTime.h"
-#include "CPUTime.h"
-// ThirdParty/logog
-#include "logog/include/logog.hpp"
-#include "logog/include/formatter.hpp"
-// BaseLib/tclap
-#include "tclap/CmdLine.h"
 
 #ifdef UNIX
 #include <sys/unistd.h>
 #endif
 
-#include "BaseLib/BuildInfo.h"
-
 #ifdef _OPENMP
 #include <omp.h>
 #endif
 
+#include <logog/include/logog.hpp>
+#include <logog/include/formatter.hpp>
+#include <tclap/CmdLine.h>
+
+#include "BaseLib/BuildInfo.h"
+#include "BaseLib/CPUTime.h"
+#include "BaseLib/RunTime.h"
+
+#include "MathLib/LinAlg/Sparse/CRSMatrix.h"
+#include "MathLib/LinAlg/Sparse/CRSMatrixOpenMP.h"
+#include "MathLib/LinAlg/Sparse/CRSMatrixPThreads.h"
+#include "MathLib/sparse.h"
+
 /**
  * new formatter for logog
  */
diff --git a/SimpleTests/MatrixTests/MatTestRemoveRowsCols.cpp b/SimpleTests/MatrixTests/MatTestRemoveRowsCols.cpp
index c16a3054278b3fe967d51fa1770555d2aef033b1..70be3b72d6ee6a8daa1c89c83cec6e55237e90a3 100644
--- a/SimpleTests/MatrixTests/MatTestRemoveRowsCols.cpp
+++ b/SimpleTests/MatrixTests/MatTestRemoveRowsCols.cpp
@@ -14,12 +14,10 @@
 #include <fstream>
 #include <iostream>
 
-// BaseLib
-#include "RunTime.h"
-#include "CPUTime.h"
+#include "BaseLib/RunTime.h"
+#include "BaseLib/CPUTime.h"
 
-// MathLib
-#include "LinAlg/Sparse/CRSMatrix.h"
+#include "MathLib/LinAlg/Sparse/CRSMatrix.h"
 
 int main(int argc, char *argv[])
 {
diff --git a/SimpleTests/MatrixTests/MatVecMultNDPerm.cpp b/SimpleTests/MatrixTests/MatVecMultNDPerm.cpp
index 1ef4b559b9c9d89c35e62706d894d0372eb751f9..06778898c2f7b80b0eff1a443ac3256ac7aba336 100644
--- a/SimpleTests/MatrixTests/MatVecMultNDPerm.cpp
+++ b/SimpleTests/MatrixTests/MatVecMultNDPerm.cpp
@@ -14,28 +14,23 @@
 
 #include <cstdlib>
 
-#include "BaseLib/BuildInfo.h"
-
 #ifdef UNIX
 #include <sys/unistd.h>
 #endif
 
-// BaseLib
-#include "RunTime.h"
-#include "CPUTime.h"
-// BaseLib/tclap
-#include "tclap/CmdLine.h"
-// ThirdParty/logog
-#include "logog/include/logog.hpp"
-#include "logog/include/formatter.hpp"
-
-// MathLib
-#include "sparse.h"
-
-#include "LinAlg/Sparse/NestedDissectionPermutation/AdjMat.h"
-#include "LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.h"
-#include "LinAlg/Sparse/NestedDissectionPermutation/Cluster.h"
-#include "LinAlg/Sparse/CRSMatrix.h"
+#include <tclap/CmdLine.h>
+#include <logog/include/logog.hpp>
+#include <logog/include/formatter.hpp>
+
+#include "BaseLib/BuildInfo.h"
+#include "BaseLib/RunTime.h"
+#include "BaseLib/CPUTime.h"
+
+#include "MathLib/sparse.h"
+#include "MathLib/LinAlg/Sparse/NestedDissectionPermutation/AdjMat.h"
+#include "MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.h"
+#include "MathLib/LinAlg/Sparse/NestedDissectionPermutation/Cluster.h"
+#include "MathLib/LinAlg/Sparse/CRSMatrix.h"
 
 /**
  * new formatter for logog
diff --git a/SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp b/SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp
index c055003b8e833a8b92378a264c786a75ef511043..01c15993df4f92c212e38aa8f7d9011ffe417d35 100644
--- a/SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp
+++ b/SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp
@@ -14,32 +14,28 @@
 
 #include <cstdlib>
 
-// BaseLib
-#include "RunTime.h"
-#include "CPUTime.h"
-// BaseLib/tclap
-#include "tclap/CmdLine.h"
-// ThirdParty/logog
-#include "logog/include/logog.hpp"
-#include "logog/include/formatter.hpp"
-
-// MathLib
-#include "sparse.h"
-
-#include "LinAlg/Sparse/NestedDissectionPermutation/AdjMat.h"
-#include "LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReorderedOpenMP.h"
-#include "LinAlg/Sparse/NestedDissectionPermutation/Cluster.h"
-
 #ifdef UNIX
 #include <sys/unistd.h>
 #endif
 
-#include "BaseLib/BuildInfo.h"
 
 #ifdef _OPENMP
 #include <omp.h>
 #endif
 
+#include <tclap/CmdLine.h>
+#include <logog/include/logog.hpp>
+#include <logog/include/formatter.hpp>
+
+#include "BaseLib/CPUTime.h"
+#include "BaseLib/RunTime.h"
+
+#include "BaseLib/BuildInfo.h"
+#include "BaseLib/LinAlg/Sparse/NestedDissectionPermutation/AdjMat.h"
+#include "BaseLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReorderedOpenMP.h"
+#include "BaseLib/LinAlg/Sparse/NestedDissectionPermutation/Cluster.h"
+#include "BaseLib/sparse.h"
+
 /**
  * new formatter for logog
  */
diff --git a/SimpleTests/MatrixTests/MatVecMultPthreads.cpp b/SimpleTests/MatrixTests/MatVecMultPthreads.cpp
index 60a183aa349b9aa8682a74c1d4fb42709a5f7783..5a566e7f4c8739dab6d689c28850f7ef15b71e2d 100644
--- a/SimpleTests/MatrixTests/MatVecMultPthreads.cpp
+++ b/SimpleTests/MatrixTests/MatVecMultPthreads.cpp
@@ -14,30 +14,28 @@
 #include <cmath>
 #include <limits>
 #include <cstdlib>
-#include "sparse.h"
-#include "LinAlg/Sparse/CRSMatrix.h"
-#include "LinAlg/Sparse/CRSMatrixOpenMP.h"
-#include "LinAlg/Sparse/CRSMatrixPThreads.h"
-
-// BaseLib
-#include "RunTime.h"
-#include "CPUTime.h"
-// ThirdParty/logog
-#include "logog/include/logog.hpp"
-#include "logog/include/formatter.hpp"
-// BaseLib/tclap
-#include "tclap/CmdLine.h"
 
 #ifdef UNIX
 #include <sys/unistd.h>
 #endif
 
-#include "BaseLib/BuildInfo.h"
-
 #ifdef HAVE_PTHREADS
 #include <pthread.h>
 #endif
 
+#include <logog/include/logog.hpp>
+#include <logog/include/formatter.hpp>
+#include <tclap/CmdLine.h>
+
+#include "MathLib/LinAlg/Sparse/CRSMatrix.h"
+#include "MathLib/LinAlg/Sparse/CRSMatrixOpenMP.h"
+#include "MathLib/LinAlg/Sparse/CRSMatrixPThreads.h"
+#include "MathLib/sparse.h"
+
+#include "BaseLib/BuildInfo.h"
+#include "BaseLib/CPUTime.h"
+#include "BaseLib/RunTime.h"
+
 /**
  * new formatter for logog
  */
diff --git a/SimpleTests/MeshTests/MeshRead.cpp b/SimpleTests/MeshTests/MeshRead.cpp
index 48a80eeb1ee92b483c6e2c51f0ade524108a6611..3cf1017946a9108417797d28af863dbacd5242f6 100644
--- a/SimpleTests/MeshTests/MeshRead.cpp
+++ b/SimpleTests/MeshTests/MeshRead.cpp
@@ -12,24 +12,20 @@
  *
  */
 
-// BaseLib
-#include "MemWatch.h"
-#include "RunTime.h"
-#include "StringTools.h"
-#include "FileTools.h"
-#include "tclap/CmdLine.h"
-#include "LogogSimpleFormatter.h"
+#include <tclap/CmdLine.h>
+#include <logog/include/logog.hpp>
 
-// ThirdParty/logog
-#include "logog/include/logog.hpp"
+#include "BaseLib/LogogSimpleFormatter.h"
+#include "BaseLib/MemWatch.h"
+#include "BaseLib/RunTime.h"
+#include "BaseLib/StringTools.h"
+#include "BaseLib/FileTools.h"
 
-// FileIO
-#include "readMeshFromFile.h"
+#include "FileIO/readMeshFromFile.h"
 
-// MeshLib
 #include "MeshLib/Node.h"
-#include "Elements/Element.h"
-#include "Mesh.h"
+#include "MeshLib/Elements/Element.h"
+#include "MeshLib/Mesh.h"
 
 
 int main(int argc, char *argv[])
diff --git a/SimpleTests/MeshTests/MeshSearchTest.cpp b/SimpleTests/MeshTests/MeshSearchTest.cpp
index ab8878cbbc5f7712db935eacc0e611cbc759f624..30d9904627d5f6283df50b7aeb6f08a483b921ac 100644
--- a/SimpleTests/MeshTests/MeshSearchTest.cpp
+++ b/SimpleTests/MeshTests/MeshSearchTest.cpp
@@ -9,23 +9,20 @@
  *  Created on  Aug 30, 2012 by Thomas Fischer
  */
 
-// BaseLib
-#include "MemWatch.h"
-#include "RunTime.h"
-#include "tclap/CmdLine.h"
-#include "LogogSimpleFormatter.h"
+#include <tclap/CmdLine.h>
+#include <logog/include/logog.hpp>
 
-// ThirdParty/logog
-#include "logog/include/logog.hpp"
+#include "BaseLib/LogogSimpleFormatter.h"
+#include "BaseLib/MemWatch.h"
+#include "BaseLib/RunTime.h"
 
-// GeoLib
-#include "Grid.h"
+#include "FileIO/Legacy/MeshIO.h"
+
+#include "GeoLib/Grid.h"
 
-// MeshLib
 #include "MeshLib/Node.h"
-#include "Elements/Element.h"
-#include "Mesh.h"
-#include "Legacy/MeshIO.h"
+#include "MeshLib/Elements/Element.h"
+#include "MeshLib/Mesh.h"
 
 void testMeshGridAlgorithm(MeshLib::Mesh const*const mesh,
 				std::vector<GeoLib::Point*>& pnts_for_search,
diff --git a/SimpleTests/SolverTests/BiCGStabDiagPrecond.cpp b/SimpleTests/SolverTests/BiCGStabDiagPrecond.cpp
index e50d1678680297ade77b5fbeca5d2fefe888bbd4..85fb6091c8cbe1e11c0cc15a607aa3a7e3b8d348 100644
--- a/SimpleTests/SolverTests/BiCGStabDiagPrecond.cpp
+++ b/SimpleTests/SolverTests/BiCGStabDiagPrecond.cpp
@@ -2,17 +2,19 @@
 #include <iostream>
 #include <cmath>
 #include <cstdlib>
-#include "LinAlg/Solvers/BiCGStab.h"
-#include "LinAlg/Sparse/CRSMatrixDiagPrecond.h"
-#include "sparse.h"
-#include "vector_io.h"
-#include "RunTime.h"
-#include "CPUTime.h"
 
 #ifdef _OPENMP
 #include <omp.h>
 #endif
 
+#include "BaseLib/RunTime.h"
+#include "BaseLib/CPUTime.h"
+
+#include "MathLib/LinAlg/Solvers/BiCGStab.h"
+#include "MathLib/LinAlg/Sparse/CRSMatrixDiagPrecond.h"
+#include "MathLib/sparse.h"
+#include "MathLib/vector_io.h"
+
 int main(int argc, char *argv[])
 {
 	if (argc != 4) {
diff --git a/SimpleTests/SolverTests/ConjugateGradientDiagonalPreconditioned.cpp b/SimpleTests/SolverTests/ConjugateGradientDiagonalPreconditioned.cpp
index e5cb18090d7a8e9e5589dc98db4ee095b2115fc6..70b5c7424c1cefab1e93b1a164ac7c9b831d6032 100644
--- a/SimpleTests/SolverTests/ConjugateGradientDiagonalPreconditioned.cpp
+++ b/SimpleTests/SolverTests/ConjugateGradientDiagonalPreconditioned.cpp
@@ -2,17 +2,19 @@
 #include <iostream>
 #include <cmath>
 #include <cstdlib>
-#include "LinAlg/Solvers/CG.h"
-#include "LinAlg/Sparse/CRSMatrixDiagPrecond.h"
-#include "sparse.h"
-#include "vector_io.h"
-#include "RunTime.h"
-#include "CPUTime.h"
 
 #ifdef _OPENMP
 #include <omp.h>
 #endif
 
+#include "BaseLib/RunTime.h"
+#include "BaseLib/CPUTime.h"
+
+#include "MathLib/LinAlg/Solvers/BiCGStab.h"
+#include "MathLib/LinAlg/Sparse/CRSMatrixDiagPrecond.h"
+#include "MathLib/sparse.h"
+#include "MathLib/vector_io.h"
+
 int main(int argc, char *argv[])
 {
 	if (argc != 4) {
diff --git a/SimpleTests/SolverTests/ConjugateGradientUnpreconditioned.cpp b/SimpleTests/SolverTests/ConjugateGradientUnpreconditioned.cpp
index 7970ddc1af1aa795ada2ce25829cf769ad9fc28f..cdf5f32d9195956ff7a4b51eda6665df98003c30 100644
--- a/SimpleTests/SolverTests/ConjugateGradientUnpreconditioned.cpp
+++ b/SimpleTests/SolverTests/ConjugateGradientUnpreconditioned.cpp
@@ -1,15 +1,15 @@
 #include <fstream>
 #include <iostream>
-#include "LinAlg/Solvers/CG.h"
-#include "LinAlg/Sparse/CRSMatrix.h"
-#include "sparse.h"
-#include "vector_io.h"
-//#include "timeMeasurement.h"
 
 #ifdef _OPENMP
 #include <omp.h>
 #endif
 
+#include "MathLib/LinAlg/Solvers/CG.h"
+#include "MathLib/LinAlg/Sparse/CRSMatrix.h"
+#include "MathLib/sparse.h"
+#include "MathLib/vector_io.h"
+
 int main(int argc, char *argv[])
 {
 	(void) argc;
diff --git a/SimpleTests/SolverTests/GMResDiagPrecond.cpp b/SimpleTests/SolverTests/GMResDiagPrecond.cpp
index 6eee4785cc981d1a7ac6d53b638349789f20bd01..cbbf87956bfb94808165d5e220b87c4906f8de18 100644
--- a/SimpleTests/SolverTests/GMResDiagPrecond.cpp
+++ b/SimpleTests/SolverTests/GMResDiagPrecond.cpp
@@ -14,12 +14,13 @@
 
 #include <iostream>
 #include <cstdlib>
-#include "LinAlg/Solvers/GMRes.h"
-#include "LinAlg/Sparse/CRSMatrixDiagPrecond.h"
-#include "sparse.h"
-#include "vector_io.h"
-#include "RunTime.h"
-#include "CPUTime.h"
+
+#include "BaseLib/CPUTime.h"
+#include "BaseLib/RunTime.h"
+#include "MathLib/LinAlg/Solvers/GMRes.h"
+#include "MathLib/LinAlg/Sparse/CRSMatrixDiagPrecond.h"
+#include "MathLib/sparse.h"
+#include "MathLib/vector_io.h"
 
 int main(int argc, char *argv[])
 {