diff --git a/fitnesse/copyjars.xml b/fitnesse/copyjars.xml
deleted file mode 100644
index 0dba706a58..0000000000
--- a/fitnesse/copyjars.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<project name="zklibrary" basedir="." default="copy">
-	<target name="copy">
-		<!-- maybe it's same file in org.idempiere.fitnesse.server, just diference version-->
-		<get src="http://downloads.sourceforge.net/project/idempiere/binary.file/jarfile/5.1/fitnesse2.jar" dest="fitnesse2.jar" usetimestamp="true" verbose="true" retries="5"/>
-	</target>
-</project>
diff --git a/org.adempiere.base.callout/build.properties b/org.adempiere.base.callout/build.properties
index 2a9dcbdc94..ae7b864d75 100644
--- a/org.adempiere.base.callout/build.properties
+++ b/org.adempiere.base.callout/build.properties
@@ -1,6 +1,5 @@
-output.. = bin/
 bin.includes = META-INF/,\
-               .,\
                OSGI-INF/costadjustmentcalloutfactory.xml,\
                OSGI-INF/
-source.. = src/
+output.. = bin/
+source.. = src/
\ No newline at end of file
diff --git a/org.adempiere.base.process/build.properties b/org.adempiere.base.process/build.properties
index 34d2e4d2da..7ad0399a27 100644
--- a/org.adempiere.base.process/build.properties
+++ b/org.adempiere.base.process/build.properties
@@ -1,4 +1,3 @@
-source.. = src/
+bin.includes = META-INF/
 output.. = bin/
-bin.includes = META-INF/,\
-               .
+source.. = src/
\ No newline at end of file
diff --git a/org.adempiere.base/.classpath b/org.adempiere.base/.classpath
index 4d93d8f5a7..a7239c9632 100644
--- a/org.adempiere.base/.classpath
+++ b/org.adempiere.base/.classpath
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/bsh.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-validator.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cron4j.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jnlp.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jython-engine.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jython.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="bsh-2.0b6.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.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="jnlp.jar"/>
-	<classpathentry exported="true" kind="lib" path="commons-validator-1.6.jar"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index 26e3019c5e..95e3236333 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -4,12 +4,12 @@ Bundle-Name: iDempiere Core
 Bundle-SymbolicName: org.adempiere.base;singleton:=true
 Bundle-Version: 5.1.0.qualifier
 Bundle-ClassPath: .,
- jython-engine.jar,
- jython.jar,
- cron4j-2.2.5.jar,
- jnlp.jar,
- bsh-2.0b6.jar,
- commons-validator-1.6.jar
+ lib/bsh.jar,
+ lib/commons-validator.jar,
+ lib/cron4j.jar,
+ lib/jnlp.jar,
+ lib/jython-engine.jar,
+ lib/jython.jar
 Export-Package: bsh,
  bsh.classpath,
  bsh.collection,
diff --git a/org.adempiere.base/build.properties b/org.adempiere.base/build.properties
index ae7e102354..6878402fa6 100644
--- a/org.adempiere.base/build.properties
+++ b/org.adempiere.base/build.properties
@@ -1,9 +1,4 @@
-bin.includes = META-INF/,\
-               plugin.xml,\
-               jython-engine.jar,\
-               jython.jar,\
-               cron4j-2.2.5.jar,\
-               jnlp.jar,\
+bin.includes = plugin.xml,\
                OSGI-INF/,\
                OSGI-INF/dslocator.xml,\
                OSGI-INF/serverbean.xml,\
@@ -23,8 +18,14 @@ bin.includes = META-INF/,\
                OSGI-INF/addressvalidationeventhandler.xml,\
                OSGI-INF/defaultproductpricingfactory.xml,\
                schema/,\
-               bsh-2.0b6.jar,\
-               commons-validator-1.6.jar,\
-               .
+               lib/bsh.jar,\
+               lib/commons-validator.jar,\
+               lib/cron4j.jar,\
+               lib/jnlp.jar,\
+               lib/jython-engine.jar,\
+               lib/jython.jar,\
+               .,\
+               META-INF/
 src.includes = schema/
 source.. = src/
+output.. = bin/
\ No newline at end of file
diff --git a/org.adempiere.base/copyjars.xml b/org.adempiere.base/copyjars.xml
index b90c10f843..804a05414e 100644
--- a/org.adempiere.base/copyjars.xml
+++ b/org.adempiere.base/copyjars.xml
@@ -1,15 +1,16 @@
  <project name="zklibrary" basedir="." default="copy">
+ 	<mkdir dir="lib" />
  	<target name="copy">
-		<get src="${url.maven2.lib}/maven2/org/apache-extras/beanshell/bsh/2.0b6/bsh-2.0b6.jar" dest="bsh-2.0b6.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/apache-extras/beanshell/bsh/2.0b6/bsh-2.0b6.jar" dest="lib/bsh.jar" usetimestamp="true" verbose="true" retries="5" />
  		<!-- bsf-all-3.0-beta3.jar replace for grovy-engine, jyyhon-enjine, bsh-engine
  	      http://mvnrepository.com/artifact/org.apache.bsf/bsf-all/3.0-beta3
                 <get src="${url.maven2.lib}/maven2/org/apache/bsf/bsf-all/3.0-beta3/bsf-all-3.0-beta3.jar" dest="bsf-all-3.0-beta3.jar" usetimestamp="true" verbose="true" retries="5"/>
  		  -->
-		<get src="${url.file.srv}/jarfile/5.1/jython-engine.jar" dest="jython-engine.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/org/python/jython/2.2.1/jython-2.2.1.jar" dest="jython.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/it/sauronsoftware/cron4j/cron4j/2.2.5/cron4j-2.2.5.jar" dest="cron4j-2.2.5.jar" usetimestamp="true" verbose="true" retries="5" />
- 		<get src="${url.maven2.lib}/maven2/commons-validator/commons-validator/1.6/commons-validator-1.6.jar" dest="commons-validator-1.6.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/5.1/jython-engine.jar" dest="lib/jython-engine.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/python/jython/2.2.1/jython-2.2.1.jar" dest="lib/jython.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/it/sauronsoftware/cron4j/cron4j/2.2.5/cron4j-2.2.5.jar" dest="lib/cron4j.jar" usetimestamp="true" verbose="true" retries="5" />
+ 		<get src="${url.maven2.lib}/maven2/commons-validator/commons-validator/1.6/commons-validator-1.6.jar" dest="lib/commons-validator.jar" usetimestamp="true" verbose="true" retries="5" />
  		<!-- jnlp is not used in idempiere? -->
-		<get src="${url.file.srv}/jarfile/5.1/jnlp.jar" dest="jnlp.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/5.1/jnlp.jar" dest="lib/jnlp.jar" usetimestamp="true" verbose="true" retries="5" />
  	</target>
  </project>
diff --git a/org.adempiere.eclipse.equinox.http.servlet/build.properties b/org.adempiere.eclipse.equinox.http.servlet/build.properties
index 5551aecc3d..b70c55013f 100644
--- a/org.adempiere.eclipse.equinox.http.servlet/build.properties
+++ b/org.adempiere.eclipse.equinox.http.servlet/build.properties
@@ -1,7 +1,6 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
-               .,\
                plugin.properties
 jre.compilation.profile = J2SE-1.3
 javacErrors.. = -assertIdentifier,-enumIdentifier
+output.. = bin/
+source.. = src/
\ No newline at end of file
diff --git a/org.adempiere.eclipse.equinox.http.servletbridge/build.properties b/org.adempiere.eclipse.equinox.http.servletbridge/build.properties
index 5551aecc3d..b70c55013f 100644
--- a/org.adempiere.eclipse.equinox.http.servletbridge/build.properties
+++ b/org.adempiere.eclipse.equinox.http.servletbridge/build.properties
@@ -1,7 +1,6 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
-               .,\
                plugin.properties
 jre.compilation.profile = J2SE-1.3
 javacErrors.. = -assertIdentifier,-enumIdentifier
+output.. = bin/
+source.. = src/
\ No newline at end of file
diff --git a/org.adempiere.eclipse.equinox.servletbridge/build.properties b/org.adempiere.eclipse.equinox.servletbridge/build.properties
index 5551aecc3d..b70c55013f 100644
--- a/org.adempiere.eclipse.equinox.servletbridge/build.properties
+++ b/org.adempiere.eclipse.equinox.servletbridge/build.properties
@@ -1,7 +1,6 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
-               .,\
                plugin.properties
 jre.compilation.profile = J2SE-1.3
 javacErrors.. = -assertIdentifier,-enumIdentifier
+output.. = bin/
+source.. = src/
\ No newline at end of file
diff --git a/org.adempiere.extend/.classpath b/org.adempiere.extend/.classpath
index 1517484308..1fa3e6803d 100644
--- a/org.adempiere.extend/.classpath
+++ b/org.adempiere.extend/.classpath
@@ -3,6 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="spiffy-with_source-all-0.05.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.adempiere.extend/META-INF/MANIFEST.MF b/org.adempiere.extend/META-INF/MANIFEST.MF
index 918ba8b0d9..fe23808466 100644
--- a/org.adempiere.extend/META-INF/MANIFEST.MF
+++ b/org.adempiere.extend/META-INF/MANIFEST.MF
@@ -15,5 +15,3 @@ Import-Package: junit.framework;version="3.8.2",
  org.junit.runners;version="4.8.2",
  org.supercsv.io,
  org.supercsv.prefs
-Bundle-ClassPath: .,
- spiffy-with_source-all-0.05.jar
diff --git a/org.adempiere.extend/buckminster.cspex b/org.adempiere.extend/buckminster.cspex
deleted file mode 100644
index 37e112943c..0000000000
--- a/org.adempiere.extend/buckminster.cspex
+++ /dev/null
@@ -1,19 +0,0 @@
-<cspecExtension xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
-	xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
-	<actions>
-		<!-- public action with ant actor to do the actual copying -->
-		<cs:public name="fetch.dependency.jars" actor="ant">
-			<cs:actorProperties>
-				<cs:property key="buildFile" value="copyjars.xml" />
-				<cs:property key="targets" value="copy" />
-			</cs:actorProperties>
-		</cs:public>		
-	</actions>
-	<groups>
-		<!-- buckminster.prebind the prebind group will be executed during materialization -->
-		<cs:private name="buckminster.postbind">
-			<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />			
-		</cs:private>
-	</groups>
-</cspecExtension>
diff --git a/org.adempiere.extend/build.properties b/org.adempiere.extend/build.properties
index 5e0df6e86b..d62c0a6218 100644
--- a/org.adempiere.extend/build.properties
+++ b/org.adempiere.extend/build.properties
@@ -1,5 +1,3 @@
-bin.includes = META-INF/,\
-               .,\
-               spiffy-with_source-all-0.05.jar
+bin.includes = META-INF/
+output.. = bin/
 source.. = src/
-
diff --git a/org.adempiere.extend/copyjars.xml b/org.adempiere.extend/copyjars.xml
deleted file mode 100644
index c0a32edd1d..0000000000
--- a/org.adempiere.extend/copyjars.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<project name="zklibrary" basedir="." default="copy">
-	<target name="copy">
-		<get src="${url.file.srv}/jarfile/5.1/spiffy-with_source-all-0.05.jar" dest="spiffy-with_source-all-0.05.jar" usetimestamp="true" verbose="true" retries="5" />
-	</target>
-</project>
diff --git a/org.adempiere.install/.classpath b/org.adempiere.install/.classpath
index 6ec290c67b..dfb19cbd82 100644
--- a/org.adempiere.install/.classpath
+++ b/org.adempiere.install/.classpath
@@ -7,6 +7,5 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="ant-contrib-1.0b3.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.adempiere.install/META-INF/MANIFEST.MF b/org.adempiere.install/META-INF/MANIFEST.MF
index 2d3658e840..1c03f301b3 100644
--- a/org.adempiere.install/META-INF/MANIFEST.MF
+++ b/org.adempiere.install/META-INF/MANIFEST.MF
@@ -3,8 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Setup
 Bundle-SymbolicName: org.adempiere.install;singleton:=true
 Bundle-Version: 5.1.0.qualifier
-Bundle-ClassPath: .,
- ant-contrib-1.0b3.jar
 Export-Package: org.adempiere.install,
  org.compiere.install
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
diff --git a/org.adempiere.install/buckminster.cspex b/org.adempiere.install/buckminster.cspex
deleted file mode 100644
index ecfc6ce11a..0000000000
--- a/org.adempiere.install/buckminster.cspex
+++ /dev/null
@@ -1,19 +0,0 @@
-<cspecExtension xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"
-	xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
-	<actions>
-		<!-- public action with ant actor to do the actual copying -->
-		<cs:public name="fetch.dependency.jars" actor="ant">
-			<cs:actorProperties>
-				<cs:property key="buildFile" value="copyjars.xml" />
-				<cs:property key="targets" value="copy" />
-			</cs:actorProperties>
-		</cs:public>
-	</actions>
-	<groups>
-		<!-- buckminster.prebind the prebind group will be executed during materialization -->
-		<cs:private name="buckminster.postbind">
-			<cs:attribute name="fetch.dependency.jars" alias="action.requirements" />			
-		</cs:private>
-	</groups>
-</cspecExtension>
diff --git a/org.adempiere.install/build.properties b/org.adempiere.install/build.properties
index c4055c42ce..90fc2e149a 100644
--- a/org.adempiere.install/build.properties
+++ b/org.adempiere.install/build.properties
@@ -1,5 +1,4 @@
 bin.includes = META-INF/,\
-               plugin.xml,\
-               ant-contrib-1.0b3.jar,\
-               .
-source.. = src/
+               plugin.xml
+output.. = bin/
+source.. = src/
\ No newline at end of file
diff --git a/org.adempiere.install/copyjars.xml b/org.adempiere.install/copyjars.xml
deleted file mode 100644
index e81e182ef5..0000000000
--- a/org.adempiere.install/copyjars.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<project name="zklibrary" basedir="." default="copy">
-	<target name="copy">
-		<get src="${url.maven2.lib}/maven2/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3.jar" dest="ant-contrib-1.0b3.jar" usetimestamp="true" verbose="true" retries="5" />
-	</target>
-</project>
diff --git a/org.adempiere.payment.processor/.classpath b/org.adempiere.payment.processor/.classpath
index c8dedbe49a..cfc3d07103 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="lib/jpayment.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/payflow.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/Verisign.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<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.payment.processor/META-INF/MANIFEST.MF b/org.adempiere.payment.processor/META-INF/MANIFEST.MF
index 9adc6dcb3e..5270c0f023 100644
--- a/org.adempiere.payment.processor/META-INF/MANIFEST.MF
+++ b/org.adempiere.payment.processor/META-INF/MANIFEST.MF
@@ -5,8 +5,8 @@ Bundle-SymbolicName: org.adempiere.payment.processor;singleton:=true
 Bundle-Version: 5.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
-Bundle-ClassPath: jpayment.jar,
- payflow.jar,
- Verisign.jar,
- .
+Bundle-ClassPath: .,
+ lib/jpayment.jar,
+ lib/payflow.jar,
+ lib/Verisign.jar
 
diff --git a/org.adempiere.payment.processor/build.properties b/org.adempiere.payment.processor/build.properties
index cb6ef3cd7f..95ea7366e4 100644
--- a/org.adempiere.payment.processor/build.properties
+++ b/org.adempiere.payment.processor/build.properties
@@ -1,8 +1,8 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
+               plugin.xml,\
                .,\
-               jpayment.jar,\
-               payflow.jar,\
-               Verisign.jar,\
-               plugin.xml
+               lib/jpayment.jar,\
+               lib/payflow.jar,\
+               lib/Verisign.jar
+source.. = src/
+output.. = bin/
\ No newline at end of file
diff --git a/org.adempiere.payment.processor/copyjars.xml b/org.adempiere.payment.processor/copyjars.xml
index b47e0e9150..2979a86b89 100644
--- a/org.adempiere.payment.processor/copyjars.xml
+++ b/org.adempiere.payment.processor/copyjars.xml
@@ -1,9 +1,10 @@
 <project name="zklibrary" basedir="." default="copy">
+	<mkdir dir="lib" />
 	<target name="copy">
 		<!-- seem payment sdk is change without use verisign.jar, i can find out this lib. maybe have to update this plug-in 
 		  http://paypal.github.io/sdk/#ppo-payflow-->
-		<get src="${url.file.srv}/jarfile/5.1/jpayment.jar" dest="jpayment.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.srv}/jarfile/5.1/Verisign.jar" dest="Verisign.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.srv}/jarfile/5.1/payflow.jar" dest="payflow.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/5.1/jpayment.jar" dest="lib/jpayment.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/5.1/Verisign.jar" dest="lib/Verisign.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/5.1/payflow.jar" dest="lib/payflow.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.adempiere.pipo.handlers/build.properties b/org.adempiere.pipo.handlers/build.properties
index e9863e281e..90fc2e149a 100644
--- a/org.adempiere.pipo.handlers/build.properties
+++ b/org.adempiere.pipo.handlers/build.properties
@@ -1,5 +1,4 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
-               .,\
                plugin.xml
+output.. = bin/
+source.. = src/
\ No newline at end of file
diff --git a/org.adempiere.pipo/build.properties b/org.adempiere.pipo/build.properties
index b79d13b91a..16ce877406 100644
--- a/org.adempiere.pipo/build.properties
+++ b/org.adempiere.pipo/build.properties
@@ -1,7 +1,6 @@
-output.. = bin/
 bin.includes = META-INF/,\
-               .,\
                plugin.xml,\
                OSGI-INF/dictionaryservice.xml,\
                OSGI-INF/
-source.. = src/
+output.. = bin/
+source.. = src/
\ No newline at end of file
diff --git a/org.adempiere.plugin.utils/build.properties b/org.adempiere.plugin.utils/build.properties
index 34d2e4d2da..7ad0399a27 100644
--- a/org.adempiere.plugin.utils/build.properties
+++ b/org.adempiere.plugin.utils/build.properties
@@ -1,4 +1,3 @@
-source.. = src/
+bin.includes = META-INF/
 output.. = bin/
-bin.includes = META-INF/,\
-               .
+source.. = src/
\ No newline at end of file
diff --git a/org.adempiere.replication.server/build.properties b/org.adempiere.replication.server/build.properties
index 6cbd05aa98..97dff9c812 100644
--- a/org.adempiere.replication.server/build.properties
+++ b/org.adempiere.replication.server/build.properties
@@ -1,6 +1,5 @@
-output.. = bin/
 bin.includes = META-INF/,\
-               .,\
                OSGI-INF/serverfactory.xml,\
                OSGI-INF/
+output.. = bin/
 source.. = src/
diff --git a/org.adempiere.replication/build.properties b/org.adempiere.replication/build.properties
index e9863e281e..90fc2e149a 100644
--- a/org.adempiere.replication/build.properties
+++ b/org.adempiere.replication/build.properties
@@ -1,5 +1,4 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
-               .,\
                plugin.xml
+output.. = bin/
+source.. = src/
\ No newline at end of file
diff --git a/org.adempiere.report.jasper.library/.classpath b/org.adempiere.report.jasper.library/.classpath
index 0c69cbccf6..ffbe57ebb4 100644
--- a/org.adempiere.report.jasper.library/.classpath
+++ b/org.adempiere.report.jasper.library/.classpath
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/jasperreports-chart-customizers-6.3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jasperreports-chart-themes-6.3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jasperreports-functions-6.3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/castor-core-1.3.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/castor-xml-1.3.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/fop-transcoder-allinone-1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/js.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/olap4j-0.9.7.309-JS-3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/spring-beans-2.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/spring-core-2.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xmpcore-5.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/castor-core.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/castor-xml.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jasperreports-chart-customizers.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jasperreports-chart-themes.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jasperreports-functions.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/olap4j.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/rhino.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/spring-beans.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/spring-core.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xml-apis-ext.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xmpcore.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
index af18983335..c86ceef00c 100644
--- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
@@ -6,18 +6,17 @@ Bundle-Version: 5.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Fragment-Host: net.sf.jasperreports.engine;bundle-version="6.3.1"
 Bundle-ClassPath: .,
- lib/castor-core-1.3.3.jar,
- lib/castor-xml-1.3.3.jar,
- lib/fop-transcoder-allinone-1.1.jar,
- lib/js.jar,
- lib/olap4j-0.9.7.309-JS-3.jar,
- lib/spring-beans-2.5.jar,
- lib/spring-core-2.5.jar,
- lib/xml-apis-ext-1.3.04.jar,
- lib/xmpcore-5.1.1.jar,
- lib/jasperreports-functions-6.3.1.jar,
- lib/jasperreports-chart-customizers-6.3.1.jar,
- lib/jasperreports-chart-themes-6.3.1.jar
+ lib/castor-core.jar,
+ lib/castor-xml.jar,
+ lib/jasperreports-chart-customizers.jar,
+ lib/jasperreports-chart-themes.jar,
+ lib/jasperreports-functions.jar,
+ lib/olap4j.jar,
+ lib/rhino.jar,
+ lib/spring-beans.jar,
+ lib/spring-core.jar,
+ lib/xml-apis-ext.jar,
+ lib/xmpcore.jar
 Import-Package: bsh,
  bsh.classpath,
  bsh.collection,
diff --git a/org.adempiere.report.jasper.library/build.properties b/org.adempiere.report.jasper.library/build.properties
index d290381892..917a447cc9 100644
--- a/org.adempiere.report.jasper.library/build.properties
+++ b/org.adempiere.report.jasper.library/build.properties
@@ -1,14 +1,13 @@
 bin.includes = META-INF/,\
                .,\
-               lib/castor-core-1.3.3.jar,\
-               lib/castor-xml-1.3.3.jar,\
-               lib/fop-transcoder-allinone-1.1.jar,\
-               lib/js.jar,\
-               lib/olap4j-0.9.7.309-JS-3.jar,\
-               lib/spring-beans-2.5.jar,\
-               lib/spring-core-2.5.jar,\
-               lib/xml-apis-ext-1.3.04.jar,\
-               lib/xmpcore-5.1.1.jar,\
-               lib/jasperreports-functions-6.3.1.jar,\
-               lib/jasperreports-chart-customizers-6.3.1.jar,\
-               lib/jasperreports-chart-themes-6.3.1.jar
+               lib/castor-core.jar,\
+               lib/castor-xml.jar,\
+               lib/jasperreports-chart-customizers.jar,\
+               lib/jasperreports-chart-themes.jar,\
+               lib/jasperreports-functions.jar,\
+               lib/olap4j.jar,\
+               lib/rhino.jar,\
+               lib/spring-beans.jar,\
+               lib/spring-core.jar,\
+               lib/xml-apis-ext.jar,\
+               lib/xmpcore.jar
diff --git a/org.adempiere.report.jasper.library/copyjars.xml b/org.adempiere.report.jasper.library/copyjars.xml
index 542a13d733..d8f756debb 100644
--- a/org.adempiere.report.jasper.library/copyjars.xml
+++ b/org.adempiere.report.jasper.library/copyjars.xml
@@ -1,18 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project>
 <project name="zklibrary" basedir="." default="copy">
+	<mkdir dir="lib" />
 	<target name="copy">
-		<mkdir dir="lib" />
-		<get src="${url.file.jp.lib}/castor-core-1.3.3.jar" dest="lib/castor-core-1.3.3.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.jp.lib}/castor-xml-1.3.3.jar" dest="lib/castor-xml-1.3.3.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.jp.lib}/fop-transcoder-allinone-1.1.jar" dest="lib/fop-transcoder-allinone-1.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.jp.lib}/jasperreports-fonts-6.3.1.jar" dest="lib/jasperreports-fonts-6.3.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.jp.lib}/jasperreports-chart-themes-6.3.1.jar" dest="lib/jasperreports-chart-themes-6.3.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.jp.lib}/jasperreports-chart-customizers-6.3.1.jar" dest="lib/jasperreports-chart-customizers-6.3.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.jp.lib}/jasperreports-functions-6.3.1.jar" dest="lib/jasperreports-functions-6.3.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.jp.lib}/js.jar" dest="lib/js.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.jp.lib}/olap4j-0.9.7.309-JS-3.jar" dest="lib/olap4j-0.9.7.309-JS-3.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.jp.lib}/spring-beans-2.5.jar" dest="lib/spring-beans-2.5.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.jp.lib}/spring-core-2.5.jar" dest="lib/spring-core-2.5.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.jp.lib}/xml-apis-ext-1.3.04.jar" dest="lib/xml-apis-ext-1.3.04.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.jp.lib}/xmpcore-5.1.1.jar" dest="lib/xmpcore-5.1.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/castor-core-1.3.3.jar" dest="lib/castor-core.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/castor-xml-1.3.3.jar" dest="lib/castor-xml.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/jasperreports-chart-themes-6.3.1.jar" dest="lib/jasperreports-chart-themes.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/jasperreports-chart-customizers-6.3.1.jar" dest="lib/jasperreports-chart-customizers.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/jasperreports-functions-6.3.1.jar" dest="lib/jasperreports-functions.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/js.jar" dest="lib/rhino.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/olap4j-0.9.7.309-JS-3.jar" dest="lib/olap4j.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/spring-beans-2.5.jar" dest="lib/spring-beans.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/spring-core-2.5.jar" dest="lib/spring-core.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/xml-apis-ext-1.3.04.jar" dest="lib/xml-apis-ext.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.jp.lib}/xmpcore-5.1.1.jar" dest="lib/xmpcore.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.adempiere.report.jasper.swing/build.properties b/org.adempiere.report.jasper.swing/build.properties
index ac81f3b55d..b38f8ee930 100644
--- a/org.adempiere.report.jasper.swing/build.properties
+++ b/org.adempiere.report.jasper.swing/build.properties
@@ -1,6 +1,5 @@
-output.. = bin/
 bin.includes = META-INF/,\
-               .,\
                OSGI-INF/jrviewerprovider.xml,\
                OSGI-INF/
-source.. = src/
+output.. = bin/
+source.. = src/
\ No newline at end of file
diff --git a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
index f4c0fe46bd..12740eee05 100644
--- a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 5.1.0.qualifier
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Web-ContextPath: JasperReportFiles
-Bundle-ClassPath: .
 Import-Package: javax.servlet;version="2.5.0",
  javax.servlet.http;version="2.5.0",
  javax.servlet.jsp;version="2.1.0",
diff --git a/org.adempiere.report.jasper.webapp/build.properties b/org.adempiere.report.jasper.webapp/build.properties
index d1b29a5002..8b946430da 100644
--- a/org.adempiere.report.jasper.webapp/build.properties
+++ b/org.adempiere.report.jasper.webapp/build.properties
@@ -1,5 +1,4 @@
 bin.includes = META-INF/,\
-               .,\
                standalone.jrxml,\
                WEB-INF/
 bin.excludes = src/**,\
@@ -7,5 +6,5 @@ bin.excludes = src/**,\
 			   .classpath,\
 			   .project,\
 			   build.properties
-source.. = src/
 output.. = bin/
+source.. = src/
diff --git a/org.adempiere.report.jasper/JasperReports.jardesc b/org.adempiere.report.jasper/JasperReports.jardesc
deleted file mode 100644
index 62bf6f9155..0000000000
--- a/org.adempiere.report.jasper/JasperReports.jardesc
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jardesc>
-    <jar path="./JasperReports/JasperReports.jar"/>
-    <options overwrite="true" compress="true" exportErrors="true" exportWarnings="true" saveDescription="true" descriptionLocation="/JasperReports/JasperReports.jardesc" useSourceFolders="false" buildIfNeeded="true" includeDirectoryEntries="false"/>
-    <manifest manifestVersion="1.0" usesManifest="true" reuseManifest="false" saveManifest="false" generateManifest="true" manifestLocation="">
-        <sealing sealJar="false">
-            <packagesToSeal/>
-            <packagesToUnSeal/>
-        </sealing>
-    </manifest>
-    <selectedElements exportClassFiles="true" exportOutputFolder="false" exportJavaFiles="true">
-        <file path="/JasperReports/Tasks.txt"/>
-        <file path="/JasperReports/.project"/>
-        <file path="/JasperReports/build.xml"/>
-        <folder path="/JasperReports/doc"/>
-        <file path="/JasperReports/JasperReports.jardesc"/>
-        <javaElement handleIdentifier="=JasperReports/src"/>
-        <file path="/JasperReports/patch-2.5.2a.diff"/>
-        <folder path="/JasperReports/scripts"/>
-        <file path="/JasperReports/patch-2.5.2b.diff"/>
-        <file path="/JasperReports/RUN_build.bat"/>
-        <file path="/JasperReports/patch-2.5.2b.pre-c.2.diff"/>
-        <file path="/JasperReports/.classpath"/>
-        <folder path="/JasperReports/.externalToolBuilders"/>
-        <file path="/JasperReports/RUN_build.sh"/>
-        <file path="/JasperReports/.cvsignore"/>
-    </selectedElements>
-</jardesc>
diff --git a/org.adempiere.report.jasper/META-INF/MANIFEST.MF b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
index b747c7a773..a17d03e88f 100644
--- a/org.adempiere.report.jasper/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere JasperReport integration
 Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true
 Bundle-Version: 5.1.0.qualifier
-Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: net.sourceforge.barbecue;version="1.5.0.beta1",
  org.apache.commons.codec,
diff --git a/org.adempiere.report.jasper/build.properties b/org.adempiere.report.jasper/build.properties
index 49115ba9ae..afa31bda27 100644
--- a/org.adempiere.report.jasper/build.properties
+++ b/org.adempiere.report.jasper/build.properties
@@ -1,4 +1,4 @@
 bin.includes = META-INF/,\
-               OSGI-INF/,\
-               .
-source.. = src/
+               OSGI-INF/
+output.. = bin/
+source.. = src/
\ No newline at end of file
diff --git a/org.adempiere.sdk-feature/materialize.properties b/org.adempiere.sdk-feature/materialize.properties
index d45ca54a70..47d6d917ca 100644
--- a/org.adempiere.sdk-feature/materialize.properties
+++ b/org.adempiere.sdk-feature/materialize.properties
@@ -11,6 +11,16 @@ local.repository.root.maven=http://central.maven.org/maven2
 
 url.maven2=http://central.maven.org
 url.maven2.lib=http://central.maven.org
+url.maven2.ga=https://maven.repository.redhat.com/ga
+url.maven2.opennms=http://repo.opennms.org/maven2
+url.maven2.jp=https://jaspersoft.jfrog.io/jaspersoft/jr-ce-releases
+url.maven2.jp.other=https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts
+url.maven2.netbeans=http://bits.netbeans.org/maven2
+url.maven2.clojars=http://clojars.org/repo
+url.maven2.atlassian.3rdparty=https://maven.atlassian.com/3rdparty
+url.maven2.jenkins=http://repo.jenkins-ci.org/releases
+
+jp-verion=6.3.1
 
 url.maven.zkoss=http://mavensync.zkoss.org
 url.maven.zkoss.lib=http://mavensync.zkoss.org
diff --git a/org.adempiere.server-feature/copyjars.xml b/org.adempiere.server-feature/copyjars.xml
index a926ecd302..e0d87ebd96 100644
--- a/org.adempiere.server-feature/copyjars.xml
+++ b/org.adempiere.server-feature/copyjars.xml
@@ -5,31 +5,33 @@
 		<get src="${url.file.srv}/database/5.1/Adempiere.jar" dest="data/seed/Adempiere.jar" usetimestamp="true" verbose="true" retries="5" />
 
 		<mkdir dir="../db/ddlutils/lib" />
-		<get src="${url.maven2.lib}/maven2/ant-contrib/ant-contrib/1.0b2/ant-contrib-1.0b2.jar" dest="../db/ddlutils/lib/ant-contrib-1.0b1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" dest="../db/ddlutils/lib/commons-beanutils-1.7.0.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/commons-betwixt/commons-betwixt/0.8/commons-betwixt-0.8.jar" dest="../db/ddlutils/lib/commons-betwixt-0.8-RC1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" dest="../db/ddlutils/lib/commons-codec-1.3.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" dest="../db/ddlutils/lib/commons-collections-3.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/commons-dbcp/commons-dbcp/1.2.1/commons-dbcp-1.2.1.jar" dest="../db/ddlutils/lib/commons-dbcp-1.2.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/commons-digester/commons-digester/1.7/commons-digester-1.7.jar" dest="../db/ddlutils/lib/commons-digester-1.7.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" dest="../db/ddlutils/lib/commons-lang-2.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" dest="../db/ddlutils/lib/commons-logging-1.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/commons-pool/commons-pool/1.2/commons-pool-1.2.jar" dest="../db/ddlutils/lib/commons-pool-1.2.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/org/apache/ddlutils/ddlutils/1.0/ddlutils-1.0.jar" dest="../db/ddlutils/lib/DdlUtils-1.0-RC1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/dom4j/dom4j/1.4/dom4j-1.4.jar" dest="../db/ddlutils/lib/dom4j-1.4.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/ant-contrib/ant-contrib/1.0b2/ant-contrib-1.0b2.jar" dest="../db/ddlutils/lib/ant-contrib.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" dest="../db/ddlutils/lib/commons-beanutils.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/commons-betwixt/commons-betwixt/0.8/commons-betwixt-0.8.jar" dest="../db/ddlutils/lib/commons-betwixt.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" dest="../db/ddlutils/lib/commons-codec.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" dest="../db/ddlutils/lib/commons-collections.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/commons-dbcp/commons-dbcp/1.2.1/commons-dbcp-1.2.1.jar" dest="../db/ddlutils/lib/commons-dbcp.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/commons-digester/commons-digester/1.7/commons-digester-1.7.jar" dest="../db/ddlutils/lib/commons-digester.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/commons-lang/commons-lang/2.1/commons-lang-2.1.jar" dest="../db/ddlutils/lib/commons-lang.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" dest="../db/ddlutils/lib/commons-logging.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/commons-pool/commons-pool/1.2/commons-pool-1.2.jar" dest="../db/ddlutils/lib/commons-pool.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/apache/ddlutils/ddlutils/1.0/ddlutils-1.0.jar" dest="../db/ddlutils/lib/DdlUtils.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/dom4j/dom4j/1.4/dom4j-1.4.jar" dest="../db/ddlutils/lib/dom4j.jar" usetimestamp="true" verbose="true" retries="5" />
+		<!-- it's fyracle db, not yet support on idempiere
+		https://it.wikipedia.org/wiki/Fyracle
+		http://www.biz-wise.nl/compiere_dl.html
 		<get src="${url.file.srv}/jarfile/5.1/fyracle.jar" dest="../db/ddlutils/lib/fyracle.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/oro/oro/2.0.8/oro-2.0.8.jar" dest="../db/ddlutils/lib/jakarta-oro-2.0.8.jar" usetimestamp="true" verbose="true" retries="5" />
+    -->
+		<get src="${url.maven2.lib}/maven2/oro/oro/2.0.8/oro-2.0.8.jar" dest="../db/ddlutils/lib/jakarta-oro.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.srv}/jarfile/5.1/oracle.jar" dest="../db/ddlutils/lib/oracle.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.file.srv}/jarfile/5.1/postgresql.jar" dest="../db/ddlutils/lib/postgresql.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/stax/stax-api/1.0.1/stax-api-1.0.1.jar" dest="../db/ddlutils/lib/stax-api-1.0.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/woodstox/wstx-asl/3.0.2/wstx-asl-3.0.2.jar" dest="../db/ddlutils/lib/wstx-asl-3.0.2.jar" usetimestamp="true" verbose="true" retries="5" />
-		<mkdir dir="../db/ddlutils/postgresql/pljava" />
-		<get src="${url.maven2.lib}/maven2/woodstox/wstx-asl/3.0.2/wstx-asl-3.0.2.jar" dest="../db/ddlutils/lib/wstx-asl-3.0.2.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/stax/stax-api/1.0.1/stax-api-1.0.1.jar" dest="../db/ddlutils/lib/stax-api.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/woodstox/wstx-asl/3.0.2/wstx-asl-3.0.2.jar" dest="../db/ddlutils/lib/wstx-asl.jar" usetimestamp="true" verbose="true" retries="5" />
 
-		<mkdir dir="../fitnesse/FitNesseRoot/FitLibraryWeb" />
-		<get src="${url.file.srv}/jarfile/5.1/101-20121212164242.zip" dest="../fitnesse/FitNesseRoot/FitLibraryWeb/101-20121212164242.zip" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.srv}/jarfile/5.1/21-20121212154702.zip" dest="../fitnesse/FitNesseRoot/FitLibraryWeb/21-20121212154702.zip" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.srv}/jarfile/5.1/6-20121212124109.zip" dest="../fitnesse/FitNesseRoot/FitLibraryWeb/6-20121212124109.zip" usetimestamp="true" verbose="true" retries="5" />
+        <mkdir dir="../fitnesse/FitNesseRoot/FitLibraryWeb" />
+        <get src="${url.file.srv}/jarfile/5.1/101-20121212164242.zip" dest="../fitnesse/FitNesseRoot/FitLibraryWeb/101-20121212164242.zip" usetimestamp="true" verbose="true" retries="5" />
+        <get src="${url.file.srv}/jarfile/5.1/21-20121212154702.zip" dest="../fitnesse/FitNesseRoot/FitLibraryWeb/21-20121212154702.zip" usetimestamp="true" verbose="true" retries="5" />
+        <get src="${url.file.srv}/jarfile/5.1/6-20121212124109.zip" dest="../fitnesse/FitNesseRoot/FitLibraryWeb/6-20121212124109.zip" usetimestamp="true" verbose="true" retries="5" />
 		<!-- maybe it's same file in org.idempiere.fitnesse.server, just diference version-->
 		<get src="${url.file.srv}/jarfile/5.1/fitnesse2.jar" dest="../fitnesse/fitnesse.jar" usetimestamp="true" verbose="true" retries="5" />
 
diff --git a/org.adempiere.server/META-INF/MANIFEST.MF b/org.adempiere.server/META-INF/MANIFEST.MF
index bb509b3bfb..9562413fd3 100644
--- a/org.adempiere.server/META-INF/MANIFEST.MF
+++ b/org.adempiere.server/META-INF/MANIFEST.MF
@@ -8,9 +8,9 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.eclipse.jetty.apache-jsp;bundle-version="0.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Web-ContextPath: /
-Bundle-ClassPath: WEB-INF/lib/jardiff.jar,
- WEB-INF/lib/jnlp-servlet.jar,
- .
+Bundle-ClassPath: .,
+ WEB-INF/lib/jardiff.jar,
+ WEB-INF/lib/jnlp-servlet.jar
 Import-Package: javax.jms;version="1.1.0",
  javax.mail;version="1.5",
  javax.servlet;version="3.0.0",
diff --git a/org.adempiere.server/build.properties b/org.adempiere.server/build.properties
index 14d131a174..73d91f74aa 100644
--- a/org.adempiere.server/build.properties
+++ b/org.adempiere.server/build.properties
@@ -1,7 +1,7 @@
 bin.includes = META-INF/,\
+               .,\
                WEB-INF/lib/jardiff.jar,\
                WEB-INF/lib/jnlp-servlet.jar,\
-               .,\
                WEB-INF/web.xml,\
                iDempiere120x60.gif,\
                iD32.gif,\
diff --git a/org.adempiere.ui.swing/.classpath b/org.adempiere.ui.swing/.classpath
index 93c369ff8d..cb9c775279 100644
--- a/org.adempiere.ui.swing/.classpath
+++ b/org.adempiere.ui.swing/.classpath
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/jpedal.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/looks.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/miglayout.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/swingx.jar"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="swingx-1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="looks-2.0.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="miglayout-3.7.1-swing.jar"/>
-	<classpathentry exported="true" kind="lib" path="jpedal.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.adempiere.ui.swing/META-INF/MANIFEST.MF b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
index 8036f30592..0ba734d43b 100644
--- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
@@ -4,10 +4,10 @@ Bundle-Name: iDempiere Swing Client
 Bundle-SymbolicName: org.adempiere.ui.swing;singleton:=true
 Bundle-Version: 5.1.0.qualifier
 Bundle-ClassPath: .,
- swingx-1.6.jar,
- looks-2.0.4.jar,
- miglayout-3.7.1-swing.jar,
- jpedal.jar
+ lib/jpedal.jar,
+ lib/looks.jar,
+ lib/miglayout.jar,
+ lib/swingx.jar
 Export-Package: com.jgoodies.looks,
  com.jgoodies.looks.common,
  com.jgoodies.looks.plastic,
diff --git a/org.adempiere.ui.swing/build.properties b/org.adempiere.ui.swing/build.properties
index c0f24360cb..781cadbf4e 100644
--- a/org.adempiere.ui.swing/build.properties
+++ b/org.adempiere.ui.swing/build.properties
@@ -1,9 +1,5 @@
 bin.includes = META-INF/,\
                plugin.xml,\
-               swingx-1.6.jar,\
-               looks-2.0.4.jar,\
-               miglayout-3.7.1-swing.jar,\
-               jpedal.jar,\
                OSGI-INF/,\
                OSGI-INF/defaultpaymentformfactory.xml,\
                OSGI-INF/defaultprintshippinglabel.xml,\
@@ -13,5 +9,10 @@ bin.includes = META-INF/,\
                OSGI-INF/defaulteditorfactory.xml,\
                OSGI-INF/reportviewerprovider.xml,\
                OSGI-INF/defaultformfactory.xml,\
-               .
+               .,\
+               lib/jpedal.jar,\
+               lib/looks.jar,\
+               lib/miglayout.jar,\
+               lib/swingx.jar
 source.. = src/
+output.. = bin/
diff --git a/org.adempiere.ui.swing/copyjars.xml b/org.adempiere.ui.swing/copyjars.xml
index c0e5787d24..085d33fbd7 100644
--- a/org.adempiere.ui.swing/copyjars.xml
+++ b/org.adempiere.ui.swing/copyjars.xml
@@ -1,9 +1,10 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
-		<get src="${url.maven2.lib}/maven2/org/swinglabs/swingx/1.6/swingx-1.6.jar" dest="swingx-1.6.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/com/jgoodies/looks/2.0.4/looks-2.0.4.jar" dest="looks-2.0.4.jar" usetimestamp="true" verbose="true" retries="5" />
+		<mkdir dir="lib" />
+		<get src="${url.maven2.lib}/maven2/org/swinglabs/swingx/1.6/swingx-1.6.jar" dest="lib/swingx.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/com/jgoodies/looks/2.0.4/looks-2.0.4.jar" dest="lib/looks.jar" usetimestamp="true" verbose="true" retries="5" />
 		<!-- old version is only for swing, but can't find out old version, so use jar for Swing, SWT and JavaFX to keep same version -->
-		<get src="${url.maven2.lib}/maven2/com/miglayout/miglayout/3.7.1/miglayout-3.7.1.jar" dest="miglayout-3.7.1-swing.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.srv}/jarfile/5.1/jpedal.jar" dest="jpedal.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/com/miglayout/miglayout/3.7.1/miglayout-3.7.1.jar" dest="lib/miglayout.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/5.1/jpedal.jar" dest="lib/jpedal.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.adempiere.ui.zk/.classpath b/org.adempiere.ui.zk/.classpath
index e5c0183f04..2677a72131 100644
--- a/org.adempiere.ui.zk/.classpath
+++ b/org.adempiere.ui.zk/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/ckez.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/daisydiff-min.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/daisydiff.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="WEB-INF/src"/>
diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
index 1913f8d6fc..0820a867e6 100644
--- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
@@ -49,8 +49,8 @@ Import-Package: groovy.transform.stc;version="2.4.7",
  org.springframework.web.util
 DynamicImport-Package: action.images
 Bundle-ClassPath: .,
- WEB-INF/lib/daisydiff-min.jar,
- WEB-INF/lib/ckez.jar
+ WEB-INF/lib/ckez.jar,
+ WEB-INF/lib/daisydiff.jar
 Export-Package: fi.jawsy.jawwa.zk.atmosphere,
  metainfo.zk,
  org.adempiere.webui,
diff --git a/org.adempiere.ui.zk/build.properties b/org.adempiere.ui.zk/build.properties
index f7f25d7290..305e057619 100644
--- a/org.adempiere.ui.zk/build.properties
+++ b/org.adempiere.ui.zk/build.properties
@@ -31,10 +31,10 @@ bin.includes = META-INF/,\
                *.jsp,\
                labelapplet.jar,\
                OSGI-INF/jfgchartrenderer.xml,\
-               WEB-INF/lib/daisydiff-min.jar,\
                manifest.json,\
                pdf.js/,\
-               WEB-INF/lib/ckez.jar
+               WEB-INF/lib/ckez.jar,\
+               WEB-INF/lib/daisydiff.jar
 src.includes = WEB-INF/tld/,\
                WEB-INF/web.xml,\
                WEB-INF/xsd/,\
diff --git a/org.adempiere.ui.zk/copyjars.xml b/org.adempiere.ui.zk/copyjars.xml
index f34dd194bc..f8e4150dcf 100644
--- a/org.adempiere.ui.zk/copyjars.xml
+++ b/org.adempiere.ui.zk/copyjars.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE project>
 <project name="zklibrary" basedir="." default="copy">
-	<target name="copy">
+	<target name="copy"> 
 		<mkdir dir="WEB-INF/lib" />
 		<get src="${url.file.srv}/jarfile/5.1/labelapplet.jar" dest="labelapplet.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.srv}/jarfile/5.1/daisydiff-min.jar" dest="WEB-INF/lib/daisydiff-min.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/5.1/daisydiff-min.jar" dest="WEB-INF/lib/daisydiff.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven.zkoss.lib}/maven2/org/zkoss/zkforge/ckez/4.7.0.0/ckez-4.7.0.0.jar" dest="WEB-INF/lib/ckez.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.adempiere.ui/.classpath b/org.adempiere.ui/.classpath
index b179f6141a..c815024f5b 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="lib/org-netbeans-api-visual.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/org-openide-util.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<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.ui/META-INF/MANIFEST.MF b/org.adempiere.ui/META-INF/MANIFEST.MF
index 483493482f..2f5fbd0da2 100644
--- a/org.adempiere.ui/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui/META-INF/MANIFEST.MF
@@ -25,6 +25,6 @@ Export-Package: org.compiere.apps,
  org.netbeans.api.visual.model,
  org.netbeans.api.visual.router,
  org.netbeans.api.visual.widget
-Bundle-ClassPath: org-netbeans-api-visual.jar,
- org-openide-util.jar,
- .
+Bundle-ClassPath: .,
+ lib/org-netbeans-api-visual.jar,
+ lib/org-openide-util.jar
diff --git a/org.adempiere.ui/build.properties b/org.adempiere.ui/build.properties
index 972223bfbc..e1e7d7cc0b 100644
--- a/org.adempiere.ui/build.properties
+++ b/org.adempiere.ui/build.properties
@@ -1,6 +1,6 @@
-output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               org-netbeans-api-visual.jar,\
-               org-openide-util.jar
+               lib/org-netbeans-api-visual.jar,\
+               lib/org-openide-util.jar
 source.. = src/
+output.. = bin/
diff --git a/org.adempiere.ui/copyjars.xml b/org.adempiere.ui/copyjars.xml
index 42847b24ff..a1e3f1b67b 100644
--- a/org.adempiere.ui/copyjars.xml
+++ b/org.adempiere.ui/copyjars.xml
@@ -1,10 +1,11 @@
 <project name="zklibrary" basedir="." default="copy">
+	<mkdir dir="lib" />
 	<target name="copy">
 		<!--in maven has newer version, but now keep old version
 		${url.maven2.lib}/maven2/org/codeartisans/thirdparties/swing/org-netbeans-api-visual/2.23.1/org-netbeans-api-visual-2.23.1.jar
 		${url.maven2.lib}/maven2/org/codeartisans/thirdparties/swing/org-openide-util/8.6.2/org-openide-util-8.6.2.jar
 		-->
-		<get src="${url.file.srv}/jarfile/5.1/org-netbeans-api-visual.jar" dest="org-netbeans-api-visual.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.srv}/jarfile/5.1/org-openide-util.jar" dest="org-openide-util.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/5.1/org-netbeans-api-visual.jar" dest="lib/org-netbeans-api-visual.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/5.1/org-openide-util.jar" dest="lib/org-openide-util.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.compiere.db.oracle.provider/.classpath b/org.compiere.db.oracle.provider/.classpath
index 7c3875a6bb..0424e95ef3 100644
--- a/org.compiere.db.oracle.provider/.classpath
+++ b/org.compiere.db.oracle.provider/.classpath
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="c3p0-0.9.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="c3p0-oracle-thin-extras-0.9.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="mchange-commons-java-0.2.9.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/c3p0-oracle-thin-extras.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/c3p0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/mchange-commons-java.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/ojdbc7.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="ojdbc7.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
index 4ad9d9a10b..f214324601 100644
--- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
@@ -7,10 +7,10 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.adempiere.install;bundle-version="0.0.0"
 Bundle-ClassPath: .,
- ojdbc7.jar,
- c3p0-0.9.5.jar,
- c3p0-oracle-thin-extras-0.9.5.jar,
- mchange-commons-java-0.2.9.jar
+ lib/c3p0-oracle-thin-extras.jar,
+ lib/c3p0.jar,
+ lib/mchange-commons-java.jar,
+ lib/ojdbc7.jar
 Import-Package: org.jfree.io;version="1.0.23",
  org.osgi.framework,
  org.slf4j;version="1.7.2"
diff --git a/org.compiere.db.oracle.provider/build.properties b/org.compiere.db.oracle.provider/build.properties
index cdd2fcb03d..a7e828cd71 100644
--- a/org.compiere.db.oracle.provider/build.properties
+++ b/org.compiere.db.oracle.provider/build.properties
@@ -2,10 +2,10 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               ojdbc7.jar,\
                OSGI-INF/oracleprovider.xml,\
                OSGI-INF/,\
-               c3p0-0.9.5.jar,\
-               c3p0-oracle-thin-extras-0.9.5.jar,\
-               mchange-commons-java-0.2.9.jar
+               lib/c3p0-oracle-thin-extras.jar,\
+               lib/c3p0.jar,\
+               lib/mchange-commons-java.jar,\
+               lib/ojdbc7.jar
 source.. = src/
diff --git a/org.compiere.db.oracle.provider/copyjars.xml b/org.compiere.db.oracle.provider/copyjars.xml
index 0632d836a7..28aeaf965e 100644
--- a/org.compiere.db.oracle.provider/copyjars.xml
+++ b/org.compiere.db.oracle.provider/copyjars.xml
@@ -1,8 +1,9 @@
 <project name="zklibrary" basedir="." default="copy">
+	<mkdir dir="lib" />
 	<target name="copy">
-		<get src="${url.maven2.lib}/maven2/com/mchange/c3p0/0.9.5/c3p0-0.9.5.jar" dest="c3p0-0.9.5.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/com/mchange/mchange-commons-java/0.2.9/mchange-commons-java-0.2.9.jar" dest="mchange-commons-java-0.2.9.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.srv}/jarfile/5.1/c3p0-oracle-thin-extras-0.9.5.jar" dest="c3p0-oracle-thin-extras-0.9.5.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.srv}/jarfile/5.1/ojdbc7.jar" dest="ojdbc7.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/com/mchange/c3p0/0.9.5/c3p0-0.9.5.jar" dest="lib/c3p0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/com/mchange/mchange-commons-java/0.2.9/mchange-commons-java-0.2.9.jar" dest="lib/mchange-commons-java.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/com/google/code/maven-play-plugin/com/mchange/c3p0-oracle-thin-extras/0.9.5/c3p0-oracle-thin-extras-0.9.5.jar" dest="lib/c3p0-oracle-thin-extras.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/5.1/ojdbc7.jar" dest="lib/ojdbc7.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.compiere.db.postgresql.provider/.classpath b/org.compiere.db.postgresql.provider/.classpath
index 74461271d8..993a6f68ac 100644
--- a/org.compiere.db.postgresql.provider/.classpath
+++ b/org.compiere.db.postgresql.provider/.classpath
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="postgresql-42.1.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/c3p0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/mchange-commons-java.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/postgresql.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="c3p0-0.9.5.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="mchange-commons-java-0.2.12.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
index bc82e05a34..ae8b53bd49 100644
--- a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
+++ b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
@@ -5,9 +5,9 @@ Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true
 Bundle-Version: 5.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .,
- c3p0-0.9.5.2.jar,
- mchange-commons-java-0.2.12.jar,
- postgresql-42.1.4.jar
+ lib/c3p0.jar,
+ lib/mchange-commons-java.jar,
+ lib/postgresql.jar
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.adempiere.install;bundle-version="0.0.0"
 Import-Package: junit.framework;version="3.8.2",
diff --git a/org.compiere.db.postgresql.provider/build.properties b/org.compiere.db.postgresql.provider/build.properties
index adfa8290b6..bd538abbd3 100644
--- a/org.compiere.db.postgresql.provider/build.properties
+++ b/org.compiere.db.postgresql.provider/build.properties
@@ -4,7 +4,7 @@ bin.includes = META-INF/,\
                plugin.xml,\
                OSGI-INF/pgprovider.xml,\
                OSGI-INF/,\
-               c3p0-0.9.5.2.jar,\
-               mchange-commons-java-0.2.12.jar,\
-               postgresql-42.1.4.jar
+               lib/c3p0.jar,\
+               lib/mchange-commons-java.jar,\
+               lib/postgresql.jar
 source.. = src/
diff --git a/org.compiere.db.postgresql.provider/copyjars.xml b/org.compiere.db.postgresql.provider/copyjars.xml
index 5cb651f370..d82fa58281 100644
--- a/org.compiere.db.postgresql.provider/copyjars.xml
+++ b/org.compiere.db.postgresql.provider/copyjars.xml
@@ -1,7 +1,8 @@
 <project name="zklibrary" basedir="." default="copy">
+  <mkdir dir="lib" />
 	<target name="copy">
-		<get src="${url.maven2.lib}/maven2/com/mchange/c3p0/0.9.5.2/c3p0-0.9.5.2.jar" dest="c3p0-0.9.5.2.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/com/mchange/mchange-commons-java/0.2.12/mchange-commons-java-0.2.12.jar" dest="mchange-commons-java-0.2.12.jar" usetimestamp="true" verbose="true" retries="5" />
-        <get src="${url.maven2.lib}/maven2/org/postgresql/postgresql/42.1.4/postgresql-42.1.4.jar" dest="postgresql-42.1.4.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/com/mchange/c3p0/0.9.5.2/c3p0-0.9.5.2.jar" dest="lib/c3p0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/com/mchange/mchange-commons-java/0.2.12/mchange-commons-java-0.2.12.jar" dest="lib/mchange-commons-java.jar" usetimestamp="true" verbose="true" retries="5" />
+        <get src="${url.maven2.lib}/maven2/org/postgresql/postgresql/42.1.4/postgresql-42.1.4.jar" dest="lib/postgresql.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.idempiere.fitnesse.server/.classpath b/org.idempiere.fitnesse.server/.classpath
index 455f2a5f1e..e58f313e5e 100644
--- a/org.idempiere.fitnesse.server/.classpath
+++ b/org.idempiere.fitnesse.server/.classpath
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/selenium-server-standalone-2.39.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/fitlibrary.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/fitlibraryweb.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/fitnesse.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/log4j.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/phantomjsdriver.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/selenium-server-standalone.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="lib/fitlibrary-2.0.jar" sourcepath="lib/fitlibrary-2.0-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/fitnesse.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.16.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/fitlibraryweb-2.0.jar" sourcepath="lib/fitlibraryweb-2.0-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/phantomjsdriver-1.0.3.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF b/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
index d9d94bf703..43899db70e 100644
--- a/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
+++ b/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
@@ -14,12 +14,12 @@ Import-Package: javax.servlet;version="3.0.0",
  org.slf4j.helpers;version="1.6.1",
  org.slf4j.spi;version="1.6.1"
 Bundle-ClassPath: .,
- lib/fitlibrary-2.0.jar,
+ lib/fitlibrary.jar,
+ lib/fitlibraryweb.jar,
  lib/fitnesse.jar,
- lib/log4j-1.2.16.jar,
- lib/fitlibraryweb-2.0.jar,
- lib/phantomjsdriver-1.0.3.jar,
- lib/selenium-server-standalone-2.39.0.jar
+ lib/log4j.jar,
+ lib/phantomjsdriver.jar,
+ lib/selenium-server-standalone.jar
 Web-ContextPath: fitnesse
 Export-Package: fit,
  fit.decorator,
diff --git a/org.idempiere.fitnesse.server/build.properties b/org.idempiere.fitnesse.server/build.properties
index 03b5d0fbbf..5de6bcec1e 100644
--- a/org.idempiere.fitnesse.server/build.properties
+++ b/org.idempiere.fitnesse.server/build.properties
@@ -2,10 +2,10 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               lib/fitnesse.jar,\
-               lib/fitlibrary-2.0.jar,\
-               lib/log4j-1.2.16.jar,\
-               lib/fitlibraryweb-2.0.jar,\
                WEB-INF/,\
-               lib/phantomjsdriver-1.0.3.jar,\
-               lib/selenium-server-standalone-2.39.0.jar
+               lib/fitlibrary.jar,\
+               lib/fitlibraryweb.jar,\
+               lib/fitnesse.jar,\
+               lib/log4j.jar,\
+               lib/phantomjsdriver.jar,\
+               lib/selenium-server-standalone.jar
diff --git a/org.idempiere.fitnesse.server/copyjars.xml b/org.idempiere.fitnesse.server/copyjars.xml
index da6aef64ae..f8644a5b81 100644
--- a/org.idempiere.fitnesse.server/copyjars.xml
+++ b/org.idempiere.fitnesse.server/copyjars.xml
@@ -1,16 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project>
 <project name="zklibrary" basedir="." default="copy">
+	<mkdir dir="lib" />
 	<target name="copy">
-		<mkdir dir="lib" />
-		<get src="${url.file.srv}/jarfile/5.1/fitlibrary-2.0.jar" dest="lib/fitlibrary-2.0.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.srv}/jarfile/5.1/fitnesse.jar" dest="lib/fitnesse.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.srv}/jarfile/5.1/fitlibraryweb-2.0.jar" dest="lib/fitlibraryweb-2.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/5.1/fitlibrary-2.0.jar" dest="lib/fitlibrary.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/fitnesse/fitnesse/20111025/fitnesse-20111025.jar" dest="lib/fitnesse.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/5.1/fitlibraryweb-2.0.jar" dest="lib/fitlibraryweb.jar" usetimestamp="true" verbose="true" retries="5" />
 		<!--old version is 2.35, can't find out in maven also homepage.
 		when host old version (2.35) to bitbucket.org can't donwload by ant, maybe big file (even it's download normal with browse). 
 		
 		not sure why use a standalone (full) version.
 		in case use lib version, we can download at maven, it's small ${url.maven2.lib}/maven2/org/seleniumhq/selenium/selenium-server/2.35.0/selenium-server-2.35.0.jar-->
-		<get src="${url.file.srv}/jarfile/5.1/selenium-server-standalone-2.39.0.jar" dest="lib/selenium-server-standalone-2.39.0.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/log4j/log4j/1.2.16/log4j-1.2.16.jar" dest="lib/log4j-1.2.16.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/com/github/detro/ghostdriver/phantomjsdriver/1.0.3/phantomjsdriver-1.0.3.jar" dest="lib/phantomjsdriver-1.0.3.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/5.1/selenium-server-standalone-2.39.0.jar" dest="lib/selenium-server-standalone.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/log4j/log4j/1.2.16/log4j-1.2.16.jar" dest="lib/log4j.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/com/github/detro/ghostdriver/phantomjsdriver/1.0.3/phantomjsdriver-1.0.3.jar" dest="lib/phantomjsdriver.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.idempiere.hazelcast.service/.classpath b/org.idempiere.hazelcast.service/.classpath
index c250c40b89..e97b25730d 100644
--- a/org.idempiere.hazelcast.service/.classpath
+++ b/org.idempiere.hazelcast.service/.classpath
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/hazelcast-cloud.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/hazelcast.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="hazelcast-3.5.3.jar"/>
-	<classpathentry kind="lib" path="hazelcast-cloud-3.5.3.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
index c2b48993f7..24a5bf7a21 100644
--- a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
+++ b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@ Import-Package: javax.crypto,
  org.w3c.dom
 DynamicImport-Package: *
 Bundle-ClassPath: .,
- hazelcast-3.5.3.jar,
- hazelcast-cloud-3.5.3.jar
+ lib/hazelcast-cloud.jar,
+ lib/hazelcast.jar
 Service-Component: OSGI-INF/clusterservice.xml, OSGI-INF/cacheservice.xml, OSGI-INF/messageservice.xml
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/org.idempiere.hazelcast.service/build.properties b/org.idempiere.hazelcast.service/build.properties
index b7cd66310a..6d294df1bc 100644
--- a/org.idempiere.hazelcast.service/build.properties
+++ b/org.idempiere.hazelcast.service/build.properties
@@ -5,6 +5,6 @@ bin.includes = META-INF/,\
                OSGI-INF/cacheservice.xml,\
                OSGI-INF/messageservice.xml,\
                OSGI-INF/,\
-               hazelcast-3.5.3.jar,\
-               hazelcast-cloud-3.5.3.jar
+               lib/hazelcast-cloud.jar,\
+               lib/hazelcast.jar
 source.. = src/
diff --git a/org.idempiere.hazelcast.service/copyjars.xml b/org.idempiere.hazelcast.service/copyjars.xml
index 7a8e1e61c2..018f024732 100644
--- a/org.idempiere.hazelcast.service/copyjars.xml
+++ b/org.idempiere.hazelcast.service/copyjars.xml
@@ -1,6 +1,7 @@
 <project name="zklibrary" basedir="." default="copy">
+	<mkdir dir="lib" />
 	<target name="copy">
-		<get src="${url.maven2.lib}/maven2/com/hazelcast/hazelcast/3.5.3/hazelcast-3.5.3.jar" dest="hazelcast-3.5.3.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/com/hazelcast/hazelcast-cloud/3.5.3/hazelcast-cloud-3.5.3.jar" dest="hazelcast-cloud-3.5.3.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/com/hazelcast/hazelcast/3.5.3/hazelcast-3.5.3.jar" dest="lib/hazelcast.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/com/hazelcast/hazelcast-cloud/3.5.3/hazelcast-cloud-3.5.3.jar" dest="lib/hazelcast-cloud.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
index fb45f5f397..a42ef75f61 100644
--- a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
+++ b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
@@ -341,4 +341,3 @@ Import-Package: fit,
  org.w3c.dom.views,
  org.w3c.dom.xpath
 Service-Component: OSGI-INF/fitfixturefactory.xml
-Bundle-ClassPath: .
diff --git a/org.idempiere.ui.zk.selenium/build.properties b/org.idempiere.ui.zk.selenium/build.properties
index 6c4d05a4c0..6f139a7cbe 100644
--- a/org.idempiere.ui.zk.selenium/build.properties
+++ b/org.idempiere.ui.zk.selenium/build.properties
@@ -1,6 +1,5 @@
-output.. = bin/
 bin.includes = META-INF/,\
-               .,\
                OSGI-INF/fitfixturefactory.xml,\
                OSGI-INF/slimfixturefactory.xml
-source.. = src/
+output.. = bin/
+source.. = src/
\ No newline at end of file
diff --git a/org.idempiere.webservices/.classpath b/org.idempiere.webservices/.classpath
index 89987628bf..78c268f27f 100644
--- a/org.idempiere.webservices/.classpath
+++ b/org.idempiere.webservices/.classpath
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/aopalliance.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/axis.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/commons-discovery.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/cxf-rt-frontend-jaxws.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/cxf.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/idempiere-xmlbeans.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/jsr311-api.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/neethi.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-aop.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-asm.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-beans.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-context.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-core.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-expression.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-osgi-extender.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-web.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/stax2-api.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/wsdl4j.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/xmlbeans.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/xmlschema-core.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="WEB-INF/src"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-osgi-extender-1.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-aop-3.0.7.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/stax2-api-3.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-web-3.0.7.RELEASE.jar" sourcepath="WEB-INF/lib/src/spring-web-3.0.7.RELEASE-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-context-3.0.7.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-beans-3.0.7.RELEASE.jar" sourcepath="WEB-INF/lib/src/spring-beans-3.0.7.RELEASE-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-core-3.0.7.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-asm-3.0.7.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-expression-3.0.7.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/wsdl4j-1.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/cxf-2.6.2.jar" sourcepath="WEB-INF/lib/src/apache-cxf-2.6.2-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/neethi-3.0.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/xmlschema-core-2.0.3.jar" sourcepath="E:/spring/xmlschema-core-2.0.3-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/cxf-rt-frontend-jaxws-2.6.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/xmlbeans-2.5.0.jar" sourcepath="E:/spring/xmlbeans-2.5.0-source.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/aopalliance-1.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/idempiere-xmlbeans-1.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/axis.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/commons-discovery-0.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/jsr311-api-1.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF
index 1e20355d2e..fd61a21356 100644
--- a/org.idempiere.webservices/META-INF/MANIFEST.MF
+++ b/org.idempiere.webservices/META-INF/MANIFEST.MF
@@ -63,26 +63,26 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.adempiere.ui;bundle-version="0.0.0",
  org.apache.ecs;bundle-version="0.0.0"
 Bundle-ClassPath: .,
- WEB-INF/lib/spring-osgi-extender-1.2.1.jar,
- WEB-INF/lib/spring-aop-3.0.7.RELEASE.jar,
- WEB-INF/lib/stax2-api-3.1.1.jar,
- WEB-INF/lib/spring-web-3.0.7.RELEASE.jar,
- WEB-INF/lib/spring-context-3.0.7.RELEASE.jar,
- WEB-INF/lib/spring-beans-3.0.7.RELEASE.jar,
- WEB-INF/lib/spring-core-3.0.7.RELEASE.jar,
- WEB-INF/lib/spring-asm-3.0.7.RELEASE.jar,
- WEB-INF/lib/spring-expression-3.0.7.RELEASE.jar,
- WEB-INF/lib/wsdl4j-1.6.2.jar,
- WEB-INF/lib/cxf-2.6.2.jar,
- WEB-INF/lib/neethi-3.0.2.jar,
- WEB-INF/lib/xmlschema-core-2.0.3.jar,
- WEB-INF/lib/cxf-rt-frontend-jaxws-2.6.1.jar,
- WEB-INF/lib/xmlbeans-2.5.0.jar,
- WEB-INF/lib/aopalliance-1.0.jar,
- WEB-INF/lib/idempiere-xmlbeans-1.0.jar,
+ WEB-INF/lib/aopalliance.jar,
  WEB-INF/lib/axis.jar,
- WEB-INF/lib/commons-discovery-0.5.jar,
- WEB-INF/lib/jsr311-api-1.1.jar
+ WEB-INF/lib/commons-discovery.jar,
+ WEB-INF/lib/cxf-rt-frontend-jaxws.jar,
+ WEB-INF/lib/cxf.jar,
+ WEB-INF/lib/idempiere-xmlbeans.jar,
+ WEB-INF/lib/jsr311-api.jar,
+ WEB-INF/lib/neethi.jar,
+ WEB-INF/lib/spring-aop.jar,
+ WEB-INF/lib/spring-asm.jar,
+ WEB-INF/lib/spring-beans.jar,
+ WEB-INF/lib/spring-context.jar,
+ WEB-INF/lib/spring-core.jar,
+ WEB-INF/lib/spring-expression.jar,
+ WEB-INF/lib/spring-osgi-extender.jar,
+ WEB-INF/lib/spring-web.jar,
+ WEB-INF/lib/stax2-api.jar,
+ WEB-INF/lib/wsdl4j.jar,
+ WEB-INF/lib/xmlbeans.jar,
+ WEB-INF/lib/xmlschema-core.jar
 Export-Package: javax.ws.rs,
  javax.ws.rs.core,
  javax.ws.rs.ext,
diff --git a/org.idempiere.webservices/build.properties b/org.idempiere.webservices/build.properties
index 8b2618bc88..39320d1e4f 100644
--- a/org.idempiere.webservices/build.properties
+++ b/org.idempiere.webservices/build.properties
@@ -4,28 +4,28 @@ bin.includes = META-INF/,\
                .,\
                WEB-INF/web.xml,\
                WEB-INF/xsd/,\
-               WEB-INF/lib/spring-web-3.0.7.RELEASE.jar,\
-               WEB-INF/lib/spring-context-3.0.7.RELEASE.jar,\
-               WEB-INF/lib/spring-beans-3.0.7.RELEASE.jar,\
-               WEB-INF/lib/spring-core-3.0.7.RELEASE.jar,\
-               WEB-INF/lib/spring-asm-3.0.7.RELEASE.jar,\
-               WEB-INF/lib/spring-expression-3.0.7.RELEASE.jar,\
-               WEB-INF/lib/wsdl4j-1.6.2.jar,\
-               WEB-INF/lib/cxf-2.6.2.jar,\
-               WEB-INF/lib/neethi-3.0.2.jar,\
-               WEB-INF/lib/xmlschema-core-2.0.3.jar,\
-               WEB-INF/lib/stax2-api-3.1.1.jar,\
-               WEB-INF/lib/cxf-rt-frontend-jaxws-2.6.1.jar,\
-               WEB-INF/lib/xmlbeans-2.5.0.jar,\
-               WEB-INF/lib/aopalliance-1.0.jar,\
-               WEB-INF/lib/spring-aop-3.0.7.RELEASE.jar,\
-               WEB-INF/lib/spring-osgi-extender-1.2.1.jar,\
-               WEB-INF/lib/idempiere-xmlbeans-1.0.jar,\
                plugin.xml,\
+               OSGI-INF/,\
+               WEB-INF/lib/aopalliance.jar,\
                WEB-INF/lib/axis.jar,\
-               WEB-INF/lib/commons-discovery-0.5.jar,\
-               WEB-INF/lib/jsr311-api-1.1.jar,\
-               OSGI-INF/
+               WEB-INF/lib/commons-discovery.jar,\
+               WEB-INF/lib/cxf-rt-frontend-jaxws.jar,\
+               WEB-INF/lib/cxf.jar,\
+               WEB-INF/lib/idempiere-xmlbeans.jar,\
+               WEB-INF/lib/jsr311-api.jar,\
+               WEB-INF/lib/neethi.jar,\
+               WEB-INF/lib/spring-aop.jar,\
+               WEB-INF/lib/spring-asm.jar,\
+               WEB-INF/lib/spring-beans.jar,\
+               WEB-INF/lib/spring-context.jar,\
+               WEB-INF/lib/spring-core.jar,\
+               WEB-INF/lib/spring-expression.jar,\
+               WEB-INF/lib/spring-osgi-extender.jar,\
+               WEB-INF/lib/spring-web.jar,\
+               WEB-INF/lib/stax2-api.jar,\
+               WEB-INF/lib/wsdl4j.jar,\
+               WEB-INF/lib/xmlbeans.jar,\
+               WEB-INF/lib/xmlschema-core.jar
 src.includes = WEB-INF/lib/,\
                WEB-INF/web.xml,\
                WEB-INF/xsd/
diff --git a/org.idempiere.webservices/copyjars.xml b/org.idempiere.webservices/copyjars.xml
index 930213f0cf..c1ffd51a11 100644
--- a/org.idempiere.webservices/copyjars.xml
+++ b/org.idempiere.webservices/copyjars.xml
@@ -1,26 +1,26 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
 		<mkdir dir="WEB-INF/lib" />
-		<get src="${url.maven2.lib}/maven2/org/springframework/osgi/spring-osgi-extender/1.2.1/spring-osgi-extender-1.2.1.jar" dest="WEB-INF/lib/spring-osgi-extender-1.2.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/org/springframework/spring-aop/3.0.7.RELEASE/spring-aop-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-aop-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1.jar" dest="WEB-INF/lib/stax2-api-3.1.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/org/springframework/spring-web/3.0.7.RELEASE/spring-web-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-web-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/org/springframework/spring-context/3.0.7.RELEASE/spring-context-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-context-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/org/springframework/spring-beans/3.0.7.RELEASE/spring-beans-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-beans-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/org/springframework/spring-core/3.0.7.RELEASE/spring-core-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-core-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/org/springframework/spring-asm/3.0.7.RELEASE/spring-asm-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-asm-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/org/springframework/spring-expression/3.0.7.RELEASE/spring-expression-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-expression-3.0.7.RELEASE.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar" dest="WEB-INF/lib/wsdl4j-1.6.2.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/org/apache/cxf/cxf-bundle/2.6.2/cxf-bundle-2.6.2.jar" dest="WEB-INF/lib/cxf-2.6.2.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/org/apache/neethi/neethi/3.0.2/neethi-3.0.2.jar" dest="WEB-INF/lib/neethi-3.0.2.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/org/apache/ws/xmlschema/xmlschema-core/2.0.3/xmlschema-core-2.0.3.jar" dest="WEB-INF/lib/xmlschema-core-2.0.3.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/org/apache/cxf/cxf-rt-frontend-jaxws/2.6.1/cxf-rt-frontend-jaxws-2.6.1.jar" dest="WEB-INF/lib/cxf-rt-frontend-jaxws-2.6.1.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.srv}/jarfile/5.1/xmlbeans-2.5.0.jar" dest="WEB-INF/lib/xmlbeans-2.5.0.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" dest="WEB-INF/lib/aopalliance-1.0.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.file.srv}/jarfile/5.1/idempiere-xmlbeans-1.0.jar" dest="WEB-INF/lib/idempiere-xmlbeans-1.0.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/springframework/osgi/spring-osgi-extender/1.2.1/spring-osgi-extender-1.2.1.jar" dest="WEB-INF/lib/spring-osgi-extender.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/springframework/spring-aop/3.0.7.RELEASE/spring-aop-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-aop.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1.jar" dest="WEB-INF/lib/stax2-api.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/springframework/spring-web/3.0.7.RELEASE/spring-web-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-web.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/springframework/spring-context/3.0.7.RELEASE/spring-context-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-context.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/springframework/spring-beans/3.0.7.RELEASE/spring-beans-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-beans.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/springframework/spring-core/3.0.7.RELEASE/spring-core-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-core.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/springframework/spring-asm/3.0.7.RELEASE/spring-asm-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-asm.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/springframework/spring-expression/3.0.7.RELEASE/spring-expression-3.0.7.RELEASE.jar" dest="WEB-INF/lib/spring-expression.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar" dest="WEB-INF/lib/wsdl4j.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/apache/cxf/cxf-bundle/2.6.2/cxf-bundle-2.6.2.jar" dest="WEB-INF/lib/cxf.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/apache/neethi/neethi/3.0.2/neethi-3.0.2.jar" dest="WEB-INF/lib/neethi.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/apache/ws/xmlschema/xmlschema-core/2.0.3/xmlschema-core-2.0.3.jar" dest="WEB-INF/lib/xmlschema-core.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/apache/cxf/cxf-rt-frontend-jaxws/2.6.1/cxf-rt-frontend-jaxws-2.6.1.jar" dest="WEB-INF/lib/cxf-rt-frontend-jaxws.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/apache/xmlbeans/xmlbeans/2.5.0/xmlbeans-2.5.0.jar" dest="WEB-INF/lib/xmlbeans.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" dest="WEB-INF/lib/aopalliance.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.file.srv}/jarfile/5.1/idempiere-xmlbeans-1.0.jar" dest="WEB-INF/lib/idempiere-xmlbeans.jar" usetimestamp="true" verbose="true" retries="5" />
 		<get src="${url.maven2.lib}/maven2/org/apache/axis/axis/1.4/axis-1.4.jar" dest="WEB-INF/lib/axis.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/commons-discovery/commons-discovery/0.5/commons-discovery-0.5.jar" dest="WEB-INF/lib/commons-discovery-0.5.jar" usetimestamp="true" verbose="true" retries="5" />
-		<get src="${url.maven2.lib}/maven2/javax/ws/rs/jsr311-api/1.1/jsr311-api-1.1.jar" dest="WEB-INF/lib/jsr311-api-1.1.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/commons-discovery/commons-discovery/0.5/commons-discovery-0.5.jar" dest="WEB-INF/lib/commons-discovery.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/javax/ws/rs/jsr311-api/1.1/jsr311-api-1.1.jar" dest="WEB-INF/lib/jsr311-api.jar" usetimestamp="true" verbose="true" retries="5" />
 
 	</target>
 </project>
diff --git a/org.idempiere.zk.extra/.classpath b/org.idempiere.zk.extra/.classpath
index ebc9b5f930..f4748fd26c 100644
--- a/org.idempiere.zk.extra/.classpath
+++ b/org.idempiere.zk.extra/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/closure-compiler.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/breeze.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/calendar.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/closure-compiler.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/gmapsz.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/timelinez.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/timeplotz.jar"/>
diff --git a/org.idempiere.zk.extra/META-INF/MANIFEST.MF b/org.idempiere.zk.extra/META-INF/MANIFEST.MF
index ab517f2939..80b250f2f7 100644
--- a/org.idempiere.zk.extra/META-INF/MANIFEST.MF
+++ b/org.idempiere.zk.extra/META-INF/MANIFEST.MF
@@ -4,13 +4,13 @@ Bundle-Name: extra zk library
 Bundle-SymbolicName: org.idempiere.zk.extra
 Bundle-Version: 5.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ClassPath: lib/calendar.jar,
+Bundle-ClassPath: .,
+ lib/breeze.jar,
+ lib/calendar.jar,
+ lib/closure-compiler.jar,
  lib/gmapsz.jar,
  lib/timelinez.jar,
- lib/timeplotz.jar,
- lib/breeze.jar,
- lib/closure-compiler.jar,
- .
+ lib/timeplotz.jar
 Export-Package: com.google.common.annotations,
  com.google.common.base,
  com.google.common.cache,
diff --git a/org.idempiere.zk.extra/build.properties b/org.idempiere.zk.extra/build.properties
index 1dd81d95e6..9c0a5dfec0 100644
--- a/org.idempiere.zk.extra/build.properties
+++ b/org.idempiere.zk.extra/build.properties
@@ -2,10 +2,10 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
+               lib/breeze.jar,\
                lib/calendar.jar,\
+               lib/closure-compiler.jar,\
                lib/gmapsz.jar,\
                lib/timelinez.jar,\
-               lib/timeplotz.jar,\
-               lib/breeze.jar,\
-               lib/closure-compiler.jar
+               lib/timeplotz.jar
 jre.compilation.profile = JavaSE-1.7
diff --git a/org.slf4j.jdk14/.classpath b/org.slf4j.jdk14/.classpath
index 3f22e67b98..4b0105145b 100644
--- a/org.slf4j.jdk14/.classpath
+++ b/org.slf4j.jdk14/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="slf4j-jdk14-1.7.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/slf4j-jdk14.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/org.slf4j.jdk14/META-INF/MANIFEST.MF b/org.slf4j.jdk14/META-INF/MANIFEST.MF
index 892b15f173..4175f6f623 100644
--- a/org.slf4j.jdk14/META-INF/MANIFEST.MF
+++ b/org.slf4j.jdk14/META-INF/MANIFEST.MF
@@ -8,4 +8,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.slf4j.impl;version=1.7.2
 Import-Package: org.slf4j;version=1.7.2,
  org.slf4j.spi;version=1.7.2,org.slf4j.helpers;version=1.7.2
-Bundle-ClassPath: slf4j-jdk14-1.7.2.jar
+Bundle-ClassPath: lib/slf4j-jdk14.jar
diff --git a/org.slf4j.jdk14/build.properties b/org.slf4j.jdk14/build.properties
index 815488f78a..4f2dec414f 100644
--- a/org.slf4j.jdk14/build.properties
+++ b/org.slf4j.jdk14/build.properties
@@ -1,2 +1,2 @@
 bin.includes = META-INF/,\
-               slf4j-jdk14-1.7.2.jar
+               lib/slf4j-jdk14.jar
diff --git a/org.slf4j.jdk14/copyjars.xml b/org.slf4j.jdk14/copyjars.xml
index 2bceb023f2..27f0159d40 100644
--- a/org.slf4j.jdk14/copyjars.xml
+++ b/org.slf4j.jdk14/copyjars.xml
@@ -1,5 +1,6 @@
 <project name="zklibrary" basedir="." default="copy">
+	<mkdir dir="lib" />
 	<target name="copy">
-		<get src="${url.maven2.lib}/maven2/org/slf4j/slf4j-jdk14/1.7.2/slf4j-jdk14-1.7.2.jar" dest="slf4j-jdk14-1.7.2.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="${url.maven2.lib}/maven2/org/slf4j/slf4j-jdk14/1.7.2/slf4j-jdk14-1.7.2.jar" dest="lib/slf4j-jdk14.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>