diff --git a/Makefile.am b/Makefile.am
index f4f73130c..68a2aa192 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,7 +61,7 @@ include $(top_srcdir)/src/gui/Makefile.am
 include $(top_srcdir)/icons/Makefile.am
 
 # tests
-include $(top_srcdir)/tests/common/Makefile.am
+include $(top_srcdir)/tests/lib/Makefile.am
 include $(top_srcdir)/tests/components/Makefile.am
 include $(top_srcdir)/tests/Makefile.am
 
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index ad482f910..4fa85a9c4 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -31,6 +31,7 @@ bin_PROGRAMS += lumigui
 lumigui_SOURCES =								\
 	$(lumigui_srcdir)/gtk-lumiera.cpp					\
 	$(lumigui_srcdir)/gtk-lumiera.hpp					\
+	$(lumigui_srcdir)/guinotificationfacade.cpp				\
 	$(lumigui_srcdir)/window-manager.cpp					\
 	$(lumigui_srcdir)/window-manager.hpp					\
 	$(lumigui_srcdir)/workspace/actions.cpp					\
diff --git a/src/lumiera/Makefile.am b/src/lumiera/Makefile.am
index de9799808..ad0c90393 100644
--- a/src/lumiera/Makefile.am
+++ b/src/lumiera/Makefile.am
@@ -15,7 +15,7 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-lumiera_srcdir = $(top_srcdir)/src/lumiera
+lumiera_srcdir = $(top_srcdir)/src
 
 bin_PROGRAMS += lumiera
 lumiera_CPPFLAGS = $(AM_CPPFLAGS) -DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\""
@@ -24,20 +24,19 @@ lumiera_LDADD = liblumierabackend.la liblumieraproc.la liblumiera.la \
 		$(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS) -lboost_program_options-mt -lboost_regex-mt
 
 lumiera_SOURCES =				\
-	$(lumiera_srcdir)/guifacade.cpp		\
-	$(lumiera_srcdir)/configfacade.cpp	\
-	$(lumiera_srcdir)/appstate.cpp		\
-	$(lumiera_srcdir)/option.cpp		\
-	$(lumiera_srcdir)/subsys.cpp		\
-	$(lumiera_srcdir)/interfaceproxy.cpp	\
-	$(lumiera_srcdir)/nobugcfg.cpp		\
-	$(lumiera_srcdir)/guistart.cpp		\
+	$(lumiera_srcdir)/lumiera/guifacade.cpp		\
+	$(lumiera_srcdir)/lumiera/configfacade.cpp	\
+	$(lumiera_srcdir)/lumiera/appstate.cpp		\
+	$(lumiera_srcdir)/lumiera/option.cpp		\
+	$(lumiera_srcdir)/lumiera/subsys.cpp		\
+	$(lumiera_srcdir)/lumiera/interfaceproxy.cpp	\
+	$(lumiera_srcdir)/lumiera/nobugcfg.cpp		\
 	$(lumiera_srcdir)/main.cpp
 
 
 noinst_HEADERS +=				\
-	$(lumiera_srcdir)/subsys.hpp		\
-	$(lumiera_srcdir)/appstate.hpp		\
-	$(lumiera_srcdir)/option.hpp		\
-	$(lumiera_srcdir)/subsystemrunner.hpp	\
-	$(lumiera_srcdir)/instancehandle.hpp
+	$(lumiera_srcdir)/lumiera/subsys.hpp		\
+	$(lumiera_srcdir)/lumiera/appstate.hpp		\
+	$(lumiera_srcdir)/lumiera/option.hpp		\
+	$(lumiera_srcdir)/lumiera/subsystemrunner.hpp	\
+	$(lumiera_srcdir)/lumiera/instancehandle.hpp
diff --git a/tests/40components.tests b/tests/40components.tests
index 1736f92e9..4ff311a4d 100644
--- a/tests/40components.tests
+++ b/tests/40components.tests
@@ -1,4 +1,4 @@
-TESTING "Component Test Suite: common and basic components" ./test-common --group=common
+TESTING "Component Test Suite: common and basic components" ./test-lib --group=common
 
 
 
diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 16c163f08..12a83de18 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -16,11 +16,11 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-testcommon_srcdir = $(top_srcdir)/tests/common
+testlib_srcdir = $(top_srcdir)/tests/lib
 
-check_PROGRAMS += test-common
-test_common_CPPFLAGS = $(AM_CPPFLAGS) -Wall -I$(testcommon_srcdir)
-test_common_LDADD =									\
+check_PROGRAMS += test-lib
+test_lib_CPPFLAGS = $(AM_CPPFLAGS) -Wall -I$(testlib_srcdir)
+test_lib_LDADD =									\
 	liblumiprocmobjectbuilder.a							\
 	liblumiprocmobjectsession.a							\
 	liblumiprocmobject.a								\
@@ -35,37 +35,37 @@ test_common_LDADD =									\
 	$(NOBUGMT_LUMIERA_LIBS) -ldl -lboost_program_options-mt -lboost_regex-mt
 
 test_common_SOURCES =						\
-	$(testcommon_srcdir)/allocationclustertest.cpp	\
-	$(testcommon_srcdir)/appconfigtest.cpp			\
-	$(testcommon_srcdir)/customsharedptrtest.cpp	\
-	$(testcommon_srcdir)/exceptionerrortest.cpp		\
-	$(testcommon_srcdir)/factoryspecialtest.cpp		\
-	$(testcommon_srcdir)/factorytest.cpp			\
-	$(testcommon_srcdir)/helloworldtest.cpp			\
-	$(testcommon_srcdir)/lifecycletest.cpp			\
-	$(testcommon_srcdir)/mainsuite.cpp				\
-	$(testcommon_srcdir)/meta/typelisttest.cpp         	\
-	$(testcommon_srcdir)/meta/typelistmaniptest.cpp     \
-	$(testcommon_srcdir)/meta/generatortest.cpp        	\
-	$(testcommon_srcdir)/meta/configflagstest.cpp      	\
-	$(testcommon_srcdir)/query/queryutilstest.cpp		\
-	$(testcommon_srcdir)/removefromsettest.cpp			\
-	$(testcommon_srcdir)/sanitizedidentifiertest.cpp	\
-	$(testcommon_srcdir)/scopedholdertest.cpp			\
-	$(testcommon_srcdir)/scopedholdertransfertest.cpp	\
-	$(testcommon_srcdir)/singletonsubclasstest.cpp		\
-	$(testcommon_srcdir)/singletontest.cpp				\
-	$(testcommon_srcdir)/singletontestmocktest.cpp		\
-	$(testcommon_srcdir)/streamtypebasicstest.cpp		\
-	$(testcommon_srcdir)/streamtypelifecycletest.cpp	\
-	$(testcommon_srcdir)/test/cmdlinewrappertest.cpp	\
-	$(testcommon_srcdir)/test/testoptiontest.cpp		\
-	$(testcommon_srcdir)/vectortransfertest.cpp			\
-	$(testcommon_srcdir)/visitingtoolconcept.cpp		\
-	$(testcommon_srcdir)/visitingtoolextendedtest.cpp	\
-	$(testcommon_srcdir)/visitingtooltest.cpp
+	$(testlib_srcdir)/allocationclustertest.cpp		\
+	$(testlib_srcdir)/appconfigtest.cpp			\
+	$(testlib_srcdir)/customsharedptrtest.cpp		\
+	$(testlib_srcdir)/exceptionerrortest.cpp		\
+	$(testlib_srcdir)/factoryspecialtest.cpp		\
+	$(testlib_srcdir)/factorytest.cpp			\
+	$(testlib_srcdir)/helloworldtest.cpp			\
+	$(testlib_srcdir)/lifecycletest.cpp			\
+	$(testlib_srcdir)/mainsuite.cpp				\
+	$(testlib_srcdir)/meta/typelisttest.cpp         	\
+	$(testlib_srcdir)/meta/typelistmaniptest.cpp    	\
+	$(testlib_srcdir)/meta/generatortest.cpp        	\
+	$(testlib_srcdir)/meta/configflagstest.cpp      	\
+	$(testlib_srcdir)/query/queryutilstest.cpp		\
+	$(testlib_srcdir)/removefromsettest.cpp			\
+	$(testlib_srcdir)/sanitizedidentifiertest.cpp		\
+	$(testlib_srcdir)/scopedholdertest.cpp			\
+	$(testlib_srcdir)/scopedholdertransfertest.cpp		\
+	$(testlib_srcdir)/singletonsubclasstest.cpp		\
+	$(testlib_srcdir)/singletontest.cpp			\
+	$(testlib_srcdir)/singletontestmocktest.cpp		\
+	$(testlib_srcdir)/streamtypebasicstest.cpp		\
+	$(testlib_srcdir)/streamtypelifecycletest.cpp		\
+	$(testlib_srcdir)/test/cmdlinewrappertest.cpp		\
+	$(testlib_srcdir)/test/testoptiontest.cpp		\
+	$(testlib_srcdir)/vectortransfertest.cpp		\
+	$(testlib_srcdir)/visitingtoolconcept.cpp		\
+	$(testlib_srcdir)/visitingtoolextendedtest.cpp		\
+	$(testlib_srcdir)/visitingtooltest.cpp
 
 noinst_HEADERS +=					\
-	$(testcommon_srcdir)/query/querydiagnostics.hpp	\
-	$(testcommon_srcdir)/testdummy.hpp 				\
-	$(testcommon_srcdir)/testtargetobj.hpp
+	$(testlib_srcdir)/query/querydiagnostics.hpp	\
+	$(testlib_srcdir)/testdummy.hpp 		\
+	$(testlib_srcdir)/testtargetobj.hpp