diff --git a/BaseLib/CPUTime.cpp b/BaseLib/CPUTime.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..a442b9b79e1cfa5aceb9bc4ab7656005c754a992
--- /dev/null
+++ b/BaseLib/CPUTime.cpp
@@ -0,0 +1,27 @@
+/*
+ * CPUTime.cpp
+ *
+ *  Created on: May 10, 2012
+ *      Author: TF
+ */
+
+#include "CPUTime.h"
+
+namespace BaseLib {
+
+void CPUTime::start()
+{
+	_start = clock();
+}
+
+void CPUTime::stop()
+{
+	_stop = clock();
+}
+
+double CPUTime::elapsed()
+{
+	return (_stop-_start)/(double)(CLOCKS_PER_SEC);
+}
+
+} // end namespace BaseLib
diff --git a/BaseLib/CPUTime.h b/BaseLib/CPUTime.h
new file mode 100644
index 0000000000000000000000000000000000000000..7198c6d3ec2ac679228a0bbfefe595fa1f23a318
--- /dev/null
+++ b/BaseLib/CPUTime.h
@@ -0,0 +1,32 @@
+/*
+ * CPUTime.h
+ *
+ *  Created on: May 10, 2012
+ *      Author: TF
+ */
+
+#ifndef CPUTIME_H
+#define CPUTIME_H
+
+#include <ctime>
+
+#include "TimeMeasurementBase.h"
+
+namespace BaseLib {
+
+class CPUTime
+{
+public:
+	virtual void start();
+    virtual void stop();
+    virtual double elapsed();
+	~CPUTime() {};
+private:
+	clock_t _start;
+	clock_t _stop;
+};
+
+} // end namespace BaseLib
+
+#endif
+
diff --git a/BaseLib/CPUTimeTimer.cpp b/BaseLib/CPUTimeTimer.cpp
deleted file mode 100644
index ad8377cd9348611c414574d9cf914b08ece7a7ff..0000000000000000000000000000000000000000
--- a/BaseLib/CPUTimeTimer.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "CPUTimeTimer.h"
-
-void CPUTimeTimer::start()
-{
-	_start = clock();
-}
-
-void CPUTimeTimer::stop()
-{
-	_stop = clock();
-}
-
-double CPUTimeTimer::elapsed()
-{
-	return (_stop-_start)/(double)(CLOCKS_PER_SEC);
-}
-
diff --git a/BaseLib/CPUTimeTimer.h b/BaseLib/CPUTimeTimer.h
deleted file mode 100644
index 8b5eb18b6022e395f7b5beda3dadd7472218f734..0000000000000000000000000000000000000000
--- a/BaseLib/CPUTimeTimer.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef CPUTIMETIMER_H
-#define CPUTIMETIMER_H
-
-#include <ctime>
-
-#include "TimeMeasurementBase.h"
-
-class CPUTimeTimer
-{
-public:
-        virtual void start();
-        virtual void stop();
-        virtual double elapsed();
-	~CPUTimeTimer() {};
-private:
-	clock_t _start;
-	clock_t _stop;
-};
-
-#endif
-
diff --git a/BaseLib/DateTools.cpp b/BaseLib/DateTools.cpp
index 4165c7c754f02cdf8a9c210117164c8a7c6467d5..c15b18ebf6c7e9a37c722e6e473e74364a15b53f 100644
--- a/BaseLib/DateTools.cpp
+++ b/BaseLib/DateTools.cpp
@@ -10,6 +10,8 @@
 #include <cmath>
 #include <cstdlib>
 
+namespace BaseLib {
+
 double date2double(int y, int m, int d)
 {
 	if ( (y<1000 || y>9999) || (m<1 || m>12) || (d<1 || d>31) )
@@ -75,3 +77,5 @@ double xmlDate2double(const std::string &s)
 	}
 	return 0;
 }
+
+} // end namespace BaseLib
diff --git a/BaseLib/DateTools.h b/BaseLib/DateTools.h
index 33e965852e5587e61cf3ba4734a59b9ba1c235ee..1427e6ac08ca9fed3e3fc380cffff7e95625cb04 100644
--- a/BaseLib/DateTools.h
+++ b/BaseLib/DateTools.h
@@ -9,6 +9,8 @@
 #include "StringTools.h"
 #include <string>
 
+namespace BaseLib {
+
 /**
  * Converts three integers representing a date into a double.
  * Note: It is not really checked if the date actually makes sense.
@@ -39,4 +41,6 @@ double strDate2double(const std::string &s);
  */
 double xmlDate2double(const std::string &s);
 
+} // namespace BaseLib
+
 #endif //DATETOOLS_H
diff --git a/BaseLib/FileFinder.h b/BaseLib/FileFinder.h
index 41ba7228a00270793b22c2bc2552651b14f6f788..d518839e6789d457e71d42b8528fa84340319840 100644
--- a/BaseLib/FileFinder.h
+++ b/BaseLib/FileFinder.h
@@ -6,6 +6,7 @@
 #ifndef FILEFINDER_H
 #define FILEFINDER_H
 
+namespace BaseLib {
 /**
  * FileFinder stores a list of directories and will return the complete path
  * for a given filename if the corresponding file is found in any of these
@@ -46,9 +47,9 @@ public:
 	};
 
 private:
-
 	std::list<std::string> _directories;
+};
 
+} // end namespace BaseLib
 
-};
 #endif // FILEFINDER_H
diff --git a/BaseLib/FileTools.h b/BaseLib/FileTools.h
index ddf915b32b2c8f2bd759b7de9e8ac8f21270e25e..0b2b428f25119e79fcb5cfdce80af076b2fe1972 100644
--- a/BaseLib/FileTools.h
+++ b/BaseLib/FileTools.h
@@ -11,6 +11,7 @@
 // ** INCLUDES **
 #include <sys/stat.h>
 
+namespace BaseLib {
 /**
  * Returns true if given file exists. From http://www.techbytes.ca/techbyte103.html
  */
@@ -43,4 +44,6 @@ static bool IsFileExisting(std::string strFilename)
 	return(blnReturn);
 }
 
+} // end namespace BaseLib
+
 #endif // FILETOOLS_H
diff --git a/BaseLib/MemWatch.cpp b/BaseLib/MemWatch.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..7d2e6e294fc966f0e16e514281ad7f23099e641e
--- /dev/null
+++ b/BaseLib/MemWatch.cpp
@@ -0,0 +1,69 @@
+/*
+ * MemWatch.cpp
+ *
+ *  Created on: May 7, 2012
+ *      Author: TF
+ */
+
+#include "MemWatch.h"
+
+#ifndef WIN32
+
+namespace BaseLib {
+
+MemWatch::MemWatch ()
+{
+        updateMemUsage ();
+}
+
+unsigned MemWatch::updateMemUsage ()
+{
+        std::string fname ("/proc/");
+        std::stringstream str_pid;
+        str_pid << (unsigned) getpid();
+        fname += str_pid.str();
+        fname += "/statm";
+        unsigned pages;
+
+        std::ifstream in (fname.c_str(), std::ios::in);
+        if (in == NULL) {
+            perror( "open" );
+            return 1;
+        }
+
+        in >> pages;
+        _vmem_size = ((unsigned long) pages) * ((unsigned long) getpagesize());
+        in >> pages;
+        _rmem_size = ((unsigned long) pages) * ((unsigned long) getpagesize());
+        in >> pages;
+        _smem_size = ((unsigned long) pages) * ((unsigned long) getpagesize());
+        in >> pages;
+        _cmem_size = ((unsigned long) pages) * ((unsigned long) getpagesize());
+        in.close ();
+        return 0;
+}
+
+unsigned long MemWatch::getVirtMemUsage ()
+{
+        updateMemUsage ();
+        return _vmem_size;
+}
+
+unsigned long MemWatch::getResMemUsage () {
+        updateMemUsage ();
+        return _rmem_size;
+}
+
+unsigned long MemWatch::getShrMemUsage () {
+        updateMemUsage ();
+        return _smem_size;
+}
+
+unsigned long MemWatch::getCodeMemUsage () {
+        updateMemUsage ();
+        return _cmem_size;
+}
+
+} // end namespace BaseLib
+
+#endif // WIN
diff --git a/BaseLib/MemWatch.h b/BaseLib/MemWatch.h
new file mode 100644
index 0000000000000000000000000000000000000000..2afa771ba80aeb18f1d90af4fd6bbaed78715286
--- /dev/null
+++ b/BaseLib/MemWatch.h
@@ -0,0 +1,42 @@
+/*
+ * MemWatch.h
+ *
+ *  Created on: May 7, 2012
+ *      Author: TF
+ */
+
+#ifndef MEMWATCH_H_
+#define MEMWATCH_H_
+
+#ifndef WIN32
+
+#include <sys/types.h>
+#include <unistd.h>
+#include <iostream>
+#include <fstream>
+#include <string>
+#include <sstream>
+
+namespace BaseLib {
+
+class MemWatch {
+public:
+	MemWatch ();
+	unsigned long getVirtMemUsage ();
+	unsigned long getResMemUsage ();
+	unsigned long getShrMemUsage ();
+	unsigned long getCodeMemUsage ();
+
+private:
+	unsigned updateMemUsage ();
+	unsigned long _vmem_size;
+	unsigned long _rmem_size;
+	unsigned long _smem_size;
+	unsigned long _cmem_size;
+};
+
+}
+
+#endif // not Windows
+
+#endif /* MEMWATCH_H_ */
diff --git a/BaseLib/README.md b/BaseLib/README.md
index 9fdcc0c5ef84387d6e517e0fad03c98e1628e9d8..c4c54ba177ba4e9e9a31151c7de4ed46ad44c6e0 100644
--- a/BaseLib/README.md
+++ b/BaseLib/README.md
@@ -8,8 +8,8 @@ For details how to use logog see the [OGS devguide](http://ufz.github.com/devgui
 
 [logog](http://johnwbyrd.github.com/logog/) is integrated as a [git-subtree](https://github.com/apenwarr/git-subtree) and can be updated with (executed in the sources root):
 
-	git-subtree pull -P Base/logog --squash https://github.com/johnwbyrd/logog.git
+	git-subtree pull -P BaseLib/logog --squash https://github.com/johnwbyrd/logog.git
 
 It was initially integrated with:
 
-	git-subtree add -P Base/logog --squash https://github.com/johnwbyrd/logog.git master
+	git-subtree add -P BaseLib/logog --squash https://github.com/johnwbyrd/logog.git master
diff --git a/BaseLib/RunTimeTimer.cpp b/BaseLib/RunTime.cpp
similarity index 60%
rename from BaseLib/RunTimeTimer.cpp
rename to BaseLib/RunTime.cpp
index 10599073b8edba697a1a749a2a2d8b77aab74078..d9652790f4931792ad57b45322f981718c6f22bb 100644
--- a/BaseLib/RunTimeTimer.cpp
+++ b/BaseLib/RunTime.cpp
@@ -1,6 +1,15 @@
-#include "RunTimeTimer.h"
+/*
+ * RunTime.cpp
+ *
+ *  Created on: May 10, 2012
+ *      Author: TF
+ */
 
-void RunTimeTimer::start()
+#include "RunTime.h"
+
+namespace BaseLib {
+
+void RunTime::start()
 {
 #ifndef _WIN32
 	gettimeofday(&_start, 0);
@@ -9,7 +18,7 @@ void RunTimeTimer::start()
 #endif
 }
 
-void RunTimeTimer::stop()
+void RunTime::stop()
 {
 #ifndef _WIN32
 	gettimeofday(&_stop, 0);
@@ -18,7 +27,7 @@ void RunTimeTimer::stop()
 #endif
 }
 
-double RunTimeTimer::elapsed()
+double RunTime::elapsed()
 {
 #ifndef _WIN32
 	return (_stop.tv_sec + _stop.tv_usec/1000000.0 - (_start.tv_sec + _start.tv_usec/1000000.0));
@@ -26,3 +35,5 @@ double RunTimeTimer::elapsed()
 	return (_stop - _start) / 1000;
 #endif
 }
+
+} // end namespace BaseLib
diff --git a/BaseLib/RunTimeTimer.h b/BaseLib/RunTime.h
similarity index 61%
rename from BaseLib/RunTimeTimer.h
rename to BaseLib/RunTime.h
index ebd7d858d6faf8e9ce3f324bef9aae2893aeb97f..8d282958829256a003e59603e90c977224eaa7ba 100644
--- a/BaseLib/RunTimeTimer.h
+++ b/BaseLib/RunTime.h
@@ -1,5 +1,12 @@
-#ifndef RUNTIMETIMER_H
-#define RUNTIMETIMER_H
+/*
+ * RunTime.h
+ *
+ *  Created on: May 10, 2012
+ *      Author: TF
+ */
+
+#ifndef RUNTIME_H
+#define RUNTIME_H
 
 #include "TimeMeasurementBase.h"
 
@@ -11,13 +18,15 @@
 
 #include "TimeMeasurementBase.h"
 
-class RunTimeTimer : public TimeMeasurementBase
+namespace BaseLib {
+
+class RunTime : public TimeMeasurementBase
 {
 public:
 	virtual void start();
 	virtual void stop();
 	virtual double elapsed();
-	~RunTimeTimer() {};
+	~RunTime() {};
 private:
 #ifndef _WIN32
 	timeval _start;
@@ -28,4 +37,6 @@ private:
 #endif
 };
 
+} // end namespace BaseLib
+
 #endif
diff --git a/BaseLib/TimeMeasurementBase.h b/BaseLib/TimeMeasurementBase.h
index 36c081fe3db1afe184da77f95482b40ba6210d73..6466dd7f31c89bb7740f65d9c65d49bf07981dff 100644
--- a/BaseLib/TimeMeasurementBase.h
+++ b/BaseLib/TimeMeasurementBase.h
@@ -1,7 +1,9 @@
 #ifndef TIMEMEASUREMENT_H
 #define TIMEMEASUREMENT_H
 
-class TimeMeasurementBase 
+namespace BaseLib {
+
+class TimeMeasurementBase
 {
 public:
 	virtual void start () = 0;
@@ -10,5 +12,6 @@ public:
 	virtual ~TimeMeasurementBase () {};
 };
 
-#endif
+} // end namespace BaseLib
 
+#endif
diff --git a/BaseLib/binarySearch.cpp b/BaseLib/binarySearch.cpp
index 7ecd110b79c7dddec320de8e955ca1929a4fec8b..fe924fa339a289485a3fabb6b99f9648d1027632 100644
--- a/BaseLib/binarySearch.cpp
+++ b/BaseLib/binarySearch.cpp
@@ -7,6 +7,8 @@
 
 #include "binarySearch.h"
 
+namespace BaseLib {
+
 size_t searchElement (double const& val, size_t beg, size_t end, const std::vector<double>& array)
 {
 	if (beg >= end) return std::numeric_limits<size_t>::max();
@@ -20,3 +22,5 @@ size_t searchElement (double const& val, size_t beg, size_t end, const std::vect
 	}
 	return searchElement (val, m+1, end, array);
 }
+
+} // end namespace BaseLib
diff --git a/BaseLib/binarySearch.h b/BaseLib/binarySearch.h
index 92148b228a020f1714f71bcf8e21e0ad0b2573eb..039244f3e89ecfe88861bf57864a94ab99aa5b74 100644
--- a/BaseLib/binarySearch.h
+++ b/BaseLib/binarySearch.h
@@ -13,6 +13,8 @@
 #ifndef BINARYSEARCH_H_
 #define BINARYSEARCH_H_
 
+namespace BaseLib {
+
 /**
  * Binary search in a sorted vector of elements to get the
  * id of an element according its key.
@@ -40,4 +42,6 @@ size_t searchElement (const T& key, size_t beg, size_t end, const std::vector<T>
 
 size_t searchElement (double const& val, size_t beg, size_t end, const std::vector<double>& array);
 
+} // end namespace BaseLib
+
 #endif /* BINARYSEARCH_H_ */
diff --git a/BaseLib/quicksort.h b/BaseLib/quicksort.h
index 10a83c098997c732798c4a848291670a7983dcb3..411d9aed1dad8580c30d098a151ea69b7fc4cabb 100644
--- a/BaseLib/quicksort.h
+++ b/BaseLib/quicksort.h
@@ -14,6 +14,8 @@
 // Base
 #include "swap.h"
 
+namespace BaseLib {
+
 template <class T>
 unsigned partition_(T* array, unsigned beg, unsigned end)
 {
@@ -97,9 +99,13 @@ void quicksort(T1* array, size_t beg, size_t end, T2* second_array)
 	}
 }
 
+} // end namespace BaseLib
+
 // STL
 #include <vector>
 
+namespace BaseLib {
+
 template <typename T>
 class Quicksort {
 public:
@@ -219,7 +225,8 @@ private:
 			quicksort(perm, p+1, end, array);
 		}
 	}
-
 };
 
+} // end namespace BaseLib
+
 #endif /* QUICKSORT_H_ */
diff --git a/GeoLib/PointVec.cpp b/GeoLib/PointVec.cpp
index 1b0e588142025a349a454b90ec3f85e4f96e9bc1..fa966cbea6976e5076c574447b42ac2503ea7af0 100644
--- a/GeoLib/PointVec.cpp
+++ b/GeoLib/PointVec.cpp
@@ -156,7 +156,7 @@ void PointVec::makePntsUnique (std::vector<GEOLIB::Point*>* pnt_vec, std::vector
 	}
 
 	// sort the points
-	Quicksort<GEOLIB::Point*> (*pnt_vec, 0, n_pnts_in_file, perm);
+	BaseLib::Quicksort<GEOLIB::Point*> (*pnt_vec, 0, n_pnts_in_file, perm);
 
 	// unfortunately quicksort is not stable -
 	// sort identical points by id - to make sorting stable
@@ -199,7 +199,7 @@ void PointVec::makePntsUnique (std::vector<GEOLIB::Point*>* pnt_vec, std::vector
 	}
 
 	// reverse permutation
-	Quicksort<GEOLIB::Point*> (perm, 0, n_pnts_in_file, *pnt_vec);
+	BaseLib::Quicksort<GEOLIB::Point*> (perm, 0, n_pnts_in_file, *pnt_vec);
 
 	// remove the second, third, ... occurrence from vector
 	for (size_t k(0); k<n_pnts_in_file; k++) {
diff --git a/GeoLib/Polygon.cpp b/GeoLib/Polygon.cpp
index 12721118874f9956cc7c5fb590c3dc289f908938..6fcbcbd6d573d8bd5b6837d8c5ce188328fd3b05 100644
--- a/GeoLib/Polygon.cpp
+++ b/GeoLib/Polygon.cpp
@@ -334,7 +334,7 @@ void Polygon::splitPolygonAtPoint (std::list<GEOLIB::Polygon*>::iterator polygon
 		perm[k] = k;
 	}
 
-	quicksort (id_vec, 0, n, perm);
+	BaseLib::quicksort (id_vec, 0, n, perm);
 
 	for (size_t k(0); k<n-1; k++) {
 		if (id_vec[k] == id_vec[k+1]) {
diff --git a/GeoLib/Station.cpp b/GeoLib/Station.cpp
index 81a67b624b815be342c2307f0f16a84fddb984ff..7736cf477dd6eb7b48ed1aad1801088cca2605d8 100644
--- a/GeoLib/Station.cpp
+++ b/GeoLib/Station.cpp
@@ -308,7 +308,7 @@ StationBorehole* StationBorehole::createStation(const std::string &line)
 			borehole->_date = 0;
 		else
 		{
-			borehole->_date = strDate2double(fields.front());
+			borehole->_date = BaseLib::strDate2double(fields.front());
 			fields.pop_front();
 		}
 	}
@@ -329,7 +329,7 @@ StationBorehole* StationBorehole::createStation(const std::string &name, double
 	(*station)[1]   = y;
 	(*station)[2]   = z;
 	station->_depth = depth;
-	if (date.compare("0000-00-00")) station->_date  = xmlDate2double(date);
+	if (date.compare("0000-00-00")) station->_date  = BaseLib::xmlDate2double(date);
 	return station;
 }
 
diff --git a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/AdjMat.cpp b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/AdjMat.cpp
index bccd00a113af59d4f0d35be45c049170e7d3fc18..d01e2272d1f32595d1840c02c4ea2d4f4ffa1a04 100644
--- a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/AdjMat.cpp
+++ b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/AdjMat.cpp
@@ -55,7 +55,7 @@ AdjMat* AdjMat::getMat(unsigned beg, unsigned end,
 
 	delete[] pos;
 	for (i = 0; i < nsize; ++i)
-		quickSort(jAn, iAn[i], iAn[i + 1]);
+		BaseLib::quickSort(jAn, iAn[i], iAn[i + 1]);
 	return new AdjMat(nsize, iAn, jAn, NULL);
 }
 
diff --git a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.cpp b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.cpp
index 08a18a4bc53ac9354c62fb4fa36bc1dcc77cc147..18093b91dbe70b4f3755d49ec4f56f592c271d5b 100644
--- a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.cpp
+++ b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.cpp
@@ -57,7 +57,7 @@ void CRSMatrixReordered::reorderMatrix(unsigned const*const op_perm, unsigned co
 
 	delete[] pos;
 	for (i = 0; i < size; ++i)
-		quicksort(jAn, static_cast<size_t>(iAn[i]), static_cast<size_t>(iAn[i + 1]), An);
+		BaseLib::quicksort(jAn, static_cast<size_t>(iAn[i]), static_cast<size_t>(iAn[i + 1]), An);
 
 	BaseLib::swap(iAn, _row_ptr);
 	BaseLib::swap(jAn, _col_idx);
diff --git a/SimpleTests/MatrixTests/MatMult.cpp b/SimpleTests/MatrixTests/MatMult.cpp
index 569451bc8ed6c977e8fa3d3f51cbe1c8ddacb711..bd51cd6676da0d74ea7c84fe885423fce47e2e2c 100644
--- a/SimpleTests/MatrixTests/MatMult.cpp
+++ b/SimpleTests/MatrixTests/MatMult.cpp
@@ -7,8 +7,8 @@
 #include "LinAlg/Sparse/CRSMatrix.h"
 #include "LinAlg/Sparse/CRSMatrixOpenMP.h"
 #include "LinAlg/Sparse/CRSMatrixPThreads.h"
-#include "RunTimeTimer.h"
-#include "CPUTimeTimer.h"
+#include "RunTime.h"
+#include "CPUTime.h"
 #include "logog.hpp"
 
 #ifdef _OPENMP
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
 	unsigned *iA(NULL), *jA(NULL), n;
 	if (in) {
 		DBUG("reading matrix from %s ...", fname_mat.c_str());
-		RunTimeTimer timer;
+		BaseLib::RunTime timer;
 		timer.start();
 		CS_read(in, n, iA, jA, A);
 		timer.stop();
@@ -69,8 +69,8 @@ int main(int argc, char *argv[])
 		x[k] = 1.0;
 
 	DBUG("matrix vector multiplication with Toms amuxCRS (%n threads) ...", n_threads);
-	RunTimeTimer run_timer;
-	CPUTimeTimer cpu_timer;
+	BaseLib::RunTime run_timer;
+	BaseLib::CPUTime cpu_timer;
 	run_timer.start();
 	cpu_timer.start();
 	for (size_t k(0); k<n_mults; k++) {
diff --git a/SimpleTests/MatrixTests/MatTestRemoveRowsCols.cpp b/SimpleTests/MatrixTests/MatTestRemoveRowsCols.cpp
index 0526308f936ee34ff8168f40a9592a8d7c795498..446bb7c8bf176a528cb1280a4d49fbe5b3cbf29f 100644
--- a/SimpleTests/MatrixTests/MatTestRemoveRowsCols.cpp
+++ b/SimpleTests/MatrixTests/MatTestRemoveRowsCols.cpp
@@ -8,9 +8,9 @@
 #include <fstream>
 #include <iostream>
 
-// Base
-#include "RunTimeTimer.h"
-#include "CPUTimeTimer.h"
+// BaseLib
+#include "RunTime.h"
+#include "CPUTime.h"
 
 // MathLib
 #include "LinAlg/Sparse/CRSMatrix.h"
@@ -33,7 +33,7 @@ int main(int argc, char *argv[])
 		if (verbose) {
 			std::cout << "reading matrix from " << fname_mat << " ... " << std::flush;
 		}
-		RunTimeTimer timer;
+		BaseLib::RunTime timer;
 		timer.start();
 		CS_read(in, n, iA, jA, A);
 		in.close();
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
 		rows_cols_to_erase[k] = (k+1)*2;
 	}
 
-	RunTimeTimer timer;
+	BaseLib::RunTime timer;
 	std::cout << "erasing " << n_rows_cols_to_erase << " rows and columns ... " << std::flush;
 	timer.start();
 	mat->eraseEntries(n_rows_cols_to_erase, rows_cols_to_erase);
diff --git a/SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp b/SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp
index 1947d62bd2b2db1fcc35b801774720770934e44d..4516c70382905bf945dd84afc36c18637fa5e429 100644
--- a/SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp
+++ b/SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp
@@ -8,8 +8,8 @@
 #include <cstdlib>
 
 // BaseLib
-#include "RunTimeTimer.h"
-#include "CPUTimeTimer.h"
+#include "RunTime.h"
+#include "CPUTime.h"
 
 // MathLib
 #include "sparse.h"
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
 		if (verbose) {
 			std::cout << "reading matrix from " << fname_mat << " ... " << std::flush;
 		}
-		RunTimeTimer timer;
+		BaseLib::RunTime timer;
 		timer.start();
 		CS_read(in, n, iA, jA, A);
 		timer.stop();
@@ -65,8 +65,8 @@ int main(int argc, char *argv[])
 		x[k] = 1.0;
 
 	// create time measurement objects
-	RunTimeTimer run_timer;
-	CPUTimeTimer cpu_timer;
+	BaseLib::RunTime run_timer;
+	BaseLib::CPUTime cpu_timer;
 
 	// calculate the nested dissection reordering
 	if (verbose) {
diff --git a/SimpleTests/MatrixTests/MatVecMultPerm.cpp b/SimpleTests/MatrixTests/MatVecMultPerm.cpp
index 7cd89662751fc0d9b1d27aa62fafb27ec22097ce..5598ea1434908d14663f29b73442201ff77a20a1 100644
--- a/SimpleTests/MatrixTests/MatVecMultPerm.cpp
+++ b/SimpleTests/MatrixTests/MatVecMultPerm.cpp
@@ -8,8 +8,8 @@
 #include <cstdlib>
 
 // BaseLib
-#include "RunTimeTimer.h"
-#include "CPUTimeTimer.h"
+#include "RunTime.h"
+#include "CPUTime.h"
 
 // MathLib
 #include "sparse.h"
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
 		if (verbose) {
 			std::cout << "reading matrix from " << fname_mat << " ... " << std::flush;
 		}
-		RunTimeTimer timer;
+		BaseLib::RunTime timer;
 		timer.start();
 		CS_read(in, n, iA, jA, A);
 		timer.stop();
@@ -67,8 +67,8 @@ int main(int argc, char *argv[])
 		x[k] = 1.0;
 
 	// create time measurement objects
-	RunTimeTimer run_timer;
-	CPUTimeTimer cpu_timer;
+	BaseLib::RunTime run_timer;
+	BaseLib::CPUTime cpu_timer;
 
 	// calculate the nested dissection reordering
 	if (verbose) {
diff --git a/SimpleTests/MeshTests/CMakeLists.txt b/SimpleTests/MeshTests/CMakeLists.txt
index 2a224164947132cbb5a297daec8593a9e6dcb03b..a094ce6623451ef8f47777733d7217389089bc68 100644
--- a/SimpleTests/MeshTests/CMakeLists.txt
+++ b/SimpleTests/MeshTests/CMakeLists.txt
@@ -4,6 +4,7 @@ INCLUDE_DIRECTORIES(
 	${CMAKE_SOURCE_DIR}/BaseLib/
 	${CMAKE_SOURCE_DIR}/BaseLib/logog/include
 	${CMAKE_SOURCE_DIR}/FileIO/
+	${CMAKE_SOURCE_DIR}/GeoLib/
 	${CMAKE_SOURCE_DIR}/MathLib/
 	${CMAKE_SOURCE_DIR}/MeshLib/
 )
diff --git a/SimpleTests/MeshTests/MeshRead.cpp b/SimpleTests/MeshTests/MeshRead.cpp
index b0e683da47a1bca5305e77c5ccd939fa930d5816..e0d0e57f533a0920413eb653185eed48cdbb8648 100644
--- a/SimpleTests/MeshTests/MeshRead.cpp
+++ b/SimpleTests/MeshTests/MeshRead.cpp
@@ -5,16 +5,41 @@
  *      Author: KR
  */
 
+// BaseLib
+#include "MemWatch.h"
+#include "RunTime.h"
+
+// MeshLib
+#include "Node.h"
+#include "Elements/Element.h"
 #include "Mesh.h"
 #include "MeshIO.h"
 
 int main(int argc, char *argv[])
 {
-	std::string file_name("c:/Project/Data/Ammer/Ammer-Homogen100m-Final.msh");
+	std::string file_name("/mnt/visdata/tom/data/TestMeshes/Mesh-dx1.00-Layered20.msh");
+
+	std::cout << "sizeof(double): " << sizeof (double) << std::endl;
+	std::cout << "sizeof(GeoLib::Point): " << sizeof (GEOLIB::Point) << std::endl;
+	std::cout << "sizeof(GeoLib::PointWithID): " << sizeof (GEOLIB::PointWithID) << std::endl;
+	std::cout << "sizeof(Node): " << sizeof (MeshLib::Node) << std::endl;
+	std::cout << "sizeof(Element): " << sizeof (MeshLib::Element) << std::endl;
+
 	//std::string file_name("c:/Project/PlyTestMesh.msh");
 	FileIO::MeshIO mesh_io;
+#ifndef WIN32
+	BaseLib::MemWatch mem_watch;
+	unsigned long mem_without_mesh (mem_watch.getVirtMemUsage());
+	BaseLib::RunTime run_time;
+	run_time.start();
+#endif
 	MeshLib::Mesh* mesh = mesh_io.loadMeshFromFile(file_name);
-
+#ifndef WIN32
+	unsigned long mem_with_mesh (mem_watch.getVirtMemUsage());
+	std::cout << "mem for mesh: " << (mem_with_mesh - mem_without_mesh)/(1024*1024) << " MB" << std::endl;
+	run_time.stop();
+	std::cout << "time for reading: " << run_time.elapsed() << " s" << std::endl;
+#endif
 	delete mesh;
 }
 
diff --git a/SimpleTests/SolverTests/BiCGStabDiagPrecond.cpp b/SimpleTests/SolverTests/BiCGStabDiagPrecond.cpp
index 43cf9cc247f70d2e023cde62af3239f7c495f869..7946ec31de21f25c6f87f9d647299921e4b5c5f3 100644
--- a/SimpleTests/SolverTests/BiCGStabDiagPrecond.cpp
+++ b/SimpleTests/SolverTests/BiCGStabDiagPrecond.cpp
@@ -6,8 +6,8 @@
 #include "LinAlg/Sparse/CRSMatrixDiagPrecond.h"
 #include "sparse.h"
 #include "vector_io.h"
-#include "RunTimeTimer.h"
-#include "CPUTimeTimer.h"
+#include "RunTime.h"
+#include "CPUTime.h"
 
 #ifdef _OPENMP
 #include <omp.h>
@@ -59,8 +59,8 @@ int main(int argc, char *argv[])
 
 	double eps (1.0e-6);
 	unsigned steps (4000);
-	RunTimeTimer run_timer;
-	CPUTimeTimer cpu_timer;
+	BaseLib::RunTime run_timer;
+	BaseLib::CPUTime cpu_timer;
 	run_timer.start();
 	cpu_timer.start();
 
diff --git a/SimpleTests/SolverTests/ConjugateGradientDiagonalPreconditioned.cpp b/SimpleTests/SolverTests/ConjugateGradientDiagonalPreconditioned.cpp
index bfb4333f4593059e946c3c5b4b827feec25b865d..a79fe47c0f0f3de330e0f760d8bc9ae226869c16 100644
--- a/SimpleTests/SolverTests/ConjugateGradientDiagonalPreconditioned.cpp
+++ b/SimpleTests/SolverTests/ConjugateGradientDiagonalPreconditioned.cpp
@@ -6,8 +6,8 @@
 #include "LinAlg/Sparse/CRSMatrixDiagPrecond.h"
 #include "sparse.h"
 #include "vector_io.h"
-#include "RunTimeTimer.h"
-#include "CPUTimeTimer.h"
+#include "RunTime.h"
+#include "CPUTime.h"
 
 #ifdef _OPENMP
 #include <omp.h>
@@ -59,8 +59,8 @@ int main(int argc, char *argv[])
 
 	double eps (1.0e-6);
 	unsigned steps (4000);
-	RunTimeTimer run_timer;
-	CPUTimeTimer cpu_timer;
+	BaseLib::RunTime run_timer;
+	BaseLib::CPUTime cpu_timer;
 	run_timer.start();
 	cpu_timer.start();
 
diff --git a/SimpleTests/SolverTests/GMResDiagPrecond.cpp b/SimpleTests/SolverTests/GMResDiagPrecond.cpp
index 41353a080cec185acc2821e6b6315095d6aa81b4..7062cb20993fb5b10051067cb864ae687de14c9c 100644
--- a/SimpleTests/SolverTests/GMResDiagPrecond.cpp
+++ b/SimpleTests/SolverTests/GMResDiagPrecond.cpp
@@ -11,8 +11,8 @@
 #include "LinAlg/Sparse/CRSMatrixDiagPrecond.h"
 #include "sparse.h"
 #include "vector_io.h"
-#include "RunTimeTimer.h"
-#include "CPUTimeTimer.h"
+#include "RunTime.h"
+#include "CPUTime.h"
 
 int main(int argc, char *argv[])
 {
@@ -56,8 +56,8 @@ int main(int argc, char *argv[])
 
 	double eps(1.0e-6);
 	unsigned steps(4000);
-	RunTimeTimer run_timer;
-	CPUTimeTimer cpu_timer;
+	BaseLib::RunTime run_timer;
+	BaseLib::CPUTime cpu_timer;
 	run_timer.start();
 	cpu_timer.start();