diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/category.xml b/eclipse-distribution/org.springframework.boot.ide.product.e47/category.xml
index ccf5061ce..6b92a63b4 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e47/category.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e47/category.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site pack200="true">
-  <description url="http://www.springsource.com/products/sts">
-    The Spring Boot Tool Suite description
-  </description>
+	<description url="http://www.springsource.com/products/sts">
+		The Spring Boot Tool Suite description
+	</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"/>
+	<!-- 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"/>
 
-  <feature
-    id="org.springsource.ide.eclipse.commons.quicksearch.feature"
-    version="0.0.0">
-    <category name="Core / Eclipse Integration Commons" />
-  </feature>
+	<feature
+		id="org.springsource.ide.eclipse.commons.quicksearch.feature"
+		version="0.0.0">
+		<category name="Core / Eclipse Integration Commons" />
+	</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" />
+	<!-- 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.ide.eclipse.boot.feature" version="0.0.0">
@@ -42,4 +42,17 @@
 		<category name="Resources / Spring IDE" />
 	</feature>
 
+	<!-- Language Server -->
+	<category-def name="Spring Boot IDE Language Servers for Eclipse" label="Spring Boot IDE Language Servers for Eclipse"/>
+
+	<feature
+		id="org.springframework.boot.ide.cloudfoundry.server.feature" version="0.0.0">
+		<category name="Spring Boot IDE Language Servers for Eclipse" />
+	</feature>
+
+	<feature
+		id="org.springframework.boot.ide.properties.servers.feature" version="0.0.0">
+		<category name="Spring Boot IDE Language Servers for Eclipse" />
+	</feature>
+
 </site>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
index 92ed4df34..28c1164de 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
@@ -85,7 +85,8 @@ openFile</programArgs>
       <feature id="org.springframework.ide.eclipse.boot.feature" installMode="root"/>
       <feature id="org.springframework.ide.eclipse.boot.dash.feature" installMode="root"/>
 
-      <feature id="org.springframework.boot.ide.properties.feature" installMode="root"/>
+      <feature id="org.springframework.boot.ide.properties.servers.feature" installMode="root"/>
+      <feature id="org.springframework.boot.ide.cloudfoundry.server.feature" installMode="root"/>
 
    </features>
 
diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index be12fee8a..9f64a6cac 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -28,9 +28,6 @@
 
 	<modules>
 		<module>org.springframework.boot.ide.branding</module>
-
-		<module>../eclipse-extensions/org.springframework.boot.ide.properties.editors</module>
-		<module>../eclipse-extensions/org.springframework.boot.ide.properties.feature</module>
 	</modules>
 
 	<properties>
@@ -50,6 +47,7 @@
 		<dist.type>snapshot</dist.type>
 
 		<dist.dependencies-version-path>nightly</dist.dependencies-version-path>
+		<dist.springboot-language-servers-pathpostfix>${dist.dependencies-version-path}</dist.springboot-language-servers-pathpostfix>
 		<dist.springide-pathpostfix>${dist.dependencies-version-path}</dist.springide-pathpostfix>
 		<dist.eclipse-integration-commons-version>${dist.dependencies-version-path}</dist.eclipse-integration-commons-version>
 
@@ -83,7 +81,7 @@
 				<repository>
 					<id>orbit</id>
 					<layout>p2</layout>
-					<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/</url>
+					<url>http://download.eclipse.org/tools/orbit/downloads/drops/S20161021172207/repository/</url>
 				</repository>
 				<repository>
 					<id>maven-extras-mirror</id>
@@ -149,6 +147,11 @@
 	</profiles>
 
 	<repositories>
+		<repository>
+			<id>spring-boot-language-servers</id>
+			<layout>p2</layout>
+			<url>http://dist.springsource.com/${dist.type}/TOOLS/sts4-language-servers/${dist.springboot-language-servers-pathpostfix}</url>
+		</repository>
 		<repository>
 			<id>springide</id>
 			<layout>p2</layout>