diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index 73d7fae252..afdaec6db7 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.adempiere.base"
+      id="org.adempiere.base.feature"
       label="Adempiere Base"
       version="5.1.0.qualifier">
 
@@ -17,23 +17,23 @@
    </license>
 
    <includes
-         id="org.compiere.db.provider"
+         id="org.compiere.db.provider.feature"
          version="0.0.0"/>
 
    <includes
-         id="org.adempiere.payment.processor"
+         id="org.adempiere.payment.processor.feature"
          version="0.0.0"/>
 
    <includes
-         id="org.adempiere.pipo"
+         id="org.adempiere.pipo.feature"
          version="0.0.0"/>
 
    <includes
-         id="org.adempiere.replication"
+         id="org.adempiere.replication.feature"
          version="0.0.0"/>
 
    <includes
-         id="org.adempiere.report.jasper"
+         id="org.adempiere.report.jasper.feature"
          version="0.0.0"/>
 
    <plugin
diff --git a/org.adempiere.bundles.external-feature/feature.xml b/org.adempiere.bundles.external-feature/feature.xml
index 22b16577e8..184f2e9626 100644
--- a/org.adempiere.bundles.external-feature/feature.xml
+++ b/org.adempiere.bundles.external-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.adempiere.bundles.external"
+      id="org.adempiere.bundles.external.feature"
       label="External bundles"
       version="5.1.0.qualifier"
       provider-name="Adempiere.org">
diff --git a/org.adempiere.payment.processor-feature/feature.xml b/org.adempiere.payment.processor-feature/feature.xml
index 1f540cc9fa..e598b01294 100644
--- a/org.adempiere.payment.processor-feature/feature.xml
+++ b/org.adempiere.payment.processor-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.adempiere.payment.processor"
+      id="org.adempiere.payment.processor.feature"
       label="Payment Processor"
       version="5.1.0.qualifier">
 
diff --git a/org.adempiere.pipo-feature/feature.xml b/org.adempiere.pipo-feature/feature.xml
index c7d2315e45..48b1174abf 100644
--- a/org.adempiere.pipo-feature/feature.xml
+++ b/org.adempiere.pipo-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.adempiere.pipo"
+      id="org.adempiere.pipo.feature"
       label="Pipo-feature"
       version="5.1.0.qualifier">
 
diff --git a/org.adempiere.replication-feature/feature.xml b/org.adempiere.replication-feature/feature.xml
index e2d61f8764..973a5c95fb 100644
--- a/org.adempiere.replication-feature/feature.xml
+++ b/org.adempiere.replication-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.adempiere.replication"
+      id="org.adempiere.replication.feature"
       label="Replication-feature"
       version="5.1.0.qualifier">
 
diff --git a/org.adempiere.replication.server-feature/feature.xml b/org.adempiere.replication.server-feature/feature.xml
index c33765e7ac..9a7390e9f9 100644
--- a/org.adempiere.replication.server-feature/feature.xml
+++ b/org.adempiere.replication.server-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.adempiere.replication.server"
+      id="org.adempiere.replication.server.feature"
       label="Replication Server-feature"
       version="5.1.0.qualifier">
 
@@ -17,8 +17,8 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="0.0.0"/>
-      <import feature="org.adempiere.replication" version="0.0.0"/>
+      <import feature="org.adempiere.base.feature" version="0.0.0"/>
+      <import feature="org.adempiere.replication.feature" version="0.0.0"/>
       <import plugin="org.adempiere.server" version="0.0.0"/>
    </requires>
 
diff --git a/org.adempiere.report.jasper-feature/feature.xml b/org.adempiere.report.jasper-feature/feature.xml
index 7fcecd7bbf..75120e9f27 100644
--- a/org.adempiere.report.jasper-feature/feature.xml
+++ b/org.adempiere.report.jasper-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.adempiere.report.jasper"
+      id="org.adempiere.report.jasper.feature"
       label="JasperReport-feature"
       version="5.1.0.qualifier">
 
diff --git a/org.adempiere.sdk-feature/feature.xml b/org.adempiere.sdk-feature/feature.xml
index a203091262..0f43cac207 100644
--- a/org.adempiere.sdk-feature/feature.xml
+++ b/org.adempiere.sdk-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.adempiere.sdk"
+      id="org.adempiere.sdk.feature"
       label="Adempiere SDK"
       version="5.1.0.qualifier"
       provider-name="Adempiere.org">
@@ -18,28 +18,28 @@
    </license>
 
    <includes
-         id="org.adempiere.target.platform"
+         id="org.adempiere.target.platform.feature"
          version="0.0.0"/>
 
    <includes
-         id="org.adempiere.server"
+         id="org.adempiere.server.feature"
          version="0.0.0"/>
 
    <includes
-         id="org.adempiere.ui.swing"
+         id="org.adempiere.ui.swing.feature"
          version="0.0.0"/>
 
    <includes
-         id="org.idempiere.hazelcast.service"
+         id="org.idempiere.hazelcast.service.feature"
          version="0.0.0"
          optional="true"/>
 
    <includes
-         id="org.idempiere.fitnesse"
+         id="org.idempiere.fitnesse.feature"
          version="0.0.0"/>
 
    <includes
-         id="org.idempiere.equinox.p2.director"
+         id="org.idempiere.equinox.p2.director.feature"
          version="0.0.0"/>
 
    <plugin
diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml
index f6828c01ac..07269c3cf4 100644
--- a/org.adempiere.server-feature/feature.xml
+++ b/org.adempiere.server-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.adempiere.server"
+      id="org.adempiere.server.feature"
       label="iDempiere Server-feature"
       version="5.1.0.qualifier">
 
@@ -17,48 +17,43 @@
    </license>
 
    <includes
-         id="org.adempiere.replication.server"
+         id="org.adempiere.replication.server.feature"
          version="0.0.0"
          optional="true"/>
 
    <includes
-         id="org.adempiere.ui.zk"
+         id="org.adempiere.ui.zk.feature"
          version="0.0.0"/>
 
    <includes
-         id="org.adempiere.webstore"
+         id="org.adempiere.webstore.feature"
          version="0.0.0"
          optional="true"/>
 
    <includes
-         id="org.idempiere.felix.webconsole"
+         id="org.idempiere.felix.webconsole.feature"
          version="0.0.0"/>
 
    <includes
-         id="org.adempiere.report.jasper"
+         id="org.adempiere.report.jasper.feature"
          version="0.0.0"/>
 
    <includes
-         id="org.adempiere.pipo"
+         id="org.adempiere.pipo.feature"
          version="0.0.0"/>
 
    <includes
-         id="org.idempiere.hazelcast.service"
+         id="org.idempiere.hazelcast.service.feature"
          version="0.0.0"/>
 
    <includes
-         id="org.adempiere.base"
+         id="org.adempiere.base.feature"
          version="0.0.0"/>
 
    <includes
-         id="org.idempiere.zk"
+         id="org.idempiere.zk.feature"
          version="0.0.0"/>
 
-   <includes
-         id="org.idempiere.customize"
-         version="0.0.0"
-         optional="true"/>
-
    <plugin
          id="org.apache.taglibs.taglibs-standard-spec"
          download-size="0"
diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml
index aa04694c18..f32e0c5dcb 100644
--- a/org.adempiere.target.platform-feature/feature.xml
+++ b/org.adempiere.target.platform-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.adempiere.target.platform"
+      id="org.adempiere.target.platform.feature"
       label="Adempiere Target Platform"
       version="5.1.0.qualifier"
       provider-name="Adempiere.org">
@@ -33,11 +33,7 @@
          version="0.0.0"/>
 
    <includes
-         id="org.adempiere.bundles.external"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.ecf.core.feature"
+         id="org.adempiere.bundles.external.feature"
          version="0.0.0"/>
 
    <includes
@@ -48,6 +44,10 @@
          id="org.eclipse.osgi.compatibility.plugins.feature"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.ecf.core.feature"
+         version="0.0.0"/>
+
    <plugin
          id="javax.xml"
          download-size="0"
diff --git a/org.adempiere.ui.swing-feature/feature.xml b/org.adempiere.ui.swing-feature/feature.xml
index 588758e584..77e7066257 100644
--- a/org.adempiere.ui.swing-feature/feature.xml
+++ b/org.adempiere.ui.swing-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.adempiere.ui.swing"
+      id="org.adempiere.ui.swing.feature"
       label="Swing Client-feature"
       version="5.1.0.qualifier">
 
@@ -17,7 +17,7 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="0.0.0"/>
+      <import feature="org.adempiere.base.feature" version="0.0.0"/>
    </requires>
 
    <plugin
diff --git a/org.adempiere.ui.zk-feature/feature.xml b/org.adempiere.ui.zk-feature/feature.xml
index cc0d6c56c8..eec2ae972d 100644
--- a/org.adempiere.ui.zk-feature/feature.xml
+++ b/org.adempiere.ui.zk-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.adempiere.ui.zk"
+      id="org.adempiere.ui.zk.feature"
       label="Zk Client-feature"
       version="5.1.0.qualifier">
 
@@ -17,7 +17,7 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="0.0.0"/>
+      <import feature="org.adempiere.base.feature" version="0.0.0"/>
    </requires>
 
    <plugin
@@ -25,11 +25,12 @@
          download-size="0"
          install-size="0"
          version="5.1.0.qualifier"/>
-         
+
    <plugin
          id="org.atmosphere.runtime"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+
 </feature>
diff --git a/org.adempiere.webstore-feature/feature.xml b/org.adempiere.webstore-feature/feature.xml
index 9cddae9b10..0364643ffa 100644
--- a/org.adempiere.webstore-feature/feature.xml
+++ b/org.adempiere.webstore-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.adempiere.webstore"
+      id="org.adempiere.webstore.feature"
       label="Webstore-feature"
       version="5.1.0.qualifier">
 
@@ -17,7 +17,7 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="0.0.0"/>
+      <import feature="org.adempiere.base.feature" version="0.0.0"/>
       <import plugin="org.adempiere.report.jasper.webapp" version="0.0.0"/>
       <import plugin="org.mortbay.jasper.apache-jsp"/>
       <import plugin="org.apache.taglibs.taglibs-standard-spec"/>
diff --git a/org.compiere.db.provider-feature/feature.xml b/org.compiere.db.provider-feature/feature.xml
index dd0ddb4501..d06cde1e0d 100644
--- a/org.compiere.db.provider-feature/feature.xml
+++ b/org.compiere.db.provider-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.compiere.db.provider"
+      id="org.compiere.db.provider.feature"
       label="Database Provider-feature"
       version="5.1.0.qualifier">
 
diff --git a/org.idempiere.eclipse.platform-feature/build.properties b/org.idempiere.eclipse.platform-feature/build.properties
index 7a0e081011..b045d39762 100644
--- a/org.idempiere.eclipse.platform-feature/build.properties
+++ b/org.idempiere.eclipse.platform-feature/build.properties
@@ -1,11 +1 @@
-bin.includes = feature.xml
-
-root.linux.gtk.x86_64.permissions.755=*.sh,**/*.sh
-
-root.linux.gtk.x86.permissions.755=*.sh,**/*.sh
-
-root.macosx.cocoa.x86.permissions.755=*.sh,**/*.sh
-
-root.macosx.cocoa.x86_64.permissions.755=*.sh,**/*.sh
-
-root.solaris.gtk.x86.permissions.755=*.sh,**/*.sh
+bin.includes = feature.xml
\ No newline at end of file
diff --git a/org.idempiere.eclipse.platform-feature/feature.xml b/org.idempiere.eclipse.platform-feature/feature.xml
index 916ad2ab0b..b6e74451d3 100644
--- a/org.idempiere.eclipse.platform-feature/feature.xml
+++ b/org.idempiere.eclipse.platform-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.idempiere.eclipse.platform"
+      id="org.idempiere.eclipse.platform.feature"
       label="Eclipse Platform for iDempiere"
       version="5.1.0.qualifier"
       provider-name="www.idempiere.org">
diff --git a/org.idempiere.equinox.p2.director-feature/feature.xml b/org.idempiere.equinox.p2.director-feature/feature.xml
index 73c18e67cf..837b249a34 100644
--- a/org.idempiere.equinox.p2.director-feature/feature.xml
+++ b/org.idempiere.equinox.p2.director-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.idempiere.equinox.p2.director"
+      id="org.idempiere.equinox.p2.director.feature"
       label="Idempiere P2 Director"
       version="5.1.0.qualifier"
       provider-name="www.idempiere.org">
diff --git a/org.idempiere.felix.webconsole-feature/feature.xml b/org.idempiere.felix.webconsole-feature/feature.xml
index 15e7e80367..1bf97d6515 100644
--- a/org.idempiere.felix.webconsole-feature/feature.xml
+++ b/org.idempiere.felix.webconsole-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.idempiere.felix.webconsole"
+      id="org.idempiere.felix.webconsole.feature"
       label="Felix Web Console Feature"
       version="5.1.0.qualifier">
 
diff --git a/org.idempiere.fitnesse-feature/feature.xml b/org.idempiere.fitnesse-feature/feature.xml
index 6f8102457d..3b1d1950de 100644
--- a/org.idempiere.fitnesse-feature/feature.xml
+++ b/org.idempiere.fitnesse-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.idempiere.fitnesse"
+      id="org.idempiere.fitnesse.feature"
       label="Fitnesse Feature"
       version="5.1.0.qualifier">
 
diff --git a/org.idempiere.hazelcast.service-feature/feature.xml b/org.idempiere.hazelcast.service-feature/feature.xml
index e159538769..2ceb533610 100644
--- a/org.idempiere.hazelcast.service-feature/feature.xml
+++ b/org.idempiere.hazelcast.service-feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.idempiere.hazelcast.service"
+      id="org.idempiere.hazelcast.service.feature"
       label="Hazelcast Service Feature"
       version="5.1.0.qualifier">
 
@@ -41,7 +41,7 @@
          id="org.idempiere.hazelcast.service.config"
          download-size="0"
          install-size="0"
-         version="5.1.0"
+         version="0.0.0"
          fragment="true"/>
 
 </feature>
diff --git a/org.idempiere.zk-feature/feature.xml b/org.idempiere.zk-feature/feature.xml
index 625068b640..0df8f9c0b6 100644
--- a/org.idempiere.zk-feature/feature.xml
+++ b/org.idempiere.zk-feature/feature.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.idempiere.zk"
+      id="org.idempiere.zk.feature"
       label="Materialize zk osgi libary"
-      version="1.0.0.qualifier">
+      version="5.1.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -85,19 +85,19 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
    <plugin
          id="org.apache.commons.fileupload"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
-  <plugin
+
+   <plugin
          id="org.apache.commons.io"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-  
+
 </feature>