diff --git a/vscode-extensions/vscode-application-properties/.classpath b/vscode-extensions/vscode-application-properties/.classpath
new file mode 100644
index 000000000..d46faf10e
--- /dev/null
+++ b/vscode-extensions/vscode-application-properties/.classpath
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" 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"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/vscode-extensions/vscode-application-properties/.gitignore b/vscode-extensions/vscode-application-properties/.gitignore
index d027a79a1..8c44546ea 100644
--- a/vscode-extensions/vscode-application-properties/.gitignore
+++ b/vscode-extensions/vscode-application-properties/.gitignore
@@ -7,8 +7,6 @@ classpath.txt
 *.vsix
 repo
 .idea
-.project
-.classpath
 *.iml
 .DS_Store
 **/.DS_Store
\ No newline at end of file
diff --git a/vscode-extensions/vscode-application-properties/.project b/vscode-extensions/vscode-application-properties/.project
new file mode 100644
index 000000000..2a069378f
--- /dev/null
+++ b/vscode-extensions/vscode-application-properties/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>vscode-application-properties</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/vscode-extensions/vscode-application-properties/lib/Main.ts b/vscode-extensions/vscode-application-properties/lib/Main.ts
index d6465f7c4..c691bc936 100644
--- a/vscode-extensions/vscode-application-properties/lib/Main.ts
+++ b/vscode-extensions/vscode-application-properties/lib/Main.ts
@@ -13,7 +13,7 @@ import {TextDocument} from 'vscode';
 
 PortFinder.basePort = 55282;
 
-var DEBUG = true;
+var DEBUG = false;
 const DEBUG_ARG = '-agentlib:jdwp=transport=dt_socket,server=y,address=8000,suspend=n';
     //If DEBUG is falsy then
     //   we launch from the 'fat jar' (which has to be built by running mvn package)
@@ -105,7 +105,7 @@ export function activate(context: VSCode.ExtensionContext) {
                         let args = [
                             '-Dserver.port=' + port,
                             '-cp', classpath, 
-                            'org.springframework.ide.vscode.boot.properties.Main'
+                            'org.springframework.ide.vscode.application.properties.Main'
                         ];
                         if (DEBUG) {
                             args.unshift(DEBUG_ARG);
diff --git a/vscode-extensions/vscode-application-properties/pom.xml b/vscode-extensions/vscode-application-properties/pom.xml
index 1c6eac947..41abc8d13 100644
--- a/vscode-extensions/vscode-application-properties/pom.xml
+++ b/vscode-extensions/vscode-application-properties/pom.xml
@@ -13,13 +13,6 @@
 	</parent>
 	
 	<repositories>
-		<!-- Local repository with tools.jar -->
-		<repository>
-			<id>jars-repository</id>
-			<name>Local repository for JAR files</name>
-			<url>file://${basedir}/repo</url>
-		</repository>
-
 		<!-- Sonatype snapshots repository -->
 		<repository>
 			<id>oss-sonatype</id>
diff --git a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/boot/properties/ApplicationPropertiesLanguageServer.java b/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/ApplicationPropertiesLanguageServer.java
similarity index 98%
rename from vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/boot/properties/ApplicationPropertiesLanguageServer.java
rename to vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/ApplicationPropertiesLanguageServer.java
index 620848bde..316afa643 100644
--- a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/boot/properties/ApplicationPropertiesLanguageServer.java
+++ b/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/ApplicationPropertiesLanguageServer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Pivotal, Inc. - initial API and implementation
  *******************************************************************************/
-package org.springframework.ide.vscode.boot.properties;
+package org.springframework.ide.vscode.application.properties;
 
 import java.util.stream.Collectors;
 
diff --git a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/boot/properties/Main.java b/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/Main.java
similarity index 98%
rename from vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/boot/properties/Main.java
rename to vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/Main.java
index 01b658605..d14a78514 100644
--- a/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/boot/properties/Main.java
+++ b/vscode-extensions/vscode-application-properties/src/main/java/org/springframework/ide/vscode/application/properties/Main.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Pivotal, Inc. - initial API and implementation
  *******************************************************************************/
-package org.springframework.ide.vscode.boot.properties;
+package org.springframework.ide.vscode.application.properties;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/vscode-extensions/vscode-application-properties/src/test/java/org/springframework/ide/vscode/boot/properties/test/ApplicationPropertiesEditorTest.java b/vscode-extensions/vscode-application-properties/src/test/java/org/springframework/ide/vscode/application/properties/test/ApplicationPropertiesEditorTest.java
similarity index 92%
rename from vscode-extensions/vscode-application-properties/src/test/java/org/springframework/ide/vscode/boot/properties/test/ApplicationPropertiesEditorTest.java
rename to vscode-extensions/vscode-application-properties/src/test/java/org/springframework/ide/vscode/application/properties/test/ApplicationPropertiesEditorTest.java
index 79c19555a..8a00e7675 100644
--- a/vscode-extensions/vscode-application-properties/src/test/java/org/springframework/ide/vscode/boot/properties/test/ApplicationPropertiesEditorTest.java
+++ b/vscode-extensions/vscode-application-properties/src/test/java/org/springframework/ide/vscode/application/properties/test/ApplicationPropertiesEditorTest.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     Pivotal, Inc. - initial API and implementation
  *******************************************************************************/
-package org.springframework.ide.vscode.boot.properties.test;
+package org.springframework.ide.vscode.application.properties.test;
 
 import org.junit.Test;
-import org.springframework.ide.vscode.boot.properties.ApplicationPropertiesLanguageServer;
+import org.springframework.ide.vscode.application.properties.ApplicationPropertiesLanguageServer;
 import org.springframework.ide.vscode.languageserver.testharness.Editor;
 import org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness;
 
diff --git a/vscode-extensions/vscode-application-properties/src/test/java/org/springframework/ide/vscode/boot/properties/test/ApplicationPropertiesLanguageServerTest.java b/vscode-extensions/vscode-application-properties/src/test/java/org/springframework/ide/vscode/application/properties/test/ApplicationPropertiesLanguageServerTest.java
similarity index 92%
rename from vscode-extensions/vscode-application-properties/src/test/java/org/springframework/ide/vscode/boot/properties/test/ApplicationPropertiesLanguageServerTest.java
rename to vscode-extensions/vscode-application-properties/src/test/java/org/springframework/ide/vscode/application/properties/test/ApplicationPropertiesLanguageServerTest.java
index 204d8c49d..df0b109c7 100644
--- a/vscode-extensions/vscode-application-properties/src/test/java/org/springframework/ide/vscode/boot/properties/test/ApplicationPropertiesLanguageServerTest.java
+++ b/vscode-extensions/vscode-application-properties/src/test/java/org/springframework/ide/vscode/application/properties/test/ApplicationPropertiesLanguageServerTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Pivotal, Inc. - initial API and implementation
  *******************************************************************************/
-package org.springframework.ide.vscode.boot.properties.test;
+package org.springframework.ide.vscode.application.properties.test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -17,7 +17,7 @@ import java.net.URISyntaxException;
 import java.nio.file.Paths;
 
 import org.junit.Test;
-import org.springframework.ide.vscode.boot.properties.ApplicationPropertiesLanguageServer;
+import org.springframework.ide.vscode.application.properties.ApplicationPropertiesLanguageServer;
 import org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness;
 
 import io.typefox.lsapi.InitializeResult;
diff --git a/vscode-extensions/vscode-application-properties/src/test/resources/workspace/application.properties b/vscode-extensions/vscode-application-properties/src/test/resources/workspace/application.properties
new file mode 100644
index 000000000..3a87ccd5f
--- /dev/null
+++ b/vscode-extensions/vscode-application-properties/src/test/resources/workspace/application.properties
@@ -0,0 +1,3 @@
+#Bar role
+app=foo
+bad
diff --git a/vscode-extensions/vscode-application-properties/src/test/resources/workspace/testfile.properties b/vscode-extensions/vscode-application-properties/src/test/resources/workspace/testfile.properties
deleted file mode 100644
index e1823ca8f..000000000
--- a/vscode-extensions/vscode-application-properties/src/test/resources/workspace/testfile.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#There are 2 syntax errors in this file
-abc
-key: value
-sdcdsc