diff --git a/lwr-genom/Makefile b/lwr-genom/Makefile
index 0e9cdb98b9bd2f4fa74fab4cc9a67d32ca04075d..f6ed89514acafe46383594557ff7249b922e495f 100644
--- a/lwr-genom/Makefile
+++ b/lwr-genom/Makefile
@@ -16,9 +16,13 @@ USE_LANGUAGES+=		c c++
 
 GENOM_MODULE=		lwr
 
+include ../../architecture/genom/depend.mk
+include ../../localization/pom-genom/depend.mk
+include ../../architecture/genBasic-genom/depend.mk
 include ../../manipulation/genManip-genom/depend.mk
 include ../../wip/kukaFri-libs/depend.mk
+include ../../motion/softMotion-libs/depend.mk
+include ../../wip/pqp-libs/depend.mk
+include ../../wip/coldman-libs/depend.mk
 include ../../math/gbM/depend.mk
-include ../../architecture/genom/depend.mk
-
 include ../../mk/robotpkg.mk
diff --git a/lwr-genom/PLIST b/lwr-genom/PLIST
index cad41f32f51b470625f0f6c323f439e6eb198516..28576cdce700a9e377decd7b85633524b69821a7 100644
--- a/lwr-genom/PLIST
+++ b/lwr-genom/PLIST
@@ -1,40 +1,25 @@
-@comment Tue Aug 31 2010
-${PLIST.noapi}bin/lwr
-${PLIST.noapi}bin/lwrSendInitRqst
-${PLIST.noapi}bin/lwrTest
-include/lwr/libeuler/lwrEuler.h
+@comment Mon Sep 6 14:30:58 CEST 2010
+bin/lwr
+bin/lwrSendInitRqst
+bin/lwrTest
 include/lwr/lwrConst.h
 include/lwr/lwrStruct.h
-${PLIST.openprs}include/lwr/server/openprs/lwrDecodeOpenprs.h
-${PLIST.openprs}include/lwr/server/openprs/lwrEncodeOpenprs.h
-${PLIST.openprs}include/lwr/server/openprs/lwrRequestsOpenprsProto.h
 include/lwr/server/lwrEndian.h
 include/lwr/server/lwrError.h
-${PLIST.noapi}include/lwr/server/lwrMsgLib.h
+include/lwr/server/lwrMsgLib.h
 include/lwr/server/lwrPosterLib.h
 include/lwr/server/lwrPosterLibStruct.h
-${PLIST.noapi}include/lwr/server/lwrPosterReadLibProto.h
-${PLIST.noapi}include/lwr/server/lwrPosterShowLib.h
-${PLIST.noapi}include/lwr/server/lwrPosterWriteLibProto.h
-${PLIST.noapi}include/lwr/server/lwrPosterXMLLib.h
+include/lwr/server/lwrPosterReadLibProto.h
+include/lwr/server/lwrPosterShowLib.h
+include/lwr/server/lwrPosterWriteLibProto.h
+include/lwr/server/lwrPosterXMLLib.h
 include/lwr/server/lwrPrint.h
 include/lwr/server/lwrPrintXML.h
 include/lwr/server/lwrScan.h
 include/lwr/server/lwrType.h
-${PLIST.tclserv_client}include/lwr/server/tclservClient/lwrTclservClientDecode.h
-${PLIST.tclserv_client}include/lwr/server/tclservClient/lwrTclservClientEncode.h
-${PLIST.tclserv_client}include/lwr/server/tclservClient/lwrTclservClientMsgLib.h
 lib/liblwrClient.la
-lib/liblwrEuler.la
-${PLIST.openprs}lib/openprs/liblwrOpenprs.la
-lib/pkgconfig/lwr-euler.pc
-${PLIST.openprs}lib/pkgconfig/lwr-oprs.pc
 lib/pkgconfig/lwr.pc
-${PLIST.tclserv_client}lib/pkgconfig/lwr-tclserv_client.pc
-${PLIST.tclserv_client}lib/tclservClient/liblwrTclservClient.la
-${PLIST.noapi}${PLIST.tcl}lib/tclserv/liblwrTclServ.la
+lib/tclserv/liblwrTclServ.la
 share/modules/gen/lwr.gen
-${PLIST.openprs}share/modules/openprs/lwrOpenprs.inc
-${PLIST.openprs}share/modules/openprs/lwrOpenprs.opf
-${PLIST.openprs}share/modules/openprs/lwrOpenprs.sym
-${PLIST.tcl}share/modules/tcl/lwrClient.tcl
+share/modules/tcl/lwrClient.tcl
+