From bc1a898ce18420182aded50ec142bad12ac4ecf6 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Fri, 19 Feb 2016 22:30:26 +0100
Subject: [PATCH] move measurements and sax together before data

---
 aarbology2/makefile.conf                      |  6 +-
 acast2/makefile.conf                          |  6 +-
 acompaction2/makefile.conf                    |  6 +-
 acompare2/makefile.conf                       |  6 +-
 aconversions2/makefile.conf                   |  6 +-
 aconvert2/makefile.conf                       |  6 +-
 aderivation2/makefile.conf                    |  6 +-
 adeterminize2/makefile.conf                   |  6 +-
 aecho2/makefile.conf                          |  6 +-
 aepsilon2/makefile.conf                       |  6 +-
 agenerate2/makefile.conf                      |  6 +-
 aintegral2/makefile.conf                      |  6 +-
 alangop2/makefile.conf                        |  6 +-
 alib2algo/makefile.conf                       |  6 +-
 {alib2measure => alib2common}/Doxyfile        |  0
 {alib2measure => alib2common}/makefile        |  0
 alib2common/makefile.conf                     |  5 ++
 .../src/allocator/StealthAllocator.hpp        |  0
 .../src/allocator/StealthTypes.cpp            |  0
 .../src/allocator/StealthTypes.hpp            |  0
 .../src/debug/New.cpp                         |  0
 .../src/debug/sigHandler.cpp                  |  0
 .../src/debug/sigHandler.h                    |  0
 .../src/debug/simpleStacktrace.cpp            |  0
 .../src/debug/simpleStacktrace.h              |  0
 alib2common/src/exception/CommonException.cpp | 71 +++++++++++++++++++
 alib2common/src/exception/CommonException.h   | 58 +++++++++++++++
 {alib2measure => alib2common}/src/measure     |  0
 .../src/measurements/MeasurementEngine.cpp    |  0
 .../src/measurements/MeasurementEngine.hpp    |  0
 .../src/measurements/MeasurementFrame.cpp     |  0
 .../src/measurements/MeasurementFrame.hpp     |  2 +-
 .../src/measurements/MeasurementNew.cpp       |  0
 .../src/measurements/MeasurementNew.hpp       |  0
 .../src/measurements/MeasurementResults.cpp   |  0
 .../src/measurements/MeasurementResults.hpp   |  2 +-
 .../src/measurements/MeasurementTypes.cpp     |  0
 .../src/measurements/MeasurementTypes.hpp     |  0
 .../measurements/frames/CounterDataFrame.cpp  |  0
 .../measurements/frames/CounterDataFrame.hpp  |  2 +-
 .../measurements/frames/MemoryDataFrame.cpp   |  0
 .../measurements/frames/MemoryDataFrame.hpp   |  2 +-
 .../src/measurements/frames/TimeDataFrame.cpp |  0
 .../src/measurements/frames/TimeDataFrame.hpp |  2 +-
 .../src/measurements/measurements.cpp         |  0
 .../src/measurements/measurements.hpp         |  0
 .../src/sax/ComposerException.cpp             |  4 --
 .../src/sax/ComposerException.h               |  5 +-
 .../src/sax/FromXMLParserHelper.cpp           |  0
 .../src/sax/FromXMLParserHelper.h             |  0
 .../src/sax/ParserException.cpp               |  4 --
 .../src/sax/ParserException.h                 |  5 +-
 .../src/sax/SaxComposeInterface.cpp           |  0
 .../src/sax/SaxComposeInterface.h             |  0
 .../src/sax/SaxParseInterface.cpp             |  6 +-
 .../src/sax/SaxParseInterface.h               |  0
 {alib2data => alib2common}/src/sax/Token.cpp  |  0
 {alib2data => alib2common}/src/sax/Token.h    |  0
 .../test-src/main.cpp                         |  4 +-
 .../measurements/MeasurementsTest.cpp         |  0
 .../test-src/measurements/MeasurementsTest.h  |  0
 .../test-src/sax/SaxTest.cpp                  |  0
 .../test-src/sax/SaxTest.h                    |  0
 alib2data/makefile.conf                       |  6 +-
 alib2data/src/alphabet/BarSymbol.cpp          |  2 +-
 alib2data/src/alphabet/BlankSymbol.cpp        |  2 +-
 .../src/alphabet/BottomOfTheStackSymbol.cpp   |  2 +-
 alib2data/src/alphabet/EndSymbol.cpp          |  2 +-
 alib2data/src/alphabet/LabeledSymbol.cpp      |  2 +-
 alib2data/src/alphabet/RankedSymbol.cpp       |  2 +-
 alib2data/src/alphabet/StartSymbol.cpp        |  2 +-
 .../src/alphabet/SubtreeWildcardSymbol.cpp    |  2 +-
 alib2data/src/alphabet/SymbolPairSymbol.cpp   |  2 +-
 alib2data/src/alphabet/SymbolSetSymbol.cpp    |  2 +-
 alib2data/src/alphabet/UniqueSymbol.cpp       |  2 +-
 alib2data/src/alphabet/VariablesBarSymbol.cpp |  2 +-
 alib2data/src/automaton/FSM/CompactNFA.cpp    |  2 +-
 alib2data/src/automaton/FSM/DFA.cpp           |  2 +-
 alib2data/src/automaton/FSM/EpsilonNFA.cpp    |  2 +-
 alib2data/src/automaton/FSM/ExtendedNFA.cpp   |  2 +-
 .../automaton/FSM/MultiInitialStateNFA.cpp    |  2 +-
 alib2data/src/automaton/FSM/NFA.cpp           |  2 +-
 alib2data/src/automaton/PDA/DPDA.cpp          |  2 +-
 .../src/automaton/PDA/InputDrivenDPDA.cpp     |  2 +-
 .../src/automaton/PDA/InputDrivenNPDA.cpp     |  2 +-
 alib2data/src/automaton/PDA/NPDA.cpp          |  2 +-
 .../PDA/RealTimeHeightDeterministicDPDA.cpp   |  2 +-
 .../PDA/RealTimeHeightDeterministicNPDA.cpp   |  2 +-
 alib2data/src/automaton/PDA/SinglePopDPDA.cpp |  2 +-
 alib2data/src/automaton/PDA/SinglePopNPDA.cpp |  2 +-
 .../src/automaton/PDA/VisiblyPushdownDPDA.cpp |  2 +-
 .../src/automaton/PDA/VisiblyPushdownNPDA.cpp |  2 +-
 alib2data/src/automaton/TA/DFTA.cpp           |  2 +-
 alib2data/src/automaton/TA/NFTA.cpp           |  2 +-
 alib2data/src/automaton/TM/OneTapeDTM.cpp     |  2 +-
 .../common/AutomatonFromXMLParser.cpp         |  2 +-
 .../automaton/common/AutomatonFromXMLParser.h |  2 +-
 .../automaton/common/AutomatonToXMLComposer.h |  2 +-
 alib2data/src/exception/AlibException.cpp     | 28 +-------
 alib2data/src/exception/AlibException.h       | 29 +-------
 alib2data/src/factory/XmlDataFactory.hpp      |  6 +-
 alib2data/src/grammar/ContextFree/CFG.cpp     |  2 +-
 alib2data/src/grammar/ContextFree/CNF.cpp     |  2 +-
 .../grammar/ContextFree/EpsilonFreeCFG.cpp    |  2 +-
 alib2data/src/grammar/ContextFree/GNF.cpp     |  2 +-
 alib2data/src/grammar/ContextFree/LG.cpp      |  2 +-
 .../src/grammar/ContextSensitive/CSG.cpp      |  2 +-
 .../NonContractingGrammar.cpp                 |  2 +-
 alib2data/src/grammar/Regular/LeftLG.cpp      |  2 +-
 alib2data/src/grammar/Regular/LeftRG.cpp      |  2 +-
 alib2data/src/grammar/Regular/RightLG.cpp     |  2 +-
 alib2data/src/grammar/Regular/RightRG.cpp     |  2 +-
 .../ContextPreservingUnrestrictedGrammar.cpp  |  2 +-
 .../Unrestricted/UnrestrictedGrammar.cpp      |  2 +-
 .../grammar/common/GrammarFromXMLParser.cpp   |  2 +-
 .../src/grammar/common/GrammarFromXMLParser.h |  3 +-
 .../src/grammar/common/GrammarToXMLComposer.h |  2 +-
 .../src/graph/common/GraphFromXMLParser.cpp   |  2 +-
 .../src/graph/common/GraphFromXMLParser.h     |  2 +-
 .../src/graph/common/GraphToXMLComposer.h     |  2 +-
 .../src/graph/directed/DirectedGraph.cpp      |  2 +-
 .../src/graph/undirected/UndirectedGraph.cpp  |  2 +-
 .../src/indexes/common/IndexFromXMLParser.cpp |  4 +-
 .../src/indexes/common/IndexFromXMLParser.h   |  2 +-
 .../src/indexes/common/IndexToXMLComposer.h   |  2 +-
 .../suffixTrie/SuffixTrieFinalMark.cpp        |  2 +-
 .../SuffixTrieTerminatingSymbol.cpp           |  2 +-
 alib2data/src/label/HexavigesimalLabel.cpp    |  2 +-
 alib2data/src/label/LabelPairLabel.cpp        |  2 +-
 alib2data/src/label/LabelSetLabel.cpp         |  2 +-
 alib2data/src/label/ObjectLabel.cpp           |  2 +-
 alib2data/src/label/PrimitiveLabel.cpp        |  2 +-
 alib2data/src/label/UniqueLabel.cpp           |  2 +-
 alib2data/src/object/ObjectBase.h             |  2 +-
 alib2data/src/object/Void.cpp                 |  2 +-
 alib2data/src/object/Void.h                   |  2 +-
 alib2data/src/primitive/Bool.cpp              |  2 +-
 alib2data/src/primitive/Character.cpp         |  2 +-
 alib2data/src/primitive/Integer.cpp           |  2 +-
 alib2data/src/primitive/PrimitiveBase.h       |  2 -
 alib2data/src/primitive/String.cpp            |  2 +-
 alib2data/src/primitive/Unsigned.cpp          |  2 +-
 .../src/regexp/common/RegExpFromXMLParser.cpp |  4 +-
 .../src/regexp/common/RegExpFromXMLParser.h   |  2 +-
 .../src/regexp/common/RegExpToXMLComposer.h   |  2 +-
 alib2data/src/regexp/formal/FormalRegExp.cpp  |  2 +-
 .../src/regexp/unbounded/UnboundedRegExp.cpp  |  2 +-
 alib2data/src/string/CyclicString.cpp         |  2 +-
 alib2data/src/string/Epsilon.cpp              |  2 +-
 alib2data/src/string/LinearString.cpp         |  2 +-
 .../string/LinearStringTerminatingSymbol.cpp  |  2 +-
 .../src/string/common/StringFromXMLParser.cpp |  2 +-
 .../src/string/common/StringFromXMLParser.h   |  2 +-
 .../src/string/common/StringToXMLComposer.h   |  2 +-
 .../src/tree/common/TreeFromXMLParser.cpp     |  4 +-
 alib2data/src/tree/common/TreeFromXMLParser.h |  2 +-
 alib2data/src/tree/common/TreeToXMLComposer.h |  2 +-
 .../tree/ranked/PrefixRankedBarPattern.cpp    |  2 +-
 .../src/tree/ranked/PrefixRankedBarTree.cpp   |  2 +-
 .../src/tree/ranked/PrefixRankedPattern.cpp   |  2 +-
 .../src/tree/ranked/PrefixRankedTree.cpp      |  2 +-
 alib2data/src/tree/ranked/RankedPattern.cpp   |  2 +-
 alib2data/src/tree/ranked/RankedTree.cpp      |  2 +-
 alib2data/src/tree/unranked/PrefixBarTree.cpp |  2 +-
 .../src/tree/unranked/UnrankedPattern.cpp     |  2 +-
 alib2data/src/tree/unranked/UnrankedTree.cpp  |  2 +-
 alib2elgo/makefile.conf                       |  6 +-
 alib2measure/makefile.conf                    |  5 --
 alib2raw/makefile.conf                        |  6 +-
 alib2str/makefile.conf                        |  6 +-
 alphabetManip2/makefile.conf                  |  6 +-
 aminimize2/makefile.conf                      |  6 +-
 anormalize2/makefile.conf                     |  6 +-
 arand2/makefile.conf                          |  6 +-
 araw2/makefile.conf                           |  6 +-
 arename2/makefile.conf                        |  6 +-
 areverse2/makefile.conf                       |  6 +-
 arun2/makefile.conf                           |  6 +-
 astat2/makefile.conf                          |  6 +-
 astringology2/makefile.conf                   |  6 +-
 atrim2/makefile.conf                          |  6 +-
 makefile                                      | 42 +++++------
 tniceprint/makefile.conf                      |  6 +-
 183 files changed, 367 insertions(+), 300 deletions(-)
 rename {alib2measure => alib2common}/Doxyfile (100%)
 rename {alib2measure => alib2common}/makefile (100%)
 create mode 100644 alib2common/makefile.conf
 rename {alib2measure => alib2common}/src/allocator/StealthAllocator.hpp (100%)
 rename {alib2measure => alib2common}/src/allocator/StealthTypes.cpp (100%)
 rename {alib2measure => alib2common}/src/allocator/StealthTypes.hpp (100%)
 rename {alib2measure => alib2common}/src/debug/New.cpp (100%)
 rename {alib2data => alib2common}/src/debug/sigHandler.cpp (100%)
 rename {alib2data => alib2common}/src/debug/sigHandler.h (100%)
 rename {alib2data => alib2common}/src/debug/simpleStacktrace.cpp (100%)
 rename {alib2data => alib2common}/src/debug/simpleStacktrace.h (100%)
 create mode 100644 alib2common/src/exception/CommonException.cpp
 create mode 100644 alib2common/src/exception/CommonException.h
 rename {alib2measure => alib2common}/src/measure (100%)
 rename {alib2measure => alib2common}/src/measurements/MeasurementEngine.cpp (100%)
 rename {alib2measure => alib2common}/src/measurements/MeasurementEngine.hpp (100%)
 rename {alib2measure => alib2common}/src/measurements/MeasurementFrame.cpp (100%)
 rename {alib2measure => alib2common}/src/measurements/MeasurementFrame.hpp (97%)
 rename {alib2measure => alib2common}/src/measurements/MeasurementNew.cpp (100%)
 rename {alib2measure => alib2common}/src/measurements/MeasurementNew.hpp (100%)
 rename {alib2measure => alib2common}/src/measurements/MeasurementResults.cpp (100%)
 rename {alib2measure => alib2common}/src/measurements/MeasurementResults.hpp (96%)
 rename {alib2measure => alib2common}/src/measurements/MeasurementTypes.cpp (100%)
 rename {alib2measure => alib2common}/src/measurements/MeasurementTypes.hpp (100%)
 rename {alib2measure => alib2common}/src/measurements/frames/CounterDataFrame.cpp (100%)
 rename {alib2measure => alib2common}/src/measurements/frames/CounterDataFrame.hpp (97%)
 rename {alib2measure => alib2common}/src/measurements/frames/MemoryDataFrame.cpp (100%)
 rename {alib2measure => alib2common}/src/measurements/frames/MemoryDataFrame.hpp (97%)
 rename {alib2measure => alib2common}/src/measurements/frames/TimeDataFrame.cpp (100%)
 rename {alib2measure => alib2common}/src/measurements/frames/TimeDataFrame.hpp (96%)
 rename {alib2measure => alib2common}/src/measurements/measurements.cpp (100%)
 rename {alib2measure => alib2common}/src/measurements/measurements.hpp (100%)
 rename {alib2data => alib2common}/src/sax/ComposerException.cpp (87%)
 rename {alib2data => alib2common}/src/sax/ComposerException.h (78%)
 rename {alib2data => alib2common}/src/sax/FromXMLParserHelper.cpp (100%)
 rename {alib2data => alib2common}/src/sax/FromXMLParserHelper.h (100%)
 rename {alib2data => alib2common}/src/sax/ParserException.cpp (87%)
 rename {alib2data => alib2common}/src/sax/ParserException.h (78%)
 rename {alib2data => alib2common}/src/sax/SaxComposeInterface.cpp (100%)
 rename {alib2data => alib2common}/src/sax/SaxComposeInterface.h (100%)
 rename {alib2data => alib2common}/src/sax/SaxParseInterface.cpp (93%)
 rename {alib2data => alib2common}/src/sax/SaxParseInterface.h (100%)
 rename {alib2data => alib2common}/src/sax/Token.cpp (100%)
 rename {alib2data => alib2common}/src/sax/Token.h (100%)
 rename {alib2measure => alib2common}/test-src/main.cpp (97%)
 rename {alib2measure => alib2common}/test-src/measurements/MeasurementsTest.cpp (100%)
 rename {alib2measure => alib2common}/test-src/measurements/MeasurementsTest.h (100%)
 rename {alib2data => alib2common}/test-src/sax/SaxTest.cpp (100%)
 rename {alib2data => alib2common}/test-src/sax/SaxTest.h (100%)
 delete mode 100644 alib2measure/makefile.conf

diff --git a/aarbology2/makefile.conf b/aarbology2/makefile.conf
index 12f14103af..69645d51e2 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 a5098aee34..87267abda5 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 4c4f770fff..813ae435ef 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 ee0aec4543..e42e6ee1da 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 50b6fecd27..d4df0fe977 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 65c384c673..ec8672f9f8 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 b1f0c823f3..0b2165f574 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 b3036edb08..bd55c47355 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 aec2b730f8..ab595c100c 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 e2ce7faaf0..171905ac42 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 13312db927..e3b9e66b32 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 adcf20c630..d5c0509a40 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 e7f3a350b9..144609c142 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 ad49479344..ca3e031071 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 0000000000..f297c94352
--- /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 0000000000..ae52596b47
--- /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 0000000000..4f2f56c98c
--- /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 02d423dc24..a4b1c55bb7 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 699e1e019b..9648422382 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 f2e3bf3b48..7cd2d10199 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 91f45516ae..d5fb506b5a 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 5213c1a10d..063a8ae1ec 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 261a57693c..e398ec2cc5 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 e1ba2c417c..99d0953e7e 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 f767901976..c92d6c4a0c 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 910d5e94dd..f8161aba51 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 ecd9171937..275a1b7ea8 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 f2bf8db94d..fd442ebd12 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 2468ce4776..17c24b551d 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 c7cbc51166..b11c102248 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 9708fcf943..436eaca664 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 62948e5263..1f2a44f2bb 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 e0a5328948..3dc1f0334b 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 bbd21316d9..e9431758a7 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 c4b66c4bbe..c7df8b9018 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 2ee301be6b..497d410945 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 d450ef34ee..428cc6ca08 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 74f5afa4ce..772a52da6c 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 f91af83a88..d1f404f350 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 803b5ef392..85f1c2ed4a 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 316b8de05e..17df534105 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 e63f3446c2..f282fd6f37 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 02a9b4d4a2..c3a13a53c3 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 bfbc134ec5..6161c200f2 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 6f288c7679..bdc232762b 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 3d5f3dbc8b..c8f29e846d 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 4e3f306216..3d938927fd 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 5be6540278..e2f2b61431 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 6c9346b58c..92f5f06c97 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 46aa618fcd..0465db8582 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 a45429716a..461e7cf24b 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 2503f27961..837bb436f9 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 26408d1b69..827fb806af 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 16aab1713e..d803e7992a 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 2d289bdbd5..4cbb5b9dc5 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 1fcc5959f4..bb54c8ddcf 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 88a149a5fc..e3ecf53f8e 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 064f80036f..b019786bb7 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 d53a607efe..c7f480fcc0 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 e22ac1e320..84a3d20e2f 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 dfb07428eb..3718cf9835 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 d7aa71f74a..ff8621b240 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 94918ba151..cdc8a5e94a 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 4ff4afc4eb..491c8586bc 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 5108379c22..85609cdc1f 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 620f368608..0ee03d0134 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 3e14be13e0..3b2bcee195 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 75da5e741e..763425b888 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 6b2c7c5770..979e8b72d4 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 98305f39f9..3e819629dc 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 36ef1bbdd6..c8db64a1ec 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 222aac1d2d..ccf68cb7ec 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 36e6ce0f5a..4b101a905b 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 6bf22316ac..4e2225df04 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 8940e50554..5c4736934f 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 cb28fd035e..6dbac5ca0c 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 5c52d38184..9a41042529 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 1b181e04f2..fe6872e04b 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 d765dc2767..4df2ccf638 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 ed35bb468c..75b8ca67f4 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 baf5b0e7d7..08e4bcad85 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 4cc0d8c32f..642a7dba49 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 5c74e19b0a..929fa79b6c 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 5d01700e54..68849b5ae2 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 c92a5683e1..a1108af169 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 7822b83c71..5b0c620b21 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 c2f773c37e..6d8f07908c 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 4f9dd8bd8c..df270584b1 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 10b5a85d80..5e88e642f9 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 59c69fda3d..d907763550 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 47f6c5dc35..1d28549f91 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 a8cadd22f5..42395baa94 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 d9c426dddd..d142c14653 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 5d259bc66f..cc05894711 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 672991aa2a..82034aee3c 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 bee9031b2b..4cbf954a92 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 9ab1785653..9df1296071 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 990f46e8a3..3ef4b130e1 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 84bd572006..7c8e7b03c8 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 b3b7a31e0c..9b1b77d06d 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 a8f5f64ddb..e417188a8f 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 41bef5e8b4..d6677ee685 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 f74c33f516..5774ddffaf 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 918e3062e7..a51bc9b6a8 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 f2529e99b0..374050a180 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 2e4eb5dfea..c2534061f2 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 05e0764b25..ce6a12272a 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 aa51304cef..09d873c82f 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 10558e88f5..ced72df4ca 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 d573c10071..82fbb1e72e 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 3b8f223489..ad8b79a9eb 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 d2e6258466..6e36208705 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 af20e72676..9ea3d94c18 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 ca7c49f175..8313b14bc6 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 66578f7869..d9789c81b9 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 24de65e409..41f89ac8f7 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 5636a9bcf6..d81410d9be 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 2531b344c3..7782227c2f 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 feced2a0a1..077b160e45 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 e48ff93376..16fbdf31a4 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 25dd3449a1..3a0b174d8e 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 aba26b4689..8629a79ccd 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 8f07934685..e920530e34 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 9edd1e8e70..55741eba18 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 7d068a3929..a646a8c292 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 d00f2f2bae..838f8f0e8b 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 11c94cb324..30143cb2b4 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 d5bbe91d20..9ef2e8ce2a 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 14eff02090..561ce63c0e 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 09bf2823bc..df483fd32c 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 b701d229bf..c7c877d041 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 1c19a61981..a151fc81ad 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 9b0e3a71ec..0000000000
--- 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 0ed2cbe9ca..70d4aef9c9 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 78c5ea527d..a9b0a71652 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 773310e4bc..f6af577cd6 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 f8991b2269..5c778a70d8 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 5c402f579b..b60510140c 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 84e1e0b2fe..49c99c7c05 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 e30471749d..5563abe8bb 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 2ffb0cd954..558ddb218c 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 9cbf3206dd..3731eca9c9 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 63a8d976d3..e000742240 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 f3e39205df..1123c5e210 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 e74c1a8f19..feca5334f5 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 b970c6d9c4..f50d679ed7 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 ec873755e2..e1dbaf1284 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 39911426a0..c7558dd076 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/
-- 
GitLab