diff --git a/headless-services/boot-java-language-server/.classpath b/headless-services/boot-java-language-server/.classpath
index 8131be0e5..5e8a55fef 100644
--- a/headless-services/boot-java-language-server/.classpath
+++ b/headless-services/boot-java-language-server/.classpath
@@ -13,12 +13,6 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/headless-services/boot-java-language-server/.project b/headless-services/boot-java-language-server/.project
index 05453dd68..5780fd770 100644
--- a/headless-services/boot-java-language-server/.project
+++ b/headless-services/boot-java-language-server/.project
@@ -11,12 +11,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
diff --git a/headless-services/boot-java-language-server/pom.xml b/headless-services/boot-java-language-server/pom.xml
index 7fd5a00ca..388b54c8d 100644
--- a/headless-services/boot-java-language-server/pom.xml
+++ b/headless-services/boot-java-language-server/pom.xml
@@ -39,61 +39,17 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.ide.vscode</groupId>
-			<artifactId>commons-maven</artifactId>
-			<version>${dependencies.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.ide.vscode</groupId>
-			<artifactId>commons-gradle</artifactId>
-			<version>${dependencies.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.ide.vscode</groupId>
-			<artifactId>commons-language-server</artifactId>
-			<version>${dependencies.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.ide.vscode</groupId>
-			<artifactId>java-properties</artifactId>
-			<version>${dependencies.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.ide.vscode</groupId>
-			<artifactId>commons-yaml</artifactId>
-			<version>${dependencies.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.ide.vscode</groupId>
-			<artifactId>commons-boot-app-cli</artifactId>
+			<artifactId>commons-boot</artifactId>
 			<version>${dependencies.version}</version>
 		</dependency>
+		
+		<!-- Test harness -->
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
 			<version>${mockito-version}</version>
 			<scope>test</scope>
 		</dependency>
-
-		<!-- Eclipse JDT for parsing (at the moment) -->
-		<dependency>
-			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.core</artifactId>
-			<version>3.13.50</version>
-		</dependency>
-
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>${commons-io-version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-configuration-metadata</artifactId>
-			<version>1.5.8.RELEASE</version>
-		</dependency>
-
-		<!-- Test harness -->
 		<dependency>
 			<groupId>org.springframework.ide.vscode</groupId>
 			<artifactId>language-server-test-harness</artifactId>
@@ -114,7 +70,7 @@
 					<target>1.8</target>
 				</configuration>
 			</plugin>
-			<!-- Configure fat jar
+			<!-- Configure fat jar -->
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
@@ -124,10 +80,12 @@
 						<goals>
 							<goal>repackage</goal>
 						</goals>
+						<configuration>
+							<mainClass>org.springframework.ide.vscode.boot.java.Main</mainClass>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
-			 -->
 			<!-- Ignore test classes from test projects -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/headless-services/commons/commons-boot/pom.xml b/headless-services/commons/commons-boot/pom.xml
index 093efa1c2..4361d19e2 100644
--- a/headless-services/commons/commons-boot/pom.xml
+++ b/headless-services/commons/commons-boot/pom.xml
@@ -63,6 +63,21 @@
 			<artifactId>commons-yaml</artifactId>
 			<version>${dependencies.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.ide.vscode</groupId>
+			<artifactId>commons-boot-app-cli</artifactId>
+			<version>${dependencies.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jdt</groupId>
+			<artifactId>org.eclipse.jdt.core</artifactId>
+			<version>3.13.50</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>${commons-io-version}</version>
+		</dependency>
 	
 		<!-- Test harness -->
 		<dependency>