diff --git a/src/backend/backend.c b/src/backend/backend.c
index a41675f3c..aed53ac47 100644
--- a/src/backend/backend.c
+++ b/src/backend/backend.c
@@ -22,7 +22,7 @@
 #include "lib/safeclib.h"
 
 #include "backend/backend.h"
-#include "lumiera/config.h"
+#include "lib/config.h"
 #include "backend/filehandlecache.h"
 #include "backend/filedescriptor.h"
 #include "backend/mmapcache.h"
diff --git a/src/backend/mmap.c b/src/backend/mmap.c
index 292c58b65..3df63fd7f 100644
--- a/src/backend/mmap.c
+++ b/src/backend/mmap.c
@@ -23,7 +23,7 @@
 
 #include "backend/mmap.h"
 #include "backend/mmapcache.h"
-#include "lumiera/config.h"
+#include "lib/config.h"
 
 #include <unistd.h>
 #include <sys/mman.h>
diff --git a/src/gui/gtk-lumiera.cpp b/src/gui/gtk-lumiera.cpp
index 83a2f80a0..90e1cc1da 100644
--- a/src/gui/gtk-lumiera.cpp
+++ b/src/gui/gtk-lumiera.cpp
@@ -33,7 +33,7 @@
 #include "model/project.hpp"
 
 extern "C" {
-#include "lumiera/interface.h"
+#include "lib/interface.h"
 }
 
 NOBUG_CPP_DEFINE_FLAG(gui);
diff --git a/src/gui/guifacade.hpp b/src/gui/guifacade.hpp
index 3b1775e79..d2c8cb2fc 100644
--- a/src/gui/guifacade.hpp
+++ b/src/gui/guifacade.hpp
@@ -41,7 +41,7 @@
 #include "lumiera/subsys.hpp"
 
 extern "C" {
-#include "lumiera/interface.h"
+#include "lib/interface.h"
 }
 
 
diff --git a/src/guistart.cpp b/src/guistart.cpp
index b86b05e2d..fa47d8ee7 100644
--- a/src/guistart.cpp
+++ b/src/guistart.cpp
@@ -48,8 +48,8 @@
 #include "common/singleton.hpp"
 
 extern "C" {
-#include "lumiera/interface.h"
-#include "lumiera/interfacedescriptor.h"
+#include "lib/interface.h"
+#include "lib/interfacedescriptor.h"
 }
 
 #include <string>
diff --git a/src/include/guinotificationfacade.h b/src/include/guinotificationfacade.h
index 2898db538..2e5ad92dd 100644
--- a/src/include/guinotificationfacade.h
+++ b/src/include/guinotificationfacade.h
@@ -86,7 +86,7 @@ extern "C" {
 #endif /* =========================== CLI Interface ================= */ 
 
   
-#include "lumiera/interface.h"
+#include "lib/interface.h"
 
 LUMIERA_INTERFACE_DECLARE (lumieraorg_GuiNotification, 1,
                            LUMIERA_INTERFACE_SLOT (void, displayInfo,        (const char*)),
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index efec8af18..b7805d3b1 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -18,7 +18,7 @@
 liblumiera_a_srcdir = $(top_srcdir)/src/lib
 noinst_LIBRARIES += liblumiera.a
 
-liblumiera_a_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror
+liblumiera_a_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror -DLUMIERA_PLUGIN_PATH="\"$(pkglibdir)\""
 
 liblumiera_a_SOURCES =					\
 	$(liblumiera_a_srcdir)/error.c			\
@@ -31,6 +31,17 @@ liblumiera_a_SOURCES =					\
 	$(liblumiera_a_srcdir)/psplay.c			\
 	$(liblumiera_a_srcdir)/mrucache.c		\
 	$(liblumiera_a_srcdir)/time.c			\
+	$(liblumiera_a_srcdir)/config.c			\
+	$(liblumiera_a_srcdir)/config_typed.c		\
+	$(liblumiera_a_srcdir)/config_wordlist.c	\
+	$(liblumiera_a_srcdir)/configentry.c		\
+	$(liblumiera_a_srcdir)/configitem.c		\
+	$(liblumiera_a_srcdir)/config_lookup.c		\
+	$(liblumiera_a_srcdir)/config_interface.c	\
+	$(liblumiera_a_srcdir)/interface.c		\
+	$(liblumiera_a_srcdir)/interfaceregistry.c	\
+	$(liblumiera_a_srcdir)/plugin.c			\
+	$(liblumiera_a_srcdir)/plugin_dynlib.c		\
 	$(liblumiera_a_srcdir)/allocationcluster.cpp	\
 	$(liblumiera_a_srcdir)/external/libgavl.cpp	\
 	$(liblumiera_a_srcdir)/cmdline.cpp
@@ -47,6 +58,15 @@ noinst_HEADERS +=					\
 	$(liblumiera_a_srcdir)/mrucache.h		\
 	$(liblumiera_a_srcdir)/time.h			\
 	$(liblumiera_a_srcdir)/ppmpl.h			\
+	$(liblumiera_a_srcdir)/interface.h		\
+	$(liblumiera_a_srcdir)/interfaceregistry.h	\
+	$(liblumiera_a_srcdir)/interfacedescriptor.h	\
+	$(liblumiera_a_srcdir)/plugin.h			\
+	$(liblumiera_a_srcdir)/config.h			\
+	$(liblumiera_a_srcdir)/configentry.h		\
+	$(liblumiera_a_srcdir)/configitem.h		\
+	$(liblumiera_a_srcdir)/config_lookup.h		\
+	$(liblumiera_a_srcdir)/config_interface.h	\
 	$(liblumiera_a_srcdir)/allocationcluster.hpp	\
 	$(liblumiera_a_srcdir)/scopedholdertransfer.hpp	\
 	$(liblumiera_a_srcdir)/scopedholder.hpp		\
diff --git a/src/lumiera/config.c b/src/lib/config.c
similarity index 99%
rename from src/lumiera/config.c
rename to src/lib/config.c
index b4083655a..0bb44e2d6 100644
--- a/src/lumiera/config.c
+++ b/src/lib/config.c
@@ -21,10 +21,10 @@
 
 //TODO: Support library includes//
 #include "lib/safeclib.h"
+#include "lib/config.h"
 
 
 //TODO: Lumiera header includes//
-#include "lumiera/config.h"
 
 //TODO: internal/static forward declarations//
 
diff --git a/src/lumiera/config.h b/src/lib/config.h
similarity index 99%
rename from src/lumiera/config.h
rename to src/lib/config.h
index c9d7b957f..79ac04368 100644
--- a/src/lumiera/config.h
+++ b/src/lib/config.h
@@ -51,8 +51,8 @@ LUMIERA_ERROR_DECLARE (CONFIG_NO_ENTRY);
 
 
 //TODO: Lumiera header includes//
-#include "lumiera/config_lookup.h"
-#include "lumiera/configitem.h"
+#include "lib/config_lookup.h"
+#include "lib/configitem.h"
 
 //TODO: System includes//
 #include <nobug.h>
diff --git a/src/lumiera/config_interface.c b/src/lib/config_interface.c
similarity index 99%
rename from src/lumiera/config_interface.c
rename to src/lib/config_interface.c
index 43b52bb3d..091d7b1b7 100644
--- a/src/lumiera/config_interface.c
+++ b/src/lib/config_interface.c
@@ -23,8 +23,8 @@
 
 
 //TODO: Lumiera header includes//
-#include "lumiera/config_interface.h"
-#include "lumiera/config.h"
+#include "lib/config_interface.h"
+#include "lib/config.h"
 
 //TODO: internal/static forward declarations//
 
@@ -140,7 +140,7 @@ LUMIERA_EXPORT(
 
 #ifndef LUMIERA_PLUGIN
 
-#include "lumiera/interfaceregistry.h"
+#include "lib/interfaceregistry.h"
 void
 lumiera_config_interface_init (void)
 {
diff --git a/src/lumiera/config_interface.h b/src/lib/config_interface.h
similarity index 99%
rename from src/lumiera/config_interface.h
rename to src/lib/config_interface.h
index 374af50c5..5cad4c888 100644
--- a/src/lumiera/config_interface.h
+++ b/src/lib/config_interface.h
@@ -24,7 +24,7 @@
 
 //TODO: Support library includes//
 
-#include "lumiera/interface.h"
+#include "lib/interface.h"
 
 //TODO: Forward declarations//
 
diff --git a/src/lumiera/config_lookup.c b/src/lib/config_lookup.c
similarity index 98%
rename from src/lumiera/config_lookup.c
rename to src/lib/config_lookup.c
index efb33c6d8..c44127623 100644
--- a/src/lumiera/config_lookup.c
+++ b/src/lib/config_lookup.c
@@ -20,8 +20,8 @@
 */
 #include "lib/safeclib.h"
 
-#include "lumiera/config_lookup.h"
-#include "lumiera/config.h"
+#include "lib/config_lookup.h"
+#include "lib/config.h"
 
 /* we only use one fatal error for now, when allocation in the config system fail, something else is pretty wrong */
 LUMIERA_ERROR_DEFINE (CONFIG_LOOKUP, "config lookup failure");
diff --git a/src/lumiera/config_lookup.h b/src/lib/config_lookup.h
similarity index 99%
rename from src/lumiera/config_lookup.h
rename to src/lib/config_lookup.h
index cc6d921ee..50dabcf47 100644
--- a/src/lumiera/config_lookup.h
+++ b/src/lib/config_lookup.h
@@ -33,7 +33,7 @@ typedef struct lumiera_config_lookupentry_struct lumiera_config_lookupentry;
 typedef lumiera_config_lookupentry* LumieraConfigLookupentry;
 
 
-#include "lumiera/configitem.h"
+#include "lib/configitem.h"
 
 
 #include <nobug.h>
diff --git a/src/lumiera/config_typed.c b/src/lib/config_typed.c
similarity index 99%
rename from src/lumiera/config_typed.c
rename to src/lib/config_typed.c
index d320f66b0..a892a9834 100644
--- a/src/lumiera/config_typed.c
+++ b/src/lib/config_typed.c
@@ -24,7 +24,7 @@
 
 
 //TODO: Lumiera header includes//
-#include "lumiera/config.h"
+#include "lib/config.h"
 
 //TODO: internal/static forward declarations//
 extern LumieraConfig lumiera_global_config;
diff --git a/src/lumiera/config_wordlist.c b/src/lib/config_wordlist.c
similarity index 99%
rename from src/lumiera/config_wordlist.c
rename to src/lib/config_wordlist.c
index 5f9f089c5..2bdad97d2 100644
--- a/src/lumiera/config_wordlist.c
+++ b/src/lib/config_wordlist.c
@@ -23,7 +23,7 @@
 #include "lib/safeclib.h"
 
 
-#include "lumiera/config.h"
+#include "lib/config.h"
 
 extern LumieraConfig lumiera_global_config;
 
diff --git a/src/lumiera/configentry.c b/src/lib/configentry.c
similarity index 98%
rename from src/lumiera/configentry.c
rename to src/lib/configentry.c
index f5d09d4f6..3f4f05c74 100644
--- a/src/lumiera/configentry.c
+++ b/src/lib/configentry.c
@@ -23,7 +23,7 @@
 #include "lib/safeclib.h"
 
 //TODO: Lumiera header includes//
-#include "lumiera/configentry.h"
+#include "lib/configentry.h"
 
 //TODO: internal/static forward declarations//
 
diff --git a/src/lumiera/configentry.h b/src/lib/configentry.h
similarity index 98%
rename from src/lumiera/configentry.h
rename to src/lib/configentry.h
index 0df7ecc59..c22cde84b 100644
--- a/src/lumiera/configentry.h
+++ b/src/lib/configentry.h
@@ -31,7 +31,7 @@ typedef lumiera_configentry* LumieraConfigentry;
 
 
 //TODO: Lumiera header includes//
-#include "lumiera/configitem.h"
+#include "lib/configitem.h"
 
 //TODO: System includes//
 #include <nobug.h>
diff --git a/src/lumiera/configitem.c b/src/lib/configitem.c
similarity index 99%
rename from src/lumiera/configitem.c
rename to src/lib/configitem.c
index 3bdb9a8f8..5eb854633 100644
--- a/src/lumiera/configitem.c
+++ b/src/lib/configitem.c
@@ -25,9 +25,9 @@
 
 
 //TODO: Lumiera header includes//
-#include "lumiera/config.h"
-#include "lumiera/configitem.h"
-#include "lumiera/configentry.h"
+#include "lib/config.h"
+#include "lib/configitem.h"
+#include "lib/configentry.h"
 
 
 static LumieraConfigitem parse_directive (LumieraConfigitem self, char* itr);
diff --git a/src/lumiera/configitem.h b/src/lib/configitem.h
similarity index 99%
rename from src/lumiera/configitem.h
rename to src/lib/configitem.h
index 52fd95ed6..23d3f25b2 100644
--- a/src/lumiera/configitem.h
+++ b/src/lib/configitem.h
@@ -33,7 +33,7 @@ typedef lumiera_configitem* LumieraConfigitem;
 struct lumiera_configitem_vtable;
 
 //TODO: Lumiera header includes//
-#include "lumiera/config_lookup.h"
+#include "lib/config_lookup.h"
 
 
 //TODO: System includes//
diff --git a/src/lumiera/interface.c b/src/lib/interface.c
similarity index 99%
rename from src/lumiera/interface.c
rename to src/lib/interface.c
index e8c633c7f..9c88b9a20 100644
--- a/src/lumiera/interface.c
+++ b/src/lib/interface.c
@@ -22,10 +22,10 @@
 #include "lib/mutex.h"
 #include "lib/safeclib.h"
 
-#include "lumiera/plugin.h"
-#include "lumiera/interface.h"
+#include "lib/plugin.h"
+#include "lib/interface.h"
 
-#include "lumiera/interfaceregistry.h"
+#include "lib/interfaceregistry.h"
 
 #include <nobug.h>
 
diff --git a/src/lumiera/interface.h b/src/lib/interface.h
similarity index 100%
rename from src/lumiera/interface.h
rename to src/lib/interface.h
diff --git a/src/lumiera/interfacedescriptor.h b/src/lib/interfacedescriptor.h
similarity index 99%
rename from src/lumiera/interfacedescriptor.h
rename to src/lib/interfacedescriptor.h
index 77ce43e73..93282469a 100644
--- a/src/lumiera/interfacedescriptor.h
+++ b/src/lib/interfacedescriptor.h
@@ -21,7 +21,7 @@
 #ifndef LUMIERA_INTERFACEDESCRIPTOR_H
 #define LUMIERA_INTERFACEDESCRIPTOR_H
 
-#include "lumiera/interface.h"
+#include "lib/interface.h"
 
 
 /**
diff --git a/src/lumiera/interfaceregistry.c b/src/lib/interfaceregistry.c
similarity index 99%
rename from src/lumiera/interfaceregistry.c
rename to src/lib/interfaceregistry.c
index 52a40988a..10809ec48 100644
--- a/src/lumiera/interfaceregistry.c
+++ b/src/lib/interfaceregistry.c
@@ -29,8 +29,8 @@
 
 
 
-#include "lumiera/plugin.h"
-#include "lumiera/interfaceregistry.h"
+#include "lib/plugin.h"
+#include "lib/interfaceregistry.h"
 
 /**
  * @file
diff --git a/src/lumiera/interfaceregistry.h b/src/lib/interfaceregistry.h
similarity index 98%
rename from src/lumiera/interfaceregistry.h
rename to src/lib/interfaceregistry.h
index 425961fd4..a440ee3d1 100644
--- a/src/lumiera/interfaceregistry.h
+++ b/src/lib/interfaceregistry.h
@@ -24,8 +24,8 @@
 #include "lib/mutex.h"
 #include "lib/psplay.h"
 
-#include "lumiera/interface.h"
-#include "lumiera/plugin.h"
+#include "lib/interface.h"
+#include "lib/plugin.h"
 
 #include <nobug.h>
 
diff --git a/src/lumiera/plugin.c b/src/lib/plugin.c
similarity index 99%
rename from src/lumiera/plugin.c
rename to src/lib/plugin.c
index 30f664e11..55c760f4e 100644
--- a/src/lumiera/plugin.c
+++ b/src/lib/plugin.c
@@ -25,9 +25,9 @@
 #include "lib/mutex.h"
 #include "lib/error.h"
 
-#include "lumiera/interfaceregistry.h"
-#include "lumiera/config.h"
-#include "lumiera/plugin.h"
+#include "lib/interfaceregistry.h"
+#include "lib/config.h"
+#include "lib/plugin.h"
 
 #include <glob.h>
 
diff --git a/src/lumiera/plugin.h b/src/lib/plugin.h
similarity index 99%
rename from src/lumiera/plugin.h
rename to src/lib/plugin.h
index f5a5ffc21..f82866bd0 100644
--- a/src/lumiera/plugin.h
+++ b/src/lib/plugin.h
@@ -24,7 +24,7 @@
 #include "lib/psplay.h"
 #include "lib/error.h"
 
-#include "lumiera/interface.h"
+#include "lib/interface.h"
 
 #include <stdlib.h>
 #include <nobug.h>
diff --git a/src/lumiera/plugin_dynlib.c b/src/lib/plugin_dynlib.c
similarity index 98%
rename from src/lumiera/plugin_dynlib.c
rename to src/lib/plugin_dynlib.c
index 52813e69c..487862823 100644
--- a/src/lumiera/plugin_dynlib.c
+++ b/src/lib/plugin_dynlib.c
@@ -18,7 +18,7 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-#include "lumiera/plugin.h"
+#include "lib/plugin.h"
 
 #include <dlfcn.h>
 #include <nobug.h>
diff --git a/src/lumiera/Makefile.am b/src/lumiera/Makefile.am
index 6f65747b3..419462631 100644
--- a/src/lumiera/Makefile.am
+++ b/src/lumiera/Makefile.am
@@ -19,21 +19,10 @@ lumiera_srcdir = $(top_srcdir)/src/lumiera
 
 
 noinst_LIBRARIES += liblumieracore.a
-liblumieracore_a_CPPFLAGS = $(AM_CPPFLAGS) -DLUMIERA_PLUGIN_PATH="\"$(pkglibdir)\"" -DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\""
+liblumieracore_a_CPPFLAGS = $(AM_CPPFLAGS) -DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\""
 liblumieracore_a_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
 
 liblumieracore_a_SOURCES =			\
-	$(lumiera_srcdir)/config.c		\
-	$(lumiera_srcdir)/config_typed.c	\
-	$(lumiera_srcdir)/config_wordlist.c	\
-	$(lumiera_srcdir)/configentry.c		\
-	$(lumiera_srcdir)/configitem.c		\
-	$(lumiera_srcdir)/config_lookup.c	\
-	$(lumiera_srcdir)/config_interface.c	\
-	$(lumiera_srcdir)/interface.c		\
-	$(lumiera_srcdir)/interfaceregistry.c	\
-	$(lumiera_srcdir)/plugin.c		\
-	$(lumiera_srcdir)/plugin_dynlib.c	\
 	$(lumiera_srcdir)/guifacade.cpp		\
 	$(lumiera_srcdir)/configfacade.cpp	\
 	$(lumiera_srcdir)/appstate.cpp		\
@@ -56,15 +45,6 @@ lumiera_SOURCES =				\
 
 
 noinst_HEADERS +=				\
-	$(lumiera_srcdir)/interface.h		\
-	$(lumiera_srcdir)/interfaceregistry.h	\
-	$(lumiera_srcdir)/interfacedescriptor.h	\
-	$(lumiera_srcdir)/plugin.h		\
-	$(lumiera_srcdir)/config.h		\
-	$(lumiera_srcdir)/configentry.h		\
-	$(lumiera_srcdir)/configitem.h		\
-	$(lumiera_srcdir)/config_lookup.h	\
-	$(lumiera_srcdir)/config_interface.h	\
 	$(lumiera_srcdir)/subsys.hpp		\
 	$(lumiera_srcdir)/appstate.hpp		\
 	$(lumiera_srcdir)/option.hpp		\
diff --git a/src/lumiera/appstate.cpp b/src/lumiera/appstate.cpp
index 916e0755c..1126fd099 100644
--- a/src/lumiera/appstate.cpp
+++ b/src/lumiera/appstate.cpp
@@ -28,11 +28,11 @@
 #include "lumiera/subsystemrunner.hpp"
 
 extern "C" {
-#include "lumiera/config_interface.h"
+#include "lib/config_interface.h"
 
-#include "lumiera/interface.h"
-#include "lumiera/interfaceregistry.h"
-#include "lumiera/plugin.h"
+#include "lib/interface.h"
+#include "lib/interfaceregistry.h"
+#include "lib/plugin.h"
 }
 
 #include "common/util.hpp"
diff --git a/src/lumiera/instancehandle.hpp b/src/lumiera/instancehandle.hpp
index 753c1fbab..bdbba91a5 100644
--- a/src/lumiera/instancehandle.hpp
+++ b/src/lumiera/instancehandle.hpp
@@ -42,8 +42,8 @@
 #include "include/nobugcfg.h"
 
 extern "C" {
-#include "lumiera/interface.h"
-#include "lumiera/interfaceregistry.h"
+#include "lib/interface.h"
+#include "lib/interfaceregistry.h"
 }
 
 #include <boost/noncopyable.hpp>
diff --git a/src/lumiera/interfaceproxy.cpp b/src/lumiera/interfaceproxy.cpp
index c6e96df8d..97b1c43ea 100644
--- a/src/lumiera/interfaceproxy.cpp
+++ b/src/lumiera/interfaceproxy.cpp
@@ -27,7 +27,7 @@
 #include "include/error.hpp"
 
 extern "C" {
-#include "lumiera/interface.h"
+#include "lib/interface.h"
 }
 
 using util::cStr;