diff --git a/org.adempiere.sdk-feature/feature.xml b/org.adempiere.sdk-feature/feature.xml
index c18971989a..3f57621ee7 100644
--- a/org.adempiere.sdk-feature/feature.xml
+++ b/org.adempiere.sdk-feature/feature.xml
@@ -38,6 +38,10 @@
id="org.idempiere.fitnesse"
version="0.0.0"/>
+
+
-
+
@@ -74,7 +74,6 @@
-
@@ -82,7 +81,7 @@
-
+
diff --git a/org.adempiere.server-feature/buckminster.properties b/org.adempiere.server-feature/buckminster.properties
index 8ed6e52f98..0af91deea8 100644
--- a/org.adempiere.server-feature/buckminster.properties
+++ b/org.adempiere.server-feature/buckminster.properties
@@ -10,9 +10,9 @@ target.os=*
target.ws=*
target.arch=*
-product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group
+product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
product.profile=DefaultProfile
-product.id=org.adempiere.server.product
+product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
osgi.user.area=${user.home}
osgi.user.area.default=${user.home}
diff --git a/org.adempiere.server-feature/buckminster_linux_gtk_x86.properties b/org.adempiere.server-feature/buckminster_linux_gtk_x86.properties
index 5fd88424ac..512965b826 100644
--- a/org.adempiere.server-feature/buckminster_linux_gtk_x86.properties
+++ b/org.adempiere.server-feature/buckminster_linux_gtk_x86.properties
@@ -10,9 +10,9 @@ target.os=linux
target.ws=gtk
target.arch=x86
-product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group
+product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
product.profile=DefaultProfile
-product.id=org.adempiere.server.product
+product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
osgi.user.area=${user.home}
osgi.user.area.default=${user.home}
diff --git a/org.adempiere.server-feature/buckminster_linux_gtk_x86_64.properties b/org.adempiere.server-feature/buckminster_linux_gtk_x86_64.properties
index 3d952a40b5..22d5db826b 100644
--- a/org.adempiere.server-feature/buckminster_linux_gtk_x86_64.properties
+++ b/org.adempiere.server-feature/buckminster_linux_gtk_x86_64.properties
@@ -10,9 +10,9 @@ target.os=linux
target.ws=gtk
target.arch=x86_64
-product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group
+product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
product.profile=DefaultProfile
-product.id=org.adempiere.server.product
+product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
osgi.user.area=${user.home}
osgi.user.area.default=${user.home}
diff --git a/org.adempiere.server-feature/buckminster_macosx_x86.properties b/org.adempiere.server-feature/buckminster_macosx_x86.properties
index b4de619240..9d1b4fb981 100644
--- a/org.adempiere.server-feature/buckminster_macosx_x86.properties
+++ b/org.adempiere.server-feature/buckminster_macosx_x86.properties
@@ -10,9 +10,9 @@ target.os=macosx
target.ws=cocoa
target.arch=x86
-product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group
+product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
product.profile=DefaultProfile
-product.id=org.adempiere.server.product
+product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
osgi.user.area=${user.home}
osgi.user.area.default=${user.home}
diff --git a/org.adempiere.server-feature/buckminster_solaris_gtk_x86.properties b/org.adempiere.server-feature/buckminster_solaris_gtk_x86.properties
index 154c3d39b1..223491493f 100644
--- a/org.adempiere.server-feature/buckminster_solaris_gtk_x86.properties
+++ b/org.adempiere.server-feature/buckminster_solaris_gtk_x86.properties
@@ -10,9 +10,9 @@ target.os=solaris
target.ws=gtk
target.arch=x86
-product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group
+product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
product.profile=DefaultProfile
-product.id=org.adempiere.server.product
+product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
osgi.user.area=${user.home}
osgi.user.area.default=${user.home}
diff --git a/org.adempiere.server-feature/buckminster_win32_x86.properties b/org.adempiere.server-feature/buckminster_win32_x86.properties
index cd31709746..02d08f0484 100644
--- a/org.adempiere.server-feature/buckminster_win32_x86.properties
+++ b/org.adempiere.server-feature/buckminster_win32_x86.properties
@@ -10,9 +10,9 @@ target.os=win32
target.ws=win32
target.arch=x86
-product.features=org.idempiere.eclipse.platform.feature.group, org.idempiere.fitnesse.feature.group
+product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
product.profile=DefaultProfile
-product.id=org.adempiere.server.product
+product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
osgi.user.area=${user.home}
osgi.user.area.default=${user.home}
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index 138ac6d2e5..3b28df0763 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -27,8 +27,8 @@
-
-
+
+
diff --git a/org.idempiere.eclipse.platform-feature/build.properties b/org.idempiere.eclipse.platform-feature/build.properties
index f08a8f4cec..7a0e081011 100644
--- a/org.idempiere.eclipse.platform-feature/build.properties
+++ b/org.idempiere.eclipse.platform-feature/build.properties
@@ -1,20 +1,11 @@
bin.includes = feature.xml
-root.folder.director=director
-root.linux.gtk.x86_64=file:director.sh,file:update.sh,file:update-prd.sh
root.linux.gtk.x86_64.permissions.755=*.sh,**/*.sh
-root.linux.gtk.x86=file:director.sh,file:update.sh,file:update-prd.sh
root.linux.gtk.x86.permissions.755=*.sh,**/*.sh
-root.macosx.cocoa.x86=file:director.sh,file:update.sh,file:update-prd.sh
root.macosx.cocoa.x86.permissions.755=*.sh,**/*.sh
-root.macosx.cocoa.x86_64=file:director.sh,file:update.sh,file:update-prd.sh
root.macosx.cocoa.x86_64.permissions.755=*.sh,**/*.sh
-root.win32.win32.x86=file:director.bat,file:update.bat,file:update-prd.bat
-root.win32.win32.x86_64=file:director.bat,file:update.bat,file:update-prd.bat
-
-root.solaris.gtk.x86=file:director.sh,file:update.sh,file:update-prd.sh
-root.solaris.gtk.x86.permissions.755=*.sh,**/*.sh
\ No newline at end of file
+root.solaris.gtk.x86.permissions.755=*.sh,**/*.sh
diff --git a/org.idempiere.equinox.p2.director-feature/.project b/org.idempiere.equinox.p2.director-feature/.project
new file mode 100644
index 0000000000..ba62bd3511
--- /dev/null
+++ b/org.idempiere.equinox.p2.director-feature/.project
@@ -0,0 +1,17 @@
+
+
+ org.idempiere.equinox.p2.director-feature
+
+
+
+
+
+ org.eclipse.pde.FeatureBuilder
+
+
+
+
+
+ org.eclipse.pde.FeatureNature
+
+
diff --git a/org.idempiere.equinox.p2.director-feature/build.properties b/org.idempiere.equinox.p2.director-feature/build.properties
new file mode 100644
index 0000000000..2c8e28e7d9
--- /dev/null
+++ b/org.idempiere.equinox.p2.director-feature/build.properties
@@ -0,0 +1,24 @@
+bin.includes = feature.xml
+
+root.folder.director=director
+
+root.linux.gtk.x86_64=file:director.sh,file:update.sh,file:update-prd.sh
+root.linux.gtk.x86_64.permissions.755=*.sh,**/*.sh
+
+root.linux.gtk.x86=file:director.sh,file:update.sh,file:update-prd.sh
+root.linux.gtk.x86.permissions.755=*.sh,**/*.sh
+
+root.macosx.cocoa.x86=file:director.sh,file:update.sh,file:update-prd.sh
+root.macosx.cocoa.x86.permissions.755=*.sh,**/*.sh
+
+root.macosx.cocoa.x86_64=file:director.sh,file:update.sh,file:update-prd.sh
+root.macosx.cocoa.x86_64.permissions.755=*.sh,**/*.sh
+
+root.win32.win32.x86=file:director.bat,file:update.bat,file:update-prd.bat
+root.win32.win32.x86.permissions.755=*.sh,**/*.sh
+
+root.win32.win32.x86_64=file:director.bat,file:update.bat,file:update-prd.bat
+root.win32.win32.x86_64.permissions.755=*.sh,**/*.sh
+
+root.solaris.gtk.x86=file:director.sh,file:update.sh,file:update-prd.sh
+root.solaris.gtk.x86.permissions.755=*.sh,**/*.sh
\ No newline at end of file
diff --git a/org.idempiere.eclipse.platform-feature/director.bat b/org.idempiere.equinox.p2.director-feature/director.bat
similarity index 100%
rename from org.idempiere.eclipse.platform-feature/director.bat
rename to org.idempiere.equinox.p2.director-feature/director.bat
diff --git a/org.idempiere.eclipse.platform-feature/director.sh b/org.idempiere.equinox.p2.director-feature/director.sh
similarity index 100%
rename from org.idempiere.eclipse.platform-feature/director.sh
rename to org.idempiere.equinox.p2.director-feature/director.sh
diff --git a/org.idempiere.eclipse.platform-feature/director/configuration/config.ini b/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini
similarity index 94%
rename from org.idempiere.eclipse.platform-feature/director/configuration/config.ini
rename to org.idempiere.equinox.p2.director-feature/director/configuration/config.ini
index 7172f72136..7af8d700b0 100644
--- a/org.idempiere.eclipse.platform-feature/director/configuration/config.ini
+++ b/org.idempiere.equinox.p2.director-feature/director/configuration/config.ini
@@ -32,7 +32,6 @@ osgi.bundles=org.eclipse.core.net@start,\
org.eclipse.equinox.p2.jarprocessor,\
org.eclipse.equinox.p2.metadata,\
org.eclipse.equinox.p2.metadata.repository,\
- org.eclipse.equinox.p2.ql,\
org.eclipse.equinox.p2.repository,\
org.eclipse.equinox.p2.touchpoint.eclipse,\
org.eclipse.equinox.p2.touchpoint.natives,\
@@ -58,7 +57,12 @@ osgi.bundles=org.eclipse.core.net@start,\
org.junit,\
org.eclipse.osgi.compatibility.state,\
org.eclipse.osgi.compatibility.plugins,\
- org.eclipse.osgi@start
+ org.eclipse.osgi@start,\
+ org.eclipse.osgi.services,\
+ org.eclipse.osgi.util,\
+ org.apache.felix.scr,\
+ org.eclipse.equinox.ds,\
+ org.tukaani.xz
osgi.framework.extensions=
osgi.bundles.defaultStartLevel=4
eclipse.p2.profile=DefaultProfile
diff --git a/org.idempiere.equinox.p2.director-feature/feature.xml b/org.idempiere.equinox.p2.director-feature/feature.xml
new file mode 100644
index 0000000000..ecdec6bdcb
--- /dev/null
+++ b/org.idempiere.equinox.p2.director-feature/feature.xml
@@ -0,0 +1,20 @@
+
+
+
+
+ [Enter Feature Description here.]
+
+
+
+ [Enter Copyright Description here.]
+
+
+
+ [Enter License Description here.]
+
+
+
diff --git a/org.idempiere.eclipse.platform-feature/update-prd.bat b/org.idempiere.equinox.p2.director-feature/update-prd.bat
similarity index 72%
rename from org.idempiere.eclipse.platform-feature/update-prd.bat
rename to org.idempiere.equinox.p2.director-feature/update-prd.bat
index a4fbd288ae..3f1d5b809b 100644
--- a/org.idempiere.eclipse.platform-feature/update-prd.bat
+++ b/org.idempiere.equinox.p2.director-feature/update-prd.bat
@@ -7,5 +7,5 @@ set DESTINATION=%cd%
@echo %1%
FOR %%c in (plugins\org.eclipse.equinox.launcher_1.*.jar) DO set JARFILE=%%c
-java -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true -jar %JARFILE% -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %DESTINATION% -repository %1% -u %2%
-java -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true -jar %JARFILE% -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %DESTINATION% -repository %1% -i %2%
+java -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true -jar %JARFILE% -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %DESTINATION% -repository %1% -u "%2%, org.idempiere.fitnesse.feature.group"
+java -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true -jar %JARFILE% -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination %DESTINATION% -repository %1% -i "%2%, org.eclipse.equinox.p2.director, org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group"
diff --git a/org.idempiere.eclipse.platform-feature/update-prd.sh b/org.idempiere.equinox.p2.director-feature/update-prd.sh
similarity index 59%
rename from org.idempiere.eclipse.platform-feature/update-prd.sh
rename to org.idempiere.equinox.p2.director-feature/update-prd.sh
index a8aa4e76b5..6f0ab3fcfb 100644
--- a/org.idempiere.eclipse.platform-feature/update-prd.sh
+++ b/org.idempiere.equinox.p2.director-feature/update-prd.sh
@@ -4,6 +4,6 @@
cd $(dirname "${0}")
DESTINATION=$(pwd)
-VMOPTS="-Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true"
-java $VMOPTS -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -u $2
-java $VMOPTS -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -i $2
\ No newline at end of file
+VMOPTS="-Declipse.log.level=ALL -Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4 -Djava.net.preferIPv4Stack=true"
+java $VMOPTS -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -u "$2, org.idempiere.fitnesse.feature.group"
+java $VMOPTS -jar plugins/org.eclipse.equinox.launcher_1.*.jar -install director -configuration director/configuration -application org.eclipse.equinox.p2.director -consoleLog -profileProperties org.eclipse.update.install.features=true -destination $DESTINATION -repository $1 -i "$2, org.eclipse.equinox.p2.director, org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group"
\ No newline at end of file
diff --git a/org.idempiere.eclipse.platform-feature/update.bat b/org.idempiere.equinox.p2.director-feature/update.bat
similarity index 100%
rename from org.idempiere.eclipse.platform-feature/update.bat
rename to org.idempiere.equinox.p2.director-feature/update.bat
diff --git a/org.idempiere.eclipse.platform-feature/update.sh b/org.idempiere.equinox.p2.director-feature/update.sh
similarity index 100%
rename from org.idempiere.eclipse.platform-feature/update.sh
rename to org.idempiere.equinox.p2.director-feature/update.sh