diff --git a/org.adempiere.base/.classpath b/org.adempiere.base/.classpath
index ffbad28f00..c7a32fae64 100644
--- a/org.adempiere.base/.classpath
+++ b/org.adempiere.base/.classpath
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="jnlp.jar"/>
-	<classpathentry exported="true" kind="lib" path="barbecue-1.5-beta1.jar"/>
-	<classpathentry exported="true" kind="lib" path="iText-2.1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="jcommon-1.0.16.jar"/>
-	<classpathentry exported="true" kind="lib" path="jfreechart-1.0.13.jar"/>
-	<classpathentry exported="true" kind="lib" path="cron4j-2.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="groovy-all-1.5.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="groovy-engine.jar"/>
-	<classpathentry exported="true" kind="lib" path="jython-engine.jar"/>
-	<classpathentry exported="true" kind="lib" path="jython.jar"/>
-	<classpathentry exported="true" kind="lib" path="bsh-2.0b5.jar"/>
-	<classpathentry exported="true" kind="lib" path="bsh-engine.jar"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<accessrules>
 			<accessrule kind="accessible" pattern="com/sun/rowset/*"/>
 		</accessrules>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="lib" path="bsh-2.0b5.jar"/>
+	<classpathentry exported="true" kind="lib" path="bsh-engine.jar"/>
+	<classpathentry exported="true" kind="lib" path="groovy-all-1.5.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="groovy-engine.jar"/>
+	<classpathentry exported="true" kind="lib" path="jython-engine.jar"/>
+	<classpathentry exported="true" kind="lib" path="jython.jar"/>
+	<classpathentry exported="true" kind="lib" path="cron4j-2.2.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="barbecue-1.5-beta1.jar"/>
+	<classpathentry exported="true" kind="lib" path="iText-2.1.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="jcommon-1.0.16.jar"/>
+	<classpathentry exported="true" kind="lib" path="jfreechart-1.0.13.jar"/>
+	<classpathentry exported="true" kind="lib" path="jnlp.jar"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
diff --git a/org.adempiere.base/.project b/org.adempiere.base/.project
index f4aae4f2b0..a3e7e09c81 100644
--- a/org.adempiere.base/.project
+++ b/org.adempiere.base/.project
@@ -3,10 +3,6 @@
 	<name>org.adempiere.base</name>
 	<comment></comment>
 	<projects>
-		<project>dbPort</project>
-		<project>looks</project>
-		<project>print</project>
-		<project>tools</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/org.adempiere.eclipse.equinox.http.servlet/.classpath b/org.adempiere.eclipse.equinox.http.servlet/.classpath
index ad32c83a78..c2ce266a67 100644
--- a/org.adempiere.eclipse.equinox.http.servlet/.classpath
+++ b/org.adempiere.eclipse.equinox.http.servlet/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.jdt.core.prefs
index 7169546ef0..c5b7b23b56 100644
--- a/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
-#Fri Dec 24 14:42:06 MYT 2010
+#Wed Jun 01 10:21:31 MYT 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1
+org.eclipse.jdt.core.compiler.compliance=1.3
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.3
diff --git a/org.adempiere.eclipse.equinox.http.servletbridge/.classpath b/org.adempiere.eclipse.equinox.http.servletbridge/.classpath
index ad32c83a78..c2ce266a67 100644
--- a/org.adempiere.eclipse.equinox.http.servletbridge/.classpath
+++ b/org.adempiere.eclipse.equinox.http.servletbridge/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.eclipse.equinox.http.servletbridge/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.eclipse.equinox.http.servletbridge/.settings/org.eclipse.jdt.core.prefs
index 67adc84601..c5b7b23b56 100644
--- a/org.adempiere.eclipse.equinox.http.servletbridge/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.eclipse.equinox.http.servletbridge/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
-#Fri Dec 24 14:43:16 MYT 2010
+#Wed Jun 01 10:21:31 MYT 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1
+org.eclipse.jdt.core.compiler.compliance=1.3
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.3
diff --git a/org.adempiere.eclipse.equinox.servletbridge/.classpath b/org.adempiere.eclipse.equinox.servletbridge/.classpath
index ad32c83a78..c2ce266a67 100644
--- a/org.adempiere.eclipse.equinox.servletbridge/.classpath
+++ b/org.adempiere.eclipse.equinox.servletbridge/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs
index 7d53f64ded..c5b7b23b56 100644
--- a/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs
+++ b/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
-#Fri Dec 24 14:44:01 MYT 2010
+#Wed Jun 01 10:21:31 MYT 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1
+org.eclipse.jdt.core.compiler.compliance=1.3
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.3
diff --git a/org.adempiere.extend/.classpath b/org.adempiere.extend/.classpath
index 578a82f61b..3496c3b589 100644
--- a/org.adempiere.extend/.classpath
+++ b/org.adempiere.extend/.classpath
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" kind="lib" path="SuperCSV-with_src-1.52.jar"/>
+	<classpathentry exported="true" kind="lib" path="spiffy-with_source-all-0.05.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="lib" path="spiffy-with_source-all-0.05.jar"/>
-	<classpathentry kind="lib" path="SuperCSV-with_src-1.52.jar"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
diff --git a/org.adempiere.extend/.project b/org.adempiere.extend/.project
index 61fec90a3f..74c65db164 100644
--- a/org.adempiere.extend/.project
+++ b/org.adempiere.extend/.project
@@ -3,11 +3,6 @@
 	<name>org.adempiere.extend</name>
 	<comment></comment>
 	<projects>
-		<project>base</project>
-		<project>dbPort</project>
-		<project>looks</project>
-		<project>print</project>
-		<project>tools</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/org.adempiere.extend/META-INF/MANIFEST.MF b/org.adempiere.extend/META-INF/MANIFEST.MF
index d9d1f2054f..143d9338f3 100644
--- a/org.adempiere.extend/META-INF/MANIFEST.MF
+++ b/org.adempiere.extend/META-INF/MANIFEST.MF
@@ -3,7 +3,9 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.adempiere.extend
 Bundle-SymbolicName: org.adempiere.extend;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: extend.jar
+Bundle-ClassPath: extend.jar,
+ spiffy-with_source-all-0.05.jar,
+ SuperCSV-with_src-1.52.jar
 Eclipse-RegisterBuddy: org.adempiere.tools
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: compiere.model,
diff --git a/org.adempiere.extend/build.properties b/org.adempiere.extend/build.properties
index 9e7ef3cd08..5134fd22a6 100644
--- a/org.adempiere.extend/build.properties
+++ b/org.adempiere.extend/build.properties
@@ -1,6 +1,8 @@
 output.extend.jar = build/
 bin.includes = META-INF/,\
-               extend.jar
+               extend.jar,\
+               spiffy-with_source-all-0.05.jar,\
+               SuperCSV-with_src-1.52.jar
 jars.compile.order = extend.jar
 source.extend.jar = src/
 
diff --git a/org.adempiere.install/.project b/org.adempiere.install/.project
index 45bf6cdc75..67b8228078 100644
--- a/org.adempiere.install/.project
+++ b/org.adempiere.install/.project
@@ -3,17 +3,6 @@
 	<name>org.adempiere.install</name>
 	<comment></comment>
 	<projects>
-		<project>base</project>
-		<project>client</project>
-		<project>dbPort</project>
-		<project>extend</project>
-		<project>jboss</project>
-		<project>looks</project>
-		<project>print</project>
-		<project>server</project>
-		<project>serverApps</project>
-		<project>serverRoot</project>
-		<project>tools</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/org.adempiere.payment.processor/.classpath b/org.adempiere.payment.processor/.classpath
index 4e88dbaf95..49087bf65e 100644
--- a/org.adempiere.payment.processor/.classpath
+++ b/org.adempiere.payment.processor/.classpath
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="jpayment.jar"/>
-	<classpathentry exported="true" kind="lib" path="payflow.jar"/>
-	<classpathentry exported="true" kind="lib" path="Verisign.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="lib" path="jpayment.jar"/>
+	<classpathentry exported="true" kind="lib" path="payflow.jar"/>
+	<classpathentry exported="true" kind="lib" path="Verisign.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath
index 20ea5a5d5a..c6c8c03607 100644
--- a/org.adempiere.report.jasper.library/.classpath
+++ b/org.adempiere.report.jasper.library/.classpath
@@ -1,31 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.7.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/commons-digester-1.7.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/iReport.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/jasperreports-3.7.3.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.13.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-digester-1.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/iReport.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jasperreports-3.7.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.13.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.adempiere.report.jasper.webapp/.classpath b/org.adempiere.report.jasper.webapp/.classpath
index aa3c377514..6046c7a0d1 100644
--- a/org.adempiere.report.jasper.webapp/.classpath
+++ b/org.adempiere.report.jasper.webapp/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
diff --git a/org.adempiere.report.jasper/.classpath b/org.adempiere.report.jasper/.classpath
index 59bd5c5a83..77574626cf 100644
--- a/org.adempiere.report.jasper/.classpath
+++ b/org.adempiere.report.jasper/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="org/compiere/report/ReportExporter.java" kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry excluding="org/compiere/report/ReportExporter.java" kind="src" path="src"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
diff --git a/org.adempiere.report.jasper/.project b/org.adempiere.report.jasper/.project
index 49157670a6..1287b5ba0c 100644
--- a/org.adempiere.report.jasper/.project
+++ b/org.adempiere.report.jasper/.project
@@ -3,13 +3,6 @@
 	<name>org.adempiere.report.jasper</name>
 	<comment></comment>
 	<projects>
-		<project>base</project>
-		<project>client</project>
-		<project>dbPort</project>
-		<project>lib</project>
-		<project>looks</project>
-		<project>print</project>
-		<project>utils</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/org.adempiere.server/.project b/org.adempiere.server/.project
index d3da222bb3..2ea4fe630b 100644
--- a/org.adempiere.server/.project
+++ b/org.adempiere.server/.project
@@ -3,11 +3,6 @@
 	<name>org.adempiere.server</name>
 	<comment></comment>
 	<projects>
-		<project>base</project>
-		<project>dbPort</project>
-		<project>looks</project>
-		<project>server</project>
-		<project>tools</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/org.adempiere.ui.swing/.project b/org.adempiere.ui.swing/.project
index ee739ca30a..7109e9f6a4 100644
--- a/org.adempiere.ui.swing/.project
+++ b/org.adempiere.ui.swing/.project
@@ -3,12 +3,6 @@
 	<name>org.adempiere.ui.swing</name>
 	<comment></comment>
 	<projects>
-		<project>base</project>
-		<project>dbPort</project>
-		<project>extend</project>
-		<project>looks</project>
-		<project>print</project>
-		<project>tools</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/org.adempiere.ui.zk/.classpath b/org.adempiere.ui.zk/.classpath
index 3c1eb99e2e..e92f909449 100644
--- a/org.adempiere.ui.zk/.classpath
+++ b/org.adempiere.ui.zk/.classpath
@@ -1,7 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="WEB-INF/src"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/classes/"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/classes" sourcepath="WEB-INF/classes"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zk.jar" sourcepath="WEB-INF/lib/zk-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zcommon.jar" sourcepath="WEB-INF/lib/zcommon-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zul.jar" sourcepath="WEB-INF/lib/zul-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/junit.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/keylistener.jar"/>
+	<classpathentry kind="lib" path="WEB-INF/lib/zkmax.jar" sourcepath="WEB-INF/lib/zkmax-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zkex.jar" sourcepath="WEB-INF/lib/zkex-sources.jar"/>
+	<classpathentry kind="lib" path="WEB-INF/lib/zkplus.jar" sourcepath="WEB-INF/lib/zkplus-sources.jar"/>
+	<classpathentry kind="lib" path="WEB-INF/lib/zhtml.jar" sourcepath="WEB-INF/lib/zhtml-sources.jar"/>
+	<classpathentry kind="lib" path="WEB-INF/lib/timelinez.jar" sourcepath="WEB-INF/lib/timelinez-sources.jar"/>
+	<classpathentry kind="lib" path="WEB-INF/lib/zweb.jar" sourcepath="WEB-INF/lib/zweb-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/cglib.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/fckez.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/asm.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/bsh.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/commons-el.jar"/>
@@ -21,20 +36,5 @@
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/xercesImpl.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zcommons-el.jar"/>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zml.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zk.jar" sourcepath="WEB-INF/lib/zk-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zcommon.jar" sourcepath="WEB-INF/lib/zcommon-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zul.jar" sourcepath="WEB-INF/lib/zul-sources.jar"/>
-	<classpathentry kind="lib" path="WEB-INF/lib/junit.jar"/>
-	<classpathentry kind="lib" path="WEB-INF/lib/keylistener.jar"/>
-	<classpathentry kind="lib" path="WEB-INF/lib/zkmax.jar" sourcepath="WEB-INF/lib/zkmax-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/zkex.jar" sourcepath="WEB-INF/lib/zkex-sources.jar"/>
-	<classpathentry kind="lib" path="WEB-INF/lib/zkplus.jar" sourcepath="WEB-INF/lib/zkplus-sources.jar"/>
-	<classpathentry kind="lib" path="WEB-INF/lib/zhtml.jar" sourcepath="WEB-INF/lib/zhtml-sources.jar"/>
-	<classpathentry kind="lib" path="WEB-INF/lib/timelinez.jar" sourcepath="WEB-INF/lib/timelinez-sources.jar"/>
-	<classpathentry kind="lib" path="WEB-INF/lib/zweb.jar" sourcepath="WEB-INF/lib/zweb-sources.jar"/>
-	<classpathentry kind="lib" path="WEB-INF/lib/cglib.jar"/>
-	<classpathentry kind="lib" path="WEB-INF/lib/fckez.jar"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="output" path="WEB-INF/classes"/>
 </classpath>
diff --git a/org.adempiere.ui.zk/.project b/org.adempiere.ui.zk/.project
index 17d049b1e8..962d1b1ce5 100644
--- a/org.adempiere.ui.zk/.project
+++ b/org.adempiere.ui.zk/.project
@@ -3,13 +3,6 @@
 	<name>org.adempiere.ui.zk</name>
 	<comment></comment>
 	<projects>
-		<project>base</project>
-		<project>client</project>
-		<project>JasperReports</project>
-		<project>JasperReportsTools</project>
-		<project>tools</project>
-		<project>packages</project>
-		<project>extend</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/org.adempiere.ui/.classpath b/org.adempiere.ui/.classpath
index aed1b056e6..74dea4d489 100644
--- a/org.adempiere.ui/.classpath
+++ b/org.adempiere.ui/.classpath
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="org-netbeans-api-visual.jar"/>
-	<classpathentry exported="true" kind="lib" path="org-openide-util.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="lib" path="org-netbeans-api-visual.jar"/>
+	<classpathentry exported="true" kind="lib" path="org-openide-util.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.adempiere.webstore/.classpath b/org.adempiere.webstore/.classpath
index aa3c377514..6046c7a0d1 100644
--- a/org.adempiere.webstore/.classpath
+++ b/org.adempiere.webstore/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
diff --git a/org.compiere.db.oracle.provider/.classpath b/org.compiere.db.oracle.provider/.classpath
index c2cbd56a27..f3c0c812d2 100644
--- a/org.compiere.db.oracle.provider/.classpath
+++ b/org.compiere.db.oracle.provider/.classpath
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="c3p0-0.9.1.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="c3p0-oracle-thin-extras-0.9.1.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="ojdbc6.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="lib" path="ojdbc6.jar"/>
+	<classpathentry exported="true" kind="lib" path="c3p0-0.9.1.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="c3p0-oracle-thin-extras-0.9.1.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.compiere.db.postgresql.provider/.classpath b/org.compiere.db.postgresql.provider/.classpath
index bf9719cda8..122d279ee0 100644
--- a/org.compiere.db.postgresql.provider/.classpath
+++ b/org.compiere.db.postgresql.provider/.classpath
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="c3p0-0.9.1.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="postgresql.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="lib" path="postgresql.jar"/>
+	<classpathentry exported="true" kind="lib" path="c3p0-0.9.1.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>