diff --git a/bundles/org.eclipse.swt/build.xml b/bundles/org.eclipse.swt/build.xml
index 2a1924f..78a4536 100644
--- a/bundles/org.eclipse.swt/build.xml
+++ b/bundles/org.eclipse.swt/build.xml
@@ -1,232 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.swt" default="plugin.zip" basedir=".">
-  <target name="initTemplate" unless="template">
-    <initTemplate/>
-  </target>
-  <target name="init" depends="initTemplate">
-    <property name="plugin" value="org.eclipse.swt"/>
-    <property name="version" value="2.0.0"/>
-    <property name="stamp" value=""/>
-    <property name="emulatedswt" value="Eclipse SWT/emulated/org/eclipse/swt"/>
-  </target>
+<project name="org.eclipse.swt" default="build.update.jar" basedir=".">
 
-  <target name="src.zip" depends="init">
-    <property name="base" value="${basedir}/src.zip.pdetemp"/>
-    <delete dir="${base}"/>
-    <mkdir dir="${base}"/>
-    <antcall target="src">
-      <param name ="destroot" value="${base}/plugins/${plugin}_${version}"/>
-    </antcall>
-	<exec dir="${base}" executable="zip">
-	   <arg line="-r ${basedir}/${plugin}_${version}.src.zip ."/>
-	</exec>
-    <delete dir="${base}"/>
-  </target>
+	<target name="initTemplate" unless="template">
+		<initTemplate/>
+	</target>
 
-  <target name="plugin.zip" depends="bin.zip"/>
-  <target name="bin.zip" depends="init">
-    <property name="base" value="${basedir}/bin.zip.pdetemp"/>
-    <delete dir="${base}"/>
-    <mkdir dir="${base}"/>
-    <antcall target="jar">
-      <param name ="destroot" value="${base}/plugins/${plugin}_${version}"/>
-    </antcall>
-    <antcall target="bin">
-      <param name ="destroot" value="${base}/plugins/${plugin}_${version}"/>
-    </antcall>
-	<exec dir="${base}" executable="zip">
-	  <arg line="-r ${basedir}/${plugin}_${version}.zip . -x *.bin.log "/>
-	</exec>
-    <delete dir="${base}"/>
-  </target>
+	<target name="init" depends="initTemplate, properties">
+	</target>
 
-  <target name="log.zip" depends="init">
-    <property name="base" value="${basedir}/log.zip.pdetemp"/>
-    <delete dir="${base}"/>
-    <mkdir dir="${base}"/>
-    <antcall target="log">
-      <param name ="destroot" value="${base}/plugins/${plugin}_${version}"/>
-    </antcall>
-	<exec dir="${base}" executable="zip">
-	   <arg line="-r ${basedir}/${plugin}_${version}.log.zip ."/>
-	</exec>
-    <delete dir="${base}"/>
-  </target>
+	<target name="build.update.jar" depends="init">
+		<property name="base" value="${basedir}/bin.zip.pdetemp"/>
+		<delete dir="${base}"/>
+		<mkdir dir="${base}"/>
+		<antcall target="gather.bin.parts">
+			<param name="destination" value="${base}/"/>
+		</antcall>
+		<delete>
+			<fileset dir="${base}" includes="**/*.bin.log"/>
+		</delete>
+		<zip zipfile="${basedir}/${plugin}_${version}.jar" basedir="${base}/plugins/${plugin}"/>
+		<delete dir="${base}"/>
+	</target>
 
-  <target name="ws/gtk/swt-pi.jar" depends="init">
-    <ant antfile="${template}" target="jar">
-      <property name="mapping" value="Eclipse SWT PI/gtk/,Eclipse SWT PI/common_j2se/"/>
-      <property name="includes" value="Eclipse SWT PI/gtk/,Eclipse SWT PI/common_j2se/"/>
-      <property name="excludes" value="Eclipse SWT PI/gtk/library/"/>
-      <property name="dest" value="${basedir}/ws/gtk/swt-pi.jar"/>
-      <property name="compilePath" value=""/>
-    </ant>
-  </target>
+	<target name="gather.bin.parts" depends="init" if="destination">
+		<ant antfile="${template}" target="includesExcludesCopy">
+			<property name="srcdir" value="${basedir}"/>
+			<property name="dest" value="${destination}/plugins/${plugin}"/>
+			<property name="excludes" value="${bin.excludes}"/>
+			<property name="includes" value="${bin.includes}"/>
+		</ant>
+	</target>
 
-  <target name="ws/gtk/swt.jar" depends="init">
-    <ant antfile="${template}" target="jar">
-      <property name="mapping" value="Eclipse SWT/gtk/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/emulated/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/gtk/,Eclipse SWT Printing/common/,Eclipse SWT Program/gtk/,Eclipse SWT Program/common/,${emulatedswt}/widgets/CoolBar.java,${emulatedswt}/widgets/CoolItem.java,${emulatedswt}/internal/BidiUtil.java,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="includes" value="Eclipse SWT/gtk/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/emulated/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/gtk/,Eclipse SWT Printing/common/,Eclipse SWT Program/gtk/,Eclipse SWT Program/common/,${emulatedswt}/widgets/CoolBar.java,${emulatedswt}/widgets/CoolItem.java,${emulatedswt}/internal/BidiUtil.java,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="excludes" value="Eclipse SWT/common/library/"/>
-      <property name="dest" value="${basedir}/ws/gtk/swt.jar"/>
-      <property name="compilePath" value="ws/gtk/swt-pi.jar"/>
-    </ant>
-  </target>
+	<target name="clean" depends="init">
+	</target>
 
-  <target name="ws/gtk1x/swt-pi.jar" depends="init">
-    <ant antfile="${template}" target="jar">
-      <property name="mapping" value="Eclipse SWT PI/gtk1x/,Eclipse SWT PI/common_j2se/"/>
-      <property name="includes" value="Eclipse SWT PI/gtk1x/,Eclipse SWT PI/common_j2se/"/>
-      <property name="excludes" value="Eclipse SWT PI/gtk1x/library/"/>
-      <property name="dest" value="${basedir}/ws/gtk1x/swt-pi.jar"/>
-      <property name="compilePath" value=""/>
-    </ant>
-  </target>
+	<target name="properties">
+		<property name="plugin" value="org.eclipse.swt"/>
+		<property name="version" value="2.0.0"/>
+		<property name="bin.includes" value="plugin.xml,plugin.properties,about.html"/>
+		<property name="bin.excludes" value=""/>
+	</target>
 
-  <target name="ws/gtk1x/swt.jar" depends="init">
-    <ant antfile="${template}" target="jar">
-      <property name="mapping" value="Eclipse SWT/gtk1x/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/emulated/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/gtk1x/,Eclipse SWT Printing/common/,Eclipse SWT Program/gtk1x/,Eclipse SWT Program/common/,${emulatedswt}/widgets/CoolBar.java,${emulatedswt}/widgets/CoolItem.java,${emulatedswt}/internal/BidiUtil.java,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="includes" value="Eclipse SWT/gtk1x/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/emulated/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/gtk1x/,Eclipse SWT Printing/common/,Eclipse SWT Program/gtk1x/,Eclipse SWT Program/common/,${emulatedswt}/widgets/CoolBar.java,${emulatedswt}/widgets/CoolItem.java,${emulatedswt}/internal/BidiUtil.java,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="excludes" value="Eclipse SWT/common/library/"/>
-      <property name="dest" value="${basedir}/ws/gtk1x/swt.jar"/>
-      <property name="compilePath" value="ws/gtk1x/swt-pi.jar"/>
-    </ant>
-  </target>
-
-  <target name="ws/motif/swt.jar" depends="init">
-    <ant antfile="${template}" target="jar">
-      <property name="mapping" value="Eclipse SWT/motif/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/motif/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/motif/,Eclipse SWT Printing/common/,Eclipse SWT Program/motif/,Eclipse SWT Program/common/,Eclipse SWT/emulated/,Eclipse SWT PI/motif/,Eclipse SWT PI/common_j2se/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="includes" value="Eclipse SWT/motif/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/motif/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/motif/,Eclipse SWT Printing/common/,Eclipse SWT Program/motif/,Eclipse SWT Program/common/,Eclipse SWT/emulated/,Eclipse SWT PI/motif/,Eclipse SWT PI/common_j2se/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="excludes" value="Eclipse SWT/common/library/,Eclipse SWT PI/motif/library/"/>
-      <property name="dest" value="${basedir}/ws/motif/swt.jar"/>
-      <property name="compilePath" value=""/>
-    </ant>
-  </target>
-
-  <target name="ws/photon/swt.jar" depends="init">
-    <ant antfile="${template}" target="jar">
-      <property name="mapping" value="Eclipse SWT/photon/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/photon/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/photon/,Eclipse SWT Printing/common/,Eclipse SWT Program/photon/,Eclipse SWT Program/common/,Eclipse SWT/emulated/,Eclipse SWT PI/photon/,Eclipse SWT PI/common_j2se/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="includes" value="Eclipse SWT/photon/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/photon/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/photon/,Eclipse SWT Printing/common/,Eclipse SWT Program/photon/,Eclipse SWT Program/common/,Eclipse SWT/emulated/,Eclipse SWT PI/photon/,Eclipse SWT PI/common_j2se/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="excludes" value="Eclipse SWT/common/library/,Eclipse SWT PI/photon/library/,${emulatedswt}/widgets/TabFolder.java,${emulatedswt}/widgets/TabItem.java"/>
-      <property name="dest" value="${basedir}/ws/photon/swt.jar"/>
-      <property name="compilePath" value=""/>
-    </ant>
-  </target>
-
-  <target name="ws/win32/swt.jar" depends="init">
-    <ant antfile="${template}" target="jar">
-      <property name="mapping" value="Eclipse SWT/win32/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT AWT/win32/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/win32/,Eclipse SWT Drag and Drop/common/,Eclipse SWT OLE Win32/win32/,Eclipse SWT Printing/win32/,Eclipse SWT Printing/common/,Eclipse SWT Program/win32/,Eclipse SWT Program/common/,Eclipse SWT PI/win32/,Eclipse SWT PI/common_j2se/,Eclipse SWT Accessibility/win32/,Eclipse SWT Accessibility/common/"/>
-      <property name="includes" value="Eclipse SWT/win32/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT AWT/win32/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/win32/,Eclipse SWT Drag and Drop/common/,Eclipse SWT OLE Win32/win32/,Eclipse SWT Printing/win32/,Eclipse SWT Printing/common/,Eclipse SWT Program/win32/,Eclipse SWT Program/common/,Eclipse SWT PI/win32/,Eclipse SWT PI/common_j2se/,Eclipse SWT Accessibility/win32/,Eclipse SWT Accessibility/common/"/>
-      <property name="excludes" value="Eclipse SWT/common/library/,Eclipse SWT PI/win32/library/"/>
-      <property name="dest" value="${basedir}/ws/win32/swt.jar"/>
-      <property name="compilePath" value=""/>
-    </ant>
-  </target>
-
-  <target name="jar" depends="init,ws/gtk/swt-pi.jar,ws/gtk/swt.jar,ws/gtk1x/swt-pi.jar,ws/gtk1x/swt.jar,ws/motif/swt.jar,ws/photon/swt.jar,ws/win32/swt.jar">
-  </target>
-
-  <target name="ws/gtk/swt-pisrc.zip" depends="init">
-    <property name="destroot" value="${basedir}"/>
-    <ant antfile="${template}" target="src">
-      <property name="mapping" value="Eclipse SWT PI/gtk/,Eclipse SWT PI/common_j2se/,Eclipse SWT PI/gtk/"/>
-      <property name="includes" value="Eclipse SWT PI/gtk/about.html,Eclipse SWT PI/gtk/**/*.java,Eclipse SWT PI/common_j2se/**/*.java,Eclipse SWT PI/gtk/library/"/>
-      <property name="excludes" value=""/>
-      <property name="dest" value="${destroot}/ws/gtk/swt-pisrc.zip"/>
-    </ant>
-  </target>
-
-  <target name="ws/gtk/swtsrc.zip" depends="init">
-    <property name="destroot" value="${basedir}"/>
-    <ant antfile="${template}" target="src">
-      <property name="mapping" value="Eclipse SWT/gtk/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/emulated/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/gtk/,Eclipse SWT Printing/common/,Eclipse SWT Program/gtk/,Eclipse SWT Program/common/,Eclipse SWT/emulated/,Eclipse SWT/emulated/,Eclipse SWT/emulated/,Eclipse SWT/common/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="includes" value="Eclipse SWT/gtk/**/*.java,Eclipse SWT/common/**/*.java,Eclipse SWT/common_j2se/**/*.java,Eclipse SWT Custom Widgets/common/**/*.java,Eclipse SWT Drag and Drop/emulated/**/*.java,Eclipse SWT Drag and Drop/common/**/*.java,Eclipse SWT Printing/gtk/**/*.java,Eclipse SWT Printing/common/**/*.java,Eclipse SWT Program/gtk/**/*.java,Eclipse SWT Program/common/**/*.java,Eclipse SWT/emulated/**/CoolBar.java,Eclipse SWT/emulated/**/CoolItem.java,Eclipse SWT/emulated/**/BidiUtil.java,Eclipse SWT/common/library/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="excludes" value=""/>
-      <property name="dest" value="${destroot}/ws/gtk/swtsrc.zip"/>
-    </ant>
-  </target>
-
-  <target name="ws/gtk1x/swt-pisrc.zip" depends="init">
-    <property name="destroot" value="${basedir}"/>
-    <ant antfile="${template}" target="src">
-      <property name="mapping" value="Eclipse SWT PI/gtk1x/,Eclipse SWT PI/common_j2se/,Eclipse SWT PI/gtk1x/"/>
-      <property name="includes" value="Eclipse SWT PI/gtk1x/about.html,Eclipse SWT PI/gtk1x/**/*.java,Eclipse SWT PI/common_j2se/**/*.java,Eclipse SWT PI/gtk1x/library/"/>
-      <property name="excludes" value=""/>
-      <property name="dest" value="${destroot}/ws/gtk1x/swt-pisrc.zip"/>
-    </ant>
-  </target>
-
-  <target name="ws/gtk1x/swtsrc.zip" depends="init">
-    <property name="destroot" value="${basedir}"/>
-    <ant antfile="${template}" target="src">
-      <property name="mapping" value="Eclipse SWT/gtk1x/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/emulated/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/gtk1x/,Eclipse SWT Printing/common/,Eclipse SWT Program/gtk1x/,Eclipse SWT Program/common/,Eclipse SWT/emulated/,Eclipse SWT/emulated/,Eclipse SWT/emulated/,Eclipse SWT/common/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="includes" value="Eclipse SWT/gtk1x/**/*.java,Eclipse SWT/common/**/*.java,Eclipse SWT/common_j2se/**/*.java,Eclipse SWT Custom Widgets/common/**/*.java,Eclipse SWT Drag and Drop/emulated/**/*.java,Eclipse SWT Drag and Drop/common/**/*.java,Eclipse SWT Printing/gtk1x/**/*.java,Eclipse SWT Printing/common/**/*.java,Eclipse SWT Program/gtk1x/**/*.java,Eclipse SWT Program/common/**/*.java,Eclipse SWT/emulated/**/CoolBar.java,Eclipse SWT/emulated/**/CoolItem.java,Eclipse SWT/emulated/**/BidiUtil.java,Eclipse SWT/common/library/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="excludes" value=""/>
-      <property name="dest" value="${destroot}/ws/gtk1x/swtsrc.zip"/>
-    </ant>
-  </target>
-
-
-  <target name="ws/motif/swtsrc.zip" depends="init">
-    <property name="destroot" value="${basedir}"/>
-    <ant antfile="${template}" target="src">
-      <property name="mapping" value="Eclipse SWT/motif/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/motif/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/motif/,Eclipse SWT Printing/common/,Eclipse SWT Program/motif/,Eclipse SWT Program/common/,Eclipse SWT/emulated/,Eclipse SWT PI/motif/,Eclipse SWT PI/common_j2se/,Eclipse SWT/common/,Eclipse SWT PI/motif/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="includes" value="Eclipse SWT/motif/**/*.java,Eclipse SWT/common/**/*.java,Eclipse SWT/common_j2se/**/*.java,Eclipse SWT Custom Widgets/common/**/*.java,Eclipse SWT Drag and Drop/motif/**/*.java,Eclipse SWT Drag and Drop/common/**/*.java,Eclipse SWT Printing/motif/**/*.java,Eclipse SWT Printing/common/**/*.java,Eclipse SWT Program/motif/**/*.java,Eclipse SWT Program/common/**/*.java,Eclipse SWT/emulated/**/*.java,Eclipse SWT PI/motif/**/*.java,Eclipse SWT PI/common_j2se/**/*.java,Eclipse SWT/common/library/,Eclipse SWT PI/motif/library/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="excludes" value=""/>
-      <property name="dest" value="${destroot}/ws/motif/swtsrc.zip"/>
-    </ant>
-  </target>
-
-  <target name="ws/photon/swtsrc.zip" depends="init">
-    <property name="destroot" value="${basedir}"/>
-    <ant antfile="${template}" target="src">
-      <property name="mapping" value="Eclipse SWT/photon/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/photon/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/photon/,Eclipse SWT Printing/common/,Eclipse SWT Program/photon/,Eclipse SWT Program/common/,Eclipse SWT/emulated,Eclipse SWT PI/photon/,Eclipse SWT PI/common_j2se/,Eclipse SWT/common/,Eclipse SWT PI/photon/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="includes" value="Eclipse SWT/photon/**/*.java,Eclipse SWT/common/**/*.java,Eclipse SWT/common_j2se/**/*.java,Eclipse SWT Custom Widgets/common/**/*.java,Eclipse SWT Drag and Drop/photon/**/*.java,Eclipse SWT Drag and Drop/common/**/*.java,Eclipse SWT Printing/photon/**/*.java,Eclipse SWT Printing/common/**/*.java,Eclipse SWT Program/photon/**/*.java,Eclipse SWT Program/common/**/*.java,Eclipse SWT/emulated/**/*.java,Eclipse SWT PI/photon/**/*.java,Eclipse SWT PI/common_j2se/**/*.java,Eclipse SWT/common/library/,Eclipse SWT PI/photon/library/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="excludes" value="${emulatedswt}/widgets/TabFolder.java,${emulatedswt}/widgets/TabItem.java"/>
-      <property name="dest" value="${destroot}/ws/photon/swtsrc.zip"/>
-    </ant>
-  </target>
-
-  <target name="ws/win32/swtsrc.zip" depends="init">
-    <property name="destroot" value="${basedir}"/>
-    <ant antfile="${template}" target="src">
-      <property name="mapping" value="Eclipse SWT/win32/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT AWT/win32/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/win32/,Eclipse SWT Drag and Drop/common/,Eclipse SWT OLE Win32/win32/,Eclipse SWT Printing/win32/,Eclipse SWT Printing/common/,Eclipse SWT Program/win32/,Eclipse SWT Program/common/,Eclipse SWT PI/win32/,Eclipse SWT PI/common_j2se/,Eclipse SWT/common/,Eclipse SWT PI/win32/,Eclipse SWT Accessibility/win32/,Eclipse SWT Accessibility/common/"/>
-      <property name="includes" value="Eclipse SWT/win32/**/*.java,Eclipse SWT/common/**/*.java,Eclipse SWT/common_j2se/**/*.java,Eclipse SWT AWT/win32/**/*.java,Eclipse SWT Custom Widgets/common/**/*.java,Eclipse SWT Drag and Drop/win32/**/*.java,Eclipse SWT Drag and Drop/common/**/*.java,Eclipse SWT OLE Win32/win32/**/*.java,Eclipse SWT Printing/win32/**/*.java,Eclipse SWT Printing/common/**/*.java,Eclipse SWT Program/win32/**/*.java,Eclipse SWT Program/common/**/*.java,Eclipse SWT PI/win32/**/*.java,Eclipse SWT PI/common_j2se/**/*.java,Eclipse SWT/common/library/,Eclipse SWT PI/win32/library/,Eclipse SWT Accessibility/win32/,Eclipse SWT Accessibility/common/"/>
-      <property name="excludes" value=""/>
-      <property name="dest" value="${destroot}/ws/win32/swtsrc.zip"/>
-    </ant>
-  </target>
-
-  <target name="src" depends="init,ws/gtk/swt-pisrc.zip,ws/gtk/swtsrc.zip,ws/gtk1x/swt-pisrc.zip,ws/gtk1x/swtsrc.zip,ws/motif/swtsrc.zip,ws/photon/swtsrc.zip,ws/win32/swtsrc.zip">
-  </target>
-
-  <target name="bin" depends="init">
-    <property name="destroot" value="${basedir}"/>
-    <ant antfile="${template}" target="bin">
-      <property name="includes" value="plugin.xml,about.html,plugin.properties,ws/,os/"/>
-      <property name="excludes" value="Eclipse SWT Printing/common/,Eclipse SWT Printing/motif/,Eclipse SWT Printing/photon/,Eclipse SWT Printing/win32/,Eclipse SWT Printing/gtk/,Eclipse SWT Printing/gtk1x/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Drag and Drop/motif/,Eclipse SWT Drag and Drop/photon/,Eclipse SWT Drag and Drop/win32/,Eclipse SWT Drag and Drop/emulated/,Eclipse SWT Program/common/,Eclipse SWT Program/motif/,Eclipse SWT Program/photon/,Eclipse SWT Program/win32/,Eclipse SWT Program/gtk/,Eclipse SWT Program/gtk1x/,Eclipse SWT/common/,Eclipse SWT/common_j2se/,Eclipse SWT/motif/,Eclipse SWT/photon/,Eclipse SWT/win32/,Eclipse SWT/gtk/,Eclipse SWT/gtk1x/,Eclipse SWT/common_j2se/,Eclipse SWT PI/common_j2se/,Eclipse SWT PI/motif/,Eclipse SWT PI/photon/,Eclipse SWT PI/win32/,Eclipse SWT PI/gtk/,Eclipse SWT PI/gtk1x/,Eclipse SWT Custom Widgets/common/,Eclipse SWT AWT/win32/,Eclipse SWT OLE Win32/win32/,Eclipse SWT/emulated/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/,Eclipse SWT Accessibility/win32/"/>
-      <property name="dest" value="${destroot}"/>
-    </ant>
-  </target>
-
-  <target name="log" depends="init">
-    <property name="destroot" value="${basedir}"/>
-    <ant antfile="${template}" target="log">
-      <property name="dest" value="${destroot}"/>
-    </ant>
-  </target>
-
-  <target name="clean" depends="init">
-    <ant antfile="${template}" target="clean">
-      <property name="jar" value="ws/gtk/swt-pi.jar,ws/gtk/swt.jar,ws/gtk1x/swt-pi.jar,ws/gtk1x/swt.jar,ws/motif/swt.jar,ws/photon/swt.jar,ws/win32/swt.jar"/>
-      <property name="srczips" value="ws/gtk/swt-pisrc.zip,ws/gtk/swtsrc.zip,ws/gtk1x/swt-pisrc.zip,ws/gtk1x/swtsrc.zip,ws/motif/swtsrc.zip,ws/photon/swtsrc.zip,ws/win32/swtsrc.zip"/>
-    </ant>
-    <delete>
-      <fileset dir="." includes="**/*.pdetemp"/>
-    </delete>
-    <delete file="${plugin}_${version}.zip"/>
-    <delete file="${plugin}_${version}.src.zip"/>
-    <delete file="${plugin}_${version}.doc.zip"/>
-    <delete file="${plugin}_${version}.log.zip"/>
-  </target>
-</project>
+</project>
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/build_j2me.xml b/bundles/org.eclipse.swt/build_j2me.xml
index ee54c72..78a4536 100644
--- a/bundles/org.eclipse.swt/build_j2me.xml
+++ b/bundles/org.eclipse.swt/build_j2me.xml
@@ -1,191 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.swt" default="plugin.zip" basedir=".">
-  <target name="initTemplate" unless="template">
-    <initTemplate/>
-  </target>
-  <target name="init" depends="initTemplate">
-    <property name="plugin" value="org.eclipse.swt"/>
-    <property name="version" value="2.0.0"/>
-    <property name="stamp" value=""/>
-    <property name="emulatedswt" value="Eclipse SWT/emulated/org/eclipse/swt"/>
-  </target>
+<project name="org.eclipse.swt" default="build.update.jar" basedir=".">
 
-  <target name="src.zip" depends="init">
-    <property name="base" value="${basedir}/src.zip.pdetemp"/>
-    <delete dir="${base}"/>
-    <mkdir dir="${base}"/>
-    <antcall target="src">
-      <param name ="destroot" value="${base}/plugins/${plugin}_${version}"/>
-    </antcall>
-	<exec dir="${base}" executable="zip">
-	   <arg line="-r ${basedir}/${plugin}_${version}.src.zip ."/>
-	</exec>
-    <delete dir="${base}"/>
-  </target>
+	<target name="initTemplate" unless="template">
+		<initTemplate/>
+	</target>
 
-  <target name="plugin.zip" depends="bin.zip"/>
-  <target name="bin.zip" depends="init">
-    <property name="base" value="${basedir}/bin.zip.pdetemp"/>
-    <delete dir="${base}"/>
-    <mkdir dir="${base}"/>
-    <antcall target="jar">
-      <param name ="destroot" value="${base}/plugins/${plugin}_${version}"/>
-    </antcall>
-    <antcall target="bin">
-      <param name ="destroot" value="${base}/plugins/${plugin}_${version}"/>
-    </antcall>
-	<exec dir="${base}" executable="zip">
-	  <arg line="-r ${basedir}/${plugin}_${version}.zip . -x *.bin.log "/>
-	</exec>
-    <delete dir="${base}"/>
-  </target>
+	<target name="init" depends="initTemplate, properties">
+	</target>
 
-  <target name="log.zip" depends="init">
-    <property name="base" value="${basedir}/log.zip.pdetemp"/>
-    <delete dir="${base}"/>
-    <mkdir dir="${base}"/>
-    <antcall target="log">
-      <param name ="destroot" value="${base}/plugins/${plugin}_${version}"/>
-    </antcall>
-	<exec dir="${base}" executable="zip">
-	   <arg line="-r ${basedir}/${plugin}_${version}.log.zip ."/>
-	</exec>
-    <delete dir="${base}"/>
-  </target>
+	<target name="build.update.jar" depends="init">
+		<property name="base" value="${basedir}/bin.zip.pdetemp"/>
+		<delete dir="${base}"/>
+		<mkdir dir="${base}"/>
+		<antcall target="gather.bin.parts">
+			<param name="destination" value="${base}/"/>
+		</antcall>
+		<delete>
+			<fileset dir="${base}" includes="**/*.bin.log"/>
+		</delete>
+		<zip zipfile="${basedir}/${plugin}_${version}.jar" basedir="${base}/plugins/${plugin}"/>
+		<delete dir="${base}"/>
+	</target>
 
-  <target name="ws/gtk/swt-pi.jar" depends="init">
-    <ant antfile="${template}" target="jar">
-      <property name="mapping" value="Eclipse SWT PI/gtk/,Eclipse SWT PI/common_j2me/"/>
-      <property name="includes" value="Eclipse SWT PI/gtk/,Eclipse SWT PI/common_j2me/"/>
-      <property name="excludes" value="Eclipse SWT PI/gtk/library/"/>
-      <property name="dest" value="${basedir}/ws/gtk/swt-pi.jar"/>
-      <property name="compilePath" value=""/>
-    </ant>
-  </target>
+	<target name="gather.bin.parts" depends="init" if="destination">
+		<ant antfile="${template}" target="includesExcludesCopy">
+			<property name="srcdir" value="${basedir}"/>
+			<property name="dest" value="${destination}/plugins/${plugin}"/>
+			<property name="excludes" value="${bin.excludes}"/>
+			<property name="includes" value="${bin.includes}"/>
+		</ant>
+	</target>
 
-  <target name="ws/gtk/swt.jar" depends="init">
-    <ant antfile="${template}" target="jar">
-      <property name="mapping" value="Eclipse SWT/gtk/,Eclipse SWT/common/,Eclipse SWT/common_j2me/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/emulated/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/gtk/,Eclipse SWT Printing/common/,Eclipse SWT Program/gtk/,Eclipse SWT Program/common/,${emulatedswt}/widgets/CoolBar.java,${emulatedswt}/widgets/CoolItem.java,${emulatedswt}/internal/BidiUtil.java,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="includes" value="Eclipse SWT/gtk/,Eclipse SWT/common/,Eclipse SWT/common_j2me/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/emulated/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/gtk/,Eclipse SWT Printing/common/,Eclipse SWT Program/gtk/,Eclipse SWT Program/common/,${emulatedswt}/widgets/CoolBar.java,${emulatedswt}/widgets/CoolItem.java,${emulatedswt}/internal/BidiUtil.java,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="excludes" value="Eclipse SWT/common/library/"/>
-      <property name="dest" value="${basedir}/ws/gtk/swt.jar"/>
-      <property name="compilePath" value="ws/gtk/swt-pi.jar"/>
-    </ant>
-  </target>
+	<target name="clean" depends="init">
+	</target>
 
-  <target name="ws/motif/swt.jar" depends="init">
-    <ant antfile="${template}" target="jar">
-      <property name="mapping" value="Eclipse SWT/motif/,Eclipse SWT/common/,Eclipse SWT/common_j2me/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/motif/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/motif/,Eclipse SWT Printing/common/,Eclipse SWT Program/motif/,Eclipse SWT Program/common/,Eclipse SWT/emulated/,Eclipse SWT PI/motif/,Eclipse SWT PI/common_j2me/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="includes" value="Eclipse SWT/motif/,Eclipse SWT/common/,Eclipse SWT/common_j2me/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/motif/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/motif/,Eclipse SWT Printing/common/,Eclipse SWT Program/motif/,Eclipse SWT Program/common/,Eclipse SWT/emulated/,Eclipse SWT PI/motif/,Eclipse SWT PI/common_j2me/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="excludes" value="Eclipse SWT/common/library/,Eclipse SWT PI/motif/library/"/>
-      <property name="dest" value="${basedir}/ws/motif/swt.jar"/>
-      <property name="compilePath" value=""/>
-    </ant>
-  </target>
+	<target name="properties">
+		<property name="plugin" value="org.eclipse.swt"/>
+		<property name="version" value="2.0.0"/>
+		<property name="bin.includes" value="plugin.xml,plugin.properties,about.html"/>
+		<property name="bin.excludes" value=""/>
+	</target>
 
-  <target name="ws/photon/swt.jar" depends="init">
-    <ant antfile="${template}" target="jar">
-      <property name="mapping" value="Eclipse SWT/photon/,Eclipse SWT/common/,Eclipse SWT/common_j2me/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/photon/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/photon/,Eclipse SWT Printing/common/,Eclipse SWT Program/photon/,Eclipse SWT Program/common/,Eclipse SWT/emulated/,Eclipse SWT PI/photon/,Eclipse SWT PI/common_j2me/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="includes" value="Eclipse SWT/photon/,Eclipse SWT/common/,Eclipse SWT/common_j2me/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/photon/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/photon/,Eclipse SWT Printing/common/,Eclipse SWT Program/photon/,Eclipse SWT Program/common/,Eclipse SWT/emulated/,Eclipse SWT PI/photon/,Eclipse SWT PI/common_j2me/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="excludes" value="Eclipse SWT/common/library/,Eclipse SWT PI/photon/library/,${emulatedswt}/widgets/TabFolder.java,${emulatedswt}/widgets/TabItem.java"/>
-      <property name="dest" value="${basedir}/ws/photon/swt.jar"/>
-      <property name="compilePath" value=""/>
-    </ant>
-  </target>
-
-  <target name="ws/win32/swt.jar" depends="init">
-    <ant antfile="${template}" target="jar">
-      <property name="mapping" value="Eclipse SWT/win32/,Eclipse SWT/common/,Eclipse SWT/common_j2me/,Eclipse SWT AWT/win32/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/emulated/,Eclipse SWT Drag and Drop/common/,Eclipse SWT OLE Win32/win32/,Eclipse SWT Printing/win32/,Eclipse SWT Printing/common/,Eclipse SWT Program/win32/,Eclipse SWT Program/common/,Eclipse SWT PI/win32/,Eclipse SWT PI/common_j2me/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="includes" value="Eclipse SWT/win32/,Eclipse SWT/common/,Eclipse SWT/common_j2me/,Eclipse SWT AWT/win32/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/emulated/,Eclipse SWT Drag and Drop/common/,Eclipse SWT OLE Win32/win32/,Eclipse SWT Printing/win32/,Eclipse SWT Printing/common/,Eclipse SWT Program/win32/,Eclipse SWT Program/common/,Eclipse SWT PI/win32/,Eclipse SWT PI/common_j2me/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="excludes" value="Eclipse SWT/common/library/,Eclipse SWT PI/win32/library/"/>
-      <property name="dest" value="${basedir}/ws/win32/swt.jar"/>
-      <property name="compilePath" value=""/>
-    </ant>
-  </target>
-
-  <target name="jar" depends="init,ws/gtk/swt-pi.jar,ws/gtk/swt.jar,ws/motif/swt.jar,ws/photon/swt.jar,ws/win32/swt.jar">
-  </target>
-
-  <target name="ws/gtk/swt-pisrc.zip" depends="init">
-    <property name="destroot" value="${basedir}"/>
-    <ant antfile="${template}" target="src">
-      <property name="mapping" value="Eclipse SWT PI/gtk/,Eclipse SWT PI/common_j2me/,Eclipse SWT PI/gtk/"/>
-      <property name="includes" value="Eclipse SWT PI/gtk/**/*.java,Eclipse SWT PI/common_j2me/**/*.java,Eclipse SWT PI/gtk/library/"/>
-      <property name="excludes" value=""/>
-      <property name="dest" value="${destroot}/ws/gtk/swt-pisrc.zip"/>
-    </ant>
-  </target>
-
-  <target name="ws/gtk/swtsrc.zip" depends="init">
-    <property name="destroot" value="${basedir}"/>
-    <ant antfile="${template}" target="src">
-      <property name="mapping" value="Eclipse SWT/gtk/,Eclipse SWT/common/,Eclipse SWT/common_j2me/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/emulated/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/gtk/,Eclipse SWT Printing/common/,Eclipse SWT Program/gtk/,Eclipse SWT Program/common/,Eclipse SWT/emulated/,Eclipse SWT/emulated/,Eclipse SWT/emulated/,Eclipse SWT/common/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="includes" value="Eclipse SWT/gtk/**/*.java,Eclipse SWT/common/**/*.java,Eclipse SWT/common_j2me/**/*.java,Eclipse SWT Custom Widgets/common/**/*.java,Eclipse SWT Drag and Drop/emulated/**/*.java,Eclipse SWT Drag and Drop/common/**/*.java,Eclipse SWT Printing/gtk/**/*.java,Eclipse SWT Printing/common/**/*.java,Eclipse SWT Program/gtk/**/*.java,Eclipse SWT Program/common/**/*.java,Eclipse SWT/emulated/**/CoolBar.java,Eclipse SWT/emulated/**/CoolItem.java,Eclipse SWT/emulated/**/BidiUtil.java,Eclipse SWT/common/library/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="excludes" value=""/>
-      <property name="dest" value="${destroot}/ws/gtk/swtsrc.zip"/>
-    </ant>
-  </target>
-
-  <target name="ws/motif/swtsrc.zip" depends="init">
-    <property name="destroot" value="${basedir}"/>
-    <ant antfile="${template}" target="src">
-      <property name="mapping" value="Eclipse SWT/motif/,Eclipse SWT/common/,Eclipse SWT/common_j2me/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/motif/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/motif/,Eclipse SWT Printing/common/,Eclipse SWT Program/motif/,Eclipse SWT Program/common/,Eclipse SWT/emulated/,Eclipse SWT PI/motif/,Eclipse SWT PI/common_j2me/,Eclipse SWT/common/,Eclipse SWT PI/motif/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="includes" value="Eclipse SWT/motif/**/*.java,Eclipse SWT/common/**/*.java,Eclipse SWT/common_j2me/**/*.java,Eclipse SWT Custom Widgets/common/**/*.java,Eclipse SWT Drag and Drop/motif/**/*.java,Eclipse SWT Drag and Drop/common/**/*.java,Eclipse SWT Printing/motif/**/*.java,Eclipse SWT Printing/common/**/*.java,Eclipse SWT Program/motif/**/*.java,Eclipse SWT Program/common/**/*.java,Eclipse SWT/emulated/**/*.java,Eclipse SWT PI/motif/**/*.java,Eclipse SWT PI/common_j2me/**/*.java,Eclipse SWT/common/library/,Eclipse SWT PI/motif/library/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="excludes" value=""/>
-      <property name="dest" value="${destroot}/ws/motif/swtsrc.zip"/>
-    </ant>
-  </target>
-
-  <target name="ws/photon/swtsrc.zip" depends="init">
-    <property name="destroot" value="${basedir}"/>
-    <ant antfile="${template}" target="src">
-      <property name="mapping" value="Eclipse SWT/photon/,Eclipse SWT/common/,Eclipse SWT/common_j2me/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/photon/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Printing/photon/,Eclipse SWT Printing/common/,Eclipse SWT Program/photon/,Eclipse SWT Program/common/,Eclipse SWT/emulated,Eclipse SWT PI/photon/,Eclipse SWT PI/common_j2me/,Eclipse SWT/common/,Eclipse SWT PI/photon/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="includes" value="Eclipse SWT/photon/**/*.java,Eclipse SWT/common/**/*.java,Eclipse SWT/common_j2me/**/*.java,Eclipse SWT Custom Widgets/common/**/*.java,Eclipse SWT Drag and Drop/photon/**/*.java,Eclipse SWT Drag and Drop/common/**/*.java,Eclipse SWT Printing/photon/**/*.java,Eclipse SWT Printing/common/**/*.java,Eclipse SWT Program/photon/**/*.java,Eclipse SWT Program/common/**/*.java,Eclipse SWT/emulated/**/*.java,Eclipse SWT PI/photon/**/*.java,Eclipse SWT PI/common_j2me/**/*.java,Eclipse SWT/common/library/,Eclipse SWT PI/photon/library/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="excludes" value="${emulatedswt}/widgets/TabFolder.java,${emulatedswt}/widgets/TabItem.java"/>
-      <property name="dest" value="${destroot}/ws/photon/swtsrc.zip"/>
-    </ant>
-  </target>
-
-  <target name="ws/win32/swtsrc.zip" depends="init">
-    <property name="destroot" value="${basedir}"/>
-    <ant antfile="${template}" target="src">
-      <property name="mapping" value="Eclipse SWT/win32/,Eclipse SWT/common/,Eclipse SWT/common_j2me/,Eclipse SWT AWT/win32/,Eclipse SWT Custom Widgets/common/,Eclipse SWT Drag and Drop/emulated/,Eclipse SWT Drag and Drop/common/,Eclipse SWT OLE Win32/win32/,Eclipse SWT Printing/win32/,Eclipse SWT Printing/common/,Eclipse SWT Program/win32/,Eclipse SWT Program/common/,Eclipse SWT PI/win32/,Eclipse SWT PI/common_j2me/,Eclipse SWT/common/,Eclipse SWT PI/win32/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="includes" value="Eclipse SWT/win32/**/*.java,Eclipse SWT/common/**/*.java,Eclipse SWT/common_j2me/**/*.java,Eclipse SWT AWT/win32/**/*.java,Eclipse SWT Custom Widgets/common/**/*.java,Eclipse SWT Drag and Drop/emulated/**/*.java,Eclipse SWT Drag and Drop/common/**/*.java,Eclipse SWT OLE Win32/win32/**/*.java,Eclipse SWT Printing/win32/**/*.java,Eclipse SWT Printing/common/**/*.java,Eclipse SWT Program/win32/**/*.java,Eclipse SWT Program/common/**/*.java,Eclipse SWT PI/win32/**/*.java,Eclipse SWT PI/common_j2me/**/*.java,Eclipse SWT/common/library/,Eclipse SWT PI/win32/library/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/"/>
-      <property name="excludes" value=""/>
-      <property name="dest" value="${destroot}/ws/win32/swtsrc.zip"/>
-    </ant>
-  </target>
-
-  <target name="src" depends="init,ws/gtk/swt-pisrc.zip,ws/gtk/swtsrc.zip,ws/motif/swtsrc.zip,ws/photon/swtsrc.zip,ws/win32/swtsrc.zip">
-  </target>
-
-  <target name="bin" depends="init">
-    <property name="destroot" value="${basedir}"/>
-    <ant antfile="${template}" target="bin">
-      <property name="includes" value="plugin.xml,about.html,plugin.properties,ws/,*.jar"/>
-      <property name="excludes" value="Eclipse SWT Printing/common/,Eclipse SWT Printing/motif/,Eclipse SWT Printing/photon/,Eclipse SWT Printing/win32/,Eclipse SWT Printing/gtk/,Eclipse SWT Drag and Drop/common/,Eclipse SWT Drag and Drop/motif/,Eclipse SWT Drag and Drop/photon/,Eclipse SWT Drag and Drop/emulated/,Eclipse SWT Drag and Drop/emulated/,Eclipse SWT Program/common/,Eclipse SWT Program/motif/,Eclipse SWT Program/photon/,Eclipse SWT Program/win32/,Eclipse SWT Program/gtk/,Eclipse SWT/common/,Eclipse SWT/common_j2me/,Eclipse SWT/motif/,Eclipse SWT/photon/,Eclipse SWT/win32/,Eclipse SWT/gtk/,Eclipse SWT/common_j2me/,Eclipse SWT PI/common_j2me/,Eclipse SWT PI/motif/,Eclipse SWT PI/photon/,Eclipse SWT PI/win32/,Eclipse SWT PI/gtk/,Eclipse SWT Custom Widgets/common/,Eclipse SWT AWT/win32/,Eclipse SWT OLE Win32/win32/,Eclipse SWT/emulated/,Eclipse SWT Accessibility/emulated/,Eclipse SWT Accessibility/common/,Eclipse SWT Accessibility/win32/"/>
-      <property name="dest" value="${destroot}"/>
-    </ant>
-  </target>
-
-  <target name="log" depends="init">
-    <property name="destroot" value="${basedir}"/>
-    <ant antfile="${template}" target="log">
-      <property name="dest" value="${destroot}"/>
-    </ant>
-  </target>
-
-  <target name="clean" depends="init">
-    <ant antfile="${template}" target="clean">
-      <property name="jar" value="ws/gtk/swt-pi.jar,ws/gtk/swt.jar,ws/motif/swt.jar,ws/photon/swt.jar,ws/win32/swt.jar"/>
-      <property name="srczips" value="ws/gtk/swt-pisrc.zip,ws/gtk/swtsrc.zip,ws/motif/swtsrc.zip,ws/photon/swtsrc.zip,ws/win32/swtsrc.zip"/>
-    </ant>
-    <delete>
-      <fileset dir="." includes="**/*.pdetemp"/>
-    </delete>
-    <delete file="${plugin}_${version}.zip"/>
-    <delete file="${plugin}_${version}.src.zip"/>
-    <delete file="${plugin}_${version}.doc.zip"/>
-    <delete file="${plugin}_${version}.log.zip"/>
-  </target>
-</project>
+</project>
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/plugin.xml b/bundles/org.eclipse.swt/plugin.xml
index 4fe8d11..e1110bf 100755
--- a/bundles/org.eclipse.swt/plugin.xml
+++ b/bundles/org.eclipse.swt/plugin.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- File written by PDE 1.0 -->
 <plugin
    id="org.eclipse.swt"
    name="%pluginName"
@@ -7,12 +6,10 @@
    provider-name="Object Technology International, Inc.">
 
 <!-- Runtime -->
-<runtime>
-   <library name="$ws$/swt-pi.jar">
-      <export name="*"/>
-   </library>
-   <library name="$ws$/swt.jar">
-      <export name="*"/>
-   </library>
-</runtime>
+   <runtime>
+      <library name="$ws$/swt.jar">
+         <export name="*"/>
+      </library>
+   </runtime>
+
 </plugin>