diff --git a/tests/components/backend/mediaaccessmock.cpp b/tests/components/backend/mediaaccessmock.cpp
index d54a4978d..25b5c6a0d 100644
--- a/tests/components/backend/mediaaccessmock.cpp
+++ b/tests/components/backend/mediaaccessmock.cpp
@@ -35,7 +35,7 @@
 
 #include "backend/mediaaccessmock.hpp"
 
-#include "common/util.hpp"
+#include "lib/util.hpp"
 
 #include <iostream>
 #include <vector>
diff --git a/tests/components/backend/mediaaccessmocktest.cpp b/tests/components/backend/mediaaccessmocktest.cpp
index 327a7bc74..034315add 100644
--- a/tests/components/backend/mediaaccessmocktest.cpp
+++ b/tests/components/backend/mediaaccessmocktest.cpp
@@ -24,8 +24,8 @@
 #include "backend/mediaaccessfacade.hpp"
 #include "backend/mediaaccessmock.hpp"
 
-#include "common/test/run.hpp"
-//#include "common/util.hpp"
+#include "lib/test/run.hpp"
+//#include "lib/util.hpp"
 
 //#include <boost/format.hpp>
 #include <iostream>
diff --git a/tests/components/mainsuite.cpp b/tests/components/mainsuite.cpp
index 3c6dd11cb..a9ae4248c 120000
--- a/tests/components/mainsuite.cpp
+++ b/tests/components/mainsuite.cpp
@@ -1 +1 @@
-../common/mainsuite.cpp
\ No newline at end of file
+../lib/mainsuite.cpp
\ No newline at end of file
diff --git a/tests/components/proc/asset/assetcategorytest.cpp b/tests/components/proc/asset/assetcategorytest.cpp
index ef02aaafe..fe4127cdc 100644
--- a/tests/components/proc/asset/assetcategorytest.cpp
+++ b/tests/components/proc/asset/assetcategorytest.cpp
@@ -21,8 +21,8 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 #include "proc/asset/category.hpp"
 
diff --git a/tests/components/proc/asset/assetdiagnostics.hpp b/tests/components/proc/asset/assetdiagnostics.hpp
index c7a698db6..326da5e8d 100644
--- a/tests/components/proc/asset/assetdiagnostics.hpp
+++ b/tests/components/proc/asset/assetdiagnostics.hpp
@@ -34,7 +34,7 @@
 
 
 #include "proc/assetmanager.hpp"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 
 #include <boost/format.hpp>
 #include <boost/bind.hpp>
diff --git a/tests/components/proc/asset/basicpipetest.cpp b/tests/components/proc/asset/basicpipetest.cpp
index d085f22d4..c18dca4ec 100644
--- a/tests/components/proc/asset/basicpipetest.cpp
+++ b/tests/components/proc/asset/basicpipetest.cpp
@@ -21,12 +21,12 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 #include "proc/asset/category.hpp"
 #include "proc/asset/pipe.hpp"
-#include "common/query.hpp"
+#include "lib/query.hpp"
 #include "proc/assetmanager.hpp"
 #include "proc/mobject/session.hpp"
 #include "proc/asset/assetdiagnostics.hpp"
diff --git a/tests/components/proc/asset/compoundmediatest.cpp b/tests/components/proc/asset/compoundmediatest.cpp
index 73e4056bc..d0f70db35 100644
--- a/tests/components/proc/asset/compoundmediatest.cpp
+++ b/tests/components/proc/asset/compoundmediatest.cpp
@@ -21,8 +21,8 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 #include "proc/assetmanager.hpp"
 #include "proc/asset/media.hpp"
diff --git a/tests/components/proc/asset/createassettest.cpp b/tests/components/proc/asset/createassettest.cpp
index 530cb1413..c5fde8f76 100644
--- a/tests/components/proc/asset/createassettest.cpp
+++ b/tests/components/proc/asset/createassettest.cpp
@@ -21,8 +21,8 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 #include "proc/assetmanager.hpp"
 #include "proc/asset/media.hpp"
diff --git a/tests/components/proc/asset/deleteassettest.cpp b/tests/components/proc/asset/deleteassettest.cpp
index 5a0ef2ba4..06d56ce48 100644
--- a/tests/components/proc/asset/deleteassettest.cpp
+++ b/tests/components/proc/asset/deleteassettest.cpp
@@ -21,9 +21,9 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-//#include "common/factory.hpp"
-//#include "common/util.hpp"
+#include "lib/test/run.hpp"
+//#include "lib/factory.hpp"
+//#include "lib/util.hpp"
 
 //#include <boost/format.hpp>
 #include <iostream>
diff --git a/tests/components/proc/asset/dependantassetstest.cpp b/tests/components/proc/asset/dependantassetstest.cpp
index 63ea2f57e..79c859843 100644
--- a/tests/components/proc/asset/dependantassetstest.cpp
+++ b/tests/components/proc/asset/dependantassetstest.cpp
@@ -21,12 +21,12 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
+#include "lib/test/run.hpp"
 #include "proc/asset/testasset.hpp"
 #include "proc/asset/assetdiagnostics.hpp"
 #include "proc/asset/media.hpp"
 #include "proc/asset/clip.hpp"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 
 using util::contains;
 using util::isnil;
diff --git a/tests/components/proc/asset/identityofassetstest.cpp b/tests/components/proc/asset/identityofassetstest.cpp
index 655c4fb40..9b629e9db 100644
--- a/tests/components/proc/asset/identityofassetstest.cpp
+++ b/tests/components/proc/asset/identityofassetstest.cpp
@@ -21,8 +21,8 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 #include "proc/assetmanager.hpp"
 #include "proc/asset/media.hpp"
diff --git a/tests/components/proc/asset/makecliptest.cpp b/tests/components/proc/asset/makecliptest.cpp
index 78ab35073..fa983ea86 100644
--- a/tests/components/proc/asset/makecliptest.cpp
+++ b/tests/components/proc/asset/makecliptest.cpp
@@ -21,8 +21,8 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 #include "proc/assetmanager.hpp"
 #include "proc/asset/media.hpp"
diff --git a/tests/components/proc/asset/mediastructurequerytest.cpp b/tests/components/proc/asset/mediastructurequerytest.cpp
index 7cbfcd847..1e588fbe7 100644
--- a/tests/components/proc/asset/mediastructurequerytest.cpp
+++ b/tests/components/proc/asset/mediastructurequerytest.cpp
@@ -21,8 +21,8 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 #include "proc/assetmanager.hpp"
 #include "proc/asset/media.hpp"
diff --git a/tests/components/proc/asset/orderingofassetstest.cpp b/tests/components/proc/asset/orderingofassetstest.cpp
index 783770348..ad8993e05 100644
--- a/tests/components/proc/asset/orderingofassetstest.cpp
+++ b/tests/components/proc/asset/orderingofassetstest.cpp
@@ -21,8 +21,8 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 #include "proc/assetmanager.hpp"
 #include "proc/asset/media.hpp"
diff --git a/tests/components/proc/asset/testasset.hpp b/tests/components/proc/asset/testasset.hpp
index 9ba16a4e6..716cd33f7 100644
--- a/tests/components/proc/asset/testasset.hpp
+++ b/tests/components/proc/asset/testasset.hpp
@@ -28,7 +28,7 @@
 #include "pre_a.hpp"
 
 #include "proc/asset.hpp"
-//#include "common/util.hpp"
+//#include "lib/util.hpp"
 
 
 #include <boost/format.hpp>
diff --git a/tests/components/proc/asset/testclipasset.hpp b/tests/components/proc/asset/testclipasset.hpp
index 8bb0fa1ad..d1027f139 100644
--- a/tests/components/proc/asset/testclipasset.hpp
+++ b/tests/components/proc/asset/testclipasset.hpp
@@ -25,9 +25,9 @@
 #define ASSET_TESTCLIPASSET_H
 
 
-#include "common/test/run.hpp"
-//#include "common/factory.hpp"
-//#include "common/util.hpp"
+#include "lib/test/run.hpp"
+//#include "lib/factory.hpp"
+//#include "lib/util.hpp"
 
 //#include <boost/format.hpp>
 #include <iostream>
diff --git a/tests/components/proc/engine/bufftabletest.cpp b/tests/components/proc/engine/bufftabletest.cpp
index 436285c95..d1acca340 100644
--- a/tests/components/proc/engine/bufftabletest.cpp
+++ b/tests/components/proc/engine/bufftabletest.cpp
@@ -21,7 +21,7 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
+#include "lib/test/run.hpp"
 #include "include/error.hpp"
 
 #include "proc/engine/procnode.hpp"
diff --git a/tests/components/proc/engine/sourcenodetest.cpp b/tests/components/proc/engine/sourcenodetest.cpp
index 35127ab4a..2d4daab02 100644
--- a/tests/components/proc/engine/sourcenodetest.cpp
+++ b/tests/components/proc/engine/sourcenodetest.cpp
@@ -21,9 +21,9 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-//#include "common/factory.hpp"
-//#include "common/util.hpp"
+#include "lib/test/run.hpp"
+//#include "lib/factory.hpp"
+//#include "lib/util.hpp"
 
 //#include <boost/format.hpp>
 #include <iostream>
diff --git a/tests/components/proc/mobject/builder/buildertooltest.cpp b/tests/components/proc/mobject/builder/buildertooltest.cpp
index b1fa1f205..31e0988cd 100644
--- a/tests/components/proc/mobject/builder/buildertooltest.cpp
+++ b/tests/components/proc/mobject/builder/buildertooltest.cpp
@@ -21,14 +21,14 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
+#include "lib/test/run.hpp"
 
 #include "proc/mobject/builder/buildertool.hpp"
 #include "proc/mobject/placement.hpp"
 #include "proc/asset/category.hpp"
 #include "proc/asset/media.hpp"
 #include "proc/mobject/session/clip.hpp"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 
 #include <iostream>
 
diff --git a/tests/components/proc/mobject/builder/buildsegmenttest.cpp b/tests/components/proc/mobject/builder/buildsegmenttest.cpp
index 5fd44d988..5efc32949 100644
--- a/tests/components/proc/mobject/builder/buildsegmenttest.cpp
+++ b/tests/components/proc/mobject/builder/buildsegmenttest.cpp
@@ -21,9 +21,9 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-//#include "common/factory.hpp"
-//#include "common/util.hpp"
+#include "lib/test/run.hpp"
+//#include "lib/factory.hpp"
+//#include "lib/util.hpp"
 
 //#include <boost/format.hpp>
 #include <iostream>
diff --git a/tests/components/proc/mobject/controller/rendersegmenttest.cpp b/tests/components/proc/mobject/controller/rendersegmenttest.cpp
index a56c76480..fd891ad60 100644
--- a/tests/components/proc/mobject/controller/rendersegmenttest.cpp
+++ b/tests/components/proc/mobject/controller/rendersegmenttest.cpp
@@ -21,9 +21,9 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-//#include "common/factory.hpp"
-//#include "common/util.hpp"
+#include "lib/test/run.hpp"
+//#include "lib/factory.hpp"
+//#include "lib/util.hpp"
 
 //#include <boost/format.hpp>
 #include <iostream>
diff --git a/tests/components/proc/mobject/placementbasictest.cpp b/tests/components/proc/mobject/placementbasictest.cpp
index e3e237252..c9c704b3f 100644
--- a/tests/components/proc/mobject/placementbasictest.cpp
+++ b/tests/components/proc/mobject/placementbasictest.cpp
@@ -21,14 +21,14 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
+#include "lib/test/run.hpp"
 #include "proc/asset/media.hpp"
 #include "proc/mobject/session.hpp"
 #include "proc/mobject/session/edl.hpp"
 #include "proc/mobject/session/testclip.hpp"
 #include "proc/mobject/placement.hpp"
 #include "proc/mobject/explicitplacement.hpp"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 #include "proc/mobject/session/mobjectfactory.hpp"   ////TODO: avoidable?
 
 //#include <boost/format.hpp>
diff --git a/tests/components/proc/mobject/session/addcliptest.cpp b/tests/components/proc/mobject/session/addcliptest.cpp
index 3cb981270..55e37c718 100644
--- a/tests/components/proc/mobject/session/addcliptest.cpp
+++ b/tests/components/proc/mobject/session/addcliptest.cpp
@@ -21,12 +21,12 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
+#include "lib/test/run.hpp"
 #include "proc/mobject/session.hpp"
 #include "proc/mobject/session/edl.hpp"
 #include "proc/mobject/session/testclip.hpp"
 #include "proc/mobject/placement.hpp"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 
 //#include <boost/format.hpp>
 #include <iostream>
diff --git a/tests/components/proc/mobject/session/defsmanagerimpltest.cpp b/tests/components/proc/mobject/session/defsmanagerimpltest.cpp
index 85f1c088c..7a54f1db0 100644
--- a/tests/components/proc/mobject/session/defsmanagerimpltest.cpp
+++ b/tests/components/proc/mobject/session/defsmanagerimpltest.cpp
@@ -23,12 +23,12 @@
 
 #include "pre_a.hpp"
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 #include "proc/asset.hpp"
 #include "proc/asset/pipe.hpp"
-#include "common/configrules.hpp"
+#include "lib/configrules.hpp"
 #include "proc/assetmanager.hpp"
 #include "proc/mobject/session.hpp"
 
diff --git a/tests/components/proc/mobject/session/defsmanagertest.cpp b/tests/components/proc/mobject/session/defsmanagertest.cpp
index 8c819c7f2..4aa976de0 100644
--- a/tests/components/proc/mobject/session/defsmanagertest.cpp
+++ b/tests/components/proc/mobject/session/defsmanagertest.cpp
@@ -23,13 +23,13 @@
 
 #include "pre_a.hpp"
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 #include "proc/asset.hpp"
 #include "proc/asset/pipe.hpp"
-#include "common/query.hpp"
-#include "common/configrules.hpp"   ///////TODO just temp
+#include "lib/query.hpp"
+#include "lib/configrules.hpp"   ///////TODO just temp
 #include "proc/assetmanager.hpp"
 #include "proc/mobject/session.hpp"
 
diff --git a/tests/components/proc/mobject/session/defsregistryimpltest.cpp b/tests/components/proc/mobject/session/defsregistryimpltest.cpp
index e2c515600..12ddc2edf 100644
--- a/tests/components/proc/mobject/session/defsregistryimpltest.cpp
+++ b/tests/components/proc/mobject/session/defsregistryimpltest.cpp
@@ -21,15 +21,15 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 #include "proc/mobject/session/defsregistry.hpp"
-#include "common/factory.hpp"
-#include "common/query.hpp"
-#include "common/p.hpp"
+#include "lib/factory.hpp"
+#include "lib/query.hpp"
+#include "lib/p.hpp"
 
-#include "../common/query/querydiagnostics.hpp"
+#include "../lib/query/querydiagnostics.hpp"
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/format.hpp>
diff --git a/tests/components/proc/mobject/session/deletecliptest.cpp b/tests/components/proc/mobject/session/deletecliptest.cpp
index 6f1e387e5..a00812db0 100644
--- a/tests/components/proc/mobject/session/deletecliptest.cpp
+++ b/tests/components/proc/mobject/session/deletecliptest.cpp
@@ -21,13 +21,13 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
+#include "lib/test/run.hpp"
 #include "proc/assetmanager.hpp"
 #include "proc/mobject/session.hpp"
 #include "proc/mobject/session/edl.hpp"               // TODO: really neded?
 #include "proc/mobject/session/testsession1.hpp"
 #include "proc/mobject/session/clip.hpp"              // TODO: really neded?
-//#include "common/util.hpp"
+//#include "lib/util.hpp"
 
 //#include <boost/format.hpp>
 #include <iostream>
diff --git a/tests/components/proc/mobject/session/rebuildfixturetest.cpp b/tests/components/proc/mobject/session/rebuildfixturetest.cpp
index ffb43a32b..a4e81328d 100644
--- a/tests/components/proc/mobject/session/rebuildfixturetest.cpp
+++ b/tests/components/proc/mobject/session/rebuildfixturetest.cpp
@@ -21,11 +21,11 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
+#include "lib/test/run.hpp"
 #include "proc/mobject/session.hpp"
 #include "proc/mobject/session/edl.hpp"
 #include "proc/mobject/session/testsession1.hpp"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 
 //#include <boost/format.hpp>
 #include <boost/bind.hpp>
diff --git a/tests/components/proc/mobject/session/sessionmanagertest.cpp b/tests/components/proc/mobject/session/sessionmanagertest.cpp
index 3dcf1716d..ee09393be 100644
--- a/tests/components/proc/mobject/session/sessionmanagertest.cpp
+++ b/tests/components/proc/mobject/session/sessionmanagertest.cpp
@@ -21,10 +21,10 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
+#include "lib/test/run.hpp"
 #include "proc/mobject/session.hpp"
 #include "proc/mobject/session/testsession1.hpp"
-//#include "common/util.hpp"
+//#include "lib/util.hpp"
 //#include <boost/format.hpp>
 #include <iostream>
 
diff --git a/tests/components/proc/mobject/session/sessionstructuretest.cpp b/tests/components/proc/mobject/session/sessionstructuretest.cpp
index 5d3eaded3..198505657 100644
--- a/tests/components/proc/mobject/session/sessionstructuretest.cpp
+++ b/tests/components/proc/mobject/session/sessionstructuretest.cpp
@@ -21,12 +21,12 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
+#include "lib/test/run.hpp"
 #include "proc/mobject/session.hpp"
 #include "proc/mobject/session/edl.hpp"             // TODO only temporarily needed
 #include "proc/mobject/session/fixture.hpp"             // TODO only temporarily needed
 #include "proc/assetmanager.hpp"
-//#include "common/util.hpp"
+//#include "lib/util.hpp"
 //#include <boost/format.hpp>
 #include <iostream>
 
diff --git a/tests/components/proc/mobject/session/testclip.cpp b/tests/components/proc/mobject/session/testclip.cpp
index ea17dd19d..e284f0de2 100644
--- a/tests/components/proc/mobject/session/testclip.cpp
+++ b/tests/components/proc/mobject/session/testclip.cpp
@@ -26,7 +26,7 @@
 #include "backend/mediaaccessmock.hpp"
 #include "proc/asset/media.hpp"
 #include "proc/asset/clip.hpp"
-#include "common/singleton.hpp"
+#include "lib/singleton.hpp"
 
 namespace mobject
   {
diff --git a/tests/components/proc/mobject/session/testclip.hpp b/tests/components/proc/mobject/session/testclip.hpp
index 63ac8475a..8f9f58c31 100644
--- a/tests/components/proc/mobject/session/testclip.hpp
+++ b/tests/components/proc/mobject/session/testclip.hpp
@@ -26,7 +26,7 @@
 
 
 #include "proc/mobject/session/clip.hpp"
-//#include "common/util.hpp"
+//#include "lib/util.hpp"
 
 
 //#include <boost/format.hpp>
diff --git a/tests/components/proc/mobject/session/testsession1.hpp b/tests/components/proc/mobject/session/testsession1.hpp
index bb8745851..0114f7e3c 100644
--- a/tests/components/proc/mobject/session/testsession1.hpp
+++ b/tests/components/proc/mobject/session/testsession1.hpp
@@ -27,8 +27,8 @@
 
 #include "proc/mobject/session.hpp"
 #include "include/error.hpp"
-//#include "common/factory.hpp"
-//#include "common/util.hpp"
+//#include "lib/factory.hpp"
+//#include "lib/util.hpp"
 
 //#include <boost/format.hpp>
 #include <iostream>
diff --git a/tests/common/Makefile.am b/tests/lib/Makefile.am
similarity index 100%
rename from tests/common/Makefile.am
rename to tests/lib/Makefile.am
diff --git a/tests/common/allocationclustertest.cpp b/tests/lib/allocationclustertest.cpp
similarity index 99%
rename from tests/common/allocationclustertest.cpp
rename to tests/lib/allocationclustertest.cpp
index 2d634ac37..447f18e5d 100644
--- a/tests/common/allocationclustertest.cpp
+++ b/tests/lib/allocationclustertest.cpp
@@ -22,8 +22,8 @@
 
 
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 #include "lib/allocationcluster.hpp"
 #include "lib/scopedholder.hpp"
diff --git a/tests/common/appconfigtest.cpp b/tests/lib/appconfigtest.cpp
similarity index 96%
rename from tests/common/appconfigtest.cpp
rename to tests/lib/appconfigtest.cpp
index 08683fa3b..c36c4f70e 100644
--- a/tests/common/appconfigtest.cpp
+++ b/tests/lib/appconfigtest.cpp
@@ -22,8 +22,8 @@
 
 
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 #include "lumiera/appstate.hpp"
 
diff --git a/tests/common/customsharedptrtest.cpp b/tests/lib/customsharedptrtest.cpp
similarity index 99%
rename from tests/common/customsharedptrtest.cpp
rename to tests/lib/customsharedptrtest.cpp
index bab7cfaa1..15ceb26e4 100644
--- a/tests/common/customsharedptrtest.cpp
+++ b/tests/lib/customsharedptrtest.cpp
@@ -21,10 +21,10 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
-#include "common/p.hpp"
+#include "lib/p.hpp"
 
 #include <boost/operators.hpp>
 
diff --git a/tests/common/exceptionerrortest.cpp b/tests/lib/exceptionerrortest.cpp
similarity index 99%
rename from tests/common/exceptionerrortest.cpp
rename to tests/lib/exceptionerrortest.cpp
index 9ce45a1c8..643a19d55 100644
--- a/tests/common/exceptionerrortest.cpp
+++ b/tests/lib/exceptionerrortest.cpp
@@ -25,8 +25,8 @@
 #include "lib/error.h"
 #include "include/error.hpp"
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 
 #include <string>
diff --git a/tests/common/factoryspecialtest.cpp b/tests/lib/factoryspecialtest.cpp
similarity index 99%
rename from tests/common/factoryspecialtest.cpp
rename to tests/lib/factoryspecialtest.cpp
index eaf50fe42..6850f057a 100644
--- a/tests/common/factoryspecialtest.cpp
+++ b/tests/lib/factoryspecialtest.cpp
@@ -21,11 +21,11 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 #include "testtargetobj.hpp"
-#include "common/factory.hpp"
+#include "lib/factory.hpp"
 
 #include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
diff --git a/tests/common/factorytest.cpp b/tests/lib/factorytest.cpp
similarity index 97%
rename from tests/common/factorytest.cpp
rename to tests/lib/factorytest.cpp
index bde121a8c..578c63085 100644
--- a/tests/common/factorytest.cpp
+++ b/tests/lib/factorytest.cpp
@@ -23,9 +23,9 @@
 
 #include "testtargetobj.hpp"
 
-#include "common/test/run.hpp"
-#include "common/factory.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/factory.hpp"
+#include "lib/util.hpp"
 
 #include <boost/lexical_cast.hpp>
 #include <iostream>
diff --git a/tests/common/helloworldtest.cpp b/tests/lib/helloworldtest.cpp
similarity index 96%
rename from tests/common/helloworldtest.cpp
rename to tests/lib/helloworldtest.cpp
index d0c289986..d6a2951af 100644
--- a/tests/common/helloworldtest.cpp
+++ b/tests/lib/helloworldtest.cpp
@@ -22,9 +22,9 @@
 
 
 #include <iostream>
-#include "common/test/run.hpp"
+#include "lib/test/run.hpp"
 
-#include "common/util.hpp"
+#include "lib/util.hpp"
 using util::isnil;
 
 #include <boost/lexical_cast.hpp>
diff --git a/tests/common/lifecycletest.cpp b/tests/lib/lifecycletest.cpp
similarity index 97%
rename from tests/common/lifecycletest.cpp
rename to tests/lib/lifecycletest.cpp
index 113c1c162..b7fae568d 100644
--- a/tests/common/lifecycletest.cpp
+++ b/tests/lib/lifecycletest.cpp
@@ -22,8 +22,8 @@
 
 
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 #include "lumiera/appstate.hpp"
 
diff --git a/tests/common/mainsuite.cpp b/tests/lib/mainsuite.cpp
similarity index 95%
rename from tests/common/mainsuite.cpp
rename to tests/lib/mainsuite.cpp
index 92db417e3..f966d4e77 100644
--- a/tests/common/mainsuite.cpp
+++ b/tests/lib/mainsuite.cpp
@@ -21,8 +21,8 @@
 */
 
 
-#include "common/test/suite.hpp"
-#include "common/test/testoption.hpp"
+#include "lib/test/suite.hpp"
+#include "lib/test/testoption.hpp"
 #include "lumiera/appstate.hpp"
 #include "include/lifecycle.h"
 
diff --git a/tests/common/meta/configflagstest.cpp b/tests/lib/meta/configflagstest.cpp
similarity index 98%
rename from tests/common/meta/configflagstest.cpp
rename to tests/lib/meta/configflagstest.cpp
index d7383615b..cc0bffcb6 100644
--- a/tests/common/meta/configflagstest.cpp
+++ b/tests/lib/meta/configflagstest.cpp
@@ -37,14 +37,14 @@
  */
 
 
-#include "common/test/run.hpp"
-#include "common/meta/util.hpp"
-#include "common/meta/generator.hpp"
-#include "common/meta/typelistutil.hpp"
-#include "common/meta/configflags.hpp"
+#include "lib/test/run.hpp"
+#include "lib/meta/util.hpp"
+#include "lib/meta/generator.hpp"
+#include "lib/meta/typelistutil.hpp"
+#include "lib/meta/configflags.hpp"
 #include "meta/typelistdiagnostics.hpp"
 #include "proc/engine/nodewiringconfig.hpp"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 
 #include <boost/format.hpp>
 #include <iostream>
diff --git a/tests/common/meta/generatortest.cpp b/tests/lib/meta/generatortest.cpp
similarity index 98%
rename from tests/common/meta/generatortest.cpp
rename to tests/lib/meta/generatortest.cpp
index 2909b076d..932b79fe0 100644
--- a/tests/common/meta/generatortest.cpp
+++ b/tests/lib/meta/generatortest.cpp
@@ -37,8 +37,8 @@
  */
 
 
-#include "common/test/run.hpp"
-#include "common/meta/generator.hpp"
+#include "lib/test/run.hpp"
+#include "lib/meta/generator.hpp"
 
 #include <boost/format.hpp>
 #include <iostream>
diff --git a/tests/common/meta/typelistdiagnostics.hpp b/tests/lib/meta/typelistdiagnostics.hpp
similarity index 97%
rename from tests/common/meta/typelistdiagnostics.hpp
rename to tests/lib/meta/typelistdiagnostics.hpp
index 8de0e8d76..7be9cef31 100644
--- a/tests/common/meta/typelistdiagnostics.hpp
+++ b/tests/lib/meta/typelistdiagnostics.hpp
@@ -36,11 +36,11 @@
 #define META_TYPELISTDIAGNOSTICS_H
 
 
-#include "common/meta/generator.hpp"
+#include "lib/meta/generator.hpp"
 
-//#include "common/meta/typelistutil.hpp"
-//#include "common/meta/util.hpp"
-//#include "common/util.hpp"
+//#include "lib/meta/typelistutil.hpp"
+//#include "lib/meta/util.hpp"
+//#include "lib/util.hpp"
 
 #include <boost/format.hpp>
 
diff --git a/tests/common/meta/typelistmaniptest.cpp b/tests/lib/meta/typelistmaniptest.cpp
similarity index 98%
rename from tests/common/meta/typelistmaniptest.cpp
rename to tests/lib/meta/typelistmaniptest.cpp
index f2b86c11e..5eb3e0f0e 100644
--- a/tests/common/meta/typelistmaniptest.cpp
+++ b/tests/lib/meta/typelistmaniptest.cpp
@@ -38,11 +38,11 @@
  */
 
 
-#include "common/test/run.hpp"
-#include "common/meta/generator.hpp"
-#include "common/meta/typelistutil.hpp"
+#include "lib/test/run.hpp"
+#include "lib/meta/generator.hpp"
+#include "lib/meta/typelistutil.hpp"
 #include "meta/typelistdiagnostics.hpp"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 
 #include <boost/format.hpp>
 #include <iostream>
diff --git a/tests/common/meta/typelisttest.cpp b/tests/lib/meta/typelisttest.cpp
similarity index 97%
rename from tests/common/meta/typelisttest.cpp
rename to tests/lib/meta/typelisttest.cpp
index 5c942b1e0..b070feaa1 100644
--- a/tests/common/meta/typelisttest.cpp
+++ b/tests/lib/meta/typelisttest.cpp
@@ -21,8 +21,8 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-#include "common/meta/typelist.hpp"
+#include "lib/test/run.hpp"
+#include "lib/meta/typelist.hpp"
 
 #include <iostream>
 
diff --git a/tests/common/query/querydiagnostics.hpp b/tests/lib/query/querydiagnostics.hpp
similarity index 100%
rename from tests/common/query/querydiagnostics.hpp
rename to tests/lib/query/querydiagnostics.hpp
diff --git a/tests/common/query/queryutilstest.cpp b/tests/lib/query/queryutilstest.cpp
similarity index 98%
rename from tests/common/query/queryutilstest.cpp
rename to tests/lib/query/queryutilstest.cpp
index b641d9d0a..8de9ced7c 100644
--- a/tests/common/query/queryutilstest.cpp
+++ b/tests/lib/query/queryutilstest.cpp
@@ -21,11 +21,11 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 #include "lib/cmdline.hpp"
-#include "common/query.hpp"
+#include "lib/query.hpp"
 #include "query/querydiagnostics.hpp"
 
 #include <boost/bind.hpp>
diff --git a/tests/common/removefromsettest.cpp b/tests/lib/removefromsettest.cpp
similarity index 98%
rename from tests/common/removefromsettest.cpp
rename to tests/lib/removefromsettest.cpp
index c51d02019..b86fc2389 100644
--- a/tests/common/removefromsettest.cpp
+++ b/tests/lib/removefromsettest.cpp
@@ -21,8 +21,8 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 #include <boost/lexical_cast.hpp>
 #include <boost/lambda/lambda.hpp>
diff --git a/tests/common/sanitizedidentifiertest.cpp b/tests/lib/sanitizedidentifiertest.cpp
similarity index 97%
rename from tests/common/sanitizedidentifiertest.cpp
rename to tests/lib/sanitizedidentifiertest.cpp
index 1e96bc515..2f15bcbbe 100644
--- a/tests/common/sanitizedidentifiertest.cpp
+++ b/tests/lib/sanitizedidentifiertest.cpp
@@ -21,8 +21,8 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 
 #include <iostream>
diff --git a/tests/common/scopedholdertest.cpp b/tests/lib/scopedholdertest.cpp
similarity index 99%
rename from tests/common/scopedholdertest.cpp
rename to tests/lib/scopedholdertest.cpp
index 2337d60df..42ed7de7e 100644
--- a/tests/common/scopedholdertest.cpp
+++ b/tests/lib/scopedholdertest.cpp
@@ -22,8 +22,8 @@
 
 
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 #include "lib/scopedholder.hpp"
 #include "testdummy.hpp"
diff --git a/tests/common/scopedholdertransfertest.cpp b/tests/lib/scopedholdertransfertest.cpp
similarity index 99%
rename from tests/common/scopedholdertransfertest.cpp
rename to tests/lib/scopedholdertransfertest.cpp
index 1c69e38bb..92be1118d 100644
--- a/tests/common/scopedholdertransfertest.cpp
+++ b/tests/lib/scopedholdertransfertest.cpp
@@ -22,8 +22,8 @@
 
 
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 #include "lib/scopedholder.hpp"
 #include "lib/scopedholdertransfer.hpp"
diff --git a/tests/common/singletonsubclasstest.cpp b/tests/lib/singletonsubclasstest.cpp
similarity index 98%
rename from tests/common/singletonsubclasstest.cpp
rename to tests/lib/singletonsubclasstest.cpp
index ac3cbd3f0..1b9097c44 100644
--- a/tests/common/singletonsubclasstest.cpp
+++ b/tests/lib/singletonsubclasstest.cpp
@@ -21,11 +21,11 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 #include "testtargetobj.hpp"
-#include "common/singletonsubclass.hpp"
+#include "lib/singletonsubclass.hpp"
 
 #include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
diff --git a/tests/common/singletontest.cpp b/tests/lib/singletontest.cpp
similarity index 97%
rename from tests/common/singletontest.cpp
rename to tests/lib/singletontest.cpp
index 9960ff911..88fc923d7 100644
--- a/tests/common/singletontest.cpp
+++ b/tests/lib/singletontest.cpp
@@ -21,11 +21,11 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 #include "testtargetobj.hpp"
-#include "common/singleton.hpp"
+#include "lib/singleton.hpp"
 
 #include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
diff --git a/tests/common/singletontestmocktest.cpp b/tests/lib/singletontestmocktest.cpp
similarity index 98%
rename from tests/common/singletontestmocktest.cpp
rename to tests/lib/singletontestmocktest.cpp
index 700398471..131603c49 100644
--- a/tests/common/singletontestmocktest.cpp
+++ b/tests/lib/singletontestmocktest.cpp
@@ -22,9 +22,9 @@
 
 
 
-#include "common/test/run.hpp"
-#include "common/singleton.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/singleton.hpp"
+#include "lib/util.hpp"
 
 #include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
diff --git a/tests/common/streamtypebasicstest.cpp b/tests/lib/streamtypebasicstest.cpp
similarity index 98%
rename from tests/common/streamtypebasicstest.cpp
rename to tests/lib/streamtypebasicstest.cpp
index a2c1332d0..3ddea1deb 100644
--- a/tests/common/streamtypebasicstest.cpp
+++ b/tests/lib/streamtypebasicstest.cpp
@@ -21,8 +21,8 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 #include "proc/control/stypemanager.hpp"
 #include "teststreamtypes.hpp"
diff --git a/tests/common/streamtypelifecycletest.cpp b/tests/lib/streamtypelifecycletest.cpp
similarity index 98%
rename from tests/common/streamtypelifecycletest.cpp
rename to tests/lib/streamtypelifecycletest.cpp
index ce260da59..af646bf1c 100644
--- a/tests/common/streamtypelifecycletest.cpp
+++ b/tests/lib/streamtypelifecycletest.cpp
@@ -21,8 +21,8 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/util.hpp"
 
 #include "proc/control/stypemanager.hpp"
 #include "proc/mobject/session.hpp"
diff --git a/tests/common/test/cmdlinewrappertest.cpp b/tests/lib/test/cmdlinewrappertest.cpp
similarity index 98%
rename from tests/common/test/cmdlinewrappertest.cpp
rename to tests/lib/test/cmdlinewrappertest.cpp
index e99e2bd8c..a5add31e2 100644
--- a/tests/common/test/cmdlinewrappertest.cpp
+++ b/tests/lib/test/cmdlinewrappertest.cpp
@@ -21,9 +21,9 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
+#include "lib/test/run.hpp"
 #include "lib/cmdline.hpp"
-#include "common/util.hpp"
+#include "lib/util.hpp"
 
 #include <iostream>
 #include <sstream>
diff --git a/tests/common/test/testoptiontest.cpp b/tests/lib/test/testoptiontest.cpp
similarity index 96%
rename from tests/common/test/testoptiontest.cpp
rename to tests/lib/test/testoptiontest.cpp
index 7f3da81c6..52ed20038 100644
--- a/tests/common/test/testoptiontest.cpp
+++ b/tests/lib/test/testoptiontest.cpp
@@ -22,9 +22,9 @@
 
 
 #include <iostream>
-#include "common/test/run.hpp"
-#include "common/test/testoption.hpp"
-#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/test/testoption.hpp"
+#include "lib/util.hpp"
 
 using util::Cmdline;
 using util::isnil;
diff --git a/tests/common/testdummy.hpp b/tests/lib/testdummy.hpp
similarity index 100%
rename from tests/common/testdummy.hpp
rename to tests/lib/testdummy.hpp
diff --git a/tests/common/teststreamtypes.hpp b/tests/lib/teststreamtypes.hpp
similarity index 97%
rename from tests/common/teststreamtypes.hpp
rename to tests/lib/teststreamtypes.hpp
index 3505b7580..22947b50a 100644
--- a/tests/common/teststreamtypes.hpp
+++ b/tests/lib/teststreamtypes.hpp
@@ -25,9 +25,9 @@
 #define LUMIERA_TEST_TESTSTREAMTYPES_H
 
 
-//#include "common/util.hpp"
+//#include "lib/util.hpp"
 
-#include "common/streamtype.hpp"
+#include "lib/streamtype.hpp"
 #include "proc/control/stypemanager.hpp"
 
 extern "C" {
diff --git a/tests/common/testtargetobj.hpp b/tests/lib/testtargetobj.hpp
similarity index 96%
rename from tests/common/testtargetobj.hpp
rename to tests/lib/testtargetobj.hpp
index 5eb7ddf01..8444acf81 100644
--- a/tests/common/testtargetobj.hpp
+++ b/tests/lib/testtargetobj.hpp
@@ -25,9 +25,9 @@
 #define LUMIERA_TEST_TESTTARGETOBJ_H
 
 
-#include "common/test/run.hpp"
-#include "common/factory.hpp"
-//#include "common/util.hpp"
+#include "lib/test/run.hpp"
+#include "lib/factory.hpp"
+//#include "lib/util.hpp"
 
 #include <boost/algorithm/string/join.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/tests/common/vectortransfertest.cpp b/tests/lib/vectortransfertest.cpp
similarity index 99%
rename from tests/common/vectortransfertest.cpp
rename to tests/lib/vectortransfertest.cpp
index b4c415c3e..ce82e6669 100644
--- a/tests/common/vectortransfertest.cpp
+++ b/tests/lib/vectortransfertest.cpp
@@ -22,7 +22,7 @@
 
 
 
-#include "common/test/run.hpp"
+#include "lib/test/run.hpp"
 
 #include "lib/scopedholdertransfer.hpp"
 #include "testdummy.hpp"
diff --git a/tests/common/visitingtoolconcept.cpp b/tests/lib/visitingtoolconcept.cpp
similarity index 99%
rename from tests/common/visitingtoolconcept.cpp
rename to tests/lib/visitingtoolconcept.cpp
index f2189ed09..94ad6ad98 100644
--- a/tests/common/visitingtoolconcept.cpp
+++ b/tests/lib/visitingtoolconcept.cpp
@@ -53,8 +53,8 @@
  */
 
 
-#include "common/test/run.hpp"
-#include "common/singleton.hpp"
+#include "lib/test/run.hpp"
+#include "lib/singleton.hpp"
 
 #include <boost/format.hpp>
 #include <iostream>
diff --git a/tests/common/visitingtoolextendedtest.cpp b/tests/lib/visitingtoolextendedtest.cpp
similarity index 99%
rename from tests/common/visitingtoolextendedtest.cpp
rename to tests/lib/visitingtoolextendedtest.cpp
index d29c60b26..b90d2bc17 100644
--- a/tests/common/visitingtoolextendedtest.cpp
+++ b/tests/lib/visitingtoolextendedtest.cpp
@@ -21,8 +21,8 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-#include "common/visitor.hpp"
+#include "lib/test/run.hpp"
+#include "lib/visitor.hpp"
 
 #include <boost/format.hpp>
 #include <iostream>
diff --git a/tests/common/visitingtooltest.cpp b/tests/lib/visitingtooltest.cpp
similarity index 98%
rename from tests/common/visitingtooltest.cpp
rename to tests/lib/visitingtooltest.cpp
index 0263d9c88..ab49ac5f4 100644
--- a/tests/common/visitingtooltest.cpp
+++ b/tests/lib/visitingtooltest.cpp
@@ -21,8 +21,8 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
-#include "common/visitor.hpp"
+#include "lib/test/run.hpp"
+#include "lib/visitor.hpp"
 
 #include <boost/format.hpp>
 #include <iostream>