diff --git a/aarbology2/makefile.conf b/aarbology2/makefile.conf
index 12f14103af27d9614f77487f62f4de1a7b10db90..69645d51e2417e5de1e3a34b553f6126e26058eb 100644
--- a/aarbology2/makefile.conf
+++ b/aarbology2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=aarbology2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/acast2/makefile.conf b/acast2/makefile.conf
index a5098aee34aa9ad0e085a69b9b8eeb19c9ae5f46..87267abda563b05e90a87f7b9e9003d4f7416ce2 100644
--- a/acast2/makefile.conf
+++ b/acast2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=acast2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/acompaction2/makefile.conf b/acompaction2/makefile.conf
index 4c4f770fffd969c421789324482b7388d29d567f..813ae435ef96d4c4454c8a3ee6ba44d2f1067dfd 100644
--- a/acompaction2/makefile.conf
+++ b/acompaction2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=acompaction2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/acompare2/makefile.conf b/acompare2/makefile.conf
index ee0aec454371c0b58807f49c104a3fb695530ee2..e42e6ee1dae8bd3287fccd2c2e95e42b37b9117f 100644
--- a/acompare2/makefile.conf
+++ b/acompare2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=acompare2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/aconversions2/makefile.conf b/aconversions2/makefile.conf
index 50b6fecd277a6151778ac0be73a12ab81914e727..d4df0fe9772b109325f6eb0a44b741aee500d0a0 100644
--- a/aconversions2/makefile.conf
+++ b/aconversions2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=aconversions2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/aconvert2/makefile.conf b/aconvert2/makefile.conf
index 65c384c6732901e9082efc0c85377dea012b2be2..ec8672f9f82c94f01b52bc666a1508578a1d99ee 100644
--- a/aconvert2/makefile.conf
+++ b/aconvert2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=aconvert2
-LINK_PATHS=../alib2str/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2str alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2str/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2str alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2str/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/aderivation2/makefile.conf b/aderivation2/makefile.conf
index b1f0c823f3680c9d8357b656dd9aaf1893be5c17..0b2165f574cb3021b8376b56e4595f66b603e164 100644
--- a/aderivation2/makefile.conf
+++ b/aderivation2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=aderivation2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/adeterminize2/makefile.conf b/adeterminize2/makefile.conf
index b3036edb084bafa85bf9a336060b6fca6203fb61..bd55c47355eb347fc7808fc4ee5c9709be5989da 100644
--- a/adeterminize2/makefile.conf
+++ b/adeterminize2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=adeterminize2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/aecho2/makefile.conf b/aecho2/makefile.conf
index aec2b730f8f60680b3fea1a9a01b69459e7daf6f..ab595c100c0f1b1a9f9380b1977c6863b16b24e1 100644
--- a/aecho2/makefile.conf
+++ b/aecho2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=aecho2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/aepsilon2/makefile.conf b/aepsilon2/makefile.conf
index e2ce7faaf0f009533b46eba0b53d69810b4ab32d..171905ac427a4db709a72ba4876d5fa3ae83c8e4 100644
--- a/aepsilon2/makefile.conf
+++ b/aepsilon2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=aepsilon2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/agenerate2/makefile.conf b/agenerate2/makefile.conf
index 13312db927e35dc664a6d8699a151a0fe35d8a8f..e3b9e66b32af92978cb1aec29c13ab00889eefaf 100644
--- a/agenerate2/makefile.conf
+++ b/agenerate2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=agenerate2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/aintegral2/makefile.conf b/aintegral2/makefile.conf
index adcf20c63021bc8cf1549c3d8b192eb710df239a..d5c0509a40f62566501599b2f53e5900829005ce 100644
--- a/aintegral2/makefile.conf
+++ b/aintegral2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=aintegral2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/alangop2/makefile.conf b/alangop2/makefile.conf
index e7f3a350b988a6eafd7355f87f3408fe5c1c5a9b..144609c1426593c747228f3b72444248d0ac4970 100644
--- a/alangop2/makefile.conf
+++ b/alangop2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=alangop2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/alib2algo/makefile.conf b/alib2algo/makefile.conf
index ad49479344cd45b3cb488d045efa6050325db5f4..ca3e031071740e8d4426ac28204af726fe8fde31 100644
--- a/alib2algo/makefile.conf
+++ b/alib2algo/makefile.conf
@@ -1,5 +1,5 @@
 LIBRARY:=alib2algo
 TESTBIN:=alib2test
-LINK_PATHS=../alib2str/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2str alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2str/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2str/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2str alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2str/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/alib2measure/Doxyfile b/alib2common/Doxyfile
similarity index 100%
rename from alib2measure/Doxyfile
rename to alib2common/Doxyfile
diff --git a/alib2measure/makefile b/alib2common/makefile
similarity index 100%
rename from alib2measure/makefile
rename to alib2common/makefile
diff --git a/alib2common/makefile.conf b/alib2common/makefile.conf
new file mode 100644
index 0000000000000000000000000000000000000000..f297c94352506718392533eea5aa7168b7f09be7
--- /dev/null
+++ b/alib2common/makefile.conf
@@ -0,0 +1,5 @@
+LIBRARY:=alib2common
+TESTBIN:=alib2test
+LINK_PATHS=../alib2std/
+LINK_LIBRARIES=alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/alib2measure/src/allocator/StealthAllocator.hpp b/alib2common/src/allocator/StealthAllocator.hpp
similarity index 100%
rename from alib2measure/src/allocator/StealthAllocator.hpp
rename to alib2common/src/allocator/StealthAllocator.hpp
diff --git a/alib2measure/src/allocator/StealthTypes.cpp b/alib2common/src/allocator/StealthTypes.cpp
similarity index 100%
rename from alib2measure/src/allocator/StealthTypes.cpp
rename to alib2common/src/allocator/StealthTypes.cpp
diff --git a/alib2measure/src/allocator/StealthTypes.hpp b/alib2common/src/allocator/StealthTypes.hpp
similarity index 100%
rename from alib2measure/src/allocator/StealthTypes.hpp
rename to alib2common/src/allocator/StealthTypes.hpp
diff --git a/alib2measure/src/debug/New.cpp b/alib2common/src/debug/New.cpp
similarity index 100%
rename from alib2measure/src/debug/New.cpp
rename to alib2common/src/debug/New.cpp
diff --git a/alib2data/src/debug/sigHandler.cpp b/alib2common/src/debug/sigHandler.cpp
similarity index 100%
rename from alib2data/src/debug/sigHandler.cpp
rename to alib2common/src/debug/sigHandler.cpp
diff --git a/alib2data/src/debug/sigHandler.h b/alib2common/src/debug/sigHandler.h
similarity index 100%
rename from alib2data/src/debug/sigHandler.h
rename to alib2common/src/debug/sigHandler.h
diff --git a/alib2data/src/debug/simpleStacktrace.cpp b/alib2common/src/debug/simpleStacktrace.cpp
similarity index 100%
rename from alib2data/src/debug/simpleStacktrace.cpp
rename to alib2common/src/debug/simpleStacktrace.cpp
diff --git a/alib2data/src/debug/simpleStacktrace.h b/alib2common/src/debug/simpleStacktrace.h
similarity index 100%
rename from alib2data/src/debug/simpleStacktrace.h
rename to alib2common/src/debug/simpleStacktrace.h
diff --git a/alib2common/src/exception/CommonException.cpp b/alib2common/src/exception/CommonException.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..ae52596b477ce6d288aa307041d77293b0b449d7
--- /dev/null
+++ b/alib2common/src/exception/CommonException.cpp
@@ -0,0 +1,71 @@
+/*
+ * CommonException.cpp
+ *
+ * Created on: Apr 1, 2013
+ * Author: Martin Zak
+ */
+
+#include "CommonException.h"
+
+#include <cstdlib>
+#include <iostream>
+#include <stdexcept>
+#include <sstream>
+
+#include <execinfo.h>
+#ifdef DEBUG
+	#include "../debug/simpleStacktrace.h"
+#endif
+
+namespace exception {
+
+CommonException::CommonException ( ) {
+	#ifdef DEBUG
+		this->backtrace = std::simpleStacktrace();
+	#else
+		this->backtrace = "";
+	#endif
+
+	this->whatMessage += this->backtrace;
+}
+
+CommonException::CommonException ( std::string cause ) : CommonException { } {
+	this->whatMessage += this->cause;
+
+	this->cause = std::move(cause);
+}
+
+CommonException::CommonException ( std::string cause, std::string backtrace ) {
+	this->whatMessage += this->backtrace;
+	this->whatMessage += this->cause;
+
+	this->backtrace = std::move(backtrace);
+	this->cause = std::move(cause);
+}
+
+CommonException::~CommonException ( ) noexcept {
+
+}
+
+const char * CommonException::what ( ) const noexcept {
+	return whatMessage.c_str ( );
+}
+
+const std::string & CommonException::getCause ( ) const {
+	return cause;
+}
+
+const std::string & CommonException::getBacktrace ( ) const {
+	return backtrace;
+}
+
+void CommonException::operator>>(std::ostream& os) const {
+	os << this->whatMessage;
+}
+
+CommonException::operator std::string() const {
+	return this->whatMessage;
+}
+
+} /* namespace exception */
+
diff --git a/alib2common/src/exception/CommonException.h b/alib2common/src/exception/CommonException.h
new file mode 100644
index 0000000000000000000000000000000000000000..4f2f56c98c2223acc5606154dc1c5c23fc444091
--- /dev/null
+++ b/alib2common/src/exception/CommonException.h
@@ -0,0 +1,58 @@
+/*
+ * CommonException.h
+ *
+ * Created on: Apr 1, 2013
+ * Author: Martin Zak
+ */
+
+#ifndef COMMON_EXCEPTION_H_
+#define COMMON_EXCEPTION_H_
+
+#include <exception>
+#include <string>
+
+namespace exception {
+
+/**
+ * Basic exception from which are derived all other exceptions.
+ * Contains reason why the exception occured.
+ */
+class CommonException : public std::exception {
+protected:
+	std::string cause;
+	std::string backtrace;
+	std::string whatMessage;
+
+public:
+	explicit CommonException ( );
+
+	explicit CommonException ( std::string cause );
+
+	explicit CommonException ( std::string cause, std::string backtrace );
+
+	virtual ~CommonException ( ) noexcept;
+
+	/**
+	 * @return reason why the exception occured
+	 */
+	const char * what ( ) const noexcept;
+
+	/**
+	 * @return reason why the exception occured
+	 */
+	const std::string & getCause ( ) const;
+
+	/**
+	 * @return reason why the exception occured
+	 */
+	const std::string & getBacktrace ( ) const;
+
+	virtual void operator >>( std::ostream & os ) const;
+
+	virtual explicit operator std::string ( ) const;
+
+};
+
+} /* namespace exception */
+
+#endif /* COMMON_EXCEPTION_H_ */
diff --git a/alib2measure/src/measure b/alib2common/src/measure
similarity index 100%
rename from alib2measure/src/measure
rename to alib2common/src/measure
diff --git a/alib2measure/src/measurements/MeasurementEngine.cpp b/alib2common/src/measurements/MeasurementEngine.cpp
similarity index 100%
rename from alib2measure/src/measurements/MeasurementEngine.cpp
rename to alib2common/src/measurements/MeasurementEngine.cpp
diff --git a/alib2measure/src/measurements/MeasurementEngine.hpp b/alib2common/src/measurements/MeasurementEngine.hpp
similarity index 100%
rename from alib2measure/src/measurements/MeasurementEngine.hpp
rename to alib2common/src/measurements/MeasurementEngine.hpp
diff --git a/alib2measure/src/measurements/MeasurementFrame.cpp b/alib2common/src/measurements/MeasurementFrame.cpp
similarity index 100%
rename from alib2measure/src/measurements/MeasurementFrame.cpp
rename to alib2common/src/measurements/MeasurementFrame.cpp
diff --git a/alib2measure/src/measurements/MeasurementFrame.hpp b/alib2common/src/measurements/MeasurementFrame.hpp
similarity index 97%
rename from alib2measure/src/measurements/MeasurementFrame.hpp
rename to alib2common/src/measurements/MeasurementFrame.hpp
index 02d423dc24dee54d6388626004c3aadcf260a151..a4b1c55bb776febe5151e0ea8ac19fddc09019d1 100644
--- a/alib2measure/src/measurements/MeasurementFrame.hpp
+++ b/alib2common/src/measurements/MeasurementFrame.hpp
@@ -8,7 +8,7 @@
 #include <chrono>
 #include <sstream>
 #include <deque>
-#include "sax/Token.h"
+#include "../sax/Token.h"
 #include "MeasurementTypes.hpp"
 #include "frames/TimeDataFrame.hpp"
 #include "frames/MemoryDataFrame.hpp"
diff --git a/alib2measure/src/measurements/MeasurementNew.cpp b/alib2common/src/measurements/MeasurementNew.cpp
similarity index 100%
rename from alib2measure/src/measurements/MeasurementNew.cpp
rename to alib2common/src/measurements/MeasurementNew.cpp
diff --git a/alib2measure/src/measurements/MeasurementNew.hpp b/alib2common/src/measurements/MeasurementNew.hpp
similarity index 100%
rename from alib2measure/src/measurements/MeasurementNew.hpp
rename to alib2common/src/measurements/MeasurementNew.hpp
diff --git a/alib2measure/src/measurements/MeasurementResults.cpp b/alib2common/src/measurements/MeasurementResults.cpp
similarity index 100%
rename from alib2measure/src/measurements/MeasurementResults.cpp
rename to alib2common/src/measurements/MeasurementResults.cpp
diff --git a/alib2measure/src/measurements/MeasurementResults.hpp b/alib2common/src/measurements/MeasurementResults.hpp
similarity index 96%
rename from alib2measure/src/measurements/MeasurementResults.hpp
rename to alib2common/src/measurements/MeasurementResults.hpp
index 699e1e019b266c9c6855a5ff739b7ec06b256803..964842238291793e17af84d151d4049ec78ad846 100644
--- a/alib2measure/src/measurements/MeasurementResults.hpp
+++ b/alib2common/src/measurements/MeasurementResults.hpp
@@ -6,7 +6,7 @@
 #define MEASUREMENT_RESULTS_HPP_
 
 #include <ostream>
-#include "sax/SaxComposeInterface.h"
+#include "../sax/SaxComposeInterface.h"
 #include "MeasurementTypes.hpp"
 #include "MeasurementFrame.hpp"
 
diff --git a/alib2measure/src/measurements/MeasurementTypes.cpp b/alib2common/src/measurements/MeasurementTypes.cpp
similarity index 100%
rename from alib2measure/src/measurements/MeasurementTypes.cpp
rename to alib2common/src/measurements/MeasurementTypes.cpp
diff --git a/alib2measure/src/measurements/MeasurementTypes.hpp b/alib2common/src/measurements/MeasurementTypes.hpp
similarity index 100%
rename from alib2measure/src/measurements/MeasurementTypes.hpp
rename to alib2common/src/measurements/MeasurementTypes.hpp
diff --git a/alib2measure/src/measurements/frames/CounterDataFrame.cpp b/alib2common/src/measurements/frames/CounterDataFrame.cpp
similarity index 100%
rename from alib2measure/src/measurements/frames/CounterDataFrame.cpp
rename to alib2common/src/measurements/frames/CounterDataFrame.cpp
diff --git a/alib2measure/src/measurements/frames/CounterDataFrame.hpp b/alib2common/src/measurements/frames/CounterDataFrame.hpp
similarity index 97%
rename from alib2measure/src/measurements/frames/CounterDataFrame.hpp
rename to alib2common/src/measurements/frames/CounterDataFrame.hpp
index f2e3bf3b48afc1e24bd3093f0030ffbdd3d351ac..7cd2d10199dc1d95d119d376be9262928c744de0 100644
--- a/alib2measure/src/measurements/frames/CounterDataFrame.hpp
+++ b/alib2common/src/measurements/frames/CounterDataFrame.hpp
@@ -6,7 +6,7 @@
 #define COUNTER_DATA_FRAME_HPP_
 
 #include <deque>
-#include "sax/Token.h"
+#include "../../sax/Token.h"
 #include "../MeasurementTypes.hpp"
 
 namespace measurements {
diff --git a/alib2measure/src/measurements/frames/MemoryDataFrame.cpp b/alib2common/src/measurements/frames/MemoryDataFrame.cpp
similarity index 100%
rename from alib2measure/src/measurements/frames/MemoryDataFrame.cpp
rename to alib2common/src/measurements/frames/MemoryDataFrame.cpp
diff --git a/alib2measure/src/measurements/frames/MemoryDataFrame.hpp b/alib2common/src/measurements/frames/MemoryDataFrame.hpp
similarity index 97%
rename from alib2measure/src/measurements/frames/MemoryDataFrame.hpp
rename to alib2common/src/measurements/frames/MemoryDataFrame.hpp
index 91f45516ae10f42b8aa566117316feea1fd0e00e..d5fb506b5a3bb34371b6fd35e2dbf728068f4d72 100644
--- a/alib2measure/src/measurements/frames/MemoryDataFrame.hpp
+++ b/alib2common/src/measurements/frames/MemoryDataFrame.hpp
@@ -6,7 +6,7 @@
 #define MEMORY_DATA_FRAME_HPP_
 
 #include <deque>
-#include "sax/Token.h"
+#include "../../sax/Token.h"
 #include "../MeasurementTypes.hpp"
 
 namespace measurements {
diff --git a/alib2measure/src/measurements/frames/TimeDataFrame.cpp b/alib2common/src/measurements/frames/TimeDataFrame.cpp
similarity index 100%
rename from alib2measure/src/measurements/frames/TimeDataFrame.cpp
rename to alib2common/src/measurements/frames/TimeDataFrame.cpp
diff --git a/alib2measure/src/measurements/frames/TimeDataFrame.hpp b/alib2common/src/measurements/frames/TimeDataFrame.hpp
similarity index 96%
rename from alib2measure/src/measurements/frames/TimeDataFrame.hpp
rename to alib2common/src/measurements/frames/TimeDataFrame.hpp
index 5213c1a10db490f307e5d1fdc843487d1d7b7c1a..063a8ae1ec913e61a4503b98da5f07ee30c8acbf 100644
--- a/alib2measure/src/measurements/frames/TimeDataFrame.hpp
+++ b/alib2common/src/measurements/frames/TimeDataFrame.hpp
@@ -7,7 +7,7 @@
 
 #include <chrono>
 #include <deque>
-#include "sax/Token.h"
+#include "../../sax/Token.h"
 #include "../MeasurementTypes.hpp"
 
 namespace measurements {
diff --git a/alib2measure/src/measurements/measurements.cpp b/alib2common/src/measurements/measurements.cpp
similarity index 100%
rename from alib2measure/src/measurements/measurements.cpp
rename to alib2common/src/measurements/measurements.cpp
diff --git a/alib2measure/src/measurements/measurements.hpp b/alib2common/src/measurements/measurements.hpp
similarity index 100%
rename from alib2measure/src/measurements/measurements.hpp
rename to alib2common/src/measurements/measurements.hpp
diff --git a/alib2data/src/sax/ComposerException.cpp b/alib2common/src/sax/ComposerException.cpp
similarity index 87%
rename from alib2data/src/sax/ComposerException.cpp
rename to alib2common/src/sax/ComposerException.cpp
index 261a57693cdee70d4ea759510a33e23274cec636..e398ec2cc5e9067341c8af522680194eaebf1fc6 100644
--- a/alib2data/src/sax/ComposerException.cpp
+++ b/alib2common/src/sax/ComposerException.cpp
@@ -15,8 +15,4 @@ ComposerException::ComposerException(const Token& expected, const Token& read) :
 	cause = "Composer Exception: Expected: " + expected.getData() + " Read: " + read.getData();
 }
 
-ComposerException::~ComposerException() noexcept {
-
-}
-
 } /* namespace sax */
diff --git a/alib2data/src/sax/ComposerException.h b/alib2common/src/sax/ComposerException.h
similarity index 78%
rename from alib2data/src/sax/ComposerException.h
rename to alib2common/src/sax/ComposerException.h
index e1ba2c417c88410009f3f355ce396575d06c6ef3..99d0953e7e283319eb0e87d8f1648de894f413a9 100644
--- a/alib2data/src/sax/ComposerException.h
+++ b/alib2common/src/sax/ComposerException.h
@@ -8,7 +8,7 @@
 #ifndef COMPOSER_EXCEPTION_H_
 #define COMPOSER_EXCEPTION_H_
 
-#include "../exception/AlibException.h"
+#include "../exception/CommonException.h"
 #include "Token.h"
 
 namespace sax {
@@ -16,13 +16,12 @@ namespace sax {
 /**
  * Exception thrown by XML parser when is expected different tag than the one which is read.
  */
-class ComposerException: public exception::AlibException {
+class ComposerException: public exception::CommonException {
 protected:
 	Token expected;
 	Token read;
 public:
 	ComposerException(const Token& expected, const Token& read);
-	~ComposerException() noexcept;
 };
 
 } /* namespace sax */
diff --git a/alib2data/src/sax/FromXMLParserHelper.cpp b/alib2common/src/sax/FromXMLParserHelper.cpp
similarity index 100%
rename from alib2data/src/sax/FromXMLParserHelper.cpp
rename to alib2common/src/sax/FromXMLParserHelper.cpp
diff --git a/alib2data/src/sax/FromXMLParserHelper.h b/alib2common/src/sax/FromXMLParserHelper.h
similarity index 100%
rename from alib2data/src/sax/FromXMLParserHelper.h
rename to alib2common/src/sax/FromXMLParserHelper.h
diff --git a/alib2data/src/sax/ParserException.cpp b/alib2common/src/sax/ParserException.cpp
similarity index 87%
rename from alib2data/src/sax/ParserException.cpp
rename to alib2common/src/sax/ParserException.cpp
index f76790197641f7c470c11829d238a3e4a402a31b..c92d6c4a0c5522a32edc8732f28690103f722fbd 100644
--- a/alib2data/src/sax/ParserException.cpp
+++ b/alib2common/src/sax/ParserException.cpp
@@ -15,9 +15,5 @@ ParserException::ParserException(const Token& expected, const Token& read) :
 	cause = "Parser Exception: Expected: " + expected.getData() + " Read: " + read.getData();
 }
 
-ParserException::~ParserException() noexcept {
-
-}
-
 } /* namespace sax */
 
diff --git a/alib2data/src/sax/ParserException.h b/alib2common/src/sax/ParserException.h
similarity index 78%
rename from alib2data/src/sax/ParserException.h
rename to alib2common/src/sax/ParserException.h
index 910d5e94dd46b95660274f2e2ab08cebad41dc33..f8161aba5196031f6b410c95870fd7b15449caa2 100644
--- a/alib2data/src/sax/ParserException.h
+++ b/alib2common/src/sax/ParserException.h
@@ -8,7 +8,7 @@
 #ifndef PARSER_EXCEPTION_H_
 #define PARSER_EXCEPTION_H_
 
-#include "../exception/AlibException.h"
+#include "../exception/CommonException.h"
 #include "Token.h"
 
 namespace sax {
@@ -16,13 +16,12 @@ namespace sax {
 /**
  * Exception thrown by XML parser when is expected different tag than the one which is read.
  */
-class ParserException: public exception::AlibException {
+class ParserException: public exception::CommonException {
 protected:
 	Token expected;
 	Token read;
 public:
 	ParserException(const Token& expected, const Token& read);
-	~ParserException() noexcept;
 };
 
 } /* namespace sax */
diff --git a/alib2data/src/sax/SaxComposeInterface.cpp b/alib2common/src/sax/SaxComposeInterface.cpp
similarity index 100%
rename from alib2data/src/sax/SaxComposeInterface.cpp
rename to alib2common/src/sax/SaxComposeInterface.cpp
diff --git a/alib2data/src/sax/SaxComposeInterface.h b/alib2common/src/sax/SaxComposeInterface.h
similarity index 100%
rename from alib2data/src/sax/SaxComposeInterface.h
rename to alib2common/src/sax/SaxComposeInterface.h
diff --git a/alib2data/src/sax/SaxParseInterface.cpp b/alib2common/src/sax/SaxParseInterface.cpp
similarity index 93%
rename from alib2data/src/sax/SaxParseInterface.cpp
rename to alib2common/src/sax/SaxParseInterface.cpp
index ecd9171937a8a7aed7f073b9700f95f4b004fd29..275a1b7ea851592eae2db7bb4fa1a551e01ecf6c 100644
--- a/alib2data/src/sax/SaxParseInterface.cpp
+++ b/alib2common/src/sax/SaxParseInterface.cpp
@@ -12,7 +12,7 @@
 #include <cstdlib>
 #include <iostream>
 #include <algorithm>
-#include "../exception/AlibException.h"
+#include "../exception/CommonException.h"
 
 namespace sax {
 
@@ -27,7 +27,7 @@ void SaxParseInterface::parseMemory(const std::string& xmlIn, std::deque<Token>&
 	xmlCleanupCharEncodingHandlers();
 
 	if (result != 0) {
-		throw exception::AlibException("Cannot parse the XML file " + xmlIn);
+		throw exception::CommonException("Cannot parse the XML file " + xmlIn);
 	}
 }
 
@@ -39,7 +39,7 @@ void SaxParseInterface::parseFile(const std::string& filename, std::deque<Token>
 	xmlFreeTextReader(reader);
 
 	if (result != 0) {
-		throw exception::AlibException("Cannot parse the XML file " + filename);
+		throw exception::CommonException("Cannot parse the XML file " + filename);
 	}
 }
 
diff --git a/alib2data/src/sax/SaxParseInterface.h b/alib2common/src/sax/SaxParseInterface.h
similarity index 100%
rename from alib2data/src/sax/SaxParseInterface.h
rename to alib2common/src/sax/SaxParseInterface.h
diff --git a/alib2data/src/sax/Token.cpp b/alib2common/src/sax/Token.cpp
similarity index 100%
rename from alib2data/src/sax/Token.cpp
rename to alib2common/src/sax/Token.cpp
diff --git a/alib2data/src/sax/Token.h b/alib2common/src/sax/Token.h
similarity index 100%
rename from alib2data/src/sax/Token.h
rename to alib2common/src/sax/Token.h
diff --git a/alib2measure/test-src/main.cpp b/alib2common/test-src/main.cpp
similarity index 97%
rename from alib2measure/test-src/main.cpp
rename to alib2common/test-src/main.cpp
index f2bf8db94da8d4ee7095ac748957aec1fe8c81c2..fd442ebd124cc1580de43b2e1846e5063fefde68 100644
--- a/alib2measure/test-src/main.cpp
+++ b/alib2common/test-src/main.cpp
@@ -14,7 +14,7 @@
 #include <cppunit/SourceLine.h>
 #include <cppunit/Exception.h>
 
-#include <exception/AlibException.h>
+#include <exception/CommonException.h>
 
 CPPUNIT_NS_BEGIN
 
@@ -148,7 +148,7 @@ int main(int argc, char* argv[]) {
 		xmlOut.write();
 
 		return progressListener.getResult();
-	} catch(const exception::AlibException& exception) {
+	} catch(const exception::CommonException& exception) {
 		std::cerr << exception.getCause() << std::endl;
 		return 1;
 	} catch(const TCLAP::ArgException& exception) {
diff --git a/alib2measure/test-src/measurements/MeasurementsTest.cpp b/alib2common/test-src/measurements/MeasurementsTest.cpp
similarity index 100%
rename from alib2measure/test-src/measurements/MeasurementsTest.cpp
rename to alib2common/test-src/measurements/MeasurementsTest.cpp
diff --git a/alib2measure/test-src/measurements/MeasurementsTest.h b/alib2common/test-src/measurements/MeasurementsTest.h
similarity index 100%
rename from alib2measure/test-src/measurements/MeasurementsTest.h
rename to alib2common/test-src/measurements/MeasurementsTest.h
diff --git a/alib2data/test-src/sax/SaxTest.cpp b/alib2common/test-src/sax/SaxTest.cpp
similarity index 100%
rename from alib2data/test-src/sax/SaxTest.cpp
rename to alib2common/test-src/sax/SaxTest.cpp
diff --git a/alib2data/test-src/sax/SaxTest.h b/alib2common/test-src/sax/SaxTest.h
similarity index 100%
rename from alib2data/test-src/sax/SaxTest.h
rename to alib2common/test-src/sax/SaxTest.h
diff --git a/alib2data/makefile.conf b/alib2data/makefile.conf
index 2468ce4776c2899a5355db107bfbec13e25c0cf1..17c24b551d3842f41f0e453dcb7d3e9f35cbd109 100644
--- a/alib2data/makefile.conf
+++ b/alib2data/makefile.conf
@@ -1,5 +1,5 @@
 LIBRARY:=alib2data
 TESTBIN:=alib2test
-LINK_PATHS=../alib2std/
-LINK_LIBRARIES=alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/alib2data/src/alphabet/BarSymbol.cpp b/alib2data/src/alphabet/BarSymbol.cpp
index c7cbc51166250f5e7366ab2012bf562f71ca9080..b11c1022486f59ff8331c88a3f821e16aaa6ea32 100644
--- a/alib2data/src/alphabet/BarSymbol.cpp
+++ b/alib2data/src/alphabet/BarSymbol.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "BarSymbol.h"
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "Symbol.h"
 #include "../object/Object.h"
 #include "../XmlApi.hpp"
diff --git a/alib2data/src/alphabet/BlankSymbol.cpp b/alib2data/src/alphabet/BlankSymbol.cpp
index 9708fcf943d7718970e4e261df63914da76371c1..436eaca66462e7c0d26631e671ba571c5172c385 100644
--- a/alib2data/src/alphabet/BlankSymbol.cpp
+++ b/alib2data/src/alphabet/BlankSymbol.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "BlankSymbol.h"
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "Symbol.h"
 #include "../object/Object.h"
 #include "../XmlApi.hpp"
diff --git a/alib2data/src/alphabet/BottomOfTheStackSymbol.cpp b/alib2data/src/alphabet/BottomOfTheStackSymbol.cpp
index 62948e5263048ea273eceaad4e5dfd1e0e469ae3..1f2a44f2bb676e38025af9924b87d6eb31a1c089 100644
--- a/alib2data/src/alphabet/BottomOfTheStackSymbol.cpp
+++ b/alib2data/src/alphabet/BottomOfTheStackSymbol.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "BottomOfTheStackSymbol.h"
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "Symbol.h"
 #include "../object/Object.h"
 #include "../XmlApi.hpp"
diff --git a/alib2data/src/alphabet/EndSymbol.cpp b/alib2data/src/alphabet/EndSymbol.cpp
index e0a5328948a89bdfc4ba2c275d9a5c5116582664..3dc1f0334b8bb07dd5428df4a4335c5b7da7ead1 100644
--- a/alib2data/src/alphabet/EndSymbol.cpp
+++ b/alib2data/src/alphabet/EndSymbol.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "EndSymbol.h"
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "Symbol.h"
 #include "../object/Object.h"
 #include "../XmlApi.hpp"
diff --git a/alib2data/src/alphabet/LabeledSymbol.cpp b/alib2data/src/alphabet/LabeledSymbol.cpp
index bbd21316d9fda30fef0bd4e67eb78b06db02cc19..e9431758a7a43bd378802b2c5bd5e10f4a38d9b0 100644
--- a/alib2data/src/alphabet/LabeledSymbol.cpp
+++ b/alib2data/src/alphabet/LabeledSymbol.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "LabeledSymbol.h"
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "Symbol.h"
 #include "../object/Object.h"
 #include "../XmlApi.hpp"
diff --git a/alib2data/src/alphabet/RankedSymbol.cpp b/alib2data/src/alphabet/RankedSymbol.cpp
index c4b66c4bbe15a42932fc49fc61717bcfce590082..c7df8b90189bc4fbd02cf42fbb5157c7cabf29f5 100644
--- a/alib2data/src/alphabet/RankedSymbol.cpp
+++ b/alib2data/src/alphabet/RankedSymbol.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "RankedSymbol.h"
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "Symbol.h"
 #include "../object/Object.h"
 #include "../XmlApi.hpp"
diff --git a/alib2data/src/alphabet/StartSymbol.cpp b/alib2data/src/alphabet/StartSymbol.cpp
index 2ee301be6b921d83bce27963c19a0435921be9dc..497d4109457672fa045fd80646fc3278eee8a9a8 100644
--- a/alib2data/src/alphabet/StartSymbol.cpp
+++ b/alib2data/src/alphabet/StartSymbol.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "StartSymbol.h"
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "Symbol.h"
 #include "../object/Object.h"
 #include "../XmlApi.hpp"
diff --git a/alib2data/src/alphabet/SubtreeWildcardSymbol.cpp b/alib2data/src/alphabet/SubtreeWildcardSymbol.cpp
index d450ef34eecc2f09d119e5015b4a35ee2d343d20..428cc6ca0888caba20a394de53686dca2884a940 100644
--- a/alib2data/src/alphabet/SubtreeWildcardSymbol.cpp
+++ b/alib2data/src/alphabet/SubtreeWildcardSymbol.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "SubtreeWildcardSymbol.h"
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "Symbol.h"
 #include "../object/Object.h"
 #include "../XmlApi.hpp"
diff --git a/alib2data/src/alphabet/SymbolPairSymbol.cpp b/alib2data/src/alphabet/SymbolPairSymbol.cpp
index 74f5afa4ce171b3673ca854842667328141de9b7..772a52da6c46473b1abe9999982bffc37763a2a7 100644
--- a/alib2data/src/alphabet/SymbolPairSymbol.cpp
+++ b/alib2data/src/alphabet/SymbolPairSymbol.cpp
@@ -7,7 +7,7 @@
 
 #include "SymbolPairSymbol.h"
 #include <sstream>
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "Symbol.h"
 #include "../object/Object.h"
 #include "../XmlApi.hpp"
diff --git a/alib2data/src/alphabet/SymbolSetSymbol.cpp b/alib2data/src/alphabet/SymbolSetSymbol.cpp
index f91af83a88392a9ad41737931600002c57ea182a..d1f404f350bcb09f37c238cfd5328e386e7b83d9 100644
--- a/alib2data/src/alphabet/SymbolSetSymbol.cpp
+++ b/alib2data/src/alphabet/SymbolSetSymbol.cpp
@@ -7,7 +7,7 @@
 
 #include "SymbolSetSymbol.h"
 #include <sstream>
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../object/Object.h"
 #include "../XmlApi.hpp"
 #include "UniqueSymbol.h"
diff --git a/alib2data/src/alphabet/UniqueSymbol.cpp b/alib2data/src/alphabet/UniqueSymbol.cpp
index 803b5ef39224ab1b64f20c2491f0f3d9c39e23fd..85f1c2ed4a1bf509a78adf672d5b55fd4d933ebf 100644
--- a/alib2data/src/alphabet/UniqueSymbol.cpp
+++ b/alib2data/src/alphabet/UniqueSymbol.cpp
@@ -7,7 +7,7 @@
 
 #include "UniqueSymbol.h"
 #include <sstream>
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "Symbol.h"
 #include "../object/Object.h"
 #include "../XmlApi.hpp"
diff --git a/alib2data/src/alphabet/VariablesBarSymbol.cpp b/alib2data/src/alphabet/VariablesBarSymbol.cpp
index 316b8de05ec6e08d042f800f24276d5eba175ee4..17df534105ffe0c1d457582a4cd7e30e7f3be2c8 100644
--- a/alib2data/src/alphabet/VariablesBarSymbol.cpp
+++ b/alib2data/src/alphabet/VariablesBarSymbol.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "VariablesBarSymbol.h"
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "Symbol.h"
 #include "../object/Object.h"
 #include "../XmlApi.hpp"
diff --git a/alib2data/src/automaton/FSM/CompactNFA.cpp b/alib2data/src/automaton/FSM/CompactNFA.cpp
index e63f3446c264c260e67bbd31776a3053423c95c5..f282fd6f37896cdcea2c8a5bebb54c419753d203 100644
--- a/alib2data/src/automaton/FSM/CompactNFA.cpp
+++ b/alib2data/src/automaton/FSM/CompactNFA.cpp
@@ -15,7 +15,7 @@
 #include <algorithm>
 #include <sstream>
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/AutomatonFromXMLParser.h"
 #include "../common/AutomatonToXMLComposer.h"
 #include "../Automaton.h"
diff --git a/alib2data/src/automaton/FSM/DFA.cpp b/alib2data/src/automaton/FSM/DFA.cpp
index 02a9b4d4a24bf3656dd3b902cc42c121a487ce20..c3a13a53c35ed45f72ddf22935222aeb60f057c8 100644
--- a/alib2data/src/automaton/FSM/DFA.cpp
+++ b/alib2data/src/automaton/FSM/DFA.cpp
@@ -10,7 +10,7 @@
 #include <ostream>
 #include <sstream>
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/AutomatonFromXMLParser.h"
 #include "../common/AutomatonToXMLComposer.h"
 #include "../Automaton.h"
diff --git a/alib2data/src/automaton/FSM/EpsilonNFA.cpp b/alib2data/src/automaton/FSM/EpsilonNFA.cpp
index bfbc134ec50156bdf35ab6c9f2bf0621e70140de..6161c200f208a2fae0a630bb3cf75d338a96f357 100644
--- a/alib2data/src/automaton/FSM/EpsilonNFA.cpp
+++ b/alib2data/src/automaton/FSM/EpsilonNFA.cpp
@@ -14,7 +14,7 @@
 #include <ostream>
 #include <sstream>
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/AutomatonFromXMLParser.h"
 #include "../common/AutomatonToXMLComposer.h"
 #include "../Automaton.h"
diff --git a/alib2data/src/automaton/FSM/ExtendedNFA.cpp b/alib2data/src/automaton/FSM/ExtendedNFA.cpp
index 6f288c7679b0c2e0bf0d1edd127ae0aaf2eacbcf..bdc232762b4b20f37c31f2377252e6a822dbcfb1 100644
--- a/alib2data/src/automaton/FSM/ExtendedNFA.cpp
+++ b/alib2data/src/automaton/FSM/ExtendedNFA.cpp
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <sstream>
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/AutomatonFromXMLParser.h"
 #include "../common/AutomatonToXMLComposer.h"
 #include "../Automaton.h"
diff --git a/alib2data/src/automaton/FSM/MultiInitialStateNFA.cpp b/alib2data/src/automaton/FSM/MultiInitialStateNFA.cpp
index 3d5f3dbc8bce973a63d5204c88bd63cbc4daedfe..c8f29e846d951aced2152a2f7f0b1a9b5255834e 100644
--- a/alib2data/src/automaton/FSM/MultiInitialStateNFA.cpp
+++ b/alib2data/src/automaton/FSM/MultiInitialStateNFA.cpp
@@ -12,7 +12,7 @@
 #include <ostream>
 #include <sstream>
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/AutomatonFromXMLParser.h"
 #include "../common/AutomatonToXMLComposer.h"
 #include "../Automaton.h"
diff --git a/alib2data/src/automaton/FSM/NFA.cpp b/alib2data/src/automaton/FSM/NFA.cpp
index 4e3f306216b232cf56597d2744600fd1d7891861..3d938927fdd050890efc52cf116cbe55a8309f58 100644
--- a/alib2data/src/automaton/FSM/NFA.cpp
+++ b/alib2data/src/automaton/FSM/NFA.cpp
@@ -10,7 +10,7 @@
 #include <ostream>
 #include <sstream>
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/AutomatonFromXMLParser.h"
 #include "../common/AutomatonToXMLComposer.h"
 #include "../Automaton.h"
diff --git a/alib2data/src/automaton/PDA/DPDA.cpp b/alib2data/src/automaton/PDA/DPDA.cpp
index 5be65402785b7a85da08e75df37badfa6c62085f..e2f2b614315292ddfe024e390b39d73aa39aeed9 100644
--- a/alib2data/src/automaton/PDA/DPDA.cpp
+++ b/alib2data/src/automaton/PDA/DPDA.cpp
@@ -10,7 +10,7 @@
 #include <algorithm>
 #include <sstream>
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/AutomatonFromXMLParser.h"
 #include "../common/AutomatonToXMLComposer.h"
 #include "../Automaton.h"
diff --git a/alib2data/src/automaton/PDA/InputDrivenDPDA.cpp b/alib2data/src/automaton/PDA/InputDrivenDPDA.cpp
index 6c9346b58ce9881b2900de1d468ae5ae4b5680b0..92f5f06c97efa96b419726e4a8b8ac82db57dfc0 100644
--- a/alib2data/src/automaton/PDA/InputDrivenDPDA.cpp
+++ b/alib2data/src/automaton/PDA/InputDrivenDPDA.cpp
@@ -11,7 +11,7 @@
 #include <sstream>
 #include <algorithm>
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/AutomatonFromXMLParser.h"
 #include "../common/AutomatonToXMLComposer.h"
 #include "../Automaton.h"
diff --git a/alib2data/src/automaton/PDA/InputDrivenNPDA.cpp b/alib2data/src/automaton/PDA/InputDrivenNPDA.cpp
index 46aa618fcd17402f405b206f39d5eeb140a2900c..0465db8582e50e92271962d30cfd65bfa6567a70 100644
--- a/alib2data/src/automaton/PDA/InputDrivenNPDA.cpp
+++ b/alib2data/src/automaton/PDA/InputDrivenNPDA.cpp
@@ -11,7 +11,7 @@
 #include <sstream>
 #include <algorithm>
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/AutomatonFromXMLParser.h"
 #include "../common/AutomatonToXMLComposer.h"
 #include "../Automaton.h"
diff --git a/alib2data/src/automaton/PDA/NPDA.cpp b/alib2data/src/automaton/PDA/NPDA.cpp
index a45429716adc845828e03e0390627a1fb64bdccc..461e7cf24bbce7aa76bb72de300f60b23ecce550 100644
--- a/alib2data/src/automaton/PDA/NPDA.cpp
+++ b/alib2data/src/automaton/PDA/NPDA.cpp
@@ -10,7 +10,7 @@
 #include <algorithm>
 #include <sstream>
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/AutomatonFromXMLParser.h"
 #include "../common/AutomatonToXMLComposer.h"
 #include "../Automaton.h"
diff --git a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp
index 2503f2796119a7fe106a5a6a796c9f49d1bc58e6..837bb436f97ae44465d90891c681899afcaa1704 100644
--- a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp
+++ b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicDPDA.cpp
@@ -10,7 +10,7 @@
 #include <algorithm>
 #include <sstream>
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/AutomatonFromXMLParser.h"
 #include "../common/AutomatonToXMLComposer.h"
 #include "../Automaton.h"
diff --git a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp
index 26408d1b69292493c4313d114c0bbccf404853b2..827fb806afe5ff1b12e479c17ce91e5e718c9a33 100644
--- a/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp
+++ b/alib2data/src/automaton/PDA/RealTimeHeightDeterministicNPDA.cpp
@@ -10,7 +10,7 @@
 #include <algorithm>
 #include <sstream>
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/AutomatonFromXMLParser.h"
 #include "../common/AutomatonToXMLComposer.h"
 #include "../Automaton.h"
diff --git a/alib2data/src/automaton/PDA/SinglePopDPDA.cpp b/alib2data/src/automaton/PDA/SinglePopDPDA.cpp
index 16aab1713e60e12fb65c38e8546385dfbca298d3..d803e7992ace31c52e0a5f4d058f0080552f5ec0 100644
--- a/alib2data/src/automaton/PDA/SinglePopDPDA.cpp
+++ b/alib2data/src/automaton/PDA/SinglePopDPDA.cpp
@@ -11,7 +11,7 @@
 #include <sstream>
 #include <ostream>
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/AutomatonFromXMLParser.h"
 #include "../common/AutomatonToXMLComposer.h"
 #include "../Automaton.h"
diff --git a/alib2data/src/automaton/PDA/SinglePopNPDA.cpp b/alib2data/src/automaton/PDA/SinglePopNPDA.cpp
index 2d289bdbd5291a5b6abbf9626faa9f59f6603397..4cbb5b9dc5e48bdc33fdf5aa9f310ef35e04ecb2 100644
--- a/alib2data/src/automaton/PDA/SinglePopNPDA.cpp
+++ b/alib2data/src/automaton/PDA/SinglePopNPDA.cpp
@@ -10,7 +10,7 @@
 #include <algorithm>
 #include <sstream>
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/AutomatonFromXMLParser.h"
 #include "../common/AutomatonToXMLComposer.h"
 #include "../Automaton.h"
diff --git a/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp b/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp
index 1fcc5959f4d2c939d4b4efc8a4a1aaf5e9c1e624..bb54c8ddcfb6c869dbea5fceee1edfc28841c0ae 100644
--- a/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp
+++ b/alib2data/src/automaton/PDA/VisiblyPushdownDPDA.cpp
@@ -10,7 +10,7 @@
 #include <algorithm>
 #include <sstream>
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/AutomatonFromXMLParser.h"
 #include "../common/AutomatonToXMLComposer.h"
 #include "../Automaton.h"
diff --git a/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp b/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp
index 88a149a5fc2fd3bf6fd32a01e637571dee6b3a46..e3ecf53f8efb610555a4539eae76646f243bd47f 100644
--- a/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp
+++ b/alib2data/src/automaton/PDA/VisiblyPushdownNPDA.cpp
@@ -10,7 +10,7 @@
 #include <algorithm>
 #include <sstream>
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/AutomatonFromXMLParser.h"
 #include "../common/AutomatonToXMLComposer.h"
 #include "../Automaton.h"
diff --git a/alib2data/src/automaton/TA/DFTA.cpp b/alib2data/src/automaton/TA/DFTA.cpp
index 064f80036f27e916ea558f4c1ed09ae44cd19b7e..b019786bb72722cb4e454c170f077f78eb914d54 100644
--- a/alib2data/src/automaton/TA/DFTA.cpp
+++ b/alib2data/src/automaton/TA/DFTA.cpp
@@ -10,7 +10,7 @@
 #include <ostream>
 #include <sstream>
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/AutomatonFromXMLParser.h"
 #include "../common/AutomatonToXMLComposer.h"
 #include "../Automaton.h"
diff --git a/alib2data/src/automaton/TA/NFTA.cpp b/alib2data/src/automaton/TA/NFTA.cpp
index d53a607efec5f6e32222b760d07aa5acf435c0b0..c7f480fcc055cd20e1920a24abb0e0f7f8a7e59e 100644
--- a/alib2data/src/automaton/TA/NFTA.cpp
+++ b/alib2data/src/automaton/TA/NFTA.cpp
@@ -10,7 +10,7 @@
 #include <ostream>
 #include <sstream>
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/AutomatonFromXMLParser.h"
 #include "../common/AutomatonToXMLComposer.h"
 #include "../Automaton.h"
diff --git a/alib2data/src/automaton/TM/OneTapeDTM.cpp b/alib2data/src/automaton/TM/OneTapeDTM.cpp
index e22ac1e320d2c11c48df1ac067dc1b56ced08311..84a3d20e2f91ad5c4b67e58aa5f70c8e354bf6d8 100644
--- a/alib2data/src/automaton/TM/OneTapeDTM.cpp
+++ b/alib2data/src/automaton/TM/OneTapeDTM.cpp
@@ -9,7 +9,7 @@
 #include "../AutomatonException.h"
 #include <sstream>
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/AutomatonFromXMLParser.h"
 #include "../common/AutomatonToXMLComposer.h"
 #include "../Automaton.h"
diff --git a/alib2data/src/automaton/common/AutomatonFromXMLParser.cpp b/alib2data/src/automaton/common/AutomatonFromXMLParser.cpp
index dfb07428eb6157bdf9b3080f44eb04cfbb728e69..3718cf983572ab0885568740ca8ab510278a74e3 100644
--- a/alib2data/src/automaton/common/AutomatonFromXMLParser.cpp
+++ b/alib2data/src/automaton/common/AutomatonFromXMLParser.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "AutomatonFromXMLParser.h"
-#include "../../sax/ParserException.h"
+#include <sax/ParserException.h>
 #include "../../XmlApi.hpp"
 #include "../../alphabet/RankedSymbol.h"
 #include "Shift.h"
diff --git a/alib2data/src/automaton/common/AutomatonFromXMLParser.h b/alib2data/src/automaton/common/AutomatonFromXMLParser.h
index d7aa71f74a9b0df27122b6fb527ed39738263aa8..ff8621b240a35f3a8c8f5a636949574c8331973c 100644
--- a/alib2data/src/automaton/common/AutomatonFromXMLParser.h
+++ b/alib2data/src/automaton/common/AutomatonFromXMLParser.h
@@ -8,7 +8,7 @@
 #ifndef AUTOMATON_FROM_XML_PARSER_H_
 #define AUTOMATON_FROM_XML_PARSER_H_
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include <set>
 #include <vector>
 #include <variant>
diff --git a/alib2data/src/automaton/common/AutomatonToXMLComposer.h b/alib2data/src/automaton/common/AutomatonToXMLComposer.h
index 94918ba15121365e8215ca61d3edfcf156284ba3..cdc8a5e94a04295ad259bbdc5d39ab7a4007cb45 100644
--- a/alib2data/src/automaton/common/AutomatonToXMLComposer.h
+++ b/alib2data/src/automaton/common/AutomatonToXMLComposer.h
@@ -18,7 +18,7 @@
 #include "../../regexp/RegExpFeatures.h"
 #include "../../alphabet/SymbolFeatures.h"
 #include "../../string/StringFeatures.h"
-#include "../../sax/Token.h"
+#include <sax/Token.h>
 
 namespace automaton {
 
diff --git a/alib2data/src/exception/AlibException.cpp b/alib2data/src/exception/AlibException.cpp
index 4ff4afc4eb35fc3535b626ea648f09577f31afc4..491c8586bc55439b0719a65fae08ee8943444feb 100644
--- a/alib2data/src/exception/AlibException.cpp
+++ b/alib2data/src/exception/AlibException.cpp
@@ -13,24 +13,14 @@
 #include <sstream>
 
 #include <execinfo.h>
-#ifdef DEBUG
-	#include "../debug/simpleStacktrace.h"
-#endif
 
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../object/Object.h"
 #include "../XmlApi.hpp"
 
 namespace exception {
 
 AlibException::AlibException ( ) {
-	#ifdef DEBUG
-		this->backtrace = std::simpleStacktrace();
-	#else
-		this->backtrace = "";
-	#endif
-
-	this->whatMessage += this->backtrace;
 }
 
 AlibException::AlibException ( std::string cause ) : AlibException { } {
@@ -47,10 +37,6 @@ AlibException::AlibException ( std::string cause, std::string backtrace ) {
 	this->cause = std::move(cause);
 }
 
-AlibException::~AlibException ( ) noexcept {
-
-}
-
 alib::ObjectBase* AlibException::clone() const {
 	return new AlibException(*this);
 }
@@ -59,18 +45,6 @@ alib::ObjectBase* AlibException::plunder() && {
 	return new AlibException(std::move(*this));
 }
 
-const char * AlibException::what ( ) const noexcept {
-	return whatMessage.c_str ( );
-}
-
-const std::string & AlibException::getCause ( ) const {
-	return cause;
-}
-
-const std::string & AlibException::getBacktrace ( ) const {
-	return backtrace;
-}
-
 int AlibException::compare(const AlibException& other) const {
 	return this->whatMessage.compare(other.whatMessage);
 }
diff --git a/alib2data/src/exception/AlibException.h b/alib2data/src/exception/AlibException.h
index 5108379c2236598bd4ce497754122e143780bda6..85609cdc1f3df12fc19624f60ae954359c82e64c 100644
--- a/alib2data/src/exception/AlibException.h
+++ b/alib2data/src/exception/AlibException.h
@@ -8,10 +8,9 @@
 #ifndef ALIB_EXCEPTION_H_
 #define ALIB_EXCEPTION_H_
 
-#include <exception>
-#include <string>
+#include <exception/CommonException.h>
 #include <deque>
-#include "../sax/Token.h"
+#include <sax/Token.h>
 
 #include "../object/ObjectBase.h"
 
@@ -21,12 +20,7 @@ namespace exception {
  * Basic exception from which are derived all other exceptions.
  * Contains reason why the exception occured.
  */
-class AlibException : public std::exception, public alib::ObjectBase {
-protected:
-	std::string cause;
-	std::string backtrace;
-	std::string whatMessage;
-
+class AlibException : public exception::CommonException, public alib::ObjectBase {
 public:
 	explicit AlibException ( );
 
@@ -34,27 +28,10 @@ public:
 
 	explicit AlibException ( std::string cause, std::string backtrace );
 
-	virtual ~AlibException ( ) noexcept;
-
 	virtual alib::ObjectBase * clone ( ) const;
 
 	virtual alib::ObjectBase * plunder ( ) &&;
 
-	/**
-	 * @return reason why the exception occured
-	 */
-	const char * what ( ) const noexcept;
-
-	/**
-	 * @return reason why the exception occured
-	 */
-	const std::string & getCause ( ) const;
-
-	/**
-	 * @return reason why the exception occured
-	 */
-	const std::string & getBacktrace ( ) const;
-
 	virtual int compare ( const ObjectBase & other ) const {
 		if ( std::type_index ( typeid ( * this ) ) == std::type_index ( typeid ( other ) ) ) return this->compare ( ( decltype ( * this ) )other );
 
diff --git a/alib2data/src/factory/XmlDataFactory.hpp b/alib2data/src/factory/XmlDataFactory.hpp
index 620f368608c0685b20d3877b2805ed371b108fdc..0ee03d01343514fd0eb546d250d33db0d7d0d660 100644
--- a/alib2data/src/factory/XmlDataFactory.hpp
+++ b/alib2data/src/factory/XmlDataFactory.hpp
@@ -11,9 +11,9 @@
 #include <string>
 #include <deque>
 
-#include "../sax/Token.h"
-#include "../sax/SaxParseInterface.h"
-#include "../sax/SaxComposeInterface.h"
+#include <sax/Token.h>
+#include <sax/SaxParseInterface.h>
+#include <sax/SaxComposeInterface.h>
 #include "../XmlApi.hpp"
 #include "../exception/AlibException.h"
 
diff --git a/alib2data/src/grammar/ContextFree/CFG.cpp b/alib2data/src/grammar/ContextFree/CFG.cpp
index 3e14be13e0e1838f69dac10973bf2fd0715f8eb3..3b2bcee195940920112101a865f7c1741318389b 100644
--- a/alib2data/src/grammar/ContextFree/CFG.cpp
+++ b/alib2data/src/grammar/ContextFree/CFG.cpp
@@ -12,7 +12,7 @@
 
 #include "../../alphabet/Symbol.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/GrammarFromXMLParser.h"
 #include "../common/GrammarToXMLComposer.h"
 #include "../Grammar.h"
diff --git a/alib2data/src/grammar/ContextFree/CNF.cpp b/alib2data/src/grammar/ContextFree/CNF.cpp
index 75da5e741ebf1c22ff79752e73f4544ec13c3f77..763425b888a722497eb859d0dd6d1a6e868c5258 100644
--- a/alib2data/src/grammar/ContextFree/CNF.cpp
+++ b/alib2data/src/grammar/ContextFree/CNF.cpp
@@ -12,7 +12,7 @@
 
 #include "../../alphabet/Symbol.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/GrammarFromXMLParser.h"
 #include "../common/GrammarToXMLComposer.h"
 #include "../Grammar.h"
diff --git a/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp b/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp
index 6b2c7c5770f98da81008a96d30a853d386d7e8f1..979e8b72d476e47a76714e4a6236a8cceb27348f 100644
--- a/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp
+++ b/alib2data/src/grammar/ContextFree/EpsilonFreeCFG.cpp
@@ -12,7 +12,7 @@
 
 #include "../../alphabet/Symbol.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/GrammarFromXMLParser.h"
 #include "../common/GrammarToXMLComposer.h"
 #include "../Grammar.h"
diff --git a/alib2data/src/grammar/ContextFree/GNF.cpp b/alib2data/src/grammar/ContextFree/GNF.cpp
index 98305f39f9f8f095fe303edee24be2a59584f3cf..3e819629dca86a9ee42e4c83b68bb46c3d3b9fdc 100644
--- a/alib2data/src/grammar/ContextFree/GNF.cpp
+++ b/alib2data/src/grammar/ContextFree/GNF.cpp
@@ -12,7 +12,7 @@
 
 #include "../../alphabet/Symbol.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/GrammarFromXMLParser.h"
 #include "../common/GrammarToXMLComposer.h"
 #include "../Grammar.h"
diff --git a/alib2data/src/grammar/ContextFree/LG.cpp b/alib2data/src/grammar/ContextFree/LG.cpp
index 36ef1bbdd6808789b7f7c08ee2ab63fdf58a839b..c8db64a1ec79cee56aeb46d6cce3c3dd0e0072df 100644
--- a/alib2data/src/grammar/ContextFree/LG.cpp
+++ b/alib2data/src/grammar/ContextFree/LG.cpp
@@ -12,7 +12,7 @@
 
 #include "../../alphabet/Symbol.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/GrammarFromXMLParser.h"
 #include "../common/GrammarToXMLComposer.h"
 #include "../Grammar.h"
diff --git a/alib2data/src/grammar/ContextSensitive/CSG.cpp b/alib2data/src/grammar/ContextSensitive/CSG.cpp
index 222aac1d2db53816be03341b83947a236abfb990..ccf68cb7ecaf497a9d0116a8c825bcd1acc72b8f 100644
--- a/alib2data/src/grammar/ContextSensitive/CSG.cpp
+++ b/alib2data/src/grammar/ContextSensitive/CSG.cpp
@@ -12,7 +12,7 @@
 
 #include "../../alphabet/Symbol.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/GrammarFromXMLParser.h"
 #include "../common/GrammarToXMLComposer.h"
 #include "../Grammar.h"
diff --git a/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp b/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp
index 36e6ce0f5a0fec7ee8bdf44fd96d60ba5b157afc..4b101a905bfba560c75236cc36eaf9c84dd73209 100644
--- a/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp
+++ b/alib2data/src/grammar/ContextSensitive/NonContractingGrammar.cpp
@@ -12,7 +12,7 @@
 
 #include "../../alphabet/Symbol.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/GrammarFromXMLParser.h"
 #include "../common/GrammarToXMLComposer.h"
 #include "../Grammar.h"
diff --git a/alib2data/src/grammar/Regular/LeftLG.cpp b/alib2data/src/grammar/Regular/LeftLG.cpp
index 6bf22316acdfe54afd275369e90f064bc2a376a1..4e2225df04bc32a17ac3bc51fb7f36f5ca95782d 100644
--- a/alib2data/src/grammar/Regular/LeftLG.cpp
+++ b/alib2data/src/grammar/Regular/LeftLG.cpp
@@ -12,7 +12,7 @@
 
 #include "../../alphabet/Symbol.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/GrammarFromXMLParser.h"
 #include "../common/GrammarToXMLComposer.h"
 #include "../Grammar.h"
diff --git a/alib2data/src/grammar/Regular/LeftRG.cpp b/alib2data/src/grammar/Regular/LeftRG.cpp
index 8940e5055400af2e801f8a030911cd8b348a4dfb..5c4736934f629794d2bc54696495b11b873e1fac 100644
--- a/alib2data/src/grammar/Regular/LeftRG.cpp
+++ b/alib2data/src/grammar/Regular/LeftRG.cpp
@@ -12,7 +12,7 @@
 
 #include "../../alphabet/Symbol.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/GrammarFromXMLParser.h"
 #include "../common/GrammarToXMLComposer.h"
 #include "../Grammar.h"
diff --git a/alib2data/src/grammar/Regular/RightLG.cpp b/alib2data/src/grammar/Regular/RightLG.cpp
index cb28fd035e26b36f98047e27cf6be29a36e120e2..6dbac5ca0c3a3497aa199802cff02c265db07d59 100644
--- a/alib2data/src/grammar/Regular/RightLG.cpp
+++ b/alib2data/src/grammar/Regular/RightLG.cpp
@@ -12,7 +12,7 @@
 
 #include "../../alphabet/Symbol.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/GrammarFromXMLParser.h"
 #include "../common/GrammarToXMLComposer.h"
 #include "../Grammar.h"
diff --git a/alib2data/src/grammar/Regular/RightRG.cpp b/alib2data/src/grammar/Regular/RightRG.cpp
index 5c52d38184f0b31cd003e320494b1460bca29bf7..9a41042529c7c9639b046d1e1ebdcac6e669d0f7 100644
--- a/alib2data/src/grammar/Regular/RightRG.cpp
+++ b/alib2data/src/grammar/Regular/RightRG.cpp
@@ -12,7 +12,7 @@
 
 #include "../../alphabet/Symbol.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/GrammarFromXMLParser.h"
 #include "../common/GrammarToXMLComposer.h"
 #include "../Grammar.h"
diff --git a/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp b/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp
index 1b181e04f273022e5c9e750ea4f71f210850715c..fe6872e04ba3a4ced251f4ca507afdfa659175c6 100644
--- a/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp
+++ b/alib2data/src/grammar/Unrestricted/ContextPreservingUnrestrictedGrammar.cpp
@@ -12,7 +12,7 @@
 
 #include "../../alphabet/Symbol.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/GrammarFromXMLParser.h"
 #include "../common/GrammarToXMLComposer.h"
 #include "../Grammar.h"
diff --git a/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp b/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp
index d765dc27677b49cf51052c314ffd0f933c79711e..4df2ccf63854cbfbfbac4a95a1bf40fd2ce3f24b 100644
--- a/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp
+++ b/alib2data/src/grammar/Unrestricted/UnrestrictedGrammar.cpp
@@ -12,7 +12,7 @@
 
 #include "../../alphabet/Symbol.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/GrammarFromXMLParser.h"
 #include "../common/GrammarToXMLComposer.h"
 #include "../Grammar.h"
diff --git a/alib2data/src/grammar/common/GrammarFromXMLParser.cpp b/alib2data/src/grammar/common/GrammarFromXMLParser.cpp
index ed35bb468cccc501fbe4c8869c49d6d0248974fb..75b8ca67f4662b694de62413f8546ac962a0f4db 100644
--- a/alib2data/src/grammar/common/GrammarFromXMLParser.cpp
+++ b/alib2data/src/grammar/common/GrammarFromXMLParser.cpp
@@ -7,7 +7,7 @@
 
 #include "GrammarFromXMLParser.h"
 #include "../../XmlApi.hpp"
-#include "../../sax/ParserException.h"
+#include <sax/ParserException.h>
 #include "../../alphabet/Symbol.h"
 
 namespace grammar {
diff --git a/alib2data/src/grammar/common/GrammarFromXMLParser.h b/alib2data/src/grammar/common/GrammarFromXMLParser.h
index baf5b0e7d7f49b8520d8e94e2c7747d631e54869..08e4bcad851b7b566a542bd3f4cc8ccc389605b0 100644
--- a/alib2data/src/grammar/common/GrammarFromXMLParser.h
+++ b/alib2data/src/grammar/common/GrammarFromXMLParser.h
@@ -13,8 +13,7 @@
 #include <variant>
 #include <vector>
 #include "../../alphabet/SymbolFeatures.h"
-#include "../../sax/Token.h"
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 
 namespace grammar {
 
diff --git a/alib2data/src/grammar/common/GrammarToXMLComposer.h b/alib2data/src/grammar/common/GrammarToXMLComposer.h
index 4cc0d8c32fd7b39091e5f12172eb977eca01e362..642a7dba4995f9d56b4ad56f2d4b50b511539e07 100644
--- a/alib2data/src/grammar/common/GrammarToXMLComposer.h
+++ b/alib2data/src/grammar/common/GrammarToXMLComposer.h
@@ -14,7 +14,7 @@
 #include <set>
 #include <variant>
 #include "../../alphabet/SymbolFeatures.h"
-#include "../../sax/Token.h"
+#include <sax/Token.h>
 
 namespace grammar {
 
diff --git a/alib2data/src/graph/common/GraphFromXMLParser.cpp b/alib2data/src/graph/common/GraphFromXMLParser.cpp
index 5c74e19b0a82628284d0c7834c00e859fa7d4905..929fa79b6c0ffcd6438c9dad0cda9d360d891475 100644
--- a/alib2data/src/graph/common/GraphFromXMLParser.cpp
+++ b/alib2data/src/graph/common/GraphFromXMLParser.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "GraphFromXMLParser.h"
-#include "../../sax/ParserException.h"
+#include <sax/ParserException.h>
 #include "../../XmlApi.hpp"
 
 #include "../Graph.h"
diff --git a/alib2data/src/graph/common/GraphFromXMLParser.h b/alib2data/src/graph/common/GraphFromXMLParser.h
index 5d01700e54175e5bdae19c28e566aa8c3d9a8506..68849b5ae2050eed1c6d5aa96962440c5716b5d5 100644
--- a/alib2data/src/graph/common/GraphFromXMLParser.h
+++ b/alib2data/src/graph/common/GraphFromXMLParser.h
@@ -8,7 +8,7 @@
 #ifndef GRAPH_FROM_XML_PARSER_H_
 #define GRAPH_FROM_XML_PARSER_H_
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../GraphFeatures.h"
 #include "../../alphabet/SymbolFeatures.h"
 #include "Node.h"
diff --git a/alib2data/src/graph/common/GraphToXMLComposer.h b/alib2data/src/graph/common/GraphToXMLComposer.h
index c92a5683e16916fbed7c3be06bfc4b8cf9d8ded9..a1108af169376ecf79ad7036f62f078d6f55b0cb 100644
--- a/alib2data/src/graph/common/GraphToXMLComposer.h
+++ b/alib2data/src/graph/common/GraphToXMLComposer.h
@@ -12,7 +12,7 @@
 #include <deque>
 
 #include "../GraphFeatures.h"
-#include "../../sax/Token.h"
+#include <sax/Token.h>
 
 namespace graph {
 
diff --git a/alib2data/src/graph/directed/DirectedGraph.cpp b/alib2data/src/graph/directed/DirectedGraph.cpp
index 7822b83c71390c3f48e17f7bbc9fe8add5eeaa91..5b0c620b21210367e3573164eecb06a9d4db3d8a 100644
--- a/alib2data/src/graph/directed/DirectedGraph.cpp
+++ b/alib2data/src/graph/directed/DirectedGraph.cpp
@@ -14,7 +14,7 @@
 #include <algorithm>
 #include <sstream>
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/GraphFromXMLParser.h"
 #include "../common/GraphToXMLComposer.h"
 #include "../Graph.h"
diff --git a/alib2data/src/graph/undirected/UndirectedGraph.cpp b/alib2data/src/graph/undirected/UndirectedGraph.cpp
index c2f773c37e366fc58f48b53670358e246e2a05d3..6d8f07908cdd1af42a35fc79f3dd6a9e4a99eebe 100644
--- a/alib2data/src/graph/undirected/UndirectedGraph.cpp
+++ b/alib2data/src/graph/undirected/UndirectedGraph.cpp
@@ -14,7 +14,7 @@
 #include <algorithm>
 #include <sstream>
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/GraphFromXMLParser.h"
 #include "../common/GraphToXMLComposer.h"
 #include "../Graph.h"
diff --git a/alib2data/src/indexes/common/IndexFromXMLParser.cpp b/alib2data/src/indexes/common/IndexFromXMLParser.cpp
index 4f9dd8bd8cdb71aa7fd50b6e4c1175518c7e71f0..df270584b1fc62307fd63d475efc8cf95f62e4ee 100644
--- a/alib2data/src/indexes/common/IndexFromXMLParser.cpp
+++ b/alib2data/src/indexes/common/IndexFromXMLParser.cpp
@@ -5,9 +5,9 @@
  *      Author: Jan Travnicek
  */
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "IndexFromXMLParser.h"
-#include "../../sax/ParserException.h"
+#include <sax/ParserException.h>
 #include "../../XmlApi.hpp"
 #include "../../primitive/Bool.h"
 
diff --git a/alib2data/src/indexes/common/IndexFromXMLParser.h b/alib2data/src/indexes/common/IndexFromXMLParser.h
index 10b5a85d8079959275158d37b193c0c32ee39068..5e88e642f90b247f58370eb2fd9013855fcc10e6 100644
--- a/alib2data/src/indexes/common/IndexFromXMLParser.h
+++ b/alib2data/src/indexes/common/IndexFromXMLParser.h
@@ -11,7 +11,7 @@
 #include <set>
 #include <deque>
 
-#include "../../sax/Token.h"
+#include <sax/Token.h>
 #include "../../alphabet/SymbolFeatures.h"
 #include "../suffixTrie/SuffixTrieNodeFinalMark.h"
 #include "../suffixTrie/SuffixTrieNodeTerminatingSymbol.h"
diff --git a/alib2data/src/indexes/common/IndexToXMLComposer.h b/alib2data/src/indexes/common/IndexToXMLComposer.h
index 59c69fda3d3cb94820aad5562733312b170fdc52..d907763550c78327bd6fdd67071eae00285eace4 100644
--- a/alib2data/src/indexes/common/IndexToXMLComposer.h
+++ b/alib2data/src/indexes/common/IndexToXMLComposer.h
@@ -11,7 +11,7 @@
 #include <deque>
 #include <set>
 #include "../../alphabet/SymbolFeatures.h"
-#include "../../sax/Token.h"
+#include <sax/Token.h>
 #include "../suffixTrie/SuffixTrieNodeFinalMark.h"
 #include "../suffixTrie/SuffixTrieNodeTerminatingSymbol.h"
 
diff --git a/alib2data/src/indexes/suffixTrie/SuffixTrieFinalMark.cpp b/alib2data/src/indexes/suffixTrie/SuffixTrieFinalMark.cpp
index 47f6c5dc35c4e687c9f30c6419c59f1f4520b23b..1d28549f91b60c82b90511275e867d85ced20ade 100644
--- a/alib2data/src/indexes/suffixTrie/SuffixTrieFinalMark.cpp
+++ b/alib2data/src/indexes/suffixTrie/SuffixTrieFinalMark.cpp
@@ -13,7 +13,7 @@
 #include <algorithm>
 #include <sstream>
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/IndexFromXMLParser.h"
 #include "../common/IndexToXMLComposer.h"
 #include "../../object/Object.h"
diff --git a/alib2data/src/indexes/suffixTrie/SuffixTrieTerminatingSymbol.cpp b/alib2data/src/indexes/suffixTrie/SuffixTrieTerminatingSymbol.cpp
index a8cadd22f5534270562d0e612b11924df4da2ed1..42395baa947f11e38523d9912d2479ffcfa2a9f9 100644
--- a/alib2data/src/indexes/suffixTrie/SuffixTrieTerminatingSymbol.cpp
+++ b/alib2data/src/indexes/suffixTrie/SuffixTrieTerminatingSymbol.cpp
@@ -12,7 +12,7 @@
 #include <algorithm>
 #include <sstream>
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/IndexFromXMLParser.h"
 #include "../common/IndexToXMLComposer.h"
 #include "../../object/Object.h"
diff --git a/alib2data/src/label/HexavigesimalLabel.cpp b/alib2data/src/label/HexavigesimalLabel.cpp
index d9c426dddd8a0d7baca8b730aaca75125b670bd4..d142c14653847a051598084810588d7046a5fe85 100644
--- a/alib2data/src/label/HexavigesimalLabel.cpp
+++ b/alib2data/src/label/HexavigesimalLabel.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "HexavigesimalLabel.h"
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "Label.h"
 #include "../object/Object.h"
 #include "../XmlApi.hpp"
diff --git a/alib2data/src/label/LabelPairLabel.cpp b/alib2data/src/label/LabelPairLabel.cpp
index 5d259bc66fb06720878d558dab5934f4841811a2..cc05894711a9ebea070fa8cefb5333cb5782d067 100644
--- a/alib2data/src/label/LabelPairLabel.cpp
+++ b/alib2data/src/label/LabelPairLabel.cpp
@@ -7,7 +7,7 @@
 
 #include "LabelPairLabel.h"
 #include <sstream>
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "Label.h"
 #include "../object/Object.h"
 #include "../XmlApi.hpp"
diff --git a/alib2data/src/label/LabelSetLabel.cpp b/alib2data/src/label/LabelSetLabel.cpp
index 672991aa2a1de0d76769c13a6c6132f234b89971..82034aee3c0524a5ac7686cf500d0f92e5aef826 100644
--- a/alib2data/src/label/LabelSetLabel.cpp
+++ b/alib2data/src/label/LabelSetLabel.cpp
@@ -7,7 +7,7 @@
 
 #include "LabelSetLabel.h"
 #include <sstream>
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "Label.h"
 #include "../object/Object.h"
 #include "../XmlApi.hpp"
diff --git a/alib2data/src/label/ObjectLabel.cpp b/alib2data/src/label/ObjectLabel.cpp
index bee9031b2b3c928ef92ccff4d8c8c85d92c36105..4cbf954a92ec38621540a6f8ccf44dea8cc484e2 100644
--- a/alib2data/src/label/ObjectLabel.cpp
+++ b/alib2data/src/label/ObjectLabel.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "ObjectLabel.h"
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "Label.h"
 #include "../object/Object.h"
 #include "../XmlApi.hpp"
diff --git a/alib2data/src/label/PrimitiveLabel.cpp b/alib2data/src/label/PrimitiveLabel.cpp
index 9ab17856538c597e3c02514ea766a1c384e57124..9df1296071605310cbb61499669691d9511b202c 100644
--- a/alib2data/src/label/PrimitiveLabel.cpp
+++ b/alib2data/src/label/PrimitiveLabel.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "PrimitiveLabel.h"
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "Label.h"
 #include "../object/Object.h"
 #include "../XmlApi.hpp"
diff --git a/alib2data/src/label/UniqueLabel.cpp b/alib2data/src/label/UniqueLabel.cpp
index 990f46e8a363531638052a304a16a0bab146fde7..3ef4b130e1d4a88e079108077c156f88a401060f 100644
--- a/alib2data/src/label/UniqueLabel.cpp
+++ b/alib2data/src/label/UniqueLabel.cpp
@@ -7,7 +7,7 @@
 
 #include "UniqueLabel.h"
 #include <sstream>
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "Label.h"
 #include "../object/Object.h"
 #include "../XmlApi.hpp"
diff --git a/alib2data/src/object/ObjectBase.h b/alib2data/src/object/ObjectBase.h
index 84bd572006c8190441a8abdfdff07e7a9f1a622e..7c8e7b03c8b2ab43c843388c95075fcd2b238bcb 100644
--- a/alib2data/src/object/ObjectBase.h
+++ b/alib2data/src/object/ObjectBase.h
@@ -12,7 +12,7 @@
 #include <memory>
 #include <deque>
 #include "../common/base.hpp"
-#include "../sax/Token.h"
+#include <sax/Token.h>
 
 namespace alib {
 
diff --git a/alib2data/src/object/Void.cpp b/alib2data/src/object/Void.cpp
index b3b7a31e0c1d75682f21355cf58df2bfe1a3da0c..9b1b77d06d3c21795497da27283463bf9bf00e9f 100644
--- a/alib2data/src/object/Void.cpp
+++ b/alib2data/src/object/Void.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "Void.h"
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "Object.h"
 #include "../XmlApi.hpp"
 
diff --git a/alib2data/src/object/Void.h b/alib2data/src/object/Void.h
index a8f5f64ddb4b01b284c9ebd79d9bdf51bea20cef..e417188a8fdf7627c1839db29d8e24580980ec55 100644
--- a/alib2data/src/object/Void.h
+++ b/alib2data/src/object/Void.h
@@ -10,7 +10,7 @@
 
 #include "ObjectBase.h"
 #include <deque>
-#include "../sax/Token.h"
+#include <sax/Token.h>
 
 namespace alib {
 
diff --git a/alib2data/src/primitive/Bool.cpp b/alib2data/src/primitive/Bool.cpp
index 41bef5e8b44de19637ed8c9261d82b98e06ee80e..d6677ee685f784aabe8cd8eb77d23a9fa8cac5ce 100644
--- a/alib2data/src/primitive/Bool.cpp
+++ b/alib2data/src/primitive/Bool.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "Bool.h"
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../exception/AlibException.h"
 #include "Primitive.h"
 #include "../object/Object.h"
diff --git a/alib2data/src/primitive/Character.cpp b/alib2data/src/primitive/Character.cpp
index f74c33f516b0c7c41486be5ea2d2b5c7ed7b91be..5774ddffaf7456f8dd71958d1b0d5ad21ac9cc0d 100644
--- a/alib2data/src/primitive/Character.cpp
+++ b/alib2data/src/primitive/Character.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "Character.h"
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "Primitive.h"
 #include "../object/Object.h"
 
diff --git a/alib2data/src/primitive/Integer.cpp b/alib2data/src/primitive/Integer.cpp
index 918e3062e78c4cb219b08db14e28bb5285cd2177..a51bc9b6a852bbcc0b38c1ce07770cfcf65a39ca 100644
--- a/alib2data/src/primitive/Integer.cpp
+++ b/alib2data/src/primitive/Integer.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "Integer.h"
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "Primitive.h"
 #include "../object/Object.h"
 
diff --git a/alib2data/src/primitive/PrimitiveBase.h b/alib2data/src/primitive/PrimitiveBase.h
index f2529e99b08fdbc881bac0fe2a95b37e4f96f928..374050a180a1f6e5774c443af48dd38397f95e66 100644
--- a/alib2data/src/primitive/PrimitiveBase.h
+++ b/alib2data/src/primitive/PrimitiveBase.h
@@ -9,8 +9,6 @@
 #define PRIMITIVE_BASE_H_
 
 #include "../object/ObjectBase.h"
-#include <deque>
-#include "../sax/Token.h"
 
 namespace primitive {
 
diff --git a/alib2data/src/primitive/String.cpp b/alib2data/src/primitive/String.cpp
index 2e4eb5dfea54cf98abf26772e3165f4bba550bfa..c2534061f267cb813282e182a001ad6542a78b24 100644
--- a/alib2data/src/primitive/String.cpp
+++ b/alib2data/src/primitive/String.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "String.h"
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "Primitive.h"
 #include "../object/Object.h"
 
diff --git a/alib2data/src/primitive/Unsigned.cpp b/alib2data/src/primitive/Unsigned.cpp
index 05e0764b25045bb2e8aa835cbde43c029893c565..ce6a12272abb2e08f923d3cecdd52acc2f30e709 100644
--- a/alib2data/src/primitive/Unsigned.cpp
+++ b/alib2data/src/primitive/Unsigned.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "Unsigned.h"
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "Primitive.h"
 #include "../object/Object.h"
 
diff --git a/alib2data/src/regexp/common/RegExpFromXMLParser.cpp b/alib2data/src/regexp/common/RegExpFromXMLParser.cpp
index aa51304cefd25400c5afbf7094d5382ac91d2047..09d873c82f03fa87d6b591b395d80822831181fd 100644
--- a/alib2data/src/regexp/common/RegExpFromXMLParser.cpp
+++ b/alib2data/src/regexp/common/RegExpFromXMLParser.cpp
@@ -6,8 +6,8 @@
  */
 
 #include "RegExpFromXMLParser.h"
-#include "../../sax/FromXMLParserHelper.h"
-#include "../../sax/ParserException.h"
+#include <sax/FromXMLParserHelper.h>
+#include <sax/ParserException.h>
 
 #include "../RegExp.h"
 #include "../RegExpClasses.h"
diff --git a/alib2data/src/regexp/common/RegExpFromXMLParser.h b/alib2data/src/regexp/common/RegExpFromXMLParser.h
index 10558e88f5df340ae125e5e0d452b1b3cdd5b965..ced72df4cad5b0bf006239ae3289534fdac2115b 100644
--- a/alib2data/src/regexp/common/RegExpFromXMLParser.h
+++ b/alib2data/src/regexp/common/RegExpFromXMLParser.h
@@ -12,7 +12,7 @@
 #include <deque>
 #include "../RegExpFeatures.h"
 #include "../../alphabet/SymbolFeatures.h"
-#include "../../sax/Token.h"
+#include <sax/Token.h>
 
 namespace regexp {
 
diff --git a/alib2data/src/regexp/common/RegExpToXMLComposer.h b/alib2data/src/regexp/common/RegExpToXMLComposer.h
index d573c1007118cde2a22d6dae5fd4ef48d6ace8bf..82fbb1e72edf2f35619e07bc3e9794756b5f8128 100644
--- a/alib2data/src/regexp/common/RegExpToXMLComposer.h
+++ b/alib2data/src/regexp/common/RegExpToXMLComposer.h
@@ -12,7 +12,7 @@
 #include "../RegExpFeatures.h"
 #include "../unbounded/UnboundedRegExpElement.h"
 #include "../formal/FormalRegExpElement.h"
-#include "../../sax/Token.h"
+#include <sax/Token.h>
 
 namespace regexp {
 
diff --git a/alib2data/src/regexp/formal/FormalRegExp.cpp b/alib2data/src/regexp/formal/FormalRegExp.cpp
index 3b8f2234891febf54b37b2970371b8bc645a4bf1..ad8b79a9eb8bade3fca05fef6f0ae3e0bcb7f2cf 100644
--- a/alib2data/src/regexp/formal/FormalRegExp.cpp
+++ b/alib2data/src/regexp/formal/FormalRegExp.cpp
@@ -16,7 +16,7 @@
 
 #include "../unbounded/UnboundedRegExp.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/RegExpFromXMLParser.h"
 #include "../common/RegExpToXMLComposer.h"
 #include "../RegExp.h"
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp b/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp
index d2e625846602b1481394b506ff9ea2e982706230..6e362087052e529d12a7c9928e18ec93e13742e8 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp
@@ -16,7 +16,7 @@
 
 #include "../formal/FormalRegExp.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/RegExpFromXMLParser.h"
 #include "../common/RegExpToXMLComposer.h"
 #include "../RegExp.h"
diff --git a/alib2data/src/string/CyclicString.cpp b/alib2data/src/string/CyclicString.cpp
index af20e72676b43241bbe3635b8f8ed5f79af0f703..9ea3d94c18df0cc09d8045911cf8ab8f0b5cacb6 100644
--- a/alib2data/src/string/CyclicString.cpp
+++ b/alib2data/src/string/CyclicString.cpp
@@ -12,7 +12,7 @@
 #include <sstream>
 #include <algorithm>
 
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "common/StringFromXMLParser.h"
 #include "common/StringToXMLComposer.h"
 #include "String.h"
diff --git a/alib2data/src/string/Epsilon.cpp b/alib2data/src/string/Epsilon.cpp
index ca7c49f175cdcbbc12d8651e34d5dc864ac9e451..8313b14bc6505c08cc5bcd3bcb88481032bf6bd0 100644
--- a/alib2data/src/string/Epsilon.cpp
+++ b/alib2data/src/string/Epsilon.cpp
@@ -7,7 +7,7 @@
 
 #include "Epsilon.h"
 
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "common/StringFromXMLParser.h"
 #include "common/StringToXMLComposer.h"
 #include "String.h"
diff --git a/alib2data/src/string/LinearString.cpp b/alib2data/src/string/LinearString.cpp
index 66578f786985f63ca42d67c5a9793836ba53da32..d9789c81b95cbdeebd5ebbb7c31209ae6448ac45 100644
--- a/alib2data/src/string/LinearString.cpp
+++ b/alib2data/src/string/LinearString.cpp
@@ -17,7 +17,7 @@
 #include <sstream>
 #include <algorithm>
 
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "common/StringFromXMLParser.h"
 #include "common/StringToXMLComposer.h"
 #include "String.h"
diff --git a/alib2data/src/string/LinearStringTerminatingSymbol.cpp b/alib2data/src/string/LinearStringTerminatingSymbol.cpp
index 24de65e4092ded1991d41fcfc9f0b5169a6d67e3..41f89ac8f7b6e06aff8be3fa3e4c8a0b94dd80c2 100644
--- a/alib2data/src/string/LinearStringTerminatingSymbol.cpp
+++ b/alib2data/src/string/LinearStringTerminatingSymbol.cpp
@@ -12,7 +12,7 @@
 #include <sstream>
 #include <algorithm>
 
-#include "../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "common/StringFromXMLParser.h"
 #include "common/StringToXMLComposer.h"
 #include "String.h"
diff --git a/alib2data/src/string/common/StringFromXMLParser.cpp b/alib2data/src/string/common/StringFromXMLParser.cpp
index 5636a9bcf64cb32f02467faa741cce4f722d705c..d81410d9be7f74b513e66ae3420751041dab075d 100644
--- a/alib2data/src/string/common/StringFromXMLParser.cpp
+++ b/alib2data/src/string/common/StringFromXMLParser.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "StringFromXMLParser.h"
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../../XmlApi.hpp"
 
 namespace string {
diff --git a/alib2data/src/string/common/StringFromXMLParser.h b/alib2data/src/string/common/StringFromXMLParser.h
index 2531b344c366c50b1b697d750dc4c7c85045867d..7782227c2f31311efde933e5ebeb5f392f74fb18 100644
--- a/alib2data/src/string/common/StringFromXMLParser.h
+++ b/alib2data/src/string/common/StringFromXMLParser.h
@@ -11,7 +11,7 @@
 #include <vector>
 #include <set>
 #include <deque>
-#include "../../sax/Token.h"
+#include <sax/Token.h>
 #include "../../alphabet/Symbol.h"
 
 namespace string {
diff --git a/alib2data/src/string/common/StringToXMLComposer.h b/alib2data/src/string/common/StringToXMLComposer.h
index feced2a0a1e85c1004d5f9a2e022a93edacb9d4c..077b160e45747b3b017ce23e1405d6698a537bdb 100644
--- a/alib2data/src/string/common/StringToXMLComposer.h
+++ b/alib2data/src/string/common/StringToXMLComposer.h
@@ -9,7 +9,7 @@
 #define STRING_TO_XML_COMPOSER_H_
 
 #include <deque>
-#include "../../sax/Token.h"
+#include <sax/Token.h>
 #include <set>
 #include <vector>
 #include "../../alphabet/Symbol.h"
diff --git a/alib2data/src/tree/common/TreeFromXMLParser.cpp b/alib2data/src/tree/common/TreeFromXMLParser.cpp
index e48ff9337676a0ee2435442fe671cd4110ff3ff2..16fbdf31a49e6f38b2e6c75d507d7344ba338354 100644
--- a/alib2data/src/tree/common/TreeFromXMLParser.cpp
+++ b/alib2data/src/tree/common/TreeFromXMLParser.cpp
@@ -5,9 +5,9 @@
  *      Author: Stepan Plachy
  */
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "TreeFromXMLParser.h"
-#include "../../sax/ParserException.h"
+#include <sax/ParserException.h>
 #include "../../XmlApi.hpp"
 
 namespace tree {
diff --git a/alib2data/src/tree/common/TreeFromXMLParser.h b/alib2data/src/tree/common/TreeFromXMLParser.h
index 25dd3449a1cace58fe31eba0d9f2fdf38f4ebf08..3a0b174d8e5bd41f7e64359cb182eb5b1cda93e7 100644
--- a/alib2data/src/tree/common/TreeFromXMLParser.h
+++ b/alib2data/src/tree/common/TreeFromXMLParser.h
@@ -12,7 +12,7 @@
 #include <vector>
 #include <deque>
 
-#include "../../sax/Token.h"
+#include <sax/Token.h>
 #include "../../alphabet/SymbolFeatures.h"
 #include "../ranked/RankedNode.h"
 #include "../unranked/UnrankedNode.h"
diff --git a/alib2data/src/tree/common/TreeToXMLComposer.h b/alib2data/src/tree/common/TreeToXMLComposer.h
index aba26b4689c6a718beb3e94c727a4d96fc408dee..8629a79ccd7bd1d40dbf5e170078f61b16dce946 100644
--- a/alib2data/src/tree/common/TreeToXMLComposer.h
+++ b/alib2data/src/tree/common/TreeToXMLComposer.h
@@ -12,7 +12,7 @@
 #include <set>
 #include <vector>
 #include "../../alphabet/SymbolFeatures.h"
-#include "../../sax/Token.h"
+#include <sax/Token.h>
 #include "../ranked/RankedNode.h"
 #include "../unranked/UnrankedNode.h"
 
diff --git a/alib2data/src/tree/ranked/PrefixRankedBarPattern.cpp b/alib2data/src/tree/ranked/PrefixRankedBarPattern.cpp
index 8f0793468541afb012f50e25b86dabefb40a54e0..e920530e345966fb9a37652977b55b667beaffb5 100644
--- a/alib2data/src/tree/ranked/PrefixRankedBarPattern.cpp
+++ b/alib2data/src/tree/ranked/PrefixRankedBarPattern.cpp
@@ -15,7 +15,7 @@
 #include "RankedPattern.h"
 #include "PrefixRankedBarTree.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/TreeFromXMLParser.h"
 #include "../common/TreeToXMLComposer.h"
 #include "../Tree.h"
diff --git a/alib2data/src/tree/ranked/PrefixRankedBarTree.cpp b/alib2data/src/tree/ranked/PrefixRankedBarTree.cpp
index 9edd1e8e705d2bb8149e10d1c2415dca2ce3d359..55741eba185c72a5bc0167749e331714b5e5e6e9 100644
--- a/alib2data/src/tree/ranked/PrefixRankedBarTree.cpp
+++ b/alib2data/src/tree/ranked/PrefixRankedBarTree.cpp
@@ -14,7 +14,7 @@
 
 #include "RankedTree.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/TreeFromXMLParser.h"
 #include "../common/TreeToXMLComposer.h"
 #include "../Tree.h"
diff --git a/alib2data/src/tree/ranked/PrefixRankedPattern.cpp b/alib2data/src/tree/ranked/PrefixRankedPattern.cpp
index 7d068a3929f03fb68f9eaaaa0966959f3d61176f..a646a8c2922dfe2229ab6d38f4a4eb01d27cde8d 100644
--- a/alib2data/src/tree/ranked/PrefixRankedPattern.cpp
+++ b/alib2data/src/tree/ranked/PrefixRankedPattern.cpp
@@ -15,7 +15,7 @@
 #include "RankedPattern.h"
 #include "PrefixRankedTree.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/TreeFromXMLParser.h"
 #include "../common/TreeToXMLComposer.h"
 #include "../Tree.h"
diff --git a/alib2data/src/tree/ranked/PrefixRankedTree.cpp b/alib2data/src/tree/ranked/PrefixRankedTree.cpp
index d00f2f2bae565bd235adc23525f9294fe32d951b..838f8f0e8b3223a2a506cdc770a47a29fe0392ad 100644
--- a/alib2data/src/tree/ranked/PrefixRankedTree.cpp
+++ b/alib2data/src/tree/ranked/PrefixRankedTree.cpp
@@ -14,7 +14,7 @@
 
 #include "RankedTree.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/TreeFromXMLParser.h"
 #include "../common/TreeToXMLComposer.h"
 #include "../Tree.h"
diff --git a/alib2data/src/tree/ranked/RankedPattern.cpp b/alib2data/src/tree/ranked/RankedPattern.cpp
index 11c94cb324dc766caa72fb1f33e6be383793a100..30143cb2b47a749e0274aa656c19f6ad148d09fe 100644
--- a/alib2data/src/tree/ranked/RankedPattern.cpp
+++ b/alib2data/src/tree/ranked/RankedPattern.cpp
@@ -14,7 +14,7 @@
 
 #include "../unranked/UnrankedPattern.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/TreeFromXMLParser.h"
 #include "../common/TreeToXMLComposer.h"
 #include "../Tree.h"
diff --git a/alib2data/src/tree/ranked/RankedTree.cpp b/alib2data/src/tree/ranked/RankedTree.cpp
index d5bbe91d20b8cf4e43998434d48afe4d7d4e145c..9ef2e8ce2a6e1a30b59dc206cc9f7051e4b48aad 100644
--- a/alib2data/src/tree/ranked/RankedTree.cpp
+++ b/alib2data/src/tree/ranked/RankedTree.cpp
@@ -14,7 +14,7 @@
 
 #include "../unranked/UnrankedTree.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/TreeFromXMLParser.h"
 #include "../common/TreeToXMLComposer.h"
 #include "../Tree.h"
diff --git a/alib2data/src/tree/unranked/PrefixBarTree.cpp b/alib2data/src/tree/unranked/PrefixBarTree.cpp
index 14eff02090ea718bdeae14f1715db17923e5fbde..561ce63c0ec776e6b1ddd93e73a06eebfaf58ffa 100644
--- a/alib2data/src/tree/unranked/PrefixBarTree.cpp
+++ b/alib2data/src/tree/unranked/PrefixBarTree.cpp
@@ -14,7 +14,7 @@
 
 #include "UnrankedTree.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/TreeFromXMLParser.h"
 #include "../common/TreeToXMLComposer.h"
 #include "../Tree.h"
diff --git a/alib2data/src/tree/unranked/UnrankedPattern.cpp b/alib2data/src/tree/unranked/UnrankedPattern.cpp
index 09bf2823bc10b47cb38951dfacc95492d85b6551..df483fd32ccc23a3e693d87d0ab02bb14903c929 100644
--- a/alib2data/src/tree/unranked/UnrankedPattern.cpp
+++ b/alib2data/src/tree/unranked/UnrankedPattern.cpp
@@ -14,7 +14,7 @@
 
 #include "../ranked/RankedPattern.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/TreeFromXMLParser.h"
 #include "../common/TreeToXMLComposer.h"
 #include "../Tree.h"
diff --git a/alib2data/src/tree/unranked/UnrankedTree.cpp b/alib2data/src/tree/unranked/UnrankedTree.cpp
index b701d229bfb00d488156cbd48660a7919c489686..c7c877d041ae6f64e565294e5a292ac332ee958f 100644
--- a/alib2data/src/tree/unranked/UnrankedTree.cpp
+++ b/alib2data/src/tree/unranked/UnrankedTree.cpp
@@ -14,7 +14,7 @@
 
 #include "../ranked/RankedTree.h"
 
-#include "../../sax/FromXMLParserHelper.h"
+#include <sax/FromXMLParserHelper.h>
 #include "../common/TreeFromXMLParser.h"
 #include "../common/TreeToXMLComposer.h"
 #include "../Tree.h"
diff --git a/alib2elgo/makefile.conf b/alib2elgo/makefile.conf
index 1c19a61981d3ba055782308c3d83d83a66bdc666..a151fc81adff386f508076a5f9ae39266dd54749 100644
--- a/alib2elgo/makefile.conf
+++ b/alib2elgo/makefile.conf
@@ -1,5 +1,5 @@
 LIBRARY:=alib2elgo
 TESTBIN:=alib2test
-LINK_PATHS=../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/alib2measure/makefile.conf b/alib2measure/makefile.conf
deleted file mode 100644
index 9b0e3a71ece373c456883d8e611dd50d13906cfe..0000000000000000000000000000000000000000
--- a/alib2measure/makefile.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LIBRARY:=alib2measure
-TESTBIN:=alib2test
-LINK_PATHS=../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/alib2raw/makefile.conf b/alib2raw/makefile.conf
index 0ed2cbe9ca69d7832cb399a0a99642884cd1ab26..70d4aef9c907c42d332e562601f16a4e34a6e25a 100644
--- a/alib2raw/makefile.conf
+++ b/alib2raw/makefile.conf
@@ -1,5 +1,5 @@
 LIBRARY:=alib2raw
 TESTBIN:=alib2test
-LINK_PATHS=../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/alib2str/makefile.conf b/alib2str/makefile.conf
index 78c5ea527d8e70445452d82957c1c8db9e5e15b1..a9b0a7165267c4208fd7579eeac658eafa01c799 100644
--- a/alib2str/makefile.conf
+++ b/alib2str/makefile.conf
@@ -1,5 +1,5 @@
 LIBRARY:=alib2str
 TESTBIN:=alib2test
-LINK_PATHS=../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/alphabetManip2/makefile.conf b/alphabetManip2/makefile.conf
index 773310e4bcbec8d0d385860a3cef09dc9ebbe500..f6af577cd6fbb9b9bad838e537a43232f0268210 100644
--- a/alphabetManip2/makefile.conf
+++ b/alphabetManip2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=alphabetManip2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/aminimize2/makefile.conf b/aminimize2/makefile.conf
index f8991b2269e6185c4aa3c96cd43a03ffaa194d45..5c778a70d81b868792d483875ad77ecd79f00f66 100644
--- a/aminimize2/makefile.conf
+++ b/aminimize2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=aminimize2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/anormalize2/makefile.conf b/anormalize2/makefile.conf
index 5c402f579b35c6e8b4c472a5c234056fea3566b4..b60510140cc36030afd046c1c96ae1a174f6d0a6 100644
--- a/anormalize2/makefile.conf
+++ b/anormalize2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=anormalize2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/arand2/makefile.conf b/arand2/makefile.conf
index 84e1e0b2fec821a389aecef3e7c19ef672d5b1d1..49c99c7c05fa416f2bc208aeaabcb359669fa338 100644
--- a/arand2/makefile.conf
+++ b/arand2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=arand2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/araw2/makefile.conf b/araw2/makefile.conf
index e30471749d14e4a21126fe8e815a3e6ddc18d810..5563abe8bb11892ce329b8ecd95b3de449139d55 100644
--- a/araw2/makefile.conf
+++ b/araw2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=araw2
-LINK_PATHS=../alib2raw/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2raw alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2raw/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2raw/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2raw alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2raw/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/arename2/makefile.conf b/arename2/makefile.conf
index 2ffb0cd954e937d3de4f59d564778319fb8a3ab4..558ddb218cddd3bd2e6ea8c8c7390b2d9a9a03fa 100644
--- a/arename2/makefile.conf
+++ b/arename2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=arename2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/areverse2/makefile.conf b/areverse2/makefile.conf
index 9cbf3206dd0223aa346e3dc9ee0d48edfd04e9f2..3731eca9c9b1047504b1635f11db89094070f7c2 100644
--- a/areverse2/makefile.conf
+++ b/areverse2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=areverse2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/arun2/makefile.conf b/arun2/makefile.conf
index 63a8d976d38d7324b02b99e4ed4a94593bd97218..e0007422401df5fba648161f0b7d20e15f1ae1c8 100644
--- a/arun2/makefile.conf
+++ b/arun2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=arun2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/astat2/makefile.conf b/astat2/makefile.conf
index f3e39205df910d877be17f62c91b02e4a55a46b3..1123c5e210d6cf831c7fd85099fdc4728f2ded02 100644
--- a/astat2/makefile.conf
+++ b/astat2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=astat2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/astringology2/makefile.conf b/astringology2/makefile.conf
index e74c1a8f19ede408a45b6d7b2206073e14bb509e..feca5334f516fb4856cc08c88727e9fc45c7c4d1 100644
--- a/astringology2/makefile.conf
+++ b/astringology2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=astringology2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/atrim2/makefile.conf b/atrim2/makefile.conf
index b970c6d9c48be7da7bca13c49db0d15543b5c019..f50d679ed7d9272fd9a9fb07653d95e7e4694fb2 100644
--- a/atrim2/makefile.conf
+++ b/atrim2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=atrim2
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
diff --git a/makefile b/makefile
index ec873755e2679dfaa1748f4844d21414a693911a..e1dbaf12847315974cf9cbee9ea639049966c193 100644
--- a/makefile
+++ b/makefile
@@ -6,15 +6,15 @@ BINFOLDER = bin
 
 STD_LIB = alib2std
 DATA_LIB = alib2data
-MEASURE_LIB = alib2measure
+COMMON_LIB = alib2common
 STR_LIB = alib2str
 RAW_LIB = alib2raw
 ALGO_LIB = alib2algo
 ELGO_LIB = alib2elgo
 
 SUBDIRS_LIBS = $(STD_LIB) \
+		$(COMMON_LIB) \
 		$(DATA_LIB) \
-		$(MEASURE_LIB) \
 		$(STR_LIB) \
 		$(RAW_LIB) \
 		$(ALGO_LIB) \
@@ -162,13 +162,13 @@ build-tests-release: $(addsuffix .build-tests-release, $(SUBDIRS_LIBS))
 $(addsuffix .all-debug, $(STD_LIB)):
 	$(MAKE) debug -C $(basename $@)
 
-$(addsuffix .all-debug, $(DATA_LIB)): $(addsuffix .all-debug, $(STD_LIB))
+$(addsuffix .all-debug, $(COMMON_LIB)): $(addsuffix .all-debug, $(STD_LIB))
 	$(MAKE) debug -C $(basename $@)
 
-$(addsuffix .all-debug, $(MEASURE_LIB)): $(addsuffix .all-debug, $(DATA_LIB))
+$(addsuffix .all-debug, $(DATA_LIB)): $(addsuffix .all-debug, $(COMMON_LIB))
 	$(MAKE) debug -C $(basename $@)
 
-$(addsuffix .all-debug, $(STR_LIB)): $(addsuffix .all-debug, $(MEASURE_LIB))
+$(addsuffix .all-debug, $(STR_LIB)): $(addsuffix .all-debug, $(DATA_LIB))
 	$(MAKE) debug -C $(basename $@)
 
 $(addsuffix .all-debug, $(RAW_LIB)): $(addsuffix .all-debug, $(STR_LIB))
@@ -188,13 +188,13 @@ $(addsuffix .all-debug, $(SUBDIRS_BINS)): $(addsuffix .all-debug, $(ELGO_LIB))
 $(addsuffix .all-release, $(STD_LIB)):
 	$(MAKE) release -C $(basename $@)
 
-$(addsuffix .all-release, $(DATA_LIB)): $(addsuffix .all-release, $(STD_LIB))
+$(addsuffix .all-release, $(COMMON_LIB)): $(addsuffix .all-release, $(STD_LIB))
 	$(MAKE) release -C $(basename $@)
 
-$(addsuffix .all-release, $(MEASURE_LIB)): $(addsuffix .all-release, $(DATA_LIB))
+$(addsuffix .all-release, $(DATA_LIB)): $(addsuffix .all-release, $(COMMON_LIB))
 	$(MAKE) release -C $(basename $@)
 
-$(addsuffix .all-release, $(STR_LIB)): $(addsuffix .all-release, $(MEASURE_LIB))
+$(addsuffix .all-release, $(STR_LIB)): $(addsuffix .all-release, $(DATA_LIB))
 	$(MAKE) release -C $(basename $@)
 
 $(addsuffix .all-release, $(RAW_LIB)): $(addsuffix .all-release, $(STR_LIB))
@@ -214,13 +214,13 @@ $(addsuffix .all-release, $(SUBDIRS_BINS)): $(addsuffix .all-release, $(ELGO_LIB
 $(addsuffix .build-debug, $(STD_LIB)):
 	$(MAKE) build-debug -C $(basename $@)
 
-$(addsuffix .build-debug, $(DATA_LIB)): $(addsuffix .build-debug, $(STD_LIB))
+$(addsuffix .build-debug, $(COMMON_LIB)): $(addsuffix .build-debug, $(STD_LIB))
 	$(MAKE) build-debug -C $(basename $@)
 
-$(addsuffix .build-debug, $(MEASURE_LIB)): $(addsuffix .build-debug, $(DATA_LIB))
+$(addsuffix .build-debug, $(DATA_LIB)): $(addsuffix .build-debug, $(COMMON_LIB))
 	$(MAKE) build-debug -C $(basename $@)
 
-$(addsuffix .build-debug, $(STR_LIB)): $(addsuffix .build-debug, $(MEASURE_LIB))
+$(addsuffix .build-debug, $(STR_LIB)): $(addsuffix .build-debug, $(DATA_LIB))
 	$(MAKE) build-debug -C $(basename $@)
 
 $(addsuffix .build-debug, $(RAW_LIB)): $(addsuffix .build-debug, $(STR_LIB))
@@ -240,13 +240,13 @@ $(addsuffix .build-debug, $(SUBDIRS_BINS)): $(addsuffix .build-debug, $(ELGO_LIB
 $(addsuffix .build-release, $(STD_LIB)):
 	$(MAKE) build-release -C $(basename $@)
 
-$(addsuffix .build-release, $(DATA_LIB)): $(addsuffix .build-release, $(STD_LIB))
+$(addsuffix .build-release, $(COMMON_LIB)): $(addsuffix .build-release, $(STD_LIB))
 	$(MAKE) build-release -C $(basename $@)
 
-$(addsuffix .build-release, $(MEASURE_LIB)): $(addsuffix .build-release, $(DATA_LIB))
+$(addsuffix .build-release, $(DATA_LIB)): $(addsuffix .build-release, $(COMMON_LIB))
 	$(MAKE) build-release -C $(basename $@)
 
-$(addsuffix .build-release, $(STR_LIB)): $(addsuffix .build-release, $(MEASURE_LIB))
+$(addsuffix .build-release, $(STR_LIB)): $(addsuffix .build-release, $(DATA_LIB))
 	$(MAKE) build-release -C $(basename $@)
 
 $(addsuffix .build-release, $(RAW_LIB)): $(addsuffix .build-release, $(STR_LIB))
@@ -266,13 +266,13 @@ $(addsuffix .build-release, $(SUBDIRS_BINS)): $(addsuffix .build-release, $(ELGO
 $(addsuffix .build-tests-debug, $(STD_LIB)): $(addsuffix .build-debug, $(STD_LIB))
 	$(MAKE) build-tests-debug -C $(basename $@)
 
-$(addsuffix .build-tests-debug, $(DATA_LIB)): $(addsuffix .build-tests-debug, $(STD_LIB)) $(addsuffix .build-debug, $(DATA_LIB))
+$(addsuffix .build-tests-debug, $(COMMON_LIB)): $(addsuffix .build-tests-debug, $(STD_LIB)) $(addsuffix .build-debug, $(COMMON_LIB))
 	$(MAKE) build-tests-debug -C $(basename $@)
 
-$(addsuffix .build-tests-debug, $(MEASURE_LIB)): $(addsuffix .build-tests-debug, $(DATA_LIB)) $(addsuffix .build-debug, $(MEASURE_LIB))
+$(addsuffix .build-tests-debug, $(DATA_LIB)): $(addsuffix .build-tests-debug, $(COMMON_LIB)) $(addsuffix .build-debug, $(DATA_LIB))
 	$(MAKE) build-tests-debug -C $(basename $@)
 
-$(addsuffix .build-tests-debug, $(STR_LIB)): $(addsuffix .build-tests-debug, $(MEASURE_LIB)) $(addsuffix .build-debug, $(STR_LIB))
+$(addsuffix .build-tests-debug, $(STR_LIB)): $(addsuffix .build-tests-debug, $(DATA_LIB)) $(addsuffix .build-debug, $(STR_LIB))
 	$(MAKE) build-tests-debug -C $(basename $@)
 
 $(addsuffix .build-tests-debug, $(RAW_LIB)): $(addsuffix .build-tests-debug, $(STR_LIB)) $(addsuffix .build-debug, $(RAW_LIB))
@@ -289,13 +289,13 @@ $(addsuffix .build-tests-debug, $(ELGO_LIB)): $(addsuffix .build-tests-debug, $(
 $(addsuffix .build-tests-release, $(STD_LIB)): $(addsuffix .build-release, $(STD_LIB))
 	$(MAKE) build-tests-release -C $(basename $@)
 
-$(addsuffix .build-tests-release, $(DATA_LIB)): $(addsuffix .build-tests-release, $(STD_LIB)) $(addsuffix .build-release, $(DATA_LIB))
+$(addsuffix .build-tests-release, $(COMMON_LIB)): $(addsuffix .build-tests-release, $(STD_LIB)) $(addsuffix .build-release, $(COMMON_LIB))
 	$(MAKE) build-tests-release -C $(basename $@)
 
-$(addsuffix .build-tests-release, $(MEASURE_LIB)): $(addsuffix .build-tests-release, $(DATA_LIB)) $(addsuffix .build-release, $(MEASURE_LIB))
+$(addsuffix .build-tests-release, $(DATA_LIB)): $(addsuffix .build-tests-release, $(COMMON_LIB)) $(addsuffix .build-release, $(DATA_LIB))
 	$(MAKE) build-tests-release -C $(basename $@)
 
-$(addsuffix .build-tests-release, $(STR_LIB)): $(addsuffix .build-tests-release, $(MEASURE_LIB)) $(addsuffix .build-release, $(STR_LIB))
+$(addsuffix .build-tests-release, $(STR_LIB)): $(addsuffix .build-tests-release, $(COMMON_LIB)) $(addsuffix .build-release, $(STR_LIB))
 	$(MAKE) build-tests-release -C $(basename $@)
 
 $(addsuffix .build-tests-release, $(RAW_LIB)): $(addsuffix .build-tests-release, $(STR_LIB)) $(addsuffix .build-release, $(RAW_LIB))
@@ -324,7 +324,7 @@ clean-release:
 doc:
 	$(MAKE) doc -C alib2std
 	$(MAKE) doc -C alib2data
-	$(MAKE) doc -C alib2measure
+	$(MAKE) doc -C alib2common
 	$(MAKE) doc -C alib2str
 	$(MAKE) doc -C alib2raw
 	$(MAKE) doc -C alib2algo
diff --git a/tniceprint/makefile.conf b/tniceprint/makefile.conf
index 39911426a0a2462d18862564288141394b22cba3..c7558dd076ae8acfe60fd40b9b9d878602d369cf 100644
--- a/tniceprint/makefile.conf
+++ b/tniceprint/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=atniceprint
-LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2measure/ ../alib2data/ ../alib2std/
-LINK_LIBRARIES=alib2elgo alib2algo alib2measure alib2data alib2std xml2
-INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2measure/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
+LINK_PATHS=../alib2elgo/ ../alib2algo/ ../alib2data/ ../alib2common/ ../alib2std/
+LINK_LIBRARIES=alib2elgo alib2algo alib2data alib2common alib2std xml2
+INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2elgo/src/ \$$(SOURCES_BASE_DIR)/../../alib2algo/src/ \$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/