diff --git a/eclipse-language-servers/org.springframework.boot.ide.properties.servers.feature/pom.xml b/eclipse-language-servers/org.springframework.boot.ide.properties.servers.feature/pom.xml
index 057d44655..29152d7be 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.properties.servers.feature/pom.xml
+++ b/eclipse-language-servers/org.springframework.boot.ide.properties.servers.feature/pom.xml
@@ -4,32 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
-		<artifactId>org.springframework.boot.ide</artifactId>
+		<artifactId>org.springframework.boot.ide.servers</artifactId>
 		<version>4.0.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
 	<artifactId>org.springframework.boot.ide.properties.servers.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-p2-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>second-generate-p2-metadata</id>
-						<goals>
-							<goal>p2-metadata</goal>
-						</goals>
-						<phase>verify</phase>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-		
 	  
 </project>
diff --git a/eclipse-language-servers/org.springframework.boot.ide.servers.repository/category.xml b/eclipse-language-servers/org.springframework.boot.ide.servers.repository/category.xml
new file mode 100644
index 000000000..fef8ad7a3
--- /dev/null
+++ b/eclipse-language-servers/org.springframework.boot.ide.servers.repository/category.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <category-def name="Spring Boot IDE Language Servers for Eclipse" label="Spring Boot IDE Language Servers for Eclipse"/>
+
+   <feature id="org.springframework.boot.ide.properties.servers.feature">
+      <category name="Spring Boot IDE Language Servers for Eclipse"/>
+   </feature>
+   
+</site>
diff --git a/eclipse-language-servers/org.springframework.boot.ide.servers.repository/pom.xml b/eclipse-language-servers/org.springframework.boot.ide.servers.repository/pom.xml
new file mode 100644
index 000000000..44add48a0
--- /dev/null
+++ b/eclipse-language-servers/org.springframework.boot.ide.servers.repository/pom.xml
@@ -0,0 +1,14 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>repository</artifactId>
+
+	<parent>
+		<groupId>org.springframework.boot.ide</groupId>
+		<artifactId>org.springframework.boot.ide.servers</artifactId>
+		<version>4.0.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	
+	<packaging>eclipse-repository</packaging>
+  
+</project>
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index eddf3729f..2d9f9f933 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -28,9 +28,10 @@
 
 	<modules>
 		<module>org.springframework.boot.ide.properties.servers</module>
-<!--		<module>org.springframework.boot.ide.properties.servers.feature</module>
-		<module>org.springframework.boot.ide.cloudfoundry.server</module>
+		<module>org.springframework.boot.ide.properties.servers.feature</module>
+<!--		<module>org.springframework.boot.ide.cloudfoundry.server</module>
 		<module>org.springframework.boot.ide.cloudfoundry.server.feature</module> -->
+		<module>org.springframework.boot.ide.servers.repository</module>
 	</modules>
 
 	<properties>