diff --git a/alib2measure/src/measurements/MeasurementXmlFactory.cpp b/alib2common/src/measurements/MeasurementXmlFactory.cpp
similarity index 98%
rename from alib2measure/src/measurements/MeasurementXmlFactory.cpp
rename to alib2common/src/measurements/MeasurementXmlFactory.cpp
index 118e3bd28c8e031890093f247f5dd8d0d88eadf9..06bb32b916ad72e3d1c2e0aaac6a88b6846051f3 100644
--- a/alib2measure/src/measurements/MeasurementXmlFactory.cpp
+++ b/alib2common/src/measurements/MeasurementXmlFactory.cpp
@@ -2,9 +2,9 @@
  * Author: Radovan Cerveny
  */
 
-#include "sax/FromXMLParserHelper.h"
+#include "../sax/FromXMLParserHelper.h"
 #include "MeasurementXmlFactory.hpp"
-#include "exception/AlibException.h"
+#include "../exception/CommonException.h"
 
 using namespace std;
 using namespace sax;
@@ -122,7 +122,7 @@ MeasurementResults MeasurementXmlFactory::parseMeasurementResults ( deque < Toke
 
 	deque < Token >::iterator iter = tokens.begin ( );
 
-	if ( iter == tokens.end ( ) ) throw::exception::AlibException ( "Empty tokens list" );
+	if ( iter == tokens.end ( ) ) throw::exception::CommonException ( "Empty tokens list" );
 
 	FromXMLParserHelper::popToken ( iter, Token::TokenType::START_ELEMENT, MEASUREMENT_RESULTS_TAG );
 
@@ -130,7 +130,7 @@ MeasurementResults MeasurementXmlFactory::parseMeasurementResults ( deque < Toke
 
 	FromXMLParserHelper::popToken ( iter, Token::TokenType::END_ELEMENT, MEASUREMENT_RESULTS_TAG );
 
-	if ( iter != tokens.end ( ) ) throw::exception::AlibException ( "Unexpeted tokens at the end of the xml" );
+	if ( iter != tokens.end ( ) ) throw::exception::CommonException ( "Unexpeted tokens at the end of the xml" );
 
 	return mr;
 }
diff --git a/alib2measure/src/measurements/MeasurementXmlFactory.hpp b/alib2common/src/measurements/MeasurementXmlFactory.hpp
similarity index 99%
rename from alib2measure/src/measurements/MeasurementXmlFactory.hpp
rename to alib2common/src/measurements/MeasurementXmlFactory.hpp
index 11bfa88586b50c962857dd02a46764a32ed61445..cd6b0a3957c0297f17b8f9b82aa1c443aa360929 100644
--- a/alib2measure/src/measurements/MeasurementXmlFactory.hpp
+++ b/alib2common/src/measurements/MeasurementXmlFactory.hpp
@@ -6,7 +6,7 @@
 #define MEASUREMENT_PROVISIONER_XML_FACTORY_HPP_
 
 #include <deque>
-#include "sax/Token.h"
+#include "../sax/Token.h"
 #include "MeasurementResults.hpp"
 
 namespace measurements {
diff --git a/ameasure2/makefile.conf b/ameasure2/makefile.conf
index 572f34f10b472c3485c1ab0431c9166f30ab69b9..82cb3b1377ce009ab801c581f4f399897c36850c 100644
--- a/ameasure2/makefile.conf
+++ b/ameasure2/makefile.conf
@@ -1,4 +1,4 @@
 EXECUTABLE:=ameasure2
-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/ameasure2/src/ameasure.cpp b/ameasure2/src/ameasure.cpp
index 5ce4ce829257dd5589f485045cf72f0d2692645e..18ca7b71081966a6e46a032e2ea32dfefb204954 100644
--- a/ameasure2/src/ameasure.cpp
+++ b/ameasure2/src/ameasure.cpp
@@ -2,10 +2,10 @@
  * Author: Radovan Cerveny
  */
 
-#include <tclap/CmdLine.h>
-#include "factory/XmlDataFactory.hpp"
 #include "provisioner/MeasurementProvisionerXmlFactory.hpp"
 #include "provisioner/MeasurementProvisioner.hpp"
+#include "factory/XmlDataFactory.hpp"
+#include <tclap/CmdLine.h>
 #include <measure>
 
 int main ( int argc, char * * argv ) {
@@ -28,9 +28,9 @@ int main ( int argc, char * * argv ) {
 		auto configuration = provisioner::MeasurementProvisionerXmlFactory::parseMeasurementProvisionerConfiguration ( tokens );
 		auto results = provisioner::MeasurementProvisioner::runConfiguration ( configuration );
 
-
 		std::cout << "Results on stdin:" << std::endl;
-		for ( provisioner::MeasurementProvisionResults & mpr : results ) {
+
+		for ( provisioner::MeasurementProvisionResults & mpr : results )
 			for ( provisioner::InputFileResults & ifr : mpr ) {
 				std::cout << ifr.first << std::endl;
 
@@ -39,10 +39,10 @@ int main ( int argc, char * * argv ) {
 						std::cout << cr.first << std::endl;
 						std::cout << measurements::MeasurementFormat::TREE << cr.second << std::endl;
 					}
+
 					std::cout << "----------" << std::endl;
 				}
 			}
-		}
 
 		return 0;