diff --git a/org.adempiere.base/.classpath b/org.adempiere.base/.classpath
index d7d871a535..4d93d8f5a7 100644
--- a/org.adempiere.base/.classpath
+++ b/org.adempiere.base/.classpath
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
+	<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"/>
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index b0381ada23..26e3019c5e 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Core
 Bundle-SymbolicName: org.adempiere.base;singleton:=true
 Bundle-Version: 5.1.0.qualifier
-Bundle-ClassPath: base.jar,
+Bundle-ClassPath: .,
  jython-engine.jar,
  jython.jar,
  cron4j-2.2.5.jar,
diff --git a/org.adempiere.base/build.properties b/org.adempiere.base/build.properties
index 495b62c82b..ae7e102354 100644
--- a/org.adempiere.base/build.properties
+++ b/org.adempiere.base/build.properties
@@ -1,5 +1,4 @@
 bin.includes = META-INF/,\
-               base.jar,\
                plugin.xml,\
                jython-engine.jar,\
                jython.jar,\
@@ -25,7 +24,7 @@ bin.includes = META-INF/,\
                OSGI-INF/defaultproductpricingfactory.xml,\
                schema/,\
                bsh-2.0b6.jar,\
-               commons-validator-1.6.jar
-output.base.jar = bin/
+               commons-validator-1.6.jar,\
+               .
 src.includes = schema/
-source.base.jar = src/
+source.. = src/
diff --git a/org.adempiere.extend/META-INF/MANIFEST.MF b/org.adempiere.extend/META-INF/MANIFEST.MF
index 3b09f15a2f..918ba8b0d9 100644
--- a/org.adempiere.extend/META-INF/MANIFEST.MF
+++ b/org.adempiere.extend/META-INF/MANIFEST.MF
@@ -3,8 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere extend
 Bundle-SymbolicName: org.adempiere.extend;singleton:=true
 Bundle-Version: 5.1.0.qualifier
-Bundle-ClassPath: extend.jar,
- spiffy-with_source-all-0.05.jar
 Eclipse-RegisterBuddy: org.adempiere.tools
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: compiere.model,
@@ -17,3 +15,5 @@ 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/build.properties b/org.adempiere.extend/build.properties
index fb0e40410a..5e0df6e86b 100644
--- a/org.adempiere.extend/build.properties
+++ b/org.adempiere.extend/build.properties
@@ -1,7 +1,5 @@
-output.extend.jar = bin/
 bin.includes = META-INF/,\
-               extend.jar,\
+               .,\
                spiffy-with_source-all-0.05.jar
-jars.compile.order = extend.jar
-source.extend.jar = src/
+source.. = src/
 
diff --git a/org.adempiere.extend/copyjars.xml b/org.adempiere.extend/copyjars.xml
index 4efc88e4ce..c0a32edd1d 100644
--- a/org.adempiere.extend/copyjars.xml
+++ b/org.adempiere.extend/copyjars.xml
@@ -1,6 +1,5 @@
 <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" />
-		<get src="${url.file.srv}/jarfile/5.1/extend.jar" dest="extend.jar" usetimestamp="true" verbose="true" retries="5" />
 	</target>
 </project>
diff --git a/org.adempiere.install/META-INF/MANIFEST.MF b/org.adempiere.install/META-INF/MANIFEST.MF
index 6cff2507c6..2d3658e840 100644
--- a/org.adempiere.install/META-INF/MANIFEST.MF
+++ b/org.adempiere.install/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Setup
 Bundle-SymbolicName: org.adempiere.install;singleton:=true
 Bundle-Version: 5.1.0.qualifier
-Bundle-ClassPath: install.jar,
+Bundle-ClassPath: .,
  ant-contrib-1.0b3.jar
 Export-Package: org.adempiere.install,
  org.compiere.install
diff --git a/org.adempiere.install/build.properties b/org.adempiere.install/build.properties
index 92cfb8317f..c4055c42ce 100644
--- a/org.adempiere.install/build.properties
+++ b/org.adempiere.install/build.properties
@@ -1,6 +1,5 @@
-source.install.jar = src/
-output.install.jar = bin/
 bin.includes = META-INF/,\
-               install.jar,\
                plugin.xml,\
-               ant-contrib-1.0b3.jar
+               ant-contrib-1.0b3.jar,\
+               .
+source.. = src/
diff --git a/org.adempiere.report.jasper/.classpath b/org.adempiere.report.jasper/.classpath
index c0c50b3955..03a0a849c9 100644
--- a/org.adempiere.report.jasper/.classpath
+++ b/org.adempiere.report.jasper/.classpath
@@ -2,10 +2,6 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry excluding="org/compiere/report/ReportExporter.java" kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.adempiere.report.jasper/META-INF/MANIFEST.MF b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
index a5b650df18..b747c7a773 100644
--- a/org.adempiere.report.jasper/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere JasperReport integration
 Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true
 Bundle-Version: 5.1.0.qualifier
-Bundle-ClassPath: JasperReports.jar
+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 93728dfcc2..49115ba9ae 100644
--- a/org.adempiere.report.jasper/build.properties
+++ b/org.adempiere.report.jasper/build.properties
@@ -1,5 +1,4 @@
 bin.includes = META-INF/,\
-               JasperReports.jar,\
-               OSGI-INF/
-source.JasperReports.jar = src/
-output.JasperReports.jar = bin/
+               OSGI-INF/,\
+               .
+source.. = src/
diff --git a/org.adempiere.ui.swing/.classpath b/org.adempiere.ui.swing/.classpath
index 280a2c35b9..93c369ff8d 100644
--- a/org.adempiere.ui.swing/.classpath
+++ b/org.adempiere.ui.swing/.classpath
@@ -6,10 +6,6 @@
 	<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">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
+	<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 559ebd6811..8036f30592 100644
--- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: iDempiere Swing Client
 Bundle-SymbolicName: org.adempiere.ui.swing;singleton:=true
 Bundle-Version: 5.1.0.qualifier
-Bundle-ClassPath: client.jar,
+Bundle-ClassPath: .,
  swingx-1.6.jar,
  looks-2.0.4.jar,
  miglayout-3.7.1-swing.jar,
diff --git a/org.adempiere.ui.swing/build.properties b/org.adempiere.ui.swing/build.properties
index 0944263797..c0f24360cb 100644
--- a/org.adempiere.ui.swing/build.properties
+++ b/org.adempiere.ui.swing/build.properties
@@ -1,5 +1,4 @@
 bin.includes = META-INF/,\
-               client.jar,\
                plugin.xml,\
                swingx-1.6.jar,\
                looks-2.0.4.jar,\
@@ -13,6 +12,6 @@ bin.includes = META-INF/,\
                OSGI-INF/defaultinfofactory.xml,\
                OSGI-INF/defaulteditorfactory.xml,\
                OSGI-INF/reportviewerprovider.xml,\
-               OSGI-INF/defaultformfactory.xml
-source.client.jar = src/
-output.client.jar = bin/
+               OSGI-INF/defaultformfactory.xml,\
+               .
+source.. = src/
diff --git a/org.idempiere.ui.zk.selenium/.classpath b/org.idempiere.ui.zk.selenium/.classpath
index fc99fa8cfa..16d067f284 100644
--- a/org.idempiere.ui.zk.selenium/.classpath
+++ b/org.idempiere.ui.zk.selenium/.classpath
@@ -2,10 +2,6 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.idempiere.ui.zk.selenium/.project b/org.idempiere.ui.zk.selenium/.project
index 8b0f75afc5..b181cfab4d 100644
--- a/org.idempiere.ui.zk.selenium/.project
+++ b/org.idempiere.ui.zk.selenium/.project
@@ -5,11 +5,6 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -23,6 +18,5 @@
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>
diff --git a/org.idempiere.ui.zk.selenium/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.idempiere.ui.zk.selenium/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index f4ef8aa0a5..0000000000
--- a/org.idempiere.ui.zk.selenium/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <installed facet="java" version="1.8"/>
-</faceted-project>