diff --git a/headless-services/boot-properties-language-server/.classpath b/headless-services/boot-properties-language-server/.classpath
index 8131be0e5..5e8a55fef 100644
--- a/headless-services/boot-properties-language-server/.classpath
+++ b/headless-services/boot-properties-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-properties-language-server/.settings/org.eclipse.core.resources.prefs b/headless-services/boot-properties-language-server/.settings/org.eclipse.core.resources.prefs
index cdfe4f1b6..99f26c020 100644
--- a/headless-services/boot-properties-language-server/.settings/org.eclipse.core.resources.prefs
+++ b/headless-services/boot-properties-language-server/.settings/org.eclipse.core.resources.prefs
@@ -1,5 +1,2 @@
 eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8
diff --git a/headless-services/boot-properties-language-server/pom.xml b/headless-services/boot-properties-language-server/pom.xml
index 4fcfb6319..94d574047 100644
--- a/headless-services/boot-properties-language-server/pom.xml
+++ b/headless-services/boot-properties-language-server/pom.xml
@@ -16,60 +16,10 @@
 		<dependencies.version>${project.version}</dependencies.version>
 	</properties>
 
-	<repositories>
-		<!-- Sonatype snapshots repository -->
-		<repository>
-			<id>oss-sonatype</id>
-			<name>oss-sonatype</name>
-			<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>${project.name}-repo</id>
-			<url>file://${project.basedir}/repo</url>
-		</repository>
-	</repositories>
-	
-	<distributionManagement>
-		<repository>
-			<id>distribution-repository</id>
-			<name>Temporary Staging Repository</name>
-			<url>file://${basedir}/dist</url>
-		</repository>
-	</distributionManagement>
-	
 	<dependencies>
-		<dependency>
-    		<!-- Local modified JSON lib packaged to support order in maps -->
-			<groupId>org.springframework.ide.eclipse</groupId>
-			<artifactId>org.json</artifactId>
-			<version>1.0</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-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>commons-yaml</artifactId>
+			<artifactId>commons-boot</artifactId>
 			<version>${dependencies.version}</version>
 		</dependency>
 	
@@ -101,7 +51,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>
@@ -112,11 +62,11 @@
 							<goal>repackage</goal>
 						</goals>
 						<configuration>
-							<finalName>${project.build.finalName}-fat</finalName>
+							<mainClass>org.springframework.ide.vscode.boot.properties.Main</mainClass>
 						</configuration>
 					</execution>
 				</executions>
-			</plugin> -->
+			</plugin>
 			<!-- Ignore test classes from test projects -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/headless-services/commons/commons-boot/.classpath b/headless-services/commons/commons-boot/.classpath
new file mode 100644
index 000000000..d46faf10e
--- /dev/null
+++ b/headless-services/commons/commons-boot/.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/headless-services/commons/commons-boot/.project b/headless-services/commons/commons-boot/.project
new file mode 100644
index 000000000..3b9bb7013
--- /dev/null
+++ b/headless-services/commons/commons-boot/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>commons-boot</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/headless-services/commons/commons-boot/.settings/org.eclipse.core.resources.prefs b/headless-services/commons/commons-boot/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..cdfe4f1b6
--- /dev/null
+++ b/headless-services/commons/commons-boot/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/headless-services/commons/commons-boot/.settings/org.eclipse.jdt.core.prefs b/headless-services/commons/commons-boot/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..714351aec
--- /dev/null
+++ b/headless-services/commons/commons-boot/.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/headless-services/commons/commons-boot/.settings/org.eclipse.m2e.core.prefs b/headless-services/commons/commons-boot/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 000000000..f897a7f1c
--- /dev/null
+++ b/headless-services/commons/commons-boot/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/headless-services/commons/commons-boot/pom.xml b/headless-services/commons/commons-boot/pom.xml
new file mode 100644
index 000000000..093efa1c2
--- /dev/null
+++ b/headless-services/commons/commons-boot/pom.xml
@@ -0,0 +1,98 @@
+<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/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>commons-boot</artifactId>
+	<packaging>jar</packaging>
+	
+	<parent>
+		<groupId>org.springframework.ide.vscode</groupId>
+		<artifactId>commons-parent</artifactId>
+		<version>0.1.4-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	
+	<properties>
+		<dependencies.version>${project.version}</dependencies.version>
+	</properties>
+
+	<repositories>
+		<repository>
+			<id>${project.name}-repo</id>
+			<url>file://${project.basedir}/repo</url>
+		</repository>
+	</repositories>
+	
+	<distributionManagement>
+		<repository>
+			<id>distribution-repository</id>
+			<name>Temporary Staging Repository</name>
+			<url>file://${basedir}/dist</url>
+		</repository>
+	</distributionManagement>
+	
+	<dependencies>
+		<dependency>
+    		<!-- Local modified JSON lib packaged to support order in maps -->
+			<groupId>org.springframework.ide.eclipse</groupId>
+			<artifactId>org.json</artifactId>
+			<version>1.0</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-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>commons-yaml</artifactId>
+			<version>${dependencies.version}</version>
+		</dependency>
+	
+		<!-- Test harness -->
+		<dependency>
+			<groupId>org.springframework.ide.vscode</groupId>
+			<artifactId>language-server-test-harness</artifactId>
+			<version>${dependencies.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>${mockito-version}</version>
+			<scope>test</scope>
+		</dependency>
+		
+	</dependencies>
+	<build>
+		<plugins>
+			<!-- Ignore test classes from test projects -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.19.1</version>
+				<configuration>
+					<excludes>
+						<exclude>test-projects/**</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+      </plugins>
+	</build>
+</project>
diff --git a/headless-services/boot-properties-language-server/repo/.gitignore b/headless-services/commons/commons-boot/repo/.gitignore
similarity index 100%
rename from headless-services/boot-properties-language-server/repo/.gitignore
rename to headless-services/commons/commons-boot/repo/.gitignore
diff --git a/headless-services/boot-properties-language-server/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0-sources.jar b/headless-services/commons/commons-boot/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0-sources.jar
similarity index 100%
rename from headless-services/boot-properties-language-server/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0-sources.jar
rename to headless-services/commons/commons-boot/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0-sources.jar
diff --git a/headless-services/boot-properties-language-server/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0.jar b/headless-services/commons/commons-boot/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0.jar
similarity index 100%
rename from headless-services/boot-properties-language-server/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0.jar
rename to headless-services/commons/commons-boot/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0.jar
diff --git a/headless-services/boot-properties-language-server/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0.pom b/headless-services/commons/commons-boot/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0.pom
similarity index 100%
rename from headless-services/boot-properties-language-server/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0.pom
rename to headless-services/commons/commons-boot/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0.pom
diff --git a/headless-services/boot-properties-language-server/repo/org/springframework/ide/eclipse/org.json/maven-metadata-local.xml b/headless-services/commons/commons-boot/repo/org/springframework/ide/eclipse/org.json/maven-metadata-local.xml
similarity index 100%
rename from headless-services/boot-properties-language-server/repo/org/springframework/ide/eclipse/org.json/maven-metadata-local.xml
rename to headless-services/commons/commons-boot/repo/org/springframework/ide/eclipse/org.json/maven-metadata-local.xml
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/eclipse/org/json/JSONObject.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/eclipse/org/json/JSONObject.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/eclipse/org/json/JSONObject.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/eclipse/org/json/JSONObject.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/common/AbstractPropertyProposal.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/common/AbstractPropertyProposal.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/common/AbstractPropertyProposal.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/common/AbstractPropertyProposal.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/common/CommonLanguageTools.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/common/CommonLanguageTools.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/common/CommonLanguageTools.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/common/CommonLanguageTools.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/common/InformationTemplates.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/common/InformationTemplates.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/common/InformationTemplates.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/common/InformationTemplates.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/common/PropertyCompletionFactory.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/common/PropertyCompletionFactory.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/common/PropertyCompletionFactory.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/common/PropertyCompletionFactory.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/common/RelaxedNameConfig.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/common/RelaxedNameConfig.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/common/RelaxedNameConfig.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/common/RelaxedNameConfig.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataGroup.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataGroup.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataGroup.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataGroup.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataHint.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataHint.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataHint.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataHint.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataItem.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataItem.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataItem.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataItem.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataProperty.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataProperty.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataProperty.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataProperty.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataRepository.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataRepository.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataRepository.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataRepository.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataSource.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataSource.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataSource.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataSource.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/Deprecation.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/Deprecation.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/Deprecation.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/Deprecation.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/DescriptionExtractor.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/DescriptionExtractor.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/DescriptionExtractor.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/DescriptionExtractor.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/Hints.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/Hints.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/Hints.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/Hints.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/JsonReader.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/JsonReader.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/JsonReader.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/JsonReader.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/README.txt b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/README.txt
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/README.txt
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/README.txt
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/RawConfigurationMetadata.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/RawConfigurationMetadata.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/RawConfigurationMetadata.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/RawConfigurationMetadata.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/SimpleConfigurationMetadataRepository.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/SimpleConfigurationMetadataRepository.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/SimpleConfigurationMetadataRepository.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/SimpleConfigurationMetadataRepository.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ValueHint.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ValueHint.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ValueHint.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ValueHint.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ValueProvider.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ValueProvider.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ValueProvider.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ValueProvider.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/package-info.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/package-info.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/package-info.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/package-info.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/CachingValueProvider.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/CachingValueProvider.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/CachingValueProvider.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/CachingValueProvider.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ClassReferenceProvider.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/ClassReferenceProvider.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ClassReferenceProvider.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/ClassReferenceProvider.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/DefaultSpringPropertyIndexProvider.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/DefaultSpringPropertyIndexProvider.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/DefaultSpringPropertyIndexProvider.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/DefaultSpringPropertyIndexProvider.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/IndexNavigator.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/IndexNavigator.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/IndexNavigator.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/IndexNavigator.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProvider.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProvider.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProvider.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProvider.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/MetadataManipulator.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/MetadataManipulator.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/MetadataManipulator.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/MetadataManipulator.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertiesLoader.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertiesLoader.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertiesLoader.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertiesLoader.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertyInfo.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertyInfo.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertyInfo.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertyInfo.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ResourceHintProvider.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/ResourceHintProvider.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ResourceHintProvider.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/ResourceHintProvider.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertiesIndexManager.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertiesIndexManager.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertiesIndexManager.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertiesIndexManager.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndex.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndex.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndex.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndex.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndexProvider.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndexProvider.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndexProvider.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndexProvider.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ValueProviderRegistry.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/ValueProviderRegistry.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ValueProviderRegistry.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/ValueProviderRegistry.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/BasicHintProvider.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/BasicHintProvider.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/BasicHintProvider.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/BasicHintProvider.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/HintProvider.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/HintProvider.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/HintProvider.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/HintProvider.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/HintProviders.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/HintProviders.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/HintProviders.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/HintProviders.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/StsValueHint.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/StsValueHint.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/StsValueHint.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/StsValueHint.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/ValueHintHoverInfo.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/ValueHintHoverInfo.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/ValueHintHoverInfo.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/ValueHintHoverInfo.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/Type.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/types/Type.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/Type.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/types/Type.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeParser.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeParser.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeParser.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeParser.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtilProvider.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtilProvider.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtilProvider.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtilProvider.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypedProperty.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypedProperty.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypedProperty.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypedProperty.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/util/DeprecationUtil.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/util/DeprecationUtil.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/util/DeprecationUtil.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/util/DeprecationUtil.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/util/Listener.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/util/Listener.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/util/Listener.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/util/Listener.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/util/ListenerManager.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/util/ListenerManager.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/util/ListenerManager.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/util/ListenerManager.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/BootPropertiesLanguageServer.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/BootPropertiesLanguageServer.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/BootPropertiesLanguageServer.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/BootPropertiesLanguageServer.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/BootPropertiesLanguageServerParams.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/BootPropertiesLanguageServerParams.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/BootPropertiesLanguageServerParams.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/BootPropertiesLanguageServerParams.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/Main.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/Main.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/Main.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/Main.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/completions/PropertiesCompletionProposalsCalculator.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/completions/PropertiesCompletionProposalsCalculator.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/completions/PropertiesCompletionProposalsCalculator.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/completions/PropertiesCompletionProposalsCalculator.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/completions/SpringPropertiesCompletionEngine.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/completions/SpringPropertiesCompletionEngine.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/completions/SpringPropertiesCompletionEngine.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/completions/SpringPropertiesCompletionEngine.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesHoverCalculator.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesHoverCalculator.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesHoverCalculator.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesHoverCalculator.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesHoverInfoProvider.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesHoverInfoProvider.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesHoverInfoProvider.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesHoverInfoProvider.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/quickfix/ReplaceDeprecatedPropertyQuickfix.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/quickfix/ReplaceDeprecatedPropertyQuickfix.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/quickfix/ReplaceDeprecatedPropertyQuickfix.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/quickfix/ReplaceDeprecatedPropertyQuickfix.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/ApplicationPropertiesProblemType.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/ApplicationPropertiesProblemType.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/ApplicationPropertiesProblemType.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/ApplicationPropertiesProblemType.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/DelimitedListReconciler.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/DelimitedListReconciler.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/DelimitedListReconciler.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/DelimitedListReconciler.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/DuplicateNameChecker.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/DuplicateNameChecker.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/DuplicateNameChecker.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/DuplicateNameChecker.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/PropertyNavigator.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/PropertyNavigator.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/PropertyNavigator.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/PropertyNavigator.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/SpringPropertiesReconcileEngine.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/SpringPropertiesReconcileEngine.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/SpringPropertiesReconcileEngine.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/SpringPropertiesReconcileEngine.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/SpringPropertyProblem.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/SpringPropertyProblem.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/SpringPropertyProblem.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/SpringPropertyProblem.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlAssistContext.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlAssistContext.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlAssistContext.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlAssistContext.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlStructureProvider.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlStructureProvider.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlStructureProvider.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlStructureProvider.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlASTReconciler.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlASTReconciler.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlASTReconciler.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlASTReconciler.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlProblemType.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlProblemType.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlProblemType.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlProblemType.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlProblems.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlProblems.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlProblems.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlProblems.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlReconcileEngine.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlReconcileEngine.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlReconcileEngine.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlReconcileEngine.java
diff --git a/headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/SpringPropertyProblem.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/SpringPropertyProblem.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/SpringPropertyProblem.java
rename to headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/SpringPropertyProblem.java
diff --git a/headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/editor/harness/AbstractPropsEditorTest.java b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/editor/harness/AbstractPropsEditorTest.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/editor/harness/AbstractPropsEditorTest.java
rename to headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/editor/harness/AbstractPropsEditorTest.java
diff --git a/headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/editor/harness/PropertyIndexHarness.java b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/editor/harness/PropertyIndexHarness.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/editor/harness/PropertyIndexHarness.java
rename to headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/editor/harness/PropertyIndexHarness.java
diff --git a/headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/editor/harness/StyledStringMatcher.java b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/editor/harness/StyledStringMatcher.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/editor/harness/StyledStringMatcher.java
rename to headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/editor/harness/StyledStringMatcher.java
diff --git a/headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/IndexNavigatorTest.java b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/IndexNavigatorTest.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/IndexNavigatorTest.java
rename to headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/IndexNavigatorTest.java
diff --git a/headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProviderTest.java b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProviderTest.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProviderTest.java
rename to headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProviderTest.java
diff --git a/headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/MetadataManipulatorTest.java b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/MetadataManipulatorTest.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/MetadataManipulatorTest.java
rename to headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/MetadataManipulatorTest.java
diff --git a/headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/PropertiesIndexTest.java b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/PropertiesIndexTest.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/PropertiesIndexTest.java
rename to headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/PropertiesIndexTest.java
diff --git a/headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/TypeParserTest.java b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/TypeParserTest.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/TypeParserTest.java
rename to headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/TypeParserTest.java
diff --git a/headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/TypeUtilTest.java b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/TypeUtilTest.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/TypeUtilTest.java
rename to headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/TypeUtilTest.java
diff --git a/headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java
rename to headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java
diff --git a/headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java
rename to headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java
diff --git a/headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/test/SpringPropertiesIndexTest.java b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/SpringPropertiesIndexTest.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/boot/test/SpringPropertiesIndexTest.java
rename to headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/SpringPropertiesIndexTest.java
diff --git a/headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/project/harness/ProjectsHarness.java b/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/project/harness/ProjectsHarness.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/java/org/springframework/ide/vscode/project/harness/ProjectsHarness.java
rename to headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/project/harness/ProjectsHarness.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/.mvn/wrapper/maven-wrapper.jar b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/.mvn/wrapper/maven-wrapper.properties b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/mvnw b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/mvnw
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/mvnw
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/mvnw
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/mvnw.cmd b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/mvnw.cmd
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/mvnw.cmd
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/mvnw.cmd
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/pom.xml b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/pom.xml
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/pom.xml
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/pom.xml
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/main/java/demo/Application.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/main/java/demo/Application.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/main/java/demo/Application.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/main/java/demo/Application.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/main/java/demo/FooProperties.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/main/java/demo/FooProperties.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/main/java/demo/FooProperties.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/main/java/demo/FooProperties.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/main/resources/application.properties b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/main/resources/application.properties
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/main/resources/application.properties
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/main/resources/application.properties
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/test/java/demo/ApplicationTests.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/test/java/demo/ApplicationTests.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/test/java/demo/ApplicationTests.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/test/java/demo/ApplicationTests.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/.mvn/wrapper/maven-wrapper.jar b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/.mvn/wrapper/maven-wrapper.properties b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/mvnw b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/mvnw
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/mvnw
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/mvnw
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/mvnw.cmd b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/mvnw.cmd
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/mvnw.cmd
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/mvnw.cmd
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/pom.xml b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/pom.xml
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/pom.xml
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/pom.xml
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/java/demo/DemoApplication.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/java/demo/DemoApplication.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/java/demo/DemoApplication.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/java/demo/DemoApplication.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/java/demo/Foo.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/java/demo/Foo.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/java/demo/Foo.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/java/demo/Foo.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/java/demo/FooProperties.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/java/demo/FooProperties.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/java/demo/FooProperties.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/java/demo/FooProperties.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/resources/application.properties b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/resources/application.properties
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/resources/application.properties
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/resources/application.properties
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/test/java/demo/DemoApplicationTests.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/test/java/demo/DemoApplicationTests.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/test/java/demo/DemoApplicationTests.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/test/java/demo/DemoApplicationTests.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/.mvn/wrapper/maven-wrapper.jar b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/.mvn/wrapper/maven-wrapper.properties b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/mvnw b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/mvnw
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/mvnw
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/mvnw
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/mvnw.cmd b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/mvnw.cmd
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/mvnw.cmd
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/mvnw.cmd
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/pom.xml b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/pom.xml
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/pom.xml
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/pom.xml
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/src/main/java/com/example/Sts4231Application.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/src/main/java/com/example/Sts4231Application.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/src/main/java/com/example/Sts4231Application.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/src/main/java/com/example/Sts4231Application.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/src/main/resources/application.properties b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/src/main/resources/application.properties
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/src/main/resources/application.properties
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/src/main/resources/application.properties
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/src/test/java/com/example/Sts4231ApplicationTests.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/src/test/java/com/example/Sts4231ApplicationTests.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/src/test/java/com/example/Sts4231ApplicationTests.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/src/test/java/com/example/Sts4231ApplicationTests.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/.mvn/wrapper/maven-wrapper.jar b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/.mvn/wrapper/maven-wrapper.properties b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/mvnw b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/mvnw
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/mvnw
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/mvnw
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/mvnw.cmd b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/mvnw.cmd
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/mvnw.cmd
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/mvnw.cmd
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/pom.xml b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/pom.xml
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/pom.xml
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/pom.xml
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/java/com/example/DemoWithResourcePropApplication.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/java/com/example/DemoWithResourcePropApplication.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/java/com/example/DemoWithResourcePropApplication.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/java/com/example/DemoWithResourcePropApplication.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/java/com/example/WelcomeController.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/java/com/example/WelcomeController.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/java/com/example/WelcomeController.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/java/com/example/WelcomeController.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/java/com/example/WelcomeProperties.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/java/com/example/WelcomeProperties.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/java/com/example/WelcomeProperties.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/java/com/example/WelcomeProperties.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/resources/META-INF/additional-spring-configuration-metadata.json
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/resources/META-INF/additional-spring-configuration-metadata.json
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/resources/META-INF/additional-spring-configuration-metadata.json
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/resources/application.yml b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/resources/application.yml
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/resources/application.yml
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/resources/application.yml
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/resources/txt/welcome.txt b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/resources/txt/welcome.txt
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/resources/txt/welcome.txt
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/resources/txt/welcome.txt
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/.gitignore b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/.gitignore
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/.gitignore
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/.gitignore
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/.mvn/wrapper/maven-wrapper.jar b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/.mvn/wrapper/maven-wrapper.properties b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/mvnw b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/mvnw
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/mvnw
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/mvnw
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/mvnw.cmd b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/mvnw.cmd
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/mvnw.cmd
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/mvnw.cmd
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/pom.xml b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/pom.xml
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/pom.xml
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/pom.xml
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/example/DemoApplication.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/example/DemoApplication.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/example/DemoApplication.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/example/DemoApplication.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/example/Runner.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/example/Runner.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/example/Runner.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/example/Runner.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/example/TestMap.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/example/TestMap.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/example/TestMap.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/example/TestMap.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/wellsfargo/lendingplatform/web/config/Color.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/wellsfargo/lendingplatform/web/config/Color.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/wellsfargo/lendingplatform/web/config/Color.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/wellsfargo/lendingplatform/web/config/Color.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/wellsfargo/lendingplatform/web/config/TestObjectWithList.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/wellsfargo/lendingplatform/web/config/TestObjectWithList.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/wellsfargo/lendingplatform/web/config/TestObjectWithList.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/wellsfargo/lendingplatform/web/config/TestObjectWithList.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/resources/application.properties b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/resources/application.properties
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/resources/application.properties
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/resources/application.properties
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/test/java/com/example/DemoApplicationTests.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/test/java/com/example/DemoApplicationTests.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/test/java/com/example/DemoApplicationTests.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/test/java/com/example/DemoApplicationTests.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/custom-properties-boot-project/.mvn/wrapper/maven-wrapper.jar b/headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/custom-properties-boot-project/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/custom-properties-boot-project/.mvn/wrapper/maven-wrapper.properties b/headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/custom-properties-boot-project/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/custom-properties-boot-project/mvnw b/headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/mvnw
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/custom-properties-boot-project/mvnw
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/mvnw
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/custom-properties-boot-project/mvnw.cmd b/headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/mvnw.cmd
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/custom-properties-boot-project/mvnw.cmd
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/mvnw.cmd
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/custom-properties-boot-project/pom.xml b/headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/pom.xml
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/custom-properties-boot-project/pom.xml
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/pom.xml
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/Demo1Application.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/Demo1Application.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/Demo1Application.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/Demo1Application.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/DemoProperties.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/DemoProperties.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/DemoProperties.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/DemoProperties.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/RestApi.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/RestApi.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/RestApi.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/RestApi.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/custom-properties-boot-project/src/main/resources/application.properties b/headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/src/main/resources/application.properties
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/custom-properties-boot-project/src/main/resources/application.properties
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/src/main/resources/application.properties
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/custom-properties-boot-project/src/test/java/com/example/Demo1ApplicationTests.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/src/test/java/com/example/Demo1ApplicationTests.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/custom-properties-boot-project/src/test/java/com/example/Demo1ApplicationTests.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/src/test/java/com/example/Demo1ApplicationTests.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/.gitignore b/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/.gitignore
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/.gitignore
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/.gitignore
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/.mvn/wrapper/maven-wrapper.jar b/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/.mvn/wrapper/maven-wrapper.properties b/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/mvnw b/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/mvnw
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/mvnw
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/mvnw
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/mvnw.cmd b/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/mvnw.cmd
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/mvnw.cmd
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/mvnw.cmd
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/pom.xml b/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/pom.xml
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/pom.xml
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/pom.xml
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/java/com/example/Boot13Application.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/java/com/example/Boot13Application.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/java/com/example/Boot13Application.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/java/com/example/Boot13Application.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/application.properties b/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/application.properties
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/application.properties
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/application.properties
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/application.yml b/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/application.yml
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/application.yml
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/application.yml
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/stuff/test-resource.txt b/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/stuff/test-resource.txt
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/stuff/test-resource.txt
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/stuff/test-resource.txt
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/stuff/wordlist.txt b/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/stuff/wordlist.txt
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/stuff/wordlist.txt
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/stuff/wordlist.txt
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/src/test/java/com/example/Boot13ApplicationTests.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/test/java/com/example/Boot13ApplicationTests.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/src/test/java/com/example/Boot13ApplicationTests.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/test/java/com/example/Boot13ApplicationTests.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/.mvn/wrapper/maven-wrapper.jar b/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/.mvn/wrapper/maven-wrapper.properties b/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/mvnw b/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/mvnw
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/mvnw
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/mvnw
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/mvnw.cmd b/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/mvnw.cmd
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/mvnw.cmd
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/mvnw.cmd
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/pom.xml b/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/pom.xml
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/pom.xml
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/pom.xml
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/main/java/com/example/DemoApplication.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/main/java/com/example/DemoApplication.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/main/java/com/example/DemoApplication.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/main/java/com/example/DemoApplication.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/main/java/com/example/MyController.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/main/java/com/example/MyController.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/main/java/com/example/MyController.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/main/java/com/example/MyController.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/main/resources/application.yml b/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/main/resources/application.yml
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/main/resources/application.yml
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/main/resources/application.yml
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/test/java/com/example/DemoApplicationTests.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/test/java/com/example/DemoApplicationTests.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/test/java/com/example/DemoApplicationTests.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/test/java/com/example/DemoApplicationTests.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/.mvn/wrapper/maven-wrapper.jar b/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/.mvn/wrapper/maven-wrapper.properties b/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/manifest.yml b/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/manifest.yml
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/manifest.yml
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/manifest.yml
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/mvnw b/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/mvnw
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/mvnw
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/mvnw
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/mvnw.cmd b/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/mvnw.cmd
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/mvnw.cmd
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/mvnw.cmd
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/pom.xml b/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/pom.xml
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/pom.xml
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/pom.xml
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/ClothingSize.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/ClothingSize.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/ClothingSize.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/ClothingSize.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/Color.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/Color.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/Color.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/Color.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/ColorData.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/ColorData.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/ColorData.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/ColorData.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/DemoEnumApplication.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/DemoEnumApplication.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/DemoEnumApplication.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/DemoEnumApplication.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/FooProperties.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/FooProperties.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/FooProperties.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/FooProperties.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application-prod.properties b/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application-prod.properties
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application-prod.properties
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application-prod.properties
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application-prod.yml b/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application-prod.yml
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application-prod.yml
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application-prod.yml
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application.properties b/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application.properties
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application.properties
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application.properties
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application.yml b/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application.yml
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application.yml
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application.yml
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/.mvn/wrapper/maven-wrapper.jar b/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/.mvn/wrapper/maven-wrapper.properties b/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/mvnw b/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/mvnw
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/mvnw
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/mvnw
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/mvnw.cmd b/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/mvnw.cmd
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/mvnw.cmd
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/mvnw.cmd
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/pom.xml b/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/pom.xml
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/pom.xml
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/pom.xml
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/CamelCaser.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/CamelCaser.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/CamelCaser.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/CamelCaser.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/DemoApplication.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/DemoApplication.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/DemoApplication.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/DemoApplication.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/Deprecater.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/Deprecater.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/Deprecater.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/Deprecater.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/TrickyGetters.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/TrickyGetters.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/TrickyGetters.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/TrickyGetters.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/resources/application.properties b/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/resources/application.properties
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/resources/application.properties
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/resources/application.properties
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/resources/application.yml b/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/resources/application.yml
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/resources/application.yml
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/resources/application.yml
diff --git a/headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/test/java/demo/DemoApplicationTests.java b/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/test/java/demo/DemoApplicationTests.java
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/test/java/demo/DemoApplicationTests.java
rename to headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/test/java/demo/DemoApplicationTests.java
diff --git a/headless-services/boot-properties-language-server/src/test/resources/workspace/application.properties b/headless-services/commons/commons-boot/src/test/resources/workspace/application.properties
similarity index 100%
rename from headless-services/boot-properties-language-server/src/test/resources/workspace/application.properties
rename to headless-services/commons/commons-boot/src/test/resources/workspace/application.properties
diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml
index ad56aca33..27ac53388 100644
--- a/headless-services/commons/pom.xml
+++ b/headless-services/commons/pom.xml
@@ -20,6 +20,7 @@
 		<module>commons-maven</module>
 		<module>commons-gradle</module>
 		<module>commons-boot-app-cli</module>
+		<module>commons-boot</module>
 	</modules>
 
 	<repositories>