diff --git a/Makefile.am b/Makefile.am
index eb67e0a23..2ea3aba54 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,8 +34,9 @@ include $(top_srcdir)/admin/Makefile.am
 
 # core
 include $(top_srcdir)/src/proc/Makefile.am
+include $(top_srcdir)/src/common/Makefile.am
 include $(top_srcdir)/src/lib/Makefile.am
-#include $(top_srcdir)/src/backend/Makefile.am
+include $(top_srcdir)/src/backend/Makefile.am
 
 # plugins
 #include $(top_srcdir)/src...
diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
index 5f693f8bf..3d70a09d5 100644
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@@ -22,16 +22,21 @@ liblumibackend_a_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror
 liblumibackend_a_CPPFLAGS = -I$(top_srcdir)/src/
 
 liblumibackend_a_SOURCES = \
-	$(liblumibackend_a_srcdir)/backend.c \
-	$(liblumibackend_a_srcdir)/file.c \
-	$(liblumibackend_a_srcdir)/filehandle.c \
-	$(liblumibackend_a_srcdir)/filedescriptor.c \
-	$(liblumibackend_a_srcdir)/filehandlecache.c
+	$(liblumibackend_a_srcdir)/mediaaccessfacade.cpp
+
+#	$(liblumibackend_a_srcdir)/backend.c \
+#	$(liblumibackend_a_srcdir)/file.c \
+#	$(liblumibackend_a_srcdir)/filehandle.c \
+#	$(liblumibackend_a_srcdir)/filedescriptor.c \
+#	$(liblumibackend_a_srcdir)/filehandlecache.c
+
 
 noinst_HEADERS += \
-	$(liblumibackend_a_srcdir)/backend.h \
-	$(liblumibackend_a_srcdir)/file.h \
-	$(liblumibackend_a_srcdir)/filehandle.h \
-	$(liblumibackend_a_srcdir)/filedescriptor.h \
-	$(liblumibackend_a_srcdir)/filehandlecache.h
+	$(liblumibackend_a_srcdir)mediaaccessfacade.cpp
+
+#	$(liblumibackend_a_srcdir)/backend.h \
+#	$(liblumibackend_a_srcdir)/file.h \
+#	$(liblumibackend_a_srcdir)/filehandle.h \
+#	$(liblumibackend_a_srcdir)/filedescriptor.h \
+#	$(liblumibackend_a_srcdir)/filehandlecache.h
 
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
new file mode 100644
index 000000000..06082da31
--- /dev/null
+++ b/src/common/Makefile.am
@@ -0,0 +1,65 @@
+#  Copyright (C)         Lumiera.org
+#    2008,               Christian Thaeter <ct@pipapo.org>
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the
+#  License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+
+# TODO use -Wextra -Werror
+
+liblumicommon_a_srcdir = $(top_srcdir)/src/common
+noinst_LIBRARIES += liblumicommon.a
+
+liblumicommon_a_CXXFLAGS = $(CXXFLAGS) -Wall
+liblumicommon_a_CPPFLAGS = -I$(top_srcdir)/src/
+
+liblumicommon_a_SOURCES =					\
+	$(liblumicommon_a_srcdir)/time.cpp			\
+	$(liblumicommon_a_srcdir)/util.cpp			\
+	$(liblumicommon_a_srcdir)/visitor.cpp			\
+	$(liblumicommon_a_srcdir)/cmdline.cpp			\
+	$(liblumicommon_a_srcdir)/configrules.cpp		\
+	$(liblumicommon_a_srcdir)/error.cpp			\
+	$(liblumicommon_a_srcdir)/query.cpp			\
+	$(liblumicommon_a_srcdir)/query/mockconfigrules.cpp	\
+	$(liblumicommon_a_srcdir)/test/suite.cpp		\
+	$(liblumicommon_a_srcdir)/test/testoption.cpp
+
+
+noinst_HEADERS +=						\
+	$(liblumicommon_a_srcdir)/cmdline.hpp			\
+	$(liblumicommon_a_srcdir)/factory.hpp			\
+	$(liblumicommon_a_srcdir)/singleton.hpp			\
+	$(liblumicommon_a_srcdir)/singletonpolicies.hpp		\
+	$(liblumicommon_a_srcdir)/singletonpreconfigure.hpp	\
+	$(liblumicommon_a_srcdir)/time.hpp			\
+	$(liblumicommon_a_srcdir)/typelist.hpp			\
+	$(liblumicommon_a_srcdir)/visitor.hpp			\
+	$(liblumicommon_a_srcdir)/visitordispatcher.hpp		\
+	$(liblumicommon_a_srcdir)/visitorpolicies.hpp		\
+	$(liblumicommon_a_srcdir)/configrules.hpp		\
+	$(liblumicommon_a_srcdir)/error.hpp			\
+	$(liblumicommon_a_srcdir)/multithread.hpp		\
+	$(liblumicommon_a_srcdir)/p.hpp				\
+	$(liblumicommon_a_srcdir)/query.hpp			\
+	$(liblumicommon_a_srcdir)/query/mockconfigrules.hpp	\
+	$(liblumicommon_a_srcdir)/singletonfactory.hpp		\
+	$(liblumicommon_a_srcdir)/singletonsubclass.hpp		\
+	$(liblumicommon_a_srcdir)/typelistutil.hpp		\
+	$(liblumicommon_a_srcdir)/util.hpp			\
+	$(liblumicommon_a_srcdir)/test/mockinjector.hpp		\
+	$(liblumicommon_a_srcdir)/test/suite.hpp		\
+	$(liblumicommon_a_srcdir)/test/testoption.hpp		\
+	$(liblumicommon_a_srcdir)/test/run.hpp
+