diff --git a/vscode-extensions/vscode-application-yaml/package.sh b/vscode-extensions/vscode-application-yaml/package.sh
index fe8487162..3cda60f54 100755
--- a/vscode-extensions/vscode-application-yaml/package.sh
+++ b/vscode-extensions/vscode-application-yaml/package.sh
@@ -6,7 +6,9 @@
 
 set -e # fail at the first sign of trouble
 
-mvn clean package ## build language server fat jar
+#Ensure commons are built and uptodate in local maven cache
+mvn -f ../commons/pom.xml clean install
+mvn clean package
 npm install
 vsce package
 
diff --git a/vscode-extensions/vscode-application-yaml/pom.xml b/vscode-extensions/vscode-application-yaml/pom.xml
index 94891dee0..2895c96ac 100644
--- a/vscode-extensions/vscode-application-yaml/pom.xml
+++ b/vscode-extensions/vscode-application-yaml/pom.xml
@@ -2,10 +2,16 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.github.kdvolder</groupId>
 	<artifactId>vscode-application-yaml</artifactId>
 	<packaging>jar</packaging>
-	<version>0.0.1-SNAPSHOT</version>
+	
+	<parent>
+		<groupId>org.springframework.ide.vscode</groupId>
+		<artifactId>commons-parent</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../commons/pom.xml</relativePath>
+	</parent>
+	
 	<repositories>
 		<!-- Local repository with tools.jar -->
 		<repository>
@@ -31,52 +37,12 @@
 			<url>file://${basedir}/dist</url>
 		</repository>
 	</distributionManagement>
-	<properties>
-		<jackson-2-version>2.5.0</jackson-2-version>
-		<jersey-2-version>2.10</jersey-2-version>
-	</properties>
 	<dependencies>
-		<!-- Java implementation of VS Code language server protocol -->
+		<!-- Language Servers -->
 		<dependency>
-			<groupId>io.typefox.lsapi</groupId>
-			<artifactId>io.typefox.lsapi</artifactId>
-			<version>0.2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>io.typefox.lsapi</groupId>
-			<artifactId>io.typefox.lsapi.services</artifactId>
-			<version>0.2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>io.typefox.lsapi</groupId>
-			<artifactId>io.typefox.lsapi.annotations</artifactId>
-			<version>0.2.0-SNAPSHOT</version>
-		</dependency>
-		<!-- JSON -->
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<version>${jackson-2-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-			<version>${jackson-2-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>${jackson-2-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.datatype</groupId>
-			<artifactId>jackson-datatype-jsr310</artifactId>
-			<version>${jackson-2-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.datatype</groupId>
-			<artifactId>jackson-datatype-jdk8</artifactId>
-			<version>${jackson-2-version}</version>
+			<groupId>org.springframework.ide.vscode</groupId>
+			<artifactId>language-server-commons</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
 		<!-- Yaml -->
 		<dependency>
@@ -90,19 +56,6 @@
 			<artifactId>guava</artifactId>
 			<version>18.0</version>
 		</dependency>
-		<!-- Testing framework -->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.11</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.assertj</groupId>
-			<artifactId>assertj-core</artifactId>
-			<version>3.5.2</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
diff --git a/vscode-extensions/vscode-manifest-yaml/.classpath b/vscode-extensions/vscode-manifest-yaml/.classpath
new file mode 100644
index 000000000..d46faf10e
--- /dev/null
+++ b/vscode-extensions/vscode-manifest-yaml/.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-manifest-yaml/.project b/vscode-extensions/vscode-manifest-yaml/.project
new file mode 100644
index 000000000..8a4f998d3
--- /dev/null
+++ b/vscode-extensions/vscode-manifest-yaml/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>vscode-manifest-yaml</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-manifest-yaml/.settings/org.eclipse.jdt.core.prefs b/vscode-extensions/vscode-manifest-yaml/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..714351aec
--- /dev/null
+++ b/vscode-extensions/vscode-manifest-yaml/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/vscode-extensions/vscode-manifest-yaml/.settings/org.eclipse.m2e.core.prefs b/vscode-extensions/vscode-manifest-yaml/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 000000000..f897a7f1c
--- /dev/null
+++ b/vscode-extensions/vscode-manifest-yaml/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1