diff --git a/org.adempiere.base.callout/META-INF/MANIFEST.MF b/org.adempiere.base.callout/META-INF/MANIFEST.MF
index 6253d50ce5..0b46c1dfb7 100644
--- a/org.adempiere.base.callout/META-INF/MANIFEST.MF
+++ b/org.adempiere.base.callout/META-INF/MANIFEST.MF
@@ -9,4 +9,5 @@ Eclipse-RegisterBuddy: org.adempiere.base
 Service-Component: OSGI-INF/costadjustmentcalloutfactory.xml
 Bundle-ActivationPolicy: lazy
 Export-Package: org.compiere.model
+Bundle-ClassPath: .
 
diff --git a/org.adempiere.base.callout/build.properties b/org.adempiere.base.callout/build.properties
index 6437ef0783..b5151e0f23 100644
--- a/org.adempiere.base.callout/build.properties
+++ b/org.adempiere.base.callout/build.properties
@@ -1,5 +1,6 @@
 bin.includes = META-INF/,\
                OSGI-INF/costadjustmentcalloutfactory.xml,\
-               OSGI-INF/
+               OSGI-INF/,\
+               .
 output.. = target/classes/
-source.. = src/
\ No newline at end of file
+source.. = src/
diff --git a/org.adempiere.base.process/META-INF/MANIFEST.MF b/org.adempiere.base.process/META-INF/MANIFEST.MF
index 56dadc4d85..0a529e0289 100644
--- a/org.adempiere.base.process/META-INF/MANIFEST.MF
+++ b/org.adempiere.base.process/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@ Import-Package: javax.mail;version="1.5",
  javax.servlet.http;version="2.5.0",
  org.apache.commons.collections.keyvalue;version="3.2.0"
 Eclipse-RegisterBuddy: org.adempiere.base
+Bundle-ClassPath: .
diff --git a/org.adempiere.base.process/build.properties b/org.adempiere.base.process/build.properties
index 5a83951504..ba31debd0e 100644
--- a/org.adempiere.base.process/build.properties
+++ b/org.adempiere.base.process/build.properties
@@ -1,3 +1,4 @@
-bin.includes = META-INF/
+bin.includes = META-INF/,\
+               .
 output.. = target/classes/
-source.. = src/
\ No newline at end of file
+source.. = src/
diff --git a/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF b/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
index 48cc3c1507..f2797eb5c4 100644
--- a/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
+++ b/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
@@ -20,3 +20,4 @@ Import-Package: javax.servlet;version="2.3",
  org.osgi.framework;version="1.3.0",
  org.osgi.service.http;version="1.2.0"
 Bundle-ManifestVersion: 2
+Bundle-ClassPath: .
diff --git a/org.adempiere.eclipse.equinox.http.servlet/build.properties b/org.adempiere.eclipse.equinox.http.servlet/build.properties
index 3b95b82a98..140c228807 100644
--- a/org.adempiere.eclipse.equinox.http.servlet/build.properties
+++ b/org.adempiere.eclipse.equinox.http.servlet/build.properties
@@ -1,5 +1,6 @@
 bin.includes = META-INF/,\
-               plugin.properties
+               plugin.properties,\
+               .
 javacErrors.. = -assertIdentifier,-enumIdentifier
 output.. = target/classes/
-source.. = src/
\ No newline at end of file
+source.. = src/
diff --git a/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF b/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF
index 5d3c0dbcfb..29c0ad550c 100644
--- a/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF
+++ b/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF
@@ -15,4 +15,5 @@ Import-Package: javax.servlet;version="2.3",javax.servlet.http;version
  quinox.servletbridge;version="1.0.0",org.osgi.framework;version="1.3.
  0",org.osgi.service.http;version="1.2.0"
 Bundle-ManifestVersion: 2
+Bundle-ClassPath: .
 
diff --git a/org.adempiere.eclipse.equinox.http.servletbridge/build.properties b/org.adempiere.eclipse.equinox.http.servletbridge/build.properties
index 3b95b82a98..140c228807 100644
--- a/org.adempiere.eclipse.equinox.http.servletbridge/build.properties
+++ b/org.adempiere.eclipse.equinox.http.servletbridge/build.properties
@@ -1,5 +1,6 @@
 bin.includes = META-INF/,\
-               plugin.properties
+               plugin.properties,\
+               .
 javacErrors.. = -assertIdentifier,-enumIdentifier
 output.. = target/classes/
-source.. = src/
\ No newline at end of file
+source.. = src/
diff --git a/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF b/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF
index 53fe74810b..58f1fa202d 100644
--- a/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF
+++ b/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF
@@ -13,3 +13,4 @@ Import-Package: javax.servlet;version="2.3.0",
  javax.servlet.http;version="2.3.0",
  org.eclipse.equinox.http.servlet;version="1.1.0"
 Bundle-ManifestVersion: 2
+Bundle-ClassPath: .
diff --git a/org.adempiere.eclipse.equinox.servletbridge/build.properties b/org.adempiere.eclipse.equinox.servletbridge/build.properties
index 3b95b82a98..140c228807 100644
--- a/org.adempiere.eclipse.equinox.servletbridge/build.properties
+++ b/org.adempiere.eclipse.equinox.servletbridge/build.properties
@@ -1,5 +1,6 @@
 bin.includes = META-INF/,\
-               plugin.properties
+               plugin.properties,\
+               .
 javacErrors.. = -assertIdentifier,-enumIdentifier
 output.. = target/classes/
-source.. = src/
\ No newline at end of file
+source.. = src/
diff --git a/org.adempiere.extend/META-INF/MANIFEST.MF b/org.adempiere.extend/META-INF/MANIFEST.MF
index fe23808466..4537929d40 100644
--- a/org.adempiere.extend/META-INF/MANIFEST.MF
+++ b/org.adempiere.extend/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@ Import-Package: junit.framework;version="3.8.2",
  org.junit.runners;version="4.8.2",
  org.supercsv.io,
  org.supercsv.prefs
+Bundle-ClassPath: .
diff --git a/org.adempiere.extend/build.properties b/org.adempiere.extend/build.properties
index 1656d65374..ba31debd0e 100644
--- a/org.adempiere.extend/build.properties
+++ b/org.adempiere.extend/build.properties
@@ -1,3 +1,4 @@
-bin.includes = META-INF/
+bin.includes = META-INF/,\
+               .
 output.. = target/classes/
 source.. = src/
diff --git a/org.adempiere.install/META-INF/MANIFEST.MF b/org.adempiere.install/META-INF/MANIFEST.MF
index 1c03f301b3..be51c7a47d 100644
--- a/org.adempiere.install/META-INF/MANIFEST.MF
+++ b/org.adempiere.install/META-INF/MANIFEST.MF
@@ -16,3 +16,4 @@ Import-Package: javax.mail;version="1.5",
  org.osgi.framework
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.adempiere.install.InstallBundleActivator
+Bundle-ClassPath: .
diff --git a/org.adempiere.install/build.properties b/org.adempiere.install/build.properties
index 91d07ced55..38d5357384 100644
--- a/org.adempiere.install/build.properties
+++ b/org.adempiere.install/build.properties
@@ -1,4 +1,5 @@
 bin.includes = META-INF/,\
-               plugin.xml
+               plugin.xml,\
+               .
 output.. = target/classes/
-source.. = src/
\ No newline at end of file
+source.. = src/
diff --git a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
index 4a106f4f2d..87517776eb 100644
--- a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
+++ b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
@@ -6,3 +6,4 @@ Bundle-Version: 5.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.adempiere.pipo;bundle-version="0.0.0",
  org.adempiere.base;bundle-version="0.0.0"
+Bundle-ClassPath: .
diff --git a/org.adempiere.pipo.handlers/build.properties b/org.adempiere.pipo.handlers/build.properties
index 91d07ced55..38d5357384 100644
--- a/org.adempiere.pipo.handlers/build.properties
+++ b/org.adempiere.pipo.handlers/build.properties
@@ -1,4 +1,5 @@
 bin.includes = META-INF/,\
-               plugin.xml
+               plugin.xml,\
+               .
 output.. = target/classes/
-source.. = src/
\ No newline at end of file
+source.. = src/
diff --git a/org.adempiere.pipo/META-INF/MANIFEST.MF b/org.adempiere.pipo/META-INF/MANIFEST.MF
index 028a8a29c9..b4d50265ff 100644
--- a/org.adempiere.pipo/META-INF/MANIFEST.MF
+++ b/org.adempiere.pipo/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.adempiere.plugin.utils;bundle-version="0.0.0"
 Service-Component: OSGI-INF/dictionaryservice.xml
 Bundle-Activator: org.adempiere.plugin.utils.PackInApplicationActivator
+Bundle-ClassPath: .
diff --git a/org.adempiere.pipo/build.properties b/org.adempiere.pipo/build.properties
index 8be3476e60..3b199ce2de 100644
--- a/org.adempiere.pipo/build.properties
+++ b/org.adempiere.pipo/build.properties
@@ -1,6 +1,7 @@
 bin.includes = META-INF/,\
                plugin.xml,\
                OSGI-INF/dictionaryservice.xml,\
-               OSGI-INF/
+               OSGI-INF/,\
+               .
 output.. = target/classes/
-source.. = src/
\ No newline at end of file
+source.. = src/
diff --git a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
index 94953eb602..3edde8e707 100644
--- a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
+++ b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF
@@ -47,3 +47,4 @@ Import-Package: org.adempiere.base,
  org.osgi.framework;version="1.5.0",
  org.osgi.util.tracker;version="1.5.0"
 Export-Package: org.adempiere.plugin.utils
+Bundle-ClassPath: .
diff --git a/org.adempiere.plugin.utils/build.properties b/org.adempiere.plugin.utils/build.properties
index 5a83951504..ba31debd0e 100644
--- a/org.adempiere.plugin.utils/build.properties
+++ b/org.adempiere.plugin.utils/build.properties
@@ -1,3 +1,4 @@
-bin.includes = META-INF/
+bin.includes = META-INF/,\
+               .
 output.. = target/classes/
-source.. = src/
\ No newline at end of file
+source.. = src/
diff --git a/org.adempiere.replication.server/META-INF/MANIFEST.MF b/org.adempiere.replication.server/META-INF/MANIFEST.MF
index ff9e289d25..d6b9242ecc 100644
--- a/org.adempiere.replication.server/META-INF/MANIFEST.MF
+++ b/org.adempiere.replication.server/META-INF/MANIFEST.MF
@@ -11,3 +11,4 @@ Import-Package: javax.jms;version="1.1.0",
  org.apache.activemq
 Service-Component: OSGI-INF/serverfactory.xml
 Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
diff --git a/org.adempiere.replication.server/build.properties b/org.adempiere.replication.server/build.properties
index 7c935c071d..b46306360d 100644
--- a/org.adempiere.replication.server/build.properties
+++ b/org.adempiere.replication.server/build.properties
@@ -1,5 +1,6 @@
 bin.includes = META-INF/,\
                OSGI-INF/serverfactory.xml,\
-               OSGI-INF/
+               OSGI-INF/,\
+               .
 output.. = target/classes/
 source.. = src/
diff --git a/org.adempiere.replication/META-INF/MANIFEST.MF b/org.adempiere.replication/META-INF/MANIFEST.MF
index c680d9214e..dc170f3794 100644
--- a/org.adempiere.replication/META-INF/MANIFEST.MF
+++ b/org.adempiere.replication/META-INF/MANIFEST.MF
@@ -11,3 +11,4 @@ Export-Package: org.adempiere.process.rpl,
 Import-Package: javax.jms;version="1.1.0",
  org.apache.activemq;version="5.3.0"
 Eclipse-RegisterBuddy: org.adempiere.base
+Bundle-ClassPath: .
diff --git a/org.adempiere.replication/build.properties b/org.adempiere.replication/build.properties
index 91d07ced55..38d5357384 100644
--- a/org.adempiere.replication/build.properties
+++ b/org.adempiere.replication/build.properties
@@ -1,4 +1,5 @@
 bin.includes = META-INF/,\
-               plugin.xml
+               plugin.xml,\
+               .
 output.. = target/classes/
-source.. = src/
\ No newline at end of file
+source.. = src/
diff --git a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
index 44b090dddc..a25a90945d 100644
--- a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@ Import-Package: net.sf.jasperreports.engine,
  org.osgi.framework
 Service-Component: OSGI-INF/jrviewerprovider.xml
 Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
diff --git a/org.adempiere.report.jasper.swing/build.properties b/org.adempiere.report.jasper.swing/build.properties
index 82fb384481..9741b55bc5 100644
--- a/org.adempiere.report.jasper.swing/build.properties
+++ b/org.adempiere.report.jasper.swing/build.properties
@@ -1,5 +1,6 @@
 bin.includes = META-INF/,\
                OSGI-INF/jrviewerprovider.xml,\
-               OSGI-INF/
+               OSGI-INF/,\
+               .
 output.. = target/classes/
-source.. = src/
\ No newline at end of file
+source.. = src/
diff --git a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
index 12740eee05..c90cefe1ba 100644
--- a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
@@ -11,5 +11,6 @@ Import-Package: javax.servlet;version="2.5.0",
  javax.servlet.jsp;version="2.1.0",
  org.apache.commons.codec,
  org.apache.commons.codec.binary
+Bundle-ClassPath: .
 
 
diff --git a/org.adempiere.report.jasper.webapp/build.properties b/org.adempiere.report.jasper.webapp/build.properties
index debfeffca2..dabe31b60f 100644
--- a/org.adempiere.report.jasper.webapp/build.properties
+++ b/org.adempiere.report.jasper.webapp/build.properties
@@ -1,6 +1,7 @@
 bin.includes = META-INF/,\
                standalone.jrxml,\
-               WEB-INF/
+               WEB-INF/,\
+               .
 bin.excludes = src/**,\
 			   .settings/**,\
 			   .classpath,\
diff --git a/org.adempiere.report.jasper/META-INF/MANIFEST.MF b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
index a17d03e88f..e564aba746 100644
--- a/org.adempiere.report.jasper/META-INF/MANIFEST.MF
+++ b/org.adempiere.report.jasper/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
 Service-Component: OSGI-INF/processfactory.xml
 Export-Package: org.adempiere.report.jasper
 Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
diff --git a/org.adempiere.report.jasper/build.properties b/org.adempiere.report.jasper/build.properties
index caa7ff79ff..24af2f8751 100644
--- a/org.adempiere.report.jasper/build.properties
+++ b/org.adempiere.report.jasper/build.properties
@@ -1,4 +1,5 @@
 bin.includes = META-INF/,\
-               OSGI-INF/
+               OSGI-INF/,\
+               .
 output.. = target/classes/
-source.. = src/
\ No newline at end of file
+source.. = src/
diff --git a/org.adempiere.ui.zk/build.properties b/org.adempiere.ui.zk/build.properties
index f5ea33f69b..8f0c6267a2 100644
--- a/org.adempiere.ui.zk/build.properties
+++ b/org.adempiere.ui.zk/build.properties
@@ -34,7 +34,8 @@ bin.includes = META-INF/,\
                manifest.json,\
                pdf.js/,\
                WEB-INF/lib/ckez.jar,\
-               WEB-INF/lib/daisydiff.jar
+               WEB-INF/lib/daisydiff.jar,\
+               .
 src.includes = WEB-INF/tld/,\
                WEB-INF/web.xml,\
                WEB-INF/xsd/,\
@@ -51,5 +52,5 @@ src.includes = WEB-INF/tld/,\
                theme/default/zul/calendar/calendar_mini.zul,\
                theme/default/zul/calendar/divarrow.zul,\
                theme/default/zul/calendar/divtab.zul
-source.. = WEB-INF/src/
 bin.excludes = WEB-INF/src/
+source.. = WEB-INF/src/
diff --git a/org.adempiere.webstore.resource/META-INF/MANIFEST.MF b/org.adempiere.webstore.resource/META-INF/MANIFEST.MF
index 9fc7784320..71cad98ed7 100644
--- a/org.adempiere.webstore.resource/META-INF/MANIFEST.MF
+++ b/org.adempiere.webstore.resource/META-INF/MANIFEST.MF
@@ -8,3 +8,4 @@ Fragment-Host: org.adempiere.webstore;bundle-version="0.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.compiere.wstore
 Jetty-WarPatchFragmentFolderPath: /
+Bundle-ClassPath: .
diff --git a/org.adempiere.webstore.resource/build.properties b/org.adempiere.webstore.resource/build.properties
index 5b870e1eb4..77385b72e9 100644
--- a/org.adempiere.webstore.resource/build.properties
+++ b/org.adempiere.webstore.resource/build.properties
@@ -1,6 +1,11 @@
-source.. = src/
-output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
                *.*
-
+bin.excludes = src/**,\
+			   bin/**,\
+			   .settings/**,\
+			   .classpath,\
+			   .project,\
+			   build.properties
+output.. = target/classes/
+source.. = src/
diff --git a/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF b/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF
index dd259c0303..3f5bc63952 100644
--- a/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF
+++ b/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@ Import-Package: javax.servlet,
  org.apache.ecs.xhtml,
  org.apache.taglibs.standard.tag.el.core
 Fragment-Host: org.adempiere.webstore;bundle-version="0.0.0"
+Bundle-ClassPath: .
diff --git a/org.adempiere.webstore.servlet/build.properties b/org.adempiere.webstore.servlet/build.properties
index 56d7765555..6eb93292ff 100644
--- a/org.adempiere.webstore.servlet/build.properties
+++ b/org.adempiere.webstore.servlet/build.properties
@@ -1,4 +1,5 @@
-source.. = src/
-output.. = target/classes/
+
 bin.includes = META-INF/,\
                .
+output.. = target/classes/
+source.. = src/
diff --git a/org.adempiere.webstore/META-INF/MANIFEST.MF b/org.adempiere.webstore/META-INF/MANIFEST.MF
index e2423bc6de..2ee23321a3 100644
--- a/org.adempiere.webstore/META-INF/MANIFEST.MF
+++ b/org.adempiere.webstore/META-INF/MANIFEST.MF
@@ -81,6 +81,7 @@ Import-Package: javax.servlet;version="3.0.0",
  org.osgi.framework;version="1.7.0",
  org.osgi.service.http;version="1.2.1"
 Bundle-Activator: org.adempiere.webstore.Activator
+Bundle-ClassPath: .
 
 
 
diff --git a/org.adempiere.webstore/build.properties b/org.adempiere.webstore/build.properties
index bfe6b1ee82..c2eb9a521f 100644
--- a/org.adempiere.webstore/build.properties
+++ b/org.adempiere.webstore/build.properties
@@ -1,10 +1,12 @@
 bin.includes = META-INF/,\
                *.*,\
-               WEB-INF/
+               WEB-INF/,\
+               .
 bin.excludes = src/**,\
 			   bin/**,\
 			   .settings/**,\
 			   .classpath,\
 			   .project,\
 			   build.properties
+output.. = target/classes/
 source.. = src/
diff --git a/org.apache.ecs/META-INF/MANIFEST.MF b/org.apache.ecs/META-INF/MANIFEST.MF
index 2c8ccf7630..983976fe24 100644
--- a/org.apache.ecs/META-INF/MANIFEST.MF
+++ b/org.apache.ecs/META-INF/MANIFEST.MF
@@ -12,3 +12,4 @@ Export-Package: org.apache.ecs;uses:="org.apache.ecs.xhtml",
  org.apache.ecs.storage,
  org.apache.ecs.xhtml;uses:="org.apache.ecs",
  org.apache.ecs.xml;uses:="org.apache.ecs"
+Bundle-ClassPath: .
diff --git a/org.apache.ecs/build.properties b/org.apache.ecs/build.properties
index 56d7765555..ba31debd0e 100644
--- a/org.apache.ecs/build.properties
+++ b/org.apache.ecs/build.properties
@@ -1,4 +1,4 @@
-source.. = src/
-output.. = target/classes/
 bin.includes = META-INF/,\
                .
+output.. = target/classes/
+source.. = src/
diff --git a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
index d9813487db..1e516a440b 100644
--- a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
+++ b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
@@ -27,3 +27,4 @@ Import-Package: javax.servlet;version="2.5.0",
  org.osgi.service.http;version="1.2.1"
 Web-ContextPath: osgi
 Service-Component: OSGI-INF/securityprovider.xml
+Bundle-ClassPath: .
diff --git a/org.idempiere.felix.webconsole/build.properties b/org.idempiere.felix.webconsole/build.properties
index 8e6d5b3cc5..b1d02522fc 100644
--- a/org.idempiere.felix.webconsole/build.properties
+++ b/org.idempiere.felix.webconsole/build.properties
@@ -1,7 +1,7 @@
-output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
                WEB-INF/,\
                OSGI-INF/
 src.includes = WEB-INF/
+output.. = target/classes/
 source.. = src/
diff --git a/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF b/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF
index 99a3b428c3..e1bd47ad65 100644
--- a/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF
+++ b/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF
@@ -63,3 +63,4 @@ Import-Package: fit,
  org.osgi.framework;version="1.3.0"
 Service-Component: OSGI-INF/fitfixturefactory.xml, OSGI-INF/slimfixturefactory.xml
 Export-Package: org.idempiere.fitnesse.fixture
+Bundle-ClassPath: .
diff --git a/org.idempiere.fitnesse.fixture/build.properties b/org.idempiere.fitnesse.fixture/build.properties
index 24b1528617..cbe5d4a39f 100644
--- a/org.idempiere.fitnesse.fixture/build.properties
+++ b/org.idempiere.fitnesse.fixture/build.properties
@@ -1,7 +1,7 @@
-output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
                OSGI-INF/fitfixturefactory.xml,\
                OSGI-INF/slimfixturefactory.xml,\
                OSGI-INF/
+output.. = target/classes/
 source.. = src/
diff --git a/org.idempiere.fitrecorder/META-INF/MANIFEST.MF b/org.idempiere.fitrecorder/META-INF/MANIFEST.MF
index 8676629a45..f4eed1ed3b 100644
--- a/org.idempiere.fitrecorder/META-INF/MANIFEST.MF
+++ b/org.idempiere.fitrecorder/META-INF/MANIFEST.MF
@@ -12,3 +12,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: plugin.xml
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
 Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
diff --git a/org.idempiere.fitrecorder/build.properties b/org.idempiere.fitrecorder/build.properties
index 110a2d2dcf..fa1cc950cf 100644
--- a/org.idempiere.fitrecorder/build.properties
+++ b/org.idempiere.fitrecorder/build.properties
@@ -1,5 +1,6 @@
-source.. = src/
-output.. = target/classes/
+
 bin.includes = META-INF/,\
                .,\
                plugin.xml
+output.. = target/classes/
+source.. = src/
diff --git a/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF
index 55e227bab8..d3f0abbf9e 100644
--- a/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF
+++ b/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF
@@ -5,3 +5,4 @@ Bundle-SymbolicName: org.idempiere.hazelcast.service.config
 Bundle-Version: 5.1.0.qualifier
 Fragment-Host: org.idempiere.hazelcast.service;bundle-version="0.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ClassPath: .
diff --git a/org.idempiere.hazelcast.service.config/build.properties b/org.idempiere.hazelcast.service.config/build.properties
index 7450f15a22..8ac98f505e 100644
--- a/org.idempiere.hazelcast.service.config/build.properties
+++ b/org.idempiere.hazelcast.service.config/build.properties
@@ -1,5 +1,6 @@
-source.. = src/
-output.. = target/classes/
+
 bin.includes = META-INF/,\
                .,\
                hazelcast.xml
+output.. = target/classes/
+source.. = src/
diff --git a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
index a42ef75f61..fb45f5f397 100644
--- a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
+++ b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
@@ -341,3 +341,4 @@ 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 93545edefe..6f3dec393f 100644
--- a/org.idempiere.ui.zk.selenium/build.properties
+++ b/org.idempiere.ui.zk.selenium/build.properties
@@ -1,5 +1,6 @@
 bin.includes = META-INF/,\
                OSGI-INF/fitfixturefactory.xml,\
-               OSGI-INF/
+               OSGI-INF/,\
+               .
 output.. = target/classes/
 source.. = src/