Index: /main/waeup.kofa/trunk/src/waeup/kofa/configure.zcml
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/configure.zcml	(revision 8888)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/configure.zcml	(revision 8889)
@@ -3,8 +3,19 @@
            xmlns:i18n="http://namespaces.zope.org/i18n">
 
-  <include package="waeup.kofa" file="locales.zcml" />
+  <!-- This will load and configure most packages we need. -->
   <include package="grok" />
+
+  <!-- Meta configurations. -->
+  <include package="zope.sendmail" file="meta.zcml" />
   <include package="waeup.kofa" file="meta.zcml" />
-  <includeDependencies package="." />
+
+  <!-- Extra packages we have to configure -->
+  <include package="grokcore.message" />
+  <include package="grokui.admin" />
+  <include package="hurry.zoperesource" />
+  <include package="megrok.layout" />
+  <include package="zc.sourcefactory" />
+  <include package="zope.app.authentication" />
+  <include package="zope.sendmail" />
 
   <!-- Comment the following line if you don't want dolmen.beaker,
@@ -15,7 +26,11 @@
        be found by the includeDependencies directive. -->
   <include package="dolmen.beaker" file="configure.zcml" />
-  <grok:grok package="." />
 
-
+  <include package="waeup.kofa" file="locales.zcml" />
+  <grok:grok package="waeup.kofa" />
+  <!-- The following configurations are large (or expected to become
+       large) and therefore 'outsourced' - the only ethical way to do
+       outsourcing ;-)
+  -->
   <includeOverrides package="waeup.kofa.widgets" file="overrides.zcml" />
   <includeOverrides package="waeup.kofa.utils" file="overrides.zcml" />
