diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e416/category.xml b/eclipse-distribution/org.springframework.boot.ide.product.e416/category.xml
index 75cb12189..6bf80f26a 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e416/category.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e416/category.xml
@@ -4,94 +4,159 @@
 		Spring Tool Suite 4
 	</description>
 
-	<!-- Eclipse Integration Commons -->
 	<category-def name="Uncategorized" label="Uncategorized"/>
-	<category-def name="Core / Eclipse Integration Commons" label="Core / Eclipse Integration Commons"/>
-	<category-def name="Resources / Eclipse Integration Commons" label="Resources / Eclipse Integration Commons"/>
+	<category-def name="Spring Tools" label="Spring Tools"/>
+	<category-def name="Spring Tools - Developer Resources" label="Spring Tools - Developer Resources"/>
 
 	<!-- STS4 branding and custom features -->
-	<category-def name="Spring Tool Suite 4 Distribution" label="Spring Tool Suite 4 Distribution" />
-
 	<feature
 		id="org.springframework.boot.ide.main.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Distribution" />
+		<category name="Spring Tools" />
+	</feature>
+
+	<feature
+		id="org.springframework.boot.ide.main.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
 	</feature>
 
 	<feature
 		id="org.springframework.boot.ide.branding.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Distribution" />
+		<category name="Spring Tools" />
 	</feature>
 
-	<!-- Spring IDE -->
-	<category-def name="Core / Spring IDE" label="Core / Spring IDE" />
-	<category-def name="Extensions / Spring IDE" label="Extensions / Spring IDE" />
-	<category-def name="Extensions (Incubation) / Spring IDE" label="Extensions (Incubation) / Spring IDE" />
-	<category-def name="Integrations / Spring IDE" label="Integrations / Spring IDE" />
-	<category-def name="Resources / Spring IDE" label="Resources / Spring IDE" />
+	<feature
+		id="org.springframework.boot.ide.branding.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
+	</feature>
 
 	<feature
 		id="org.springframework.ide.eclipse.boot.dash.feature" version="0.0.0">
-		<category name="Extensions / Spring IDE" />
+		<category name="Spring Tools" />
+	</feature>
+
+	<feature
+		id="org.springframework.ide.eclipse.boot.dash.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
 	</feature>
 
 	<feature
 		id="org.springframework.ide.eclipse.xml.namespaces.feature" version="0.0.0">
-		<category name="Extensions / Spring IDE" />
+		<category name="Spring Tools" />
 	</feature>
 
-	<!-- Language Server -->
-	<category-def name="Spring Tool Suite 4 Language Server Integrations for Eclipse" label="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
+	<feature
+		id="org.springframework.ide.eclipse.xml.namespaces.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
+	</feature>
 
 	<feature
 		id="org.springframework.tooling.cloudfoundry.manifest.ls.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
+		<category name="Spring Tools" />
+	</feature>
+
+	<feature
+		id="org.springframework.tooling.cloudfoundry.manifest.ls.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
 	</feature>
 
 	<feature
 		id="org.springframework.tooling.boot.ls.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
+		<category name="Spring Tools" />
+	</feature>
+
+	<feature
+		id="org.springframework.tooling.boot.ls.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
 	</feature>
 
 	<feature
 		id="org.springframework.tooling.bosh.ls.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
+		<category name="Spring Tools" />
+	</feature>
+
+	<feature
+		id="org.springframework.tooling.bosh.ls.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
 	</feature>
 
 	<feature
 		id="org.springframework.tooling.concourse.ls.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
+		<category name="Spring Tools" />
+	</feature>
+
+	<feature
+		id="org.springframework.tooling.concourse.ls.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
 	</feature>
 
 	<bundle id="org.springframework.tooling.ls.eclipse.commons">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springframework.tooling.ls.eclipse.commons.source">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springframework.tooling.ls.eclipse.commons">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springframework.tooling.ls.eclipse.commons.source">
+		<category name="Uncategorized"/>
 	</bundle>
 
 	<bundle id="org.springframework.tooling.jdt.ls.commons">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springframework.tooling.jdt.ls.commons.source">
+		<category name="Uncategorized"/>
 	</bundle>
 
 	<bundle id="org.springframework.tooling.ls.eclipse.gotosymbol">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springframework.tooling.ls.eclipse.gotosymbol.source">
+		<category name="Uncategorized"/>
 	</bundle>
 
 	<bundle id="org.springsource.ide.eclipse.commons.core">
-		<category name="Core / Eclipse Integration Commons"/>
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.core.source">
+		<category name="Uncategorized"/>
 	</bundle>
 
 	<bundle id="org.springsource.ide.eclipse.commons.ui">
-		<category name="Core / Eclipse Integration Commons"/>
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.ui.source">
+		<category name="Uncategorized"/>
 	</bundle>
 
 	<bundle id="org.springsource.ide.eclipse.commons.frameworks.core">
-		<category name="Core / Eclipse Integration Commons"/>
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.frameworks.core.source">
+		<category name="Uncategorized"/>
 	</bundle>
 
 	<bundle id="org.springsource.ide.eclipse.commons.frameworks.ui">
-		<category name="Core / Eclipse Integration Commons"/>
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.frameworks.ui.source">
+		<category name="Uncategorized"/>
 	</bundle>
 
 	<bundle id="org.springsource.ide.eclipse.commons.livexp">
-		<category name="Core / Eclipse Integration Commons"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.livexp.source">
 	</bundle>
 
 	<feature id="org.eclipse.mylyn.wikitext_feature">
@@ -272,23 +337,43 @@
 
 	<!-- additional test bundles, required for other tests that might reuse this, e.g. from STS3 -->
 	<bundle id="org.springframework.ide.eclipse.boot.dash.test">
-		<category name="Uncategorized"/>
+		<category name="Spring Tools - Developer Resources"/>
+	</bundle>
+
+	<bundle id="org.springframework.ide.eclipse.boot.dash.test.source">
+		<category name="Spring Tools - Developer Resources"/>
 	</bundle>
 
 	<bundle id="org.springframework.ide.eclipse.boot.launch.test">
-		<category name="Uncategorized"/>
+		<category name="Spring Tools - Developer Resources"/>
+	</bundle>
+
+	<bundle id="org.springframework.ide.eclipse.boot.launch.test.source">
+		<category name="Spring Tools - Developer Resources"/>
 	</bundle>
 
 	<bundle id="org.springframework.ide.eclipse.boot.refactoring.test">
-		<category name="Uncategorized"/>
+		<category name="Spring Tools - Developer Resources"/>
+	</bundle>
+
+	<bundle id="org.springframework.ide.eclipse.boot.refactoring.test.source">
+		<category name="Spring Tools - Developer Resources"/>
 	</bundle>
 
 	<bundle id="org.springframework.ide.eclipse.boot.test">
-		<category name="Uncategorized"/>
+		<category name="Spring Tools - Developer Resources"/>
+	</bundle>
+
+	<bundle id="org.springframework.ide.eclipse.boot.test.source">
+		<category name="Spring Tools - Developer Resources"/>
 	</bundle>
 
 	<bundle id="org.springframework.ide.eclipse.maven.pom.tests">
-		<category name="Uncategorized"/>
+		<category name="Spring Tools - Developer Resources"/>
 	</bundle>
-		
+
+	<bundle id="org.springframework.ide.eclipse.maven.pom.tests.source">
+		<category name="Spring Tools - Developer Resources"/>
+	</bundle>
+
 </site>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e417/category.xml b/eclipse-distribution/org.springframework.boot.ide.product.e417/category.xml
index 342edb80a..6bf80f26a 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e417/category.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e417/category.xml
@@ -4,94 +4,159 @@
 		Spring Tool Suite 4
 	</description>
 
-	<!-- Eclipse Integration Commons -->
 	<category-def name="Uncategorized" label="Uncategorized"/>
-	<category-def name="Core / Eclipse Integration Commons" label="Core / Eclipse Integration Commons"/>
-	<category-def name="Resources / Eclipse Integration Commons" label="Resources / Eclipse Integration Commons"/>
+	<category-def name="Spring Tools" label="Spring Tools"/>
+	<category-def name="Spring Tools - Developer Resources" label="Spring Tools - Developer Resources"/>
 
 	<!-- STS4 branding and custom features -->
-	<category-def name="Spring Tool Suite 4 Distribution" label="Spring Tool Suite 4 Distribution" />
-
 	<feature
 		id="org.springframework.boot.ide.main.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Distribution" />
+		<category name="Spring Tools" />
+	</feature>
+
+	<feature
+		id="org.springframework.boot.ide.main.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
 	</feature>
 
 	<feature
 		id="org.springframework.boot.ide.branding.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Distribution" />
+		<category name="Spring Tools" />
 	</feature>
 
-	<!-- Spring IDE -->
-	<category-def name="Core / Spring IDE" label="Core / Spring IDE" />
-	<category-def name="Extensions / Spring IDE" label="Extensions / Spring IDE" />
-	<category-def name="Extensions (Incubation) / Spring IDE" label="Extensions (Incubation) / Spring IDE" />
-	<category-def name="Integrations / Spring IDE" label="Integrations / Spring IDE" />
-	<category-def name="Resources / Spring IDE" label="Resources / Spring IDE" />
+	<feature
+		id="org.springframework.boot.ide.branding.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
+	</feature>
 
 	<feature
 		id="org.springframework.ide.eclipse.boot.dash.feature" version="0.0.0">
-		<category name="Extensions / Spring IDE" />
+		<category name="Spring Tools" />
+	</feature>
+
+	<feature
+		id="org.springframework.ide.eclipse.boot.dash.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
 	</feature>
 
 	<feature
 		id="org.springframework.ide.eclipse.xml.namespaces.feature" version="0.0.0">
-		<category name="Extensions / Spring IDE" />
+		<category name="Spring Tools" />
 	</feature>
 
-	<!-- Language Server -->
-	<category-def name="Spring Tool Suite 4 Language Server Integrations for Eclipse" label="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
+	<feature
+		id="org.springframework.ide.eclipse.xml.namespaces.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
+	</feature>
 
 	<feature
 		id="org.springframework.tooling.cloudfoundry.manifest.ls.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
+		<category name="Spring Tools" />
+	</feature>
+
+	<feature
+		id="org.springframework.tooling.cloudfoundry.manifest.ls.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
 	</feature>
 
 	<feature
 		id="org.springframework.tooling.boot.ls.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
+		<category name="Spring Tools" />
+	</feature>
+
+	<feature
+		id="org.springframework.tooling.boot.ls.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
 	</feature>
 
 	<feature
 		id="org.springframework.tooling.bosh.ls.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
+		<category name="Spring Tools" />
+	</feature>
+
+	<feature
+		id="org.springframework.tooling.bosh.ls.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
 	</feature>
 
 	<feature
 		id="org.springframework.tooling.concourse.ls.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
+		<category name="Spring Tools" />
+	</feature>
+
+	<feature
+		id="org.springframework.tooling.concourse.ls.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
 	</feature>
 
 	<bundle id="org.springframework.tooling.ls.eclipse.commons">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springframework.tooling.ls.eclipse.commons.source">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springframework.tooling.ls.eclipse.commons">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springframework.tooling.ls.eclipse.commons.source">
+		<category name="Uncategorized"/>
 	</bundle>
 
 	<bundle id="org.springframework.tooling.jdt.ls.commons">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springframework.tooling.jdt.ls.commons.source">
+		<category name="Uncategorized"/>
 	</bundle>
 
 	<bundle id="org.springframework.tooling.ls.eclipse.gotosymbol">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springframework.tooling.ls.eclipse.gotosymbol.source">
+		<category name="Uncategorized"/>
 	</bundle>
 
 	<bundle id="org.springsource.ide.eclipse.commons.core">
-		<category name="Core / Eclipse Integration Commons"/>
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.core.source">
+		<category name="Uncategorized"/>
 	</bundle>
 
 	<bundle id="org.springsource.ide.eclipse.commons.ui">
-		<category name="Core / Eclipse Integration Commons"/>
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.ui.source">
+		<category name="Uncategorized"/>
 	</bundle>
 
 	<bundle id="org.springsource.ide.eclipse.commons.frameworks.core">
-		<category name="Core / Eclipse Integration Commons"/>
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.frameworks.core.source">
+		<category name="Uncategorized"/>
 	</bundle>
 
 	<bundle id="org.springsource.ide.eclipse.commons.frameworks.ui">
-		<category name="Core / Eclipse Integration Commons"/>
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.frameworks.ui.source">
+		<category name="Uncategorized"/>
 	</bundle>
 
 	<bundle id="org.springsource.ide.eclipse.commons.livexp">
-		<category name="Core / Eclipse Integration Commons"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.livexp.source">
 	</bundle>
 
 	<feature id="org.eclipse.mylyn.wikitext_feature">
@@ -272,23 +337,43 @@
 
 	<!-- additional test bundles, required for other tests that might reuse this, e.g. from STS3 -->
 	<bundle id="org.springframework.ide.eclipse.boot.dash.test">
-		<category name="Uncategorized"/>
+		<category name="Spring Tools - Developer Resources"/>
+	</bundle>
+
+	<bundle id="org.springframework.ide.eclipse.boot.dash.test.source">
+		<category name="Spring Tools - Developer Resources"/>
 	</bundle>
 
 	<bundle id="org.springframework.ide.eclipse.boot.launch.test">
-		<category name="Uncategorized"/>
+		<category name="Spring Tools - Developer Resources"/>
+	</bundle>
+
+	<bundle id="org.springframework.ide.eclipse.boot.launch.test.source">
+		<category name="Spring Tools - Developer Resources"/>
 	</bundle>
 
 	<bundle id="org.springframework.ide.eclipse.boot.refactoring.test">
-		<category name="Uncategorized"/>
+		<category name="Spring Tools - Developer Resources"/>
+	</bundle>
+
+	<bundle id="org.springframework.ide.eclipse.boot.refactoring.test.source">
+		<category name="Spring Tools - Developer Resources"/>
 	</bundle>
 
 	<bundle id="org.springframework.ide.eclipse.boot.test">
-		<category name="Uncategorized"/>
+		<category name="Spring Tools - Developer Resources"/>
+	</bundle>
+
+	<bundle id="org.springframework.ide.eclipse.boot.test.source">
+		<category name="Spring Tools - Developer Resources"/>
 	</bundle>
 
 	<bundle id="org.springframework.ide.eclipse.maven.pom.tests">
-		<category name="Uncategorized"/>
+		<category name="Spring Tools - Developer Resources"/>
+	</bundle>
+
+	<bundle id="org.springframework.ide.eclipse.maven.pom.tests.source">
+		<category name="Spring Tools - Developer Resources"/>
 	</bundle>
 
 </site>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e418/category.xml b/eclipse-distribution/org.springframework.boot.ide.product.e418/category.xml
index f834ea241..6bf80f26a 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e418/category.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e418/category.xml
@@ -4,95 +4,161 @@
 		Spring Tool Suite 4
 	</description>
 
-	<!-- Eclipse Integration Commons -->
 	<category-def name="Uncategorized" label="Uncategorized"/>
-	<category-def name="Core / Eclipse Integration Commons" label="Core / Eclipse Integration Commons"/>
-	<category-def name="Resources / Eclipse Integration Commons" label="Resources / Eclipse Integration Commons"/>
+	<category-def name="Spring Tools" label="Spring Tools"/>
+	<category-def name="Spring Tools - Developer Resources" label="Spring Tools - Developer Resources"/>
 
 	<!-- STS4 branding and custom features -->
-	<category-def name="Spring Tool Suite 4 Distribution" label="Spring Tool Suite 4 Distribution" />
-
 	<feature
 		id="org.springframework.boot.ide.main.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Distribution" />
+		<category name="Spring Tools" />
+	</feature>
+
+	<feature
+		id="org.springframework.boot.ide.main.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
 	</feature>
 
 	<feature
 		id="org.springframework.boot.ide.branding.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Distribution" />
+		<category name="Spring Tools" />
 	</feature>
 
-	<!-- Spring IDE -->
-	<category-def name="Core / Spring IDE" label="Core / Spring IDE" />
-	<category-def name="Extensions / Spring IDE" label="Extensions / Spring IDE" />
-	<category-def name="Extensions (Incubation) / Spring IDE" label="Extensions (Incubation) / Spring IDE" />
-	<category-def name="Integrations / Spring IDE" label="Integrations / Spring IDE" />
-	<category-def name="Resources / Spring IDE" label="Resources / Spring IDE" />
+	<feature
+		id="org.springframework.boot.ide.branding.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
+	</feature>
 
 	<feature
 		id="org.springframework.ide.eclipse.boot.dash.feature" version="0.0.0">
-		<category name="Extensions / Spring IDE" />
+		<category name="Spring Tools" />
+	</feature>
+
+	<feature
+		id="org.springframework.ide.eclipse.boot.dash.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
 	</feature>
 
 	<feature
 		id="org.springframework.ide.eclipse.xml.namespaces.feature" version="0.0.0">
-		<category name="Extensions / Spring IDE" />
+		<category name="Spring Tools" />
 	</feature>
 
-	<!-- Language Server -->
-	<category-def name="Spring Tool Suite 4 Language Server Integrations for Eclipse" label="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
+	<feature
+		id="org.springframework.ide.eclipse.xml.namespaces.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
+	</feature>
 
 	<feature
 		id="org.springframework.tooling.cloudfoundry.manifest.ls.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
+		<category name="Spring Tools" />
+	</feature>
+
+	<feature
+		id="org.springframework.tooling.cloudfoundry.manifest.ls.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
 	</feature>
 
 	<feature
 		id="org.springframework.tooling.boot.ls.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
+		<category name="Spring Tools" />
+	</feature>
+
+	<feature
+		id="org.springframework.tooling.boot.ls.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
 	</feature>
 
 	<feature
 		id="org.springframework.tooling.bosh.ls.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
+		<category name="Spring Tools" />
+	</feature>
+
+	<feature
+		id="org.springframework.tooling.bosh.ls.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
 	</feature>
 
 	<feature
 		id="org.springframework.tooling.concourse.ls.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
+		<category name="Spring Tools" />
+	</feature>
+
+	<feature
+		id="org.springframework.tooling.concourse.ls.feature.source" version="0.0.0">
+		<category name="Spring Tools - Developer Resources" />
 	</feature>
 
 	<bundle id="org.springframework.tooling.ls.eclipse.commons">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springframework.tooling.ls.eclipse.commons.source">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springframework.tooling.ls.eclipse.commons">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springframework.tooling.ls.eclipse.commons.source">
+		<category name="Uncategorized"/>
 	</bundle>
 
 	<bundle id="org.springframework.tooling.jdt.ls.commons">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springframework.tooling.jdt.ls.commons.source">
+		<category name="Uncategorized"/>
 	</bundle>
 
 	<bundle id="org.springframework.tooling.ls.eclipse.gotosymbol">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springframework.tooling.ls.eclipse.gotosymbol.source">
+		<category name="Uncategorized"/>
 	</bundle>
 
 	<bundle id="org.springsource.ide.eclipse.commons.core">
-		<category name="Core / Eclipse Integration Commons"/>
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.core.source">
+		<category name="Uncategorized"/>
 	</bundle>
 
 	<bundle id="org.springsource.ide.eclipse.commons.ui">
-		<category name="Core / Eclipse Integration Commons"/>
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.ui.source">
+		<category name="Uncategorized"/>
 	</bundle>
 
 	<bundle id="org.springsource.ide.eclipse.commons.frameworks.core">
-		<category name="Core / Eclipse Integration Commons"/>
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.frameworks.core.source">
+		<category name="Uncategorized"/>
 	</bundle>
 
 	<bundle id="org.springsource.ide.eclipse.commons.frameworks.ui">
-		<category name="Core / Eclipse Integration Commons"/>
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.frameworks.ui.source">
+		<category name="Uncategorized"/>
 	</bundle>
 
 	<bundle id="org.springsource.ide.eclipse.commons.livexp">
-		<category name="Core / Eclipse Integration Commons"/>
 	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.livexp.source">
+	</bundle>
+
 	<feature id="org.eclipse.mylyn.wikitext_feature">
 		<category name="Uncategorized"/>
 	</feature>
@@ -271,23 +337,43 @@
 
 	<!-- additional test bundles, required for other tests that might reuse this, e.g. from STS3 -->
 	<bundle id="org.springframework.ide.eclipse.boot.dash.test">
-		<category name="Uncategorized"/>
+		<category name="Spring Tools - Developer Resources"/>
+	</bundle>
+
+	<bundle id="org.springframework.ide.eclipse.boot.dash.test.source">
+		<category name="Spring Tools - Developer Resources"/>
 	</bundle>
 
 	<bundle id="org.springframework.ide.eclipse.boot.launch.test">
-		<category name="Uncategorized"/>
+		<category name="Spring Tools - Developer Resources"/>
+	</bundle>
+
+	<bundle id="org.springframework.ide.eclipse.boot.launch.test.source">
+		<category name="Spring Tools - Developer Resources"/>
 	</bundle>
 
 	<bundle id="org.springframework.ide.eclipse.boot.refactoring.test">
-		<category name="Uncategorized"/>
+		<category name="Spring Tools - Developer Resources"/>
+	</bundle>
+
+	<bundle id="org.springframework.ide.eclipse.boot.refactoring.test.source">
+		<category name="Spring Tools - Developer Resources"/>
 	</bundle>
 
 	<bundle id="org.springframework.ide.eclipse.boot.test">
-		<category name="Uncategorized"/>
+		<category name="Spring Tools - Developer Resources"/>
+	</bundle>
+
+	<bundle id="org.springframework.ide.eclipse.boot.test.source">
+		<category name="Spring Tools - Developer Resources"/>
 	</bundle>
 
 	<bundle id="org.springframework.ide.eclipse.maven.pom.tests">
-		<category name="Uncategorized"/>
+		<category name="Spring Tools - Developer Resources"/>
+	</bundle>
+
+	<bundle id="org.springframework.ide.eclipse.maven.pom.tests.source">
+		<category name="Spring Tools - Developer Resources"/>
 	</bundle>
 
 </site>
diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index 296dbfd8e..fac094446 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.springframework.boot.ide</groupId>
@@ -40,7 +39,7 @@
 
 	<modules>
 		<module>../eclipse-extensions/org.springframework.boot.ide.main.feature</module>
-		
+
 		<module>org.springframework.boot.ide.branding</module>
 		<module>org.springframework.boot.ide.branding.feature</module>
 
@@ -93,12 +92,12 @@
 		<dist.bucket>dist.springsource.com</dist.bucket>
 		<dist.key>TOOLS</dist.key>
 		<dist.project>sts4</dist.project>
-		
+
 		<dist.pathpostfix>nightly</dist.pathpostfix>
 		<dist.path>${dist.type}/${dist.key}/${dist.project}/${dist.pathpostfix}</dist.path>
-		
-		<sts4-language-servers-p2-repo>https://dist.springsource.com/${dist.type}/TOOLS/sts4-language-server-integrations/${sts4-language-servers-version}</sts4-language-servers-p2-repo>
 
+		<sts4-language-servers-p2-repo>https://dist.springsource.com/${dist.type}/TOOLS/sts4-language-server-integrations/${sts4-language-servers-version}</sts4-language-servers-p2-repo>
+		
 		<tycho-version>1.7.0</tycho-version>
 		<encoding>UTF-8</encoding>
 
@@ -114,11 +113,11 @@
 				<dist.path.repo>${dist.type}/TOOLS/sts4/nightly/${dist.target.major}</dist.path.repo>
 				<dist.path.product>${dist.type}/STS4/nightly/dist/${dist.target.major}</dist.path.product>
 				<skip.update-nightly-download-page>false</skip.update-nightly-download-page>
-				
+
 				<sts4-language-servers-version>nightly</sts4-language-servers-version>
 			</properties>
 		</profile>
-		
+
 		<profile>
 			<id>milestone</id>
 			<properties>
@@ -130,7 +129,7 @@
 				<sts4-language-servers-version>today</sts4-language-servers-version> <!-- this should be overridden in the build with the concrete ls version to include-->
 			</properties>
 		</profile>
-		
+
 		<profile>
 			<id>release</id>
 			<properties>
@@ -215,7 +214,7 @@
 					<layout>p2</layout>
 					<url>https://www.mihai-nita.net/eclipse</url>
 				</repository>
-<!--				<repository>
+				<!--				<repository>
 					<id>xtext-base</id>
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/</url>
@@ -263,7 +262,7 @@
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/technology/m2e/snapshots/1.16.2/latest/</url>
 				</repository>
-<!--				<repository>
+				<!--				<repository>
 					<id>latest-m2e-wtp</id>
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/m2e-wtp/releases/1.4/</url>
@@ -313,7 +312,7 @@
 					<layout>p2</layout>
 					<url>https://www.mihai-nita.net/eclipse</url>
 				</repository>
-<!--				<repository>
+				<!--				<repository>
 					<id>xtext-base</id>
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/</url>
@@ -328,7 +327,7 @@
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/lsp4e/snapshots/</url>
 				</repository>
-<!--				<repository>
+				<!--				<repository>
 					<id>lsp4e</id>
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/lsp4e/releases/latest/</url>
@@ -343,7 +342,7 @@
 				<module>org.springframework.boot.ide.product.e417</module>
 			</modules>
 		</profile>
-		
+
 		<profile>
 			<id>e418</id>
 			<properties>
@@ -376,7 +375,7 @@
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/technology/m2e/snapshots/1.16.2/latest/</url>
 				</repository>
-<!--				<repository>
+				<!--				<repository>
 					<id>latest-m2e-wtp</id>
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/m2e-wtp/releases/1.4/</url>
@@ -426,7 +425,7 @@
 					<layout>p2</layout>
 					<url>https://www.mihai-nita.net/eclipse</url>
 				</repository>
-<!--				<repository>
+				<!--				<repository>
 					<id>xtext-base</id>
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/</url>
@@ -441,7 +440,7 @@
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/lsp4e/snapshots/</url>
 				</repository>
-<!--				<repository>
+				<!--				<repository>
 					<id>lsp4e</id>
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/lsp4e/releases/latest/</url>
@@ -456,7 +455,7 @@
 				<module>org.springframework.boot.ide.product.e418</module>
 			</modules>
 		</profile>
-		
+
 		<profile>
 			<id>build.springsource.com</id>
 			<activation>
@@ -500,7 +499,7 @@
 			<layout>p2</layout>
 			<url>https://dist.springsource.com/release/TOOLS/third-party/misc-p2-repo/${misc.p2.repo.version}</url>
 		</repository>
-<!--		<repository>
+		<!--		<repository>
 			<id>egit-github</id>
 			<layout>p2</layout>
 			<url>https://download.eclipse.org/egit/github/updates</url>
@@ -510,7 +509,7 @@
 			<layout>p2</layout>
 			<url>https://download.eclipse.org/egit/github/updates-stable-nightly/</url>
 		</repository>
-<!--		<repository>
+		<!--		<repository>
 			<id>m2e-apt</id>
 			<layout>p2</layout>
 			<url>https://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-apt</url>
@@ -528,10 +527,10 @@
 	</repositories>
 
 	<pluginRepositories>
-	    <pluginRepository>
-	      <id>tycho-snapshots</id>
-	      <url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
-	    </pluginRepository>
+		<pluginRepository>
+			<id>tycho-snapshots</id>
+			<url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
+		</pluginRepository>
 		<!-- necessary for Maven and Ant AWS dependency -->
 		<pluginRepository>
 			<id>spring-maven-release</id>
@@ -560,11 +559,20 @@
 
 		<plugins>
 
-	        <plugin>
-	          <groupId>org.eclipse.tycho.extras</groupId>
-	          <artifactId>tycho-source-feature-plugin</artifactId>
-			  <version>${tycho-version}</version>
-	        </plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-source-feature-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>source-feature</id>
+						<phase>package</phase>
+						<goals>
+							<goal>source-feature</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
@@ -595,14 +603,14 @@
 				<executions>
 					<execution>
 						<id>attached-p2-metadata</id>
-						<phase>verify</phase>
+						<phase>package</phase>
 						<goals>
 							<goal>p2-metadata</goal>
 						</goals>
 					</execution>
 				</executions>
 			</plugin>
-			
+
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-maven-plugin</artifactId>
@@ -627,7 +635,7 @@
 					<skipArchive>true</skipArchive>
 				</configuration>
 			</plugin>
-			
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jarsigner-plugin</artifactId>
@@ -647,14 +655,14 @@
 					<storepass>${signing.store.password}</storepass>
 					<keypass>${signing.key.password}</keypass>
 					<tsa>http://sha256timestamp.ws.symantec.com/sha256/timestamp</tsa>
-<!--					<tsa>http://timestamp.digicert.com</tsa> -->
+					<!--					<tsa>http://timestamp.digicert.com</tsa> -->
 				</configuration>
 			</plugin>
 		</plugins>
 
 		<pluginManagement>
 			<plugins>
-				
+
 				<plugin>
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>tycho-compiler-plugin</artifactId>
@@ -672,7 +680,7 @@
 						<resolver>p2</resolver>
 						<pomDependencies>consider</pomDependencies>
 						<ignoreTychoRepositories>true</ignoreTychoRepositories>
-<!--						<dependency-resolution>
+						<!--						<dependency-resolution>
 							<optionalDependencies>ignore</optionalDependencies>
 						</dependency-resolution> -->
 						<environments>
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/build.properties b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/build.properties
index be11ea24f..9851ec3b0 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/build.properties
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/build.properties
@@ -1,3 +1,6 @@
 bin.includes = META-INF/,\
                plugin.xml,\
 			   about.html
+src.includes = META-INF/,\
+               plugin.xml,\
+			   about.html
\ No newline at end of file
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml
index 301b36d56..43719d709 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml
+++ b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml
@@ -6,22 +6,42 @@
 		<category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
 	</feature>
 
+	<feature id="org.springframework.tooling.boot.ls.feature.source">
+		<category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
+	</feature>
+
 	<feature id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature">
 		<category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
 	</feature>
 
+	<feature id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature.source">
+		<category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
+	</feature>
+
 	<feature id="org.springframework.tooling.cloudfoundry.manifest.ls.feature">
 		<category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
 	</feature>
 
+	<feature id="org.springframework.tooling.cloudfoundry.manifest.ls.feature.source">
+		<category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
+	</feature>
+
 	<feature id="org.springframework.tooling.bosh.ls.feature">
 		<category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
 	</feature>
 
+	<feature id="org.springframework.tooling.bosh.ls.feature.source">
+		<category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
+	</feature>
+
 	<feature id="org.springframework.tooling.concourse.ls.feature">
 		<category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
 	</feature>
 
+	<feature id="org.springframework.tooling.concourse.ls.feature.source">
+		<category name="Spring Tools 4 Language Server Integrations for Eclipse"/>
+	</feature>
+
 	<category-def name="deps" label="Dependencies"/>
 
 	<feature id="org.eclipse.mylyn.wikitext_feature">
@@ -32,50 +52,98 @@
 		<category name="deps"/>
 	</bundle>
 
+	<bundle id="org.springframework.tooling.ls.eclipse.commons.source">
+		<category name="deps"/>
+	</bundle>
+
 	<bundle id="org.springframework.tooling.jdt.ls.commons">
 		<category name="deps"/>
 	</bundle>
 
+	<bundle id="org.springframework.tooling.jdt.ls.commons.source">
+		<category name="deps"/>
+	</bundle>
+
 	<bundle id="org.springframework.tooling.ls.eclipse.gotosymbol">
 		<category name="deps"/>
 	</bundle>
 
+	<bundle id="org.springframework.tooling.ls.eclipse.gotosymbol.source">
+		<category name="deps"/>
+	</bundle>
+
 	<bundle id="org.springsource.ide.eclipse.commons.boot.ls">
 		<category name="deps"/>
 	</bundle>
 
+	<bundle id="org.springsource.ide.eclipse.commons.boot.ls.source">
+		<category name="deps"/>
+	</bundle>
+
 	<bundle id="org.springsource.ide.eclipse.commons.core">
 		<category name="deps"/>
 	</bundle>
 
+	<bundle id="org.springsource.ide.eclipse.commons.core.source">
+		<category name="deps"/>
+	</bundle>
+
 	<bundle id="org.springsource.ide.eclipse.commons.frameworks.core">
 		<category name="deps"/>
 	</bundle>
 
+	<bundle id="org.springsource.ide.eclipse.commons.frameworks.core.source">
+		<category name="deps"/>
+	</bundle>
+
 	<bundle id="org.springsource.ide.eclipse.commons.frameworks.test.util">
 		<category name="deps"/>
 	</bundle>
 
+	<bundle id="org.springsource.ide.eclipse.commons.frameworks.test.util.source">
+		<category name="deps"/>
+	</bundle>
+
 	<bundle id="org.springsource.ide.eclipse.commons.frameworks.ui">
 		<category name="deps"/>
 	</bundle>
 
+	<bundle id="org.springsource.ide.eclipse.commons.frameworks.ui.source">
+		<category name="deps"/>
+	</bundle>
+
 	<bundle id="org.springsource.ide.eclipse.commons.jdk_tools">
 		<category name="deps"/>
 	</bundle>
 
+	<bundle id="org.springsource.ide.eclipse.commons.jdk_tools.source">
+		<category name="deps"/>
+	</bundle>
+
 	<bundle id="org.springsource.ide.eclipse.commons.livexp">
 		<category name="deps"/>
 	</bundle>
 
+	<bundle id="org.springsource.ide.eclipse.commons.livexp.source">
+		<category name="deps"/>
+	</bundle>
+
 	<bundle id="org.springsource.ide.eclipse.commons.tests.util">
 		<category name="deps"/>
 	</bundle>
 
+	<bundle id="org.springsource.ide.eclipse.commons.tests.util.source">
+		<category name="deps"/>
+	</bundle>
+
 	<bundle id="org.springsource.ide.eclipse.commons.ui">
 		<category name="deps"/>
 	</bundle>
 
+	<bundle id="org.springsource.ide.eclipse.commons.ui.source">
+		<category name="deps"/>
+	</bundle>
+
 	<bundle id="io.projectreactor.reactor-core">
 		<category name="deps"/>
 	</bundle>
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index 022b4845c..ada4fe16d 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.springframework.boot.ide</groupId>
@@ -42,7 +41,7 @@
 		<module>../headless-services/jdt-ls-extension</module>
 		<module>org.springframework.tooling.ls.eclipse.commons</module>
 		<module>org.springframework.tooling.ls.eclipse.commons.test</module>
-	
+
 		<module>org.springsource.ide.eclipse.commons.boot.ls</module>
 		<module>org.springsource.ide.eclipse.commons.core</module>
 		<module>org.springsource.ide.eclipse.commons.frameworks.core</module>
@@ -108,7 +107,7 @@
 				<dist.version>nightly</dist.version>
 			</properties>
 		</profile>
-		
+
 		<profile>
 			<id>milestone</id>
 			<properties>
@@ -116,7 +115,7 @@
 				<dist.version>today</dist.version> <!-- should be overridden when building with some timestamp like 20171114 -->
 			</properties>
 		</profile>
-		
+
 		<profile>
 			<id>release</id>
 			<properties>
@@ -192,7 +191,7 @@
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/mylyn/docs/releases/3.0/</url>
 				</repository>
-<!--				<repository>
+				<!--				<repository>
 					<id>lsp4e</id>
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/lsp4e/snapshots/</url>
@@ -242,7 +241,7 @@
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/mylyn/docs/releases/3.0/</url>
 				</repository>
-<!--				<repository>
+				<!--				<repository>
 					<id>lsp4e</id>
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/lsp4e/snapshots/</url>
@@ -296,10 +295,10 @@
 	</repositories>
 
 	<pluginRepositories>
-	    <pluginRepository>
-	      <id>tycho-snapshots</id>
-	      <url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
-	    </pluginRepository>
+		<pluginRepository>
+			<id>tycho-snapshots</id>
+			<url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
+		</pluginRepository>
 		<!-- necessary for Maven and Ant AWS dependency -->
 		<pluginRepository>
 			<id>spring-maven-release</id>
@@ -328,6 +327,35 @@
 
 		<plugins>
 
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-source-feature-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>source-feature</id>
+						<phase>package</phase>
+						<goals>
+							<goal>source-feature</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>plugin-source</id>
+						<goals>
+							<goal>plugin-source</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
 			<plugin>
 				<artifactId>maven-deploy-plugin</artifactId>
 				<version>2.5</version>
@@ -371,9 +399,10 @@
 					<storepass>${signing.store.password}</storepass>
 					<keypass>${signing.key.password}</keypass>
 					<tsa>http://sha256timestamp.ws.symantec.com/sha256/timestamp</tsa>
-<!--					<tsa>http://timestamp.digicert.com</tsa> -->
+					<!--					<tsa>http://timestamp.digicert.com</tsa> -->
 				</configuration>
 			</plugin>
+
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-plugin</artifactId>
@@ -384,7 +413,7 @@
 						<goals>
 							<goal>p2-metadata</goal>
 						</goals>
-						<phase>verify</phase>
+						<phase>package</phase>
 					</execution>
 				</executions>
 			</plugin>
@@ -392,6 +421,7 @@
 
 		<pluginManagement>
 			<plugins>
+	
 				<plugin>
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>tycho-compiler-plugin</artifactId>
@@ -401,6 +431,7 @@
 						<compilerArgument>-err:-forbidden</compilerArgument>
 					</configuration>
 				</plugin>
+
 				<plugin>
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>target-platform-configuration</artifactId>
diff --git a/headless-services/jdt-ls-extension/pom.xml b/headless-services/jdt-ls-extension/pom.xml
index ce19e24ae..d17b3f3ea 100644
--- a/headless-services/jdt-ls-extension/pom.xml
+++ b/headless-services/jdt-ls-extension/pom.xml
@@ -1,6 +1,4 @@
-<project xmlns="https://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="https://maven.apache.org/POM/4.0.0
+<project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0
                              https://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
@@ -55,7 +53,7 @@
 		<signing.keystore>~/.keytool/pivotal.jks</signing.keystore>
 		<misc.p2.repo.version>3.9.4.201902271843</misc.p2.repo.version>
 	</properties>
-	
+
 	<profiles>
 		<profile>
 			<id>bamboo-signing</id>
@@ -73,7 +71,7 @@
 			<layout>p2</layout>
 			<url>https://download.eclipse.org/releases/2019-09</url>
 		</repository>
-		
+
 		<repository>
 			<id>JDT.LS</id>
 			<layout>p2</layout>
@@ -85,22 +83,51 @@
 			<layout>p2</layout>
 			<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository</url>
 		</repository>
-		
+
 		<repository>
 			<id>jboss-apt</id>
 			<layout>p2</layout>
 			<!--URL copied from jdt.ls target platform file, needed to satisfy some of its dependencies -->
 			<url>https://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-apt/1.5.0-2018-08-14_20-24-39-H12/</url>
 		</repository>
- 		<repository>
- 			<id>p2-thirdparty-bundles</id>
- 			<layout>p2</layout>
- 			<url>https://dist.springsource.com/release/TOOLS/third-party/misc-p2-repo/${misc.p2.repo.version}</url>
- 		</repository>
+		<repository>
+			<id>p2-thirdparty-bundles</id>
+			<layout>p2</layout>
+			<url>https://dist.springsource.com/release/TOOLS/third-party/misc-p2-repo/${misc.p2.repo.version}</url>
+		</repository>
 	</repositories>
 	<build>
 		<plugins>
 
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-source-feature-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>source-feature</id>
+						<phase>package</phase>
+						<goals>
+							<goal>source-feature</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>plugin-source</id>
+						<goals>
+							<goal>plugin-source</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-maven-plugin</artifactId>
@@ -135,7 +162,7 @@
 					<storepass>${signing.store.password}</storepass>
 					<keypass>${signing.key.password}</keypass>
 					<tsa>http://sha256timestamp.ws.symantec.com/sha256/timestamp</tsa>
-<!--					<tsa>http://timestamp.digicert.com</tsa> -->
+					<!--					<tsa>http://timestamp.digicert.com</tsa> -->
 				</configuration>
 			</plugin>