diff --git a/packages/org.eclipse.epp.package.committers.product/epp.product b/packages/org.eclipse.epp.package.committers.product/epp.product
index 9af6874f..edba0a5b 100644
--- a/packages/org.eclipse.epp.package.committers.product/epp.product
+++ b/packages/org.eclipse.epp.package.committers.product/epp.product
@@ -234,9 +234,12 @@ United States, other countries, or both.
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.commons.activity" installMode="root"/>
+      <feature id="org.eclipse.mylyn.egit.feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.git" installMode="root"/>
+      <feature id="org.eclipse.mylyn.github.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.hudson" installMode="root"/>
-      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.reviews.feature" installMode="root"/>
 
       <!-- product specific contents -->
diff --git a/packages/org.eclipse.epp.package.committers.product/p2.inf b/packages/org.eclipse.epp.package.committers.product/p2.inf
index fd8ff267..21c00e11 100644
--- a/packages/org.eclipse.epp.package.committers.product/p2.inf
+++ b/packages/org.eclipse.epp.package.committers.product/p2.inf
@@ -179,25 +179,37 @@ requires.126.name = org.eclipse.pde.spies.source.feature.group
 requires.126.filter = (org.eclipse.epp.install.roots=true)
 
 requires.200.namespace = org.eclipse.equinox.p2.iu
-requires.200.name = org.eclipse.mylyn.ide_feature.feature.group
+requires.200.name = org.eclipse.mylyn.commons.activity.feature.group
 requires.200.filter = (org.eclipse.epp.install.roots=true)
 
 requires.201.namespace = org.eclipse.equinox.p2.iu
-requires.201.name = org.eclipse.mylyn.git.feature.group
+requires.201.name = org.eclipse.mylyn.egit.feature.feature.group
 requires.201.filter = (org.eclipse.epp.install.roots=true)
 
 requires.202.namespace = org.eclipse.equinox.p2.iu
-requires.202.name = org.eclipse.mylyn.hudson.feature.group
+requires.202.name = org.eclipse.mylyn.ide_feature.feature.group
 requires.202.filter = (org.eclipse.epp.install.roots=true)
 
 requires.203.namespace = org.eclipse.equinox.p2.iu
-requires.203.name = org.eclipse.mylyn.reviews.feature.feature.group
+requires.203.name = org.eclipse.mylyn.git.feature.group
 requires.203.filter = (org.eclipse.epp.install.roots=true)
 
 requires.204.namespace = org.eclipse.equinox.p2.iu
-requires.204.name = org.eclipse.mylyn.java_feature.feature.group
+requires.204.name = org.eclipse.mylyn.github.feature.feature.group
 requires.204.filter = (org.eclipse.epp.install.roots=true)
 
 requires.205.namespace = org.eclipse.equinox.p2.iu
-requires.205.name = org.eclipse.mylyn.pde_feature.feature.group
+requires.205.name = org.eclipse.mylyn.hudson.feature.group
 requires.205.filter = (org.eclipse.epp.install.roots=true)
+
+requires.206.namespace = org.eclipse.equinox.p2.iu
+requires.206.name = org.eclipse.mylyn.reviews.feature.feature.group
+requires.206.filter = (org.eclipse.epp.install.roots=true)
+
+requires.210.namespace = org.eclipse.equinox.p2.iu
+requires.210.name = org.eclipse.mylyn.java_feature.feature.group
+requires.210.filter = (org.eclipse.epp.install.roots=true)
+
+requires.211.namespace = org.eclipse.equinox.p2.iu
+requires.211.name = org.eclipse.mylyn.pde_feature.feature.group
+requires.211.filter = (org.eclipse.epp.install.roots=true)
diff --git a/packages/org.eclipse.epp.package.cpp.product/epp.product b/packages/org.eclipse.epp.package.cpp.product/epp.product
index 73f1290e..5dad667e 100644
--- a/packages/org.eclipse.epp.package.cpp.product/epp.product
+++ b/packages/org.eclipse.epp.package.cpp.product/epp.product
@@ -234,9 +234,12 @@ United States, other countries, or both.
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.commons.activity" installMode="root"/>
+      <feature id="org.eclipse.mylyn.egit.feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.git" installMode="root"/>
+      <feature id="org.eclipse.mylyn.github.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.hudson" installMode="root"/>
-      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.reviews.feature" installMode="root"/>
 
       <!-- product specific contents -->
diff --git a/packages/org.eclipse.epp.package.cpp.product/p2.inf b/packages/org.eclipse.epp.package.cpp.product/p2.inf
index 3b4aa750..8e2f9185 100644
--- a/packages/org.eclipse.epp.package.cpp.product/p2.inf
+++ b/packages/org.eclipse.epp.package.cpp.product/p2.inf
@@ -203,22 +203,34 @@ requires.132.name = org.eclipse.tracecompass.lttng2.ust.feature.group
 requires.132.filter = (org.eclipse.epp.install.roots=true)
 
 requires.200.namespace = org.eclipse.equinox.p2.iu
-requires.200.name = org.eclipse.mylyn.ide_feature.feature.group
+requires.200.name = org.eclipse.mylyn.commons.activity.feature.group
 requires.200.filter = (org.eclipse.epp.install.roots=true)
 
 requires.201.namespace = org.eclipse.equinox.p2.iu
-requires.201.name = org.eclipse.mylyn.git.feature.group
+requires.201.name = org.eclipse.mylyn.egit.feature.feature.group
 requires.201.filter = (org.eclipse.epp.install.roots=true)
 
 requires.202.namespace = org.eclipse.equinox.p2.iu
-requires.202.name = org.eclipse.mylyn.hudson.feature.group
+requires.202.name = org.eclipse.mylyn.ide_feature.feature.group
 requires.202.filter = (org.eclipse.epp.install.roots=true)
 
 requires.203.namespace = org.eclipse.equinox.p2.iu
-requires.203.name = org.eclipse.mylyn.reviews.feature.feature.group
+requires.203.name = org.eclipse.mylyn.git.feature.group
 requires.203.filter = (org.eclipse.epp.install.roots=true)
 
 requires.204.namespace = org.eclipse.equinox.p2.iu
-requires.204.name = org.eclipse.cdt.mylyn.feature.group
+requires.204.name = org.eclipse.mylyn.github.feature.feature.group
 requires.204.filter = (org.eclipse.epp.install.roots=true)
 
+requires.205.namespace = org.eclipse.equinox.p2.iu
+requires.205.name = org.eclipse.mylyn.hudson.feature.group
+requires.205.filter = (org.eclipse.epp.install.roots=true)
+
+requires.206.namespace = org.eclipse.equinox.p2.iu
+requires.206.name = org.eclipse.mylyn.reviews.feature.feature.group
+requires.206.filter = (org.eclipse.epp.install.roots=true)
+
+requires.210.namespace = org.eclipse.equinox.p2.iu
+requires.210.name = org.eclipse.cdt.mylyn.feature.group
+requires.210.filter = (org.eclipse.epp.install.roots=true)
+
diff --git a/packages/org.eclipse.epp.package.dsl.product/epp.product b/packages/org.eclipse.epp.package.dsl.product/epp.product
index 6ec2e0b1..ca1c0e57 100644
--- a/packages/org.eclipse.epp.package.dsl.product/epp.product
+++ b/packages/org.eclipse.epp.package.dsl.product/epp.product
@@ -234,9 +234,12 @@ United States, other countries, or both.
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.commons.activity" installMode="root"/>
+      <feature id="org.eclipse.mylyn.egit.feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.git" installMode="root"/>
+      <feature id="org.eclipse.mylyn.github.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.hudson" installMode="root"/>
-      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.reviews.feature" installMode="root"/>
 
       <!-- product specific contents -->
diff --git a/packages/org.eclipse.epp.package.dsl.product/p2.inf b/packages/org.eclipse.epp.package.dsl.product/p2.inf
index 5c98e5c7..be828c6b 100644
--- a/packages/org.eclipse.epp.package.dsl.product/p2.inf
+++ b/packages/org.eclipse.epp.package.dsl.product/p2.inf
@@ -143,21 +143,33 @@ requires.117.name = org.eclipse.buildship.feature.group
 requires.117.filter = (org.eclipse.epp.install.roots=true)
 
 requires.200.namespace = org.eclipse.equinox.p2.iu
-requires.200.name = org.eclipse.mylyn.ide_feature.feature.group
+requires.200.name = org.eclipse.mylyn.commons.activity.feature.group
 requires.200.filter = (org.eclipse.epp.install.roots=true)
 
 requires.201.namespace = org.eclipse.equinox.p2.iu
-requires.201.name = org.eclipse.mylyn.git.feature.group
+requires.201.name = org.eclipse.mylyn.egit.feature.feature.group
 requires.201.filter = (org.eclipse.epp.install.roots=true)
 
 requires.202.namespace = org.eclipse.equinox.p2.iu
-requires.202.name = org.eclipse.mylyn.hudson.feature.group
+requires.202.name = org.eclipse.mylyn.ide_feature.feature.group
 requires.202.filter = (org.eclipse.epp.install.roots=true)
 
 requires.203.namespace = org.eclipse.equinox.p2.iu
-requires.203.name = org.eclipse.mylyn.reviews.feature.feature.group
+requires.203.name = org.eclipse.mylyn.git.feature.group
 requires.203.filter = (org.eclipse.epp.install.roots=true)
 
 requires.204.namespace = org.eclipse.equinox.p2.iu
-requires.204.name = org.eclipse.mylyn.java_feature.feature.group
+requires.204.name = org.eclipse.mylyn.github.feature.feature.group
 requires.204.filter = (org.eclipse.epp.install.roots=true)
+
+requires.205.namespace = org.eclipse.equinox.p2.iu
+requires.205.name = org.eclipse.mylyn.hudson.feature.group
+requires.205.filter = (org.eclipse.epp.install.roots=true)
+
+requires.206.namespace = org.eclipse.equinox.p2.iu
+requires.206.name = org.eclipse.mylyn.reviews.feature.feature.group
+requires.206.filter = (org.eclipse.epp.install.roots=true)
+
+requires.210.namespace = org.eclipse.equinox.p2.iu
+requires.210.name = org.eclipse.mylyn.java_feature.feature.group
+requires.210.filter = (org.eclipse.epp.install.roots=true)
diff --git a/packages/org.eclipse.epp.package.embedcpp.product/epp.product b/packages/org.eclipse.epp.package.embedcpp.product/epp.product
index 4ddd0336..fbe20a66 100644
--- a/packages/org.eclipse.epp.package.embedcpp.product/epp.product
+++ b/packages/org.eclipse.epp.package.embedcpp.product/epp.product
@@ -234,9 +234,12 @@ United States, other countries, or both.
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.commons.activity" installMode="root"/>
+      <feature id="org.eclipse.mylyn.egit.feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.git" installMode="root"/>
+      <feature id="org.eclipse.mylyn.github.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.hudson" installMode="root"/>
-      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.reviews.feature" installMode="root"/>
 
       <!-- product specific contents -->
diff --git a/packages/org.eclipse.epp.package.embedcpp.product/p2.inf b/packages/org.eclipse.epp.package.embedcpp.product/p2.inf
index a8a6ecf5..9ecffbe7 100644
--- a/packages/org.eclipse.epp.package.embedcpp.product/p2.inf
+++ b/packages/org.eclipse.epp.package.embedcpp.product/p2.inf
@@ -267,22 +267,34 @@ requires.148.name = org.eclipse.embedcdt.templates.xpack.feature.group
 requires.148.filter = (org.eclipse.epp.install.roots=true)
 
 requires.200.namespace = org.eclipse.equinox.p2.iu
-requires.200.name = org.eclipse.mylyn.ide_feature.feature.group
+requires.200.name = org.eclipse.mylyn.commons.activity.feature.group
 requires.200.filter = (org.eclipse.epp.install.roots=true)
 
 requires.201.namespace = org.eclipse.equinox.p2.iu
-requires.201.name = org.eclipse.mylyn.git.feature.group
+requires.201.name = org.eclipse.mylyn.egit.feature.feature.group
 requires.201.filter = (org.eclipse.epp.install.roots=true)
 
 requires.202.namespace = org.eclipse.equinox.p2.iu
-requires.202.name = org.eclipse.mylyn.hudson.feature.group
+requires.202.name = org.eclipse.mylyn.ide_feature.feature.group
 requires.202.filter = (org.eclipse.epp.install.roots=true)
 
 requires.203.namespace = org.eclipse.equinox.p2.iu
-requires.203.name = org.eclipse.mylyn.reviews.feature.feature.group
+requires.203.name = org.eclipse.mylyn.git.feature.group
 requires.203.filter = (org.eclipse.epp.install.roots=true)
 
 requires.204.namespace = org.eclipse.equinox.p2.iu
-requires.204.name = org.eclipse.cdt.mylyn.feature.group
+requires.204.name = org.eclipse.mylyn.github.feature.feature.group
 requires.204.filter = (org.eclipse.epp.install.roots=true)
 
+requires.205.namespace = org.eclipse.equinox.p2.iu
+requires.205.name = org.eclipse.mylyn.hudson.feature.group
+requires.205.filter = (org.eclipse.epp.install.roots=true)
+
+requires.206.namespace = org.eclipse.equinox.p2.iu
+requires.206.name = org.eclipse.mylyn.reviews.feature.feature.group
+requires.206.filter = (org.eclipse.epp.install.roots=true)
+
+requires.210.namespace = org.eclipse.equinox.p2.iu
+requires.210.name = org.eclipse.cdt.mylyn.feature.group
+requires.210.filter = (org.eclipse.epp.install.roots=true)
+
diff --git a/packages/org.eclipse.epp.package.java.product/epp.product b/packages/org.eclipse.epp.package.java.product/epp.product
index 3d297774..8004ff13 100644
--- a/packages/org.eclipse.epp.package.java.product/epp.product
+++ b/packages/org.eclipse.epp.package.java.product/epp.product
@@ -234,9 +234,12 @@ United States, other countries, or both.
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.commons.activity" installMode="root"/>
+      <feature id="org.eclipse.mylyn.egit.feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.git" installMode="root"/>
+      <feature id="org.eclipse.mylyn.github.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.hudson" installMode="root"/>
-      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.reviews.feature" installMode="root"/>
 
       <!-- product specific contents -->
diff --git a/packages/org.eclipse.epp.package.java.product/p2.inf b/packages/org.eclipse.epp.package.java.product/p2.inf
index e7419c95..b1bcf6b0 100644
--- a/packages/org.eclipse.epp.package.java.product/p2.inf
+++ b/packages/org.eclipse.epp.package.java.product/p2.inf
@@ -135,22 +135,34 @@ requires.115.name = org.eclipse.jdt.bcoview.feature.feature.group
 requires.115.filter = (org.eclipse.epp.install.roots=true)
 
 requires.200.namespace = org.eclipse.equinox.p2.iu
-requires.200.name = org.eclipse.mylyn.ide_feature.feature.group
+requires.200.name = org.eclipse.mylyn.commons.activity.feature.group
 requires.200.filter = (org.eclipse.epp.install.roots=true)
 
 requires.201.namespace = org.eclipse.equinox.p2.iu
-requires.201.name = org.eclipse.mylyn.git.feature.group
+requires.201.name = org.eclipse.mylyn.egit.feature.feature.group
 requires.201.filter = (org.eclipse.epp.install.roots=true)
 
 requires.202.namespace = org.eclipse.equinox.p2.iu
-requires.202.name = org.eclipse.mylyn.hudson.feature.group
+requires.202.name = org.eclipse.mylyn.ide_feature.feature.group
 requires.202.filter = (org.eclipse.epp.install.roots=true)
 
 requires.203.namespace = org.eclipse.equinox.p2.iu
-requires.203.name = org.eclipse.mylyn.reviews.feature.feature.group
+requires.203.name = org.eclipse.mylyn.git.feature.group
 requires.203.filter = (org.eclipse.epp.install.roots=true)
 
 requires.204.namespace = org.eclipse.equinox.p2.iu
-requires.204.name = org.eclipse.mylyn.java_feature.feature.group
+requires.204.name = org.eclipse.mylyn.github.feature.feature.group
 requires.204.filter = (org.eclipse.epp.install.roots=true)
 
+requires.205.namespace = org.eclipse.equinox.p2.iu
+requires.205.name = org.eclipse.mylyn.hudson.feature.group
+requires.205.filter = (org.eclipse.epp.install.roots=true)
+
+requires.206.namespace = org.eclipse.equinox.p2.iu
+requires.206.name = org.eclipse.mylyn.reviews.feature.feature.group
+requires.206.filter = (org.eclipse.epp.install.roots=true)
+
+requires.210.namespace = org.eclipse.equinox.p2.iu
+requires.210.name = org.eclipse.mylyn.java_feature.feature.group
+requires.210.filter = (org.eclipse.epp.install.roots=true)
+
diff --git a/packages/org.eclipse.epp.package.jee.product/epp.product b/packages/org.eclipse.epp.package.jee.product/epp.product
index 867b49e6..dd880551 100644
--- a/packages/org.eclipse.epp.package.jee.product/epp.product
+++ b/packages/org.eclipse.epp.package.jee.product/epp.product
@@ -234,9 +234,12 @@ United States, other countries, or both.
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.commons.activity" installMode="root"/>
+      <feature id="org.eclipse.mylyn.egit.feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.git" installMode="root"/>
+      <feature id="org.eclipse.mylyn.github.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.hudson" installMode="root"/>
-      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.reviews.feature" installMode="root"/>
 
       <!-- product specific contents -->
diff --git a/packages/org.eclipse.epp.package.jee.product/p2.inf b/packages/org.eclipse.epp.package.jee.product/p2.inf
index 3654f255..32a37c32 100644
--- a/packages/org.eclipse.epp.package.jee.product/p2.inf
+++ b/packages/org.eclipse.epp.package.jee.product/p2.inf
@@ -399,25 +399,37 @@ requires.181.name = org.eclipse.jdt.bcoview.feature.feature.group
 requires.181.filter = (org.eclipse.epp.install.roots=true)
 
 requires.200.namespace = org.eclipse.equinox.p2.iu
-requires.200.name = org.eclipse.mylyn.ide_feature.feature.group
+requires.200.name = org.eclipse.mylyn.commons.activity.feature.group
 requires.200.filter = (org.eclipse.epp.install.roots=true)
 
 requires.201.namespace = org.eclipse.equinox.p2.iu
-requires.201.name = org.eclipse.mylyn.git.feature.group
+requires.201.name = org.eclipse.mylyn.egit.feature.feature.group
 requires.201.filter = (org.eclipse.epp.install.roots=true)
 
 requires.202.namespace = org.eclipse.equinox.p2.iu
-requires.202.name = org.eclipse.mylyn.hudson.feature.group
+requires.202.name = org.eclipse.mylyn.ide_feature.feature.group
 requires.202.filter = (org.eclipse.epp.install.roots=true)
 
 requires.203.namespace = org.eclipse.equinox.p2.iu
-requires.203.name = org.eclipse.mylyn.reviews.feature.feature.group
+requires.203.name = org.eclipse.mylyn.git.feature.group
 requires.203.filter = (org.eclipse.epp.install.roots=true)
 
 requires.204.namespace = org.eclipse.equinox.p2.iu
-requires.204.name = org.eclipse.mylyn.java_feature.feature.group
+requires.204.name = org.eclipse.mylyn.github.feature.feature.group
 requires.204.filter = (org.eclipse.epp.install.roots=true)
 
 requires.205.namespace = org.eclipse.equinox.p2.iu
-requires.205.name = org.eclipse.mylyn.pde_feature.feature.group
+requires.205.name = org.eclipse.mylyn.hudson.feature.group
 requires.205.filter = (org.eclipse.epp.install.roots=true)
+
+requires.206.namespace = org.eclipse.equinox.p2.iu
+requires.206.name = org.eclipse.mylyn.reviews.feature.feature.group
+requires.206.filter = (org.eclipse.epp.install.roots=true)
+
+requires.210.namespace = org.eclipse.equinox.p2.iu
+requires.210.name = org.eclipse.mylyn.java_feature.feature.group
+requires.210.filter = (org.eclipse.epp.install.roots=true)
+
+requires.211.namespace = org.eclipse.equinox.p2.iu
+requires.211.name = org.eclipse.mylyn.pde_feature.feature.group
+requires.211.filter = (org.eclipse.epp.install.roots=true)
diff --git a/packages/org.eclipse.epp.package.modeling.product/epp.product b/packages/org.eclipse.epp.package.modeling.product/epp.product
index 3309569b..ed8adcbf 100644
--- a/packages/org.eclipse.epp.package.modeling.product/epp.product
+++ b/packages/org.eclipse.epp.package.modeling.product/epp.product
@@ -234,9 +234,12 @@ United States, other countries, or both.
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.commons.activity" installMode="root"/>
+      <feature id="org.eclipse.mylyn.egit.feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.git" installMode="root"/>
+      <feature id="org.eclipse.mylyn.github.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.hudson" installMode="root"/>
-      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.reviews.feature" installMode="root"/>
 
       <!-- product specific contents -->
diff --git a/packages/org.eclipse.epp.package.modeling.product/p2.inf b/packages/org.eclipse.epp.package.modeling.product/p2.inf
index 2cc689c3..ac93c4e1 100644
--- a/packages/org.eclipse.epp.package.modeling.product/p2.inf
+++ b/packages/org.eclipse.epp.package.modeling.product/p2.inf
@@ -199,27 +199,39 @@ requires.131.name = org.eclipse.pde.spies.feature.group
 requires.131.filter = (org.eclipse.epp.install.roots=true)
 
 requires.200.namespace = org.eclipse.equinox.p2.iu
-requires.200.name = org.eclipse.mylyn.ide_feature.feature.group
+requires.200.name = org.eclipse.mylyn.commons.activity.feature.group
 requires.200.filter = (org.eclipse.epp.install.roots=true)
 
 requires.201.namespace = org.eclipse.equinox.p2.iu
-requires.201.name = org.eclipse.mylyn.git.feature.group
+requires.201.name = org.eclipse.mylyn.egit.feature.feature.group
 requires.201.filter = (org.eclipse.epp.install.roots=true)
 
 requires.202.namespace = org.eclipse.equinox.p2.iu
-requires.202.name = org.eclipse.mylyn.hudson.feature.group
+requires.202.name = org.eclipse.mylyn.ide_feature.feature.group
 requires.202.filter = (org.eclipse.epp.install.roots=true)
 
 requires.203.namespace = org.eclipse.equinox.p2.iu
-requires.203.name = org.eclipse.mylyn.reviews.feature.feature.group
+requires.203.name = org.eclipse.mylyn.git.feature.group
 requires.203.filter = (org.eclipse.epp.install.roots=true)
 
 requires.204.namespace = org.eclipse.equinox.p2.iu
-requires.204.name = org.eclipse.mylyn.java_feature.feature.group
+requires.204.name = org.eclipse.mylyn.github.feature.feature.group
 requires.204.filter = (org.eclipse.epp.install.roots=true)
 
 requires.205.namespace = org.eclipse.equinox.p2.iu
-requires.205.name = org.eclipse.mylyn.pde_feature.feature.group
+requires.205.name = org.eclipse.mylyn.hudson.feature.group
 requires.205.filter = (org.eclipse.epp.install.roots=true)
 
+requires.206.namespace = org.eclipse.equinox.p2.iu
+requires.206.name = org.eclipse.mylyn.reviews.feature.feature.group
+requires.206.filter = (org.eclipse.epp.install.roots=true)
+
+requires.210.namespace = org.eclipse.equinox.p2.iu
+requires.210.name = org.eclipse.mylyn.java_feature.feature.group
+requires.210.filter = (org.eclipse.epp.install.roots=true)
+
+requires.211.namespace = org.eclipse.equinox.p2.iu
+requires.211.name = org.eclipse.mylyn.pde_feature.feature.group
+requires.211.filter = (org.eclipse.epp.install.roots=true)
+
 
diff --git a/packages/org.eclipse.epp.package.parallel.product/epp.product b/packages/org.eclipse.epp.package.parallel.product/epp.product
index 1e74b2a6..db3b521f 100644
--- a/packages/org.eclipse.epp.package.parallel.product/epp.product
+++ b/packages/org.eclipse.epp.package.parallel.product/epp.product
@@ -234,9 +234,12 @@ United States, other countries, or both.
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.commons.activity" installMode="root"/>
+      <feature id="org.eclipse.mylyn.egit.feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.git" installMode="root"/>
+      <feature id="org.eclipse.mylyn.github.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.hudson" installMode="root"/>
-      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.reviews.feature" installMode="root"/>
 
       <!-- product specific contents -->
diff --git a/packages/org.eclipse.epp.package.parallel.product/p2.inf b/packages/org.eclipse.epp.package.parallel.product/p2.inf
index 1455319f..66be6ed4 100644
--- a/packages/org.eclipse.epp.package.parallel.product/p2.inf
+++ b/packages/org.eclipse.epp.package.parallel.product/p2.inf
@@ -167,21 +167,33 @@ requires.123.name = org.eclipse.wst.xml_ui.feature.feature.group
 requires.123.filter = (org.eclipse.epp.install.roots=true)
 
 requires.200.namespace = org.eclipse.equinox.p2.iu
-requires.200.name = org.eclipse.mylyn.ide_feature.feature.group
+requires.200.name = org.eclipse.mylyn.commons.activity.feature.group
 requires.200.filter = (org.eclipse.epp.install.roots=true)
 
 requires.201.namespace = org.eclipse.equinox.p2.iu
-requires.201.name = org.eclipse.mylyn.git.feature.group
+requires.201.name = org.eclipse.mylyn.egit.feature.feature.group
 requires.201.filter = (org.eclipse.epp.install.roots=true)
 
 requires.202.namespace = org.eclipse.equinox.p2.iu
-requires.202.name = org.eclipse.mylyn.hudson.feature.group
+requires.202.name = org.eclipse.mylyn.ide_feature.feature.group
 requires.202.filter = (org.eclipse.epp.install.roots=true)
 
 requires.203.namespace = org.eclipse.equinox.p2.iu
-requires.203.name = org.eclipse.mylyn.reviews.feature.feature.group
+requires.203.name = org.eclipse.mylyn.git.feature.group
 requires.203.filter = (org.eclipse.epp.install.roots=true)
 
 requires.204.namespace = org.eclipse.equinox.p2.iu
-requires.204.name = org.eclipse.cdt.mylyn.feature.group
+requires.204.name = org.eclipse.mylyn.github.feature.feature.group
 requires.204.filter = (org.eclipse.epp.install.roots=true)
+
+requires.205.namespace = org.eclipse.equinox.p2.iu
+requires.205.name = org.eclipse.mylyn.hudson.feature.group
+requires.205.filter = (org.eclipse.epp.install.roots=true)
+
+requires.206.namespace = org.eclipse.equinox.p2.iu
+requires.206.name = org.eclipse.mylyn.reviews.feature.feature.group
+requires.206.filter = (org.eclipse.epp.install.roots=true)
+
+requires.210.namespace = org.eclipse.equinox.p2.iu
+requires.210.name = org.eclipse.cdt.mylyn.feature.group
+requires.210.filter = (org.eclipse.epp.install.roots=true)
diff --git a/packages/org.eclipse.epp.package.php.product/epp.product b/packages/org.eclipse.epp.package.php.product/epp.product
index 768a7007..35d8aa35 100644
--- a/packages/org.eclipse.epp.package.php.product/epp.product
+++ b/packages/org.eclipse.epp.package.php.product/epp.product
@@ -234,9 +234,12 @@ United States, other countries, or both.
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.commons.activity" installMode="root"/>
+      <feature id="org.eclipse.mylyn.egit.feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.git" installMode="root"/>
+      <feature id="org.eclipse.mylyn.github.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.hudson" installMode="root"/>
-      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.reviews.feature" installMode="root"/>
 
       <!-- product specific contents -->
@@ -250,6 +253,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.wst.xml_ui.feature" installMode="root"/>
       <feature id="org.eclipse.wildwebdeveloper.feature" installMode="root"/>
       <feature id="org.eclipse.wildwebdeveloper.embedder.node.feature" installMode="root"/>
+      <feature id="org.eclipse.php.mylyn" installMode="root"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.php.product/p2.inf b/packages/org.eclipse.epp.package.php.product/p2.inf
index f4fe738b..fd4b81b1 100644
--- a/packages/org.eclipse.epp.package.php.product/p2.inf
+++ b/packages/org.eclipse.epp.package.php.product/p2.inf
@@ -135,18 +135,34 @@ requires.115.name = org.eclipse.wildwebdeveloper.embedder.node.feature.feature.g
 requires.115.filter = (org.eclipse.epp.install.roots=true)
 
 requires.200.namespace = org.eclipse.equinox.p2.iu
-requires.200.name = org.eclipse.mylyn.ide_feature.feature.group
+requires.200.name = org.eclipse.mylyn.commons.activity.feature.group
 requires.200.filter = (org.eclipse.epp.install.roots=true)
 
 requires.201.namespace = org.eclipse.equinox.p2.iu
-requires.201.name = org.eclipse.mylyn.git.feature.group
+requires.201.name = org.eclipse.mylyn.egit.feature.feature.group
 requires.201.filter = (org.eclipse.epp.install.roots=true)
 
 requires.202.namespace = org.eclipse.equinox.p2.iu
-requires.202.name = org.eclipse.mylyn.hudson.feature.group
+requires.202.name = org.eclipse.mylyn.ide_feature.feature.group
 requires.202.filter = (org.eclipse.epp.install.roots=true)
 
 requires.203.namespace = org.eclipse.equinox.p2.iu
-requires.203.name = org.eclipse.mylyn.reviews.feature.feature.group
+requires.203.name = org.eclipse.mylyn.git.feature.group
 requires.203.filter = (org.eclipse.epp.install.roots=true)
 
+requires.204.namespace = org.eclipse.equinox.p2.iu
+requires.204.name = org.eclipse.mylyn.github.feature.feature.group
+requires.204.filter = (org.eclipse.epp.install.roots=true)
+
+requires.205.namespace = org.eclipse.equinox.p2.iu
+requires.205.name = org.eclipse.mylyn.hudson.feature.group
+requires.205.filter = (org.eclipse.epp.install.roots=true)
+
+requires.206.namespace = org.eclipse.equinox.p2.iu
+requires.206.name = org.eclipse.mylyn.reviews.feature.feature.group
+requires.206.filter = (org.eclipse.epp.install.roots=true)
+
+requires.210.namespace = org.eclipse.equinox.p2.iu
+requires.210.name = org.eclipse.php.mylyn.feature.group
+requires.210.filter = (org.eclipse.epp.install.roots=true)
+
diff --git a/packages/org.eclipse.epp.package.rcp.product/epp.product b/packages/org.eclipse.epp.package.rcp.product/epp.product
index 4c161e28..96754e6b 100644
--- a/packages/org.eclipse.epp.package.rcp.product/epp.product
+++ b/packages/org.eclipse.epp.package.rcp.product/epp.product
@@ -234,9 +234,12 @@ United States, other countries, or both.
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.commons.activity" installMode="root"/>
+      <feature id="org.eclipse.mylyn.egit.feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.git" installMode="root"/>
+      <feature id="org.eclipse.mylyn.github.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.hudson" installMode="root"/>
-      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.reviews.feature" installMode="root"/>
 
       <!-- product specific contents -->
diff --git a/packages/org.eclipse.epp.package.rcp.product/p2.inf b/packages/org.eclipse.epp.package.rcp.product/p2.inf
index 11691ada..e99feb04 100644
--- a/packages/org.eclipse.epp.package.rcp.product/p2.inf
+++ b/packages/org.eclipse.epp.package.rcp.product/p2.inf
@@ -167,25 +167,37 @@ requires.123.name = org.eclipse.pde.spies.feature.group
 requires.123.filter = (org.eclipse.epp.install.roots=true)
 
 requires.200.namespace = org.eclipse.equinox.p2.iu
-requires.200.name = org.eclipse.mylyn.ide_feature.feature.group
+requires.200.name = org.eclipse.mylyn.commons.activity.feature.group
 requires.200.filter = (org.eclipse.epp.install.roots=true)
 
 requires.201.namespace = org.eclipse.equinox.p2.iu
-requires.201.name = org.eclipse.mylyn.git.feature.group
+requires.201.name = org.eclipse.mylyn.egit.feature.feature.group
 requires.201.filter = (org.eclipse.epp.install.roots=true)
 
 requires.202.namespace = org.eclipse.equinox.p2.iu
-requires.202.name = org.eclipse.mylyn.hudson.feature.group
+requires.202.name = org.eclipse.mylyn.ide_feature.feature.group
 requires.202.filter = (org.eclipse.epp.install.roots=true)
 
 requires.203.namespace = org.eclipse.equinox.p2.iu
-requires.203.name = org.eclipse.mylyn.reviews.feature.feature.group
+requires.203.name = org.eclipse.mylyn.git.feature.group
 requires.203.filter = (org.eclipse.epp.install.roots=true)
 
 requires.204.namespace = org.eclipse.equinox.p2.iu
-requires.204.name = org.eclipse.mylyn.java_feature.feature.group
+requires.204.name = org.eclipse.mylyn.github.feature.feature.group
 requires.204.filter = (org.eclipse.epp.install.roots=true)
 
 requires.205.namespace = org.eclipse.equinox.p2.iu
-requires.205.name = org.eclipse.mylyn.pde_feature.feature.group
+requires.205.name = org.eclipse.mylyn.hudson.feature.group
 requires.205.filter = (org.eclipse.epp.install.roots=true)
+
+requires.206.namespace = org.eclipse.equinox.p2.iu
+requires.206.name = org.eclipse.mylyn.reviews.feature.feature.group
+requires.206.filter = (org.eclipse.epp.install.roots=true)
+
+requires.210.namespace = org.eclipse.equinox.p2.iu
+requires.210.name = org.eclipse.mylyn.java_feature.feature.group
+requires.210.filter = (org.eclipse.epp.install.roots=true)
+
+requires.211.namespace = org.eclipse.equinox.p2.iu
+requires.211.name = org.eclipse.mylyn.pde_feature.feature.group
+requires.211.filter = (org.eclipse.epp.install.roots=true)
diff --git a/packages/org.eclipse.epp.package.scout.product/epp.product b/packages/org.eclipse.epp.package.scout.product/epp.product
index 814c0d7b..65e991ff 100644
--- a/packages/org.eclipse.epp.package.scout.product/epp.product
+++ b/packages/org.eclipse.epp.package.scout.product/epp.product
@@ -234,9 +234,12 @@ United States, other countries, or both.
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.commons.activity" installMode="root"/>
+      <feature id="org.eclipse.mylyn.egit.feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.git" installMode="root"/>
+      <feature id="org.eclipse.mylyn.github.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.hudson" installMode="root"/>
-      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.reviews.feature" installMode="root"/>
 
       <!-- product specific contents -->
diff --git a/packages/org.eclipse.epp.package.scout.product/p2.inf b/packages/org.eclipse.epp.package.scout.product/p2.inf
index 97be5dfa..74389742 100644
--- a/packages/org.eclipse.epp.package.scout.product/p2.inf
+++ b/packages/org.eclipse.epp.package.scout.product/p2.inf
@@ -139,21 +139,33 @@ requires.116.name = org.eclipse.jdt.bcoview.feature.feature.group
 requires.116.filter = (org.eclipse.epp.install.roots=true)
 
 requires.200.namespace = org.eclipse.equinox.p2.iu
-requires.200.name = org.eclipse.mylyn.ide_feature.feature.group
+requires.200.name = org.eclipse.mylyn.commons.activity.feature.group
 requires.200.filter = (org.eclipse.epp.install.roots=true)
 
 requires.201.namespace = org.eclipse.equinox.p2.iu
-requires.201.name = org.eclipse.mylyn.git.feature.group
+requires.201.name = org.eclipse.mylyn.egit.feature.feature.group
 requires.201.filter = (org.eclipse.epp.install.roots=true)
 
 requires.202.namespace = org.eclipse.equinox.p2.iu
-requires.202.name = org.eclipse.mylyn.hudson.feature.group
+requires.202.name = org.eclipse.mylyn.ide_feature.feature.group
 requires.202.filter = (org.eclipse.epp.install.roots=true)
 
 requires.203.namespace = org.eclipse.equinox.p2.iu
-requires.203.name = org.eclipse.mylyn.reviews.feature.feature.group
+requires.203.name = org.eclipse.mylyn.git.feature.group
 requires.203.filter = (org.eclipse.epp.install.roots=true)
 
 requires.204.namespace = org.eclipse.equinox.p2.iu
-requires.204.name = org.eclipse.mylyn.java_feature.feature.group
+requires.204.name = org.eclipse.mylyn.github.feature.feature.group
 requires.204.filter = (org.eclipse.epp.install.roots=true)
+
+requires.205.namespace = org.eclipse.equinox.p2.iu
+requires.205.name = org.eclipse.mylyn.hudson.feature.group
+requires.205.filter = (org.eclipse.epp.install.roots=true)
+
+requires.206.namespace = org.eclipse.equinox.p2.iu
+requires.206.name = org.eclipse.mylyn.reviews.feature.feature.group
+requires.206.filter = (org.eclipse.epp.install.roots=true)
+
+requires.210.namespace = org.eclipse.equinox.p2.iu
+requires.210.name = org.eclipse.mylyn.java_feature.feature.group
+requires.210.filter = (org.eclipse.epp.install.roots=true)