Index: trunk/autoquest-distribution/src/main/assembly/bin.xml
===================================================================
--- trunk/autoquest-distribution/src/main/assembly/bin.xml	(revision 1015)
+++ trunk/autoquest-distribution/src/main/assembly/bin.xml	(revision 1016)
@@ -6,5 +6,5 @@
   <formats>
     <format>tar.gz</format>
-    <!-- format>dir</format>
+    <!--format>dir</format>
     <format>tar.bz2</format>
     <format>zip</format-->
@@ -12,4 +12,5 @@
   <moduleSets>
     <moduleSet>
+      <!-- add all dependencies except autoquest-runner into the lib directory -->
       <!-- useAllReactorProjects>true</useAllReactorProjects-->
       <includes></includes>
@@ -24,4 +25,5 @@
     </moduleSet>
     <moduleSet>
+      <!-- add only autoquest-runner to the main directory -->
       <includes>
           <include>de.ugoe.cs.autoquest:autoquest-runner</include>
@@ -29,20 +31,16 @@
       <binaries>
         <includes></includes>
-        <includeDependencies>false</includeDependencies>
         <outputDirectory></outputDirectory>
         <unpack>false</unpack>
-      </binaries>
-    </moduleSet>
-    <moduleSet>
-      <includes>
-          <include>de.ugoe.cs.autoquest:autoquest-runner</include>
-      </includes>
-      <binaries>
-        <excludes>
-          <exclude>de.ugoe.cs.autoquest*</exclude>
-          <exclude>org.eclipse.swt*</exclude>
-        </excludes>
-        <outputDirectory>lib</outputDirectory>
-        <unpack>false</unpack>
+        <dependencySets>
+          <dependencySet>
+            <excludes>
+              <exclude>de.ugoe.cs.autoquest*</exclude>
+              <exclude>org.eclipse.swt*</exclude>
+            </excludes>
+            <outputDirectory>lib</outputDirectory>
+            <unpack>false</unpack>
+          </dependencySet>
+        </dependencySets>
       </binaries>
     </moduleSet>