diff --git a/headless-services/commons/commons-boot/.classpath b/headless-services/commons/commons-boot/.classpath
deleted file mode 100644
index d46faf10e..000000000
--- a/headless-services/commons/commons-boot/.classpath
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/headless-services/commons/commons-boot/.project b/headless-services/commons/commons-boot/.project
deleted file mode 100644
index 3b9bb7013..000000000
--- a/headless-services/commons/commons-boot/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- commons-boot
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
- org.eclipse.m2e.core.maven2Nature
-
-
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
deleted file mode 100644
index cdfe4f1b6..000000000
--- a/headless-services/commons/commons-boot/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/test/java=UTF-8
-encoding//src/test/resources=UTF-8
-encoding/=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
deleted file mode 100644
index 714351aec..000000000
--- a/headless-services/commons/commons-boot/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index f897a7f1c..000000000
--- a/headless-services/commons/commons-boot/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index cbd90a8ec..000000000
--- a/headless-services/commons/commons-boot/pom.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
- 4.0.0
- commons-boot
- jar
-
-
- org.springframework.ide.vscode
- commons-parent
- 0.1.5-SNAPSHOT
- ../pom.xml
-
-
-
- ${project.version}
-
-
-
-
- ${project.name}-repo
- file://${project.basedir}/repo
-
-
-
-
-
- distribution-repository
- Temporary Staging Repository
- file://${basedir}/dist
-
-
-
-
-
-
- org.springframework.ide.eclipse
- org.json
- 1.0
-
-
- org.springframework.ide.vscode
- java-properties
- ${dependencies.version}
-
-
- org.springframework.ide.vscode
- commons-maven
- ${dependencies.version}
-
-
- org.springframework.ide.vscode
- commons-gradle
- ${dependencies.version}
-
-
- org.springframework.ide.vscode
- commons-language-server
- ${dependencies.version}
-
-
- org.springframework.ide.vscode
- commons-yaml
- ${dependencies.version}
-
-
- org.springframework.ide.vscode
- commons-boot-app-cli
- ${dependencies.version}
-
-
- org.eclipse.jdt
- org.eclipse.jdt.core
- 3.13.50
-
-
- commons-io
- commons-io
- ${commons-io-version}
-
-
-
-
- org.springframework.ide.vscode
- language-server-test-harness
- ${dependencies.version}
- test
-
-
-
- org.mockito
- mockito-all
- ${mockito-version}
- test
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.19.1
-
-
- test-projects/**
-
-
-
-
-
-
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/Main.java b/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/Main.java
deleted file mode 100644
index c80b8ce1c..000000000
--- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/Main.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016, 2017 Pivotal, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.vscode.boot.java;
-
-import java.io.IOException;
-
-import org.springframework.ide.vscode.boot.BootLanguageServer;
-import org.springframework.ide.vscode.boot.BootLanguageServerParams;
-import org.springframework.ide.vscode.commons.languageserver.LaunguageServerApp;
-import org.springframework.ide.vscode.commons.languageserver.composable.ComposableLanguageServer;
-import org.springframework.ide.vscode.commons.util.LogRedirect;
-
-/**
- * Starts up Language Server process
- *
- * @author Martin Lippert
- */
-public class Main {
-
- public static void main(String[] args) throws IOException, InterruptedException {
- String serverName = "boot-java-language-server";
- if (!System.getProperty(LaunguageServerApp.STANDALONE_STARTUP, "false").equals("true")) {
- LogRedirect.redirectToFile(serverName);
- }
- LaunguageServerApp.start(serverName, () -> {
- ComposableLanguageServer s = BootLanguageServer.createJava(
- BootLanguageServerParams.createDefault()
- );
- return s.getServer();
- });
- }
-
-}
diff --git a/headless-services/commons/commons-boot/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
deleted file mode 100644
index 1d6c901a0..000000000
--- a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/Main.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016, 2017 Pivotal, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Pivotal, Inc. - initial API and implementation
- *******************************************************************************/
-package org.springframework.ide.vscode.boot.properties;
-
-import java.io.IOException;
-
-import org.springframework.ide.vscode.boot.BootLanguageServer;
-import org.springframework.ide.vscode.boot.BootLanguageServerParams;
-import org.springframework.ide.vscode.commons.languageserver.LaunguageServerApp;
-import org.springframework.ide.vscode.commons.util.LogRedirect;
-
-/**
- * Starts up Language Server process
- *
- * @author Alex Boyko
- * @author Kris De Volder
- *
- */
-public class Main {
-
- public static void main(String[] args) throws IOException, InterruptedException {
- String serverName = "boot-properties-language-server";
- LogRedirect.redirectToFile(serverName);
- LaunguageServerApp.start(serverName,
- () -> BootLanguageServer.createProperties(BootLanguageServerParams.createDefault()).getServer()
- );
- }
-
-}
diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml
index 84280906d..9359b9607 100644
--- a/headless-services/commons/pom.xml
+++ b/headless-services/commons/pom.xml
@@ -20,7 +20,6 @@
commons-maven
commons-gradle
commons-boot-app-cli
- commons-boot
diff --git a/headless-services/spring-boot-language-server/.classpath b/headless-services/spring-boot-language-server/.classpath
index af1430be1..4f8e155a9 100644
--- a/headless-services/spring-boot-language-server/.classpath
+++ b/headless-services/spring-boot-language-server/.classpath
@@ -10,6 +10,7 @@
+
@@ -22,5 +23,11 @@
+
+
+
+
+
+
diff --git a/headless-services/spring-boot-language-server/.settings/org.eclipse.core.resources.prefs b/headless-services/spring-boot-language-server/.settings/org.eclipse.core.resources.prefs
index e9441bb12..cdfe4f1b6 100644
--- a/headless-services/spring-boot-language-server/.settings/org.eclipse.core.resources.prefs
+++ b/headless-services/spring-boot-language-server/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +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/=UTF-8
diff --git a/headless-services/spring-boot-language-server/pom.xml b/headless-services/spring-boot-language-server/pom.xml
index 1da8aa054..9ef562b8d 100644
--- a/headless-services/spring-boot-language-server/pom.xml
+++ b/headless-services/spring-boot-language-server/pom.xml
@@ -16,11 +16,60 @@
${project.version}
+
+
+ ${project.name}-repo
+ file://${project.basedir}/repo
+
+
+
+
+
+
+ org.springframework.ide.eclipse
+ org.json
+ 1.0
+
org.springframework.ide.vscode
- commons-boot
- 0.1.5-SNAPSHOT
+ java-properties
+ ${dependencies.version}
+
+
+ org.springframework.ide.vscode
+ commons-maven
+ ${dependencies.version}
+
+
+ org.springframework.ide.vscode
+ commons-gradle
+ ${dependencies.version}
+
+
+ org.springframework.ide.vscode
+ commons-language-server
+ ${dependencies.version}
+
+
+ org.springframework.ide.vscode
+ commons-yaml
+ ${dependencies.version}
+
+
+ org.springframework.ide.vscode
+ commons-boot-app-cli
+ ${dependencies.version}
+
+
+ org.eclipse.jdt
+ org.eclipse.jdt.core
+ 3.13.50
+
+
+ commons-io
+ commons-io
+ ${commons-io-version}
diff --git a/headless-services/commons/commons-boot/repo/.gitignore b/headless-services/spring-boot-language-server/repo/.gitignore
similarity index 100%
rename from headless-services/commons/commons-boot/repo/.gitignore
rename to headless-services/spring-boot-language-server/repo/.gitignore
diff --git a/headless-services/commons/commons-boot/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0-sources.jar b/headless-services/spring-boot-language-server/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0-sources.jar
similarity index 100%
rename from headless-services/commons/commons-boot/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0-sources.jar
rename to headless-services/spring-boot-language-server/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0-sources.jar
diff --git a/headless-services/commons/commons-boot/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0.jar b/headless-services/spring-boot-language-server/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0.jar
similarity index 100%
rename from headless-services/commons/commons-boot/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0.jar
rename to headless-services/spring-boot-language-server/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0.jar
diff --git a/headless-services/commons/commons-boot/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0.pom b/headless-services/spring-boot-language-server/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0.pom
similarity index 100%
rename from headless-services/commons/commons-boot/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0.pom
rename to headless-services/spring-boot-language-server/repo/org/springframework/ide/eclipse/org.json/1.0/org.json-1.0.pom
diff --git a/headless-services/commons/commons-boot/repo/org/springframework/ide/eclipse/org.json/maven-metadata-local.xml b/headless-services/spring-boot-language-server/repo/org/springframework/ide/eclipse/org.json/maven-metadata-local.xml
similarity index 100%
rename from headless-services/commons/commons-boot/repo/org/springframework/ide/eclipse/org.json/maven-metadata-local.xml
rename to headless-services/spring-boot-language-server/repo/org/springframework/ide/eclipse/org.json/maven-metadata-local.xml
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/eclipse/org/json/JSONObject.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/eclipse/org/json/JSONObject.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/eclipse/org/json/JSONObject.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/eclipse/org/json/JSONObject.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/BootLanguageServer.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/BootLanguageServer.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/BootLanguageServer.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/BootLanguageServer.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/BootLanguageServerParams.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/BootLanguageServerParams.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/BootLanguageServerParams.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/BootLanguageServerParams.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/common/AbstractPropertyProposal.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/common/AbstractPropertyProposal.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/common/AbstractPropertyProposal.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/common/AbstractPropertyProposal.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/common/CommonLanguageTools.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/common/CommonLanguageTools.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/common/CommonLanguageTools.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/common/CommonLanguageTools.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/common/InformationTemplates.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/common/InformationTemplates.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/common/InformationTemplates.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/common/InformationTemplates.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/common/PropertyCompletionFactory.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/common/PropertyCompletionFactory.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/common/PropertyCompletionFactory.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/common/PropertyCompletionFactory.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/common/RelaxedNameConfig.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/common/RelaxedNameConfig.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/common/RelaxedNameConfig.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/common/RelaxedNameConfig.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataGroup.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataGroup.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataGroup.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataGroup.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataHint.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataHint.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataHint.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataHint.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataItem.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataItem.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataItem.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataItem.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataProperty.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataProperty.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataProperty.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataProperty.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataRepository.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataRepository.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataRepository.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataRepository.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataSource.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataSource.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataSource.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ConfigurationMetadataSource.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/Deprecation.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/Deprecation.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/Deprecation.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/Deprecation.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/DescriptionExtractor.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/DescriptionExtractor.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/DescriptionExtractor.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/DescriptionExtractor.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/Hints.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/Hints.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/Hints.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/Hints.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/JsonReader.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/JsonReader.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/JsonReader.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/JsonReader.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/README.txt b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/README.txt
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/README.txt
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/README.txt
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/RawConfigurationMetadata.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/RawConfigurationMetadata.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/RawConfigurationMetadata.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/RawConfigurationMetadata.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/SimpleConfigurationMetadataRepository.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/SimpleConfigurationMetadataRepository.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/SimpleConfigurationMetadataRepository.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/SimpleConfigurationMetadataRepository.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ValueHint.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ValueHint.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ValueHint.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ValueHint.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ValueProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ValueProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ValueProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/ValueProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/package-info.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/package-info.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/package-info.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/configurationmetadata/package-info.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/Annotations.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Annotations.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/Annotations.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/Annotations.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaConfig.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaConfig.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaConfig.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaConfig.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerComponents.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerComponents.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerComponents.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/BootJavaLanguageServerComponents.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/ProjectServices.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/ProjectServices.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/ProjectServices.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/ProjectServices.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/WordHighlighter.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/WordHighlighter.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/WordHighlighter.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/WordHighlighter.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationHierarchies.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationHierarchies.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationHierarchies.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationHierarchies.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationHierarchyAwareLookup.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationHierarchyAwareLookup.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationHierarchyAwareLookup.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationHierarchyAwareLookup.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/autowired/AutowiredHoverProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/AutowiredHoverProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/autowired/AutowiredHoverProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/AutowiredHoverProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeansSymbolProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeansSymbolProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeansSymbolProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeansSymbolProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/beans/ComponentSymbolProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ComponentSymbolProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/beans/ComponentSymbolProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ComponentSymbolProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalsLiveHoverProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalsLiveHoverProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalsLiveHoverProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalsLiveHoverProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/data/DataRepositorySymbolProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/data/DataRepositorySymbolProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/data/DataRepositorySymbolProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/data/DataRepositorySymbolProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaCodeLensEngine.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaCodeLensEngine.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaCodeLensEngine.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaCodeLensEngine.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaCompletionEngine.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaCompletionEngine.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaCompletionEngine.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaCompletionEngine.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaDocumentSymbolHandler.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaDocumentSymbolHandler.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaDocumentSymbolHandler.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaDocumentSymbolHandler.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaHoverProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaHoverProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaHoverProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaHoverProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaReconcileEngine.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaReconcileEngine.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaReconcileEngine.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaReconcileEngine.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaReferencesHandler.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaReferencesHandler.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaReferencesHandler.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaReferencesHandler.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaWorkspaceSymbolHandler.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaWorkspaceSymbolHandler.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaWorkspaceSymbolHandler.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaWorkspaceSymbolHandler.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/CompletionProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/CompletionProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/CompletionProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/CompletionProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/HoverProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/HoverProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/HoverProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/HoverProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/ReferenceProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/ReferenceProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/ReferenceProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/ReferenceProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/RunningAppProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/RunningAppProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/RunningAppProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/RunningAppProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/SymbolProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/SymbolProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/handlers/SymbolProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/SymbolProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/jdt/imports/ImportRewrite.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/jdt/imports/ImportRewrite.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/jdt/imports/ImportRewrite.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/jdt/imports/ImportRewrite.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/links/AbstractSourceLinks.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/AbstractSourceLinks.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/links/AbstractSourceLinks.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/AbstractSourceLinks.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinkFactory.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinkFactory.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinkFactory.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinkFactory.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinks.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinks.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinks.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/SourceLinks.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/links/VSCodeSourceLinks.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/VSCodeSourceLinks.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/links/VSCodeSourceLinks.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/VSCodeSourceLinks.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/livehover/AbstractInjectedIntoHoverProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/AbstractInjectedIntoHoverProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/livehover/AbstractInjectedIntoHoverProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/AbstractInjectedIntoHoverProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ActiveProfilesProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ActiveProfilesProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ActiveProfilesProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ActiveProfilesProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/livehover/BeanInjectedIntoHoverProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/BeanInjectedIntoHoverProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/livehover/BeanInjectedIntoHoverProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/BeanInjectedIntoHoverProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ComponentInjectionsHoverProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ComponentInjectionsHoverProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ComponentInjectionsHoverProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ComponentInjectionsHoverProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/livehover/LiveHoverUtils.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/LiveHoverUtils.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/livehover/LiveHoverUtils.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/LiveHoverUtils.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/LiveAppURLSymbolProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/LiveAppURLSymbolProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/LiveAppURLSymbolProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/LiveAppURLSymbolProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingCompletionProcessor.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingCompletionProcessor.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingCompletionProcessor.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingCompletionProcessor.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingSymbolProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingSymbolProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingSymbolProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingSymbolProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/UrlUtil.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/UrlUtil.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/UrlUtil.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/UrlUtil.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxMethodFinder.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxMethodFinder.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxMethodFinder.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxMethodFinder.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxPathFinder.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxPathFinder.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxPathFinder.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxPathFinder.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxRouterSymbolProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxRouterSymbolProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxRouterSymbolProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxRouterSymbolProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxUtils.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxUtils.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxUtils.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/WebfluxUtils.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/scope/Constants.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/scope/Constants.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/scope/Constants.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/scope/Constants.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/scope/ScopeCompletionProcessor.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/scope/ScopeCompletionProcessor.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/scope/ScopeCompletionProcessor.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/scope/ScopeCompletionProcessor.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/scope/ScopeNameCompletion.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/scope/ScopeNameCompletion.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/scope/ScopeNameCompletion.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/scope/ScopeNameCompletion.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/scope/ScopeNameCompletionProposal.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/scope/ScopeNameCompletionProposal.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/scope/ScopeNameCompletionProposal.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/scope/ScopeNameCompletionProposal.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippet.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippet.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippet.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippet.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetBuilder.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetBuilder.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetBuilder.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetBuilder.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetCompletion.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetCompletion.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetCompletion.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetCompletion.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetContext.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetContext.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetContext.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetContext.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetManager.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetManager.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetManager.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetManager.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/snippets/eclipse-templates.xml b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/eclipse-templates.xml
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/snippets/eclipse-templates.xml
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/eclipse-templates.xml
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/utils/ASTUtils.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/ASTUtils.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/utils/ASTUtils.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/ASTUtils.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/utils/CompilationUnitCache.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/CompilationUnitCache.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/utils/CompilationUnitCache.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/CompilationUnitCache.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/utils/FunctionUtils.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/FunctionUtils.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/utils/FunctionUtils.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/FunctionUtils.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexer.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringLiveHoverWatchdog.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringLiveHoverWatchdog.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringLiveHoverWatchdog.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringLiveHoverWatchdog.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringResource.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringResource.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringResource.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringResource.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/value/Constants.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/value/Constants.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/value/Constants.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/value/Constants.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/value/ValueCompletionProcessor.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/value/ValueCompletionProcessor.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/value/ValueCompletionProcessor.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/value/ValueCompletionProcessor.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/value/ValueHoverProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/value/ValueHoverProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/value/ValueHoverProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/value/ValueHoverProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/value/ValuePropertyKeyProposal.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/value/ValuePropertyKeyProposal.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/value/ValuePropertyKeyProposal.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/value/ValuePropertyKeyProposal.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/value/ValuePropertyReferencesProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/value/ValuePropertyReferencesProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/java/value/ValuePropertyReferencesProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/value/ValuePropertyReferencesProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/CachingValueProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/CachingValueProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/CachingValueProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/CachingValueProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/ClassReferenceProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ClassReferenceProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/ClassReferenceProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ClassReferenceProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/DefaultSpringPropertyIndexProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/DefaultSpringPropertyIndexProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/DefaultSpringPropertyIndexProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/DefaultSpringPropertyIndexProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/IndexNavigator.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/IndexNavigator.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/IndexNavigator.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/IndexNavigator.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/MetadataManipulator.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/MetadataManipulator.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/MetadataManipulator.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/MetadataManipulator.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertiesLoader.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertiesLoader.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertiesLoader.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertiesLoader.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertyInfo.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertyInfo.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertyInfo.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/PropertyInfo.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/ResourceHintProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ResourceHintProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/ResourceHintProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ResourceHintProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertiesIndexManager.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertiesIndexManager.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertiesIndexManager.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertiesIndexManager.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndex.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndex.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndex.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndex.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndexProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndexProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndexProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/SpringPropertyIndexProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/ValueProviderRegistry.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ValueProviderRegistry.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/ValueProviderRegistry.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/ValueProviderRegistry.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/BasicHintProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/BasicHintProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/BasicHintProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/BasicHintProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/HintProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/HintProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/HintProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/HintProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/HintProviders.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/HintProviders.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/HintProviders.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/HintProviders.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/StsValueHint.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/StsValueHint.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/StsValueHint.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/StsValueHint.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/ValueHintHoverInfo.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/ValueHintHoverInfo.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/ValueHintHoverInfo.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/hints/ValueHintHoverInfo.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/types/DelimitedStringParser.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/DelimitedStringParser.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/types/DelimitedStringParser.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/DelimitedStringParser.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/types/Type.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/Type.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/types/Type.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/Type.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeParser.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeParser.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeParser.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeParser.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtil.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtilProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtilProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtilProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypeUtilProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypedProperty.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypedProperty.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypedProperty.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/types/TypedProperty.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/util/DeprecationUtil.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/util/DeprecationUtil.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/util/DeprecationUtil.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/util/DeprecationUtil.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/util/Listener.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/util/Listener.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/util/Listener.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/util/Listener.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/util/ListenerManager.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/util/ListenerManager.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/metadata/util/ListenerManager.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/metadata/util/ListenerManager.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/BootPropertiesLanguageServerComponents.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/BootPropertiesLanguageServerComponents.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/BootPropertiesLanguageServerComponents.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/BootPropertiesLanguageServerComponents.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/completions/PropertiesCompletionProposalsCalculator.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/completions/PropertiesCompletionProposalsCalculator.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/completions/PropertiesCompletionProposalsCalculator.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/completions/PropertiesCompletionProposalsCalculator.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/completions/SpringPropertiesCompletionEngine.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/completions/SpringPropertiesCompletionEngine.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/completions/SpringPropertiesCompletionEngine.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/completions/SpringPropertiesCompletionEngine.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesHoverCalculator.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesHoverCalculator.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesHoverCalculator.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesHoverCalculator.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesHoverInfoProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesHoverInfoProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesHoverInfoProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/hover/PropertiesHoverInfoProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/quickfix/ReplaceDeprecatedPropertyQuickfix.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/quickfix/ReplaceDeprecatedPropertyQuickfix.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/quickfix/ReplaceDeprecatedPropertyQuickfix.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/quickfix/ReplaceDeprecatedPropertyQuickfix.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/ApplicationPropertiesProblemType.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/ApplicationPropertiesProblemType.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/ApplicationPropertiesProblemType.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/ApplicationPropertiesProblemType.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/DuplicateNameChecker.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/DuplicateNameChecker.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/DuplicateNameChecker.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/DuplicateNameChecker.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/PropertyNavigator.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/PropertyNavigator.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/PropertyNavigator.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/PropertyNavigator.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/SpringPropertiesReconcileEngine.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/SpringPropertiesReconcileEngine.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/SpringPropertiesReconcileEngine.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/SpringPropertiesReconcileEngine.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/SpringPropertyProblem.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/SpringPropertyProblem.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/SpringPropertyProblem.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/SpringPropertyProblem.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlAssistContext.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlAssistContext.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlAssistContext.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlAssistContext.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlStructureProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlStructureProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlStructureProvider.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/completions/ApplicationYamlStructureProvider.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/quickfix/ReplaceDeprecatedYamlQuickfix.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlASTReconciler.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlASTReconciler.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlASTReconciler.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlASTReconciler.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlProblemType.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlProblemType.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlProblemType.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlProblemType.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlProblems.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlProblems.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlProblems.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlProblems.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlReconcileEngine.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlReconcileEngine.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlReconcileEngine.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/ApplicationYamlReconcileEngine.java
diff --git a/headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/SpringPropertyProblem.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/SpringPropertyProblem.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/SpringPropertyProblem.java
rename to headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/yaml/reconcile/SpringPropertyProblem.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/editor/harness/AbstractPropsEditorTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/editor/harness/AbstractPropsEditorTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/editor/harness/AbstractPropsEditorTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/editor/harness/AbstractPropsEditorTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/editor/harness/PropertyIndexHarness.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/editor/harness/PropertyIndexHarness.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/editor/harness/PropertyIndexHarness.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/editor/harness/PropertyIndexHarness.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/editor/harness/StyledStringMatcher.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/editor/harness/StyledStringMatcher.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/editor/harness/StyledStringMatcher.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/editor/harness/StyledStringMatcher.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/autowired/test/AutowiredHoverProviderTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/autowired/test/AutowiredHoverProviderTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/autowired/test/AutowiredHoverProviderTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/autowired/test/AutowiredHoverProviderTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/SpringIndexerBeansTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/SpringIndexerBeansTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/SpringIndexerBeansTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/SpringIndexerBeansTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/SpringIndexerFunctionBeansTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/SpringIndexerFunctionBeansTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/SpringIndexerFunctionBeansTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/SpringIndexerFunctionBeansTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/SpringIndexerHarness.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/SpringIndexerHarness.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/SpringIndexerHarness.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/SpringIndexerHarness.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalsLiveHoverTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalsLiveHoverTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalsLiveHoverTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalsLiveHoverTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/data/test/DataRepositorySymbolProviderTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/data/test/DataRepositorySymbolProviderTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/data/test/DataRepositorySymbolProviderTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/data/test/DataRepositorySymbolProviderTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/ActiveProfilesHoverTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/ActiveProfilesHoverTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/ActiveProfilesHoverTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/ActiveProfilesHoverTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/ActuatorWarningHoverTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/ActuatorWarningHoverTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/ActuatorWarningHoverTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/ActuatorWarningHoverTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/BeanInjectedIntoHoverProviderTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/BeanInjectedIntoHoverProviderTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/BeanInjectedIntoHoverProviderTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/BeanInjectedIntoHoverProviderTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/BeansByTypeHoverProviderTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/BeansByTypeHoverProviderTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/BeansByTypeHoverProviderTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/BeansByTypeHoverProviderTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/ComponentInjectionsHoverProviderTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/ComponentInjectionsHoverProviderTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/ComponentInjectionsHoverProviderTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/ComponentInjectionsHoverProviderTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/references/test/PropertyReferenceFinderTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/references/test/PropertyReferenceFinderTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/references/test/PropertyReferenceFinderTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/references/test/PropertyReferenceFinderTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingSymbolProviderTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingSymbolProviderTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingSymbolProviderTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingSymbolProviderTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/WebFluxMappingSymbolProviderTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/scope/test/ScopeCompletionTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/scope/test/ScopeCompletionTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/scope/test/ScopeCompletionTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/scope/test/ScopeCompletionTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/CompilationUnitCacheTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/CompilationUnitCacheTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/CompilationUnitCacheTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/CompilationUnitCacheTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringIndexerTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringPropertyIndexTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringPropertyIndexTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringPropertyIndexTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/SpringPropertyIndexTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/VSCodeSourceLinksTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/VSCodeSourceLinksTest.java
similarity index 99%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/VSCodeSourceLinksTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/VSCodeSourceLinksTest.java
index 3c6b5db88..455ca32aa 100644
--- a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/VSCodeSourceLinksTest.java
+++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/utils/test/VSCodeSourceLinksTest.java
@@ -13,8 +13,8 @@ package org.springframework.ide.vscode.boot.java.utils.test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import java.io.File;
-import java.net.URI;
+import java.io.File;
+import java.net.URI;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Optional;
@@ -54,12 +54,12 @@ public class VSCodeSourceLinksTest {
Optional url = new VSCodeSourceLinks(null).sourceLinkUrlForFQName(project, "com.example.EmptyBoot15WebAppApplication");
assertTrue(url.isPresent());
Path projectPath = Paths.get(project.pom().getParent());
- URI uri = URI.create(url.get());
-
- // Use File to get rid of the fragment parts of the URL. The URL may have fragments that indicate line and column numbers
- uri = new File(uri.getPath()).toURI();
-
- Path relativePath = projectPath.relativize(Paths.get(uri));
+ URI uri = URI.create(url.get());
+
+ // Use File to get rid of the fragment parts of the URL. The URL may have fragments that indicate line and column numbers
+ uri = new File(uri.getPath()).toURI();
+
+ Path relativePath = projectPath.relativize(Paths.get(uri));
assertEquals(Paths.get("src/main/java/com/example/EmptyBoot15WebAppApplication.java"), relativePath);
String positionPart = url.get().substring(url.get().lastIndexOf('#'));
assertEquals("#7,14", positionPart);
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueCompletionTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueCompletionTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueCompletionTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueCompletionTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueHoverTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueHoverTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueHoverTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/value/test/ValueHoverTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/IndexNavigatorTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/IndexNavigatorTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/IndexNavigatorTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/IndexNavigatorTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProviderTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProviderTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProviderTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/LoggerNameProviderTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/MetadataManipulatorTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/MetadataManipulatorTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/MetadataManipulatorTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/MetadataManipulatorTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/PropertiesIndexTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/PropertiesIndexTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/PropertiesIndexTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/PropertiesIndexTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/TypeParserTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/TypeParserTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/TypeParserTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/TypeParserTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/TypeUtilTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/TypeUtilTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/metadata/TypeUtilTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/metadata/TypeUtilTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationYamlEditorTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/SpringPropertiesIndexTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/SpringPropertiesIndexTest.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/boot/test/SpringPropertiesIndexTest.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/SpringPropertiesIndexTest.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/project/harness/BootJavaLanguageServerHarness.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/project/harness/BootJavaLanguageServerHarness.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/project/harness/BootJavaLanguageServerHarness.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/project/harness/BootJavaLanguageServerHarness.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/project/harness/MockRunningAppProvider.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/project/harness/MockRunningAppProvider.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/project/harness/MockRunningAppProvider.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/project/harness/MockRunningAppProvider.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/project/harness/ProjectsHarness.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/project/harness/ProjectsHarness.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/project/harness/ProjectsHarness.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/project/harness/ProjectsHarness.java
diff --git a/headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/project/harness/PropertyIndexHarness.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/project/harness/PropertyIndexHarness.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/java/org/springframework/ide/vscode/project/harness/PropertyIndexHarness.java
rename to headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/project/harness/PropertyIndexHarness.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/.mvn/wrapper/maven-wrapper.jar b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/.mvn/wrapper/maven-wrapper.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/mvnw
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/mvnw
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/mvnw
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/mvnw.cmd
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/mvnw.cmd
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/mvnw.cmd
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/pom.xml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/pom.xml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/pom.xml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/main/java/demo/Application.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/main/java/demo/Application.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/main/java/demo/Application.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/main/java/demo/FooProperties.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/main/java/demo/FooProperties.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/main/java/demo/FooProperties.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/main/resources/application.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/main/resources/application.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/main/resources/application.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/main/resources/application.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/test/java/demo/ApplicationTests.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/test/java/demo/ApplicationTests.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.0-properties-live-metadta/src/test/java/demo/ApplicationTests.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/.mvn/wrapper/maven-wrapper.jar b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/.mvn/wrapper/maven-wrapper.properties b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/mvnw
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/mvnw
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/mvnw
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/mvnw.cmd
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/mvnw.cmd
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/mvnw.cmd
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/pom.xml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/pom.xml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/pom.xml
diff --git a/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 b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/java/demo/DemoApplication.java
rename to headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/java/demo/Foo.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/java/demo/Foo.java
rename to headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/java/demo/FooProperties.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/java/demo/FooProperties.java
rename to headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/resources/application.properties b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/resources/application.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/main/resources/application.properties
diff --git a/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 b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.2.1-app-properties-list-of-pojo/src/test/java/demo/DemoApplicationTests.java
rename to headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/.mvn/wrapper/maven-wrapper.jar b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/.mvn/wrapper/maven-wrapper.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/mvnw
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/mvnw
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/mvnw
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/mvnw.cmd
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/mvnw.cmd
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/mvnw.cmd
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/pom.xml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/pom.xml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/pom.xml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/src/main/java/com/example/Sts4231Application.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/src/main/java/com/example/Sts4231Application.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/src/main/java/com/example/Sts4231Application.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/src/main/resources/application.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/src/main/resources/application.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/src/main/resources/application.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/src/main/resources/application.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/src/test/java/com/example/Sts4231ApplicationTests.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/src/test/java/com/example/Sts4231ApplicationTests.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.0-app-sts-4231/src/test/java/com/example/Sts4231ApplicationTests.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/.mvn/wrapper/maven-wrapper.jar b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/.mvn/wrapper/maven-wrapper.properties b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/mvnw
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/mvnw
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/mvnw
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/mvnw.cmd
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/mvnw.cmd
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/mvnw.cmd
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/pom.xml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/pom.xml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/pom.xml
diff --git a/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 b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/java/com/example/DemoWithResourcePropApplication.java
rename to headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/java/com/example/WelcomeController.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/java/com/example/WelcomeController.java
rename to headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/java/com/example/WelcomeProperties.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/java/com/example/WelcomeProperties.java
rename to headless-services/spring-boot-language-server/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/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 b/headless-services/spring-boot-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
similarity index 100%
rename from 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
rename to headless-services/spring-boot-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
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/resources/application.yml b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/resources/application.yml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/resources/application.yml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/resources/txt/welcome.txt b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/resources/txt/welcome.txt
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-app-with-resource-prop/src/main/resources/txt/welcome.txt
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/.gitignore b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/.gitignore
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/.gitignore
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/.gitignore
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/.mvn/wrapper/maven-wrapper.jar b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/.mvn/wrapper/maven-wrapper.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/mvnw
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/mvnw
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/mvnw
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/mvnw.cmd
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/mvnw.cmd
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/mvnw.cmd
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/pom.xml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/pom.xml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/pom.xml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/example/DemoApplication.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/example/DemoApplication.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/example/DemoApplication.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/example/Runner.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/example/Runner.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/example/Runner.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/example/TestMap.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/example/TestMap.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/example/TestMap.java
diff --git a/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 b/headless-services/spring-boot-language-server/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/commons/commons-boot/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/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/java/com/wellsfargo/lendingplatform/web/config/TestObjectWithList.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/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/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/resources/application.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/resources/application.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/resources/application.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/main/resources/application.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/test/java/com/example/DemoApplicationTests.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/test/java/com/example/DemoApplicationTests.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/boot-1.3.3-sts-4335/src/test/java/com/example/DemoApplicationTests.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/.mvn/wrapper/maven-wrapper.jar b/headless-services/spring-boot-language-server/src/test/resources/test-projects/custom-properties-boot-project/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/custom-properties-boot-project/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/.mvn/wrapper/maven-wrapper.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/custom-properties-boot-project/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/custom-properties-boot-project/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/custom-properties-boot-project/mvnw
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/mvnw
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/custom-properties-boot-project/mvnw
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/custom-properties-boot-project/mvnw.cmd
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/mvnw.cmd
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/custom-properties-boot-project/mvnw.cmd
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/custom-properties-boot-project/pom.xml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/pom.xml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/custom-properties-boot-project/pom.xml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/Demo1Application.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/Demo1Application.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/Demo1Application.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/Demo1Application.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/DemoProperties.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/DemoProperties.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/DemoProperties.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/DemoProperties.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/RestApi.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/RestApi.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/RestApi.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/custom-properties-boot-project/src/main/java/com/example/RestApi.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/src/main/resources/application.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/custom-properties-boot-project/src/main/resources/application.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/src/main/resources/application.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/custom-properties-boot-project/src/main/resources/application.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/src/test/java/com/example/Demo1ApplicationTests.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/custom-properties-boot-project/src/test/java/com/example/Demo1ApplicationTests.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/custom-properties-boot-project/src/test/java/com/example/Demo1ApplicationTests.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/custom-properties-boot-project/src/test/java/com/example/Demo1ApplicationTests.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/.gitignore b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/.gitignore
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/.gitignore
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/.gitignore
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/.mvn/wrapper/maven-wrapper.jar b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/.mvn/wrapper/maven-wrapper.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/mvnw
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/mvnw
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/mvnw
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/mvnw.cmd
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/mvnw.cmd
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/mvnw.cmd
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/pom.xml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/pom.xml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/pom.xml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/java/com/example/Boot13Application.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/java/com/example/Boot13Application.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/java/com/example/Boot13Application.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/application.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/application.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/application.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/application.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/application.yml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/application.yml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/application.yml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/application.yml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/stuff/test-resource.txt b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/stuff/test-resource.txt
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/stuff/test-resource.txt
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/stuff/wordlist.txt b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/stuff/wordlist.txt
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/stuff/wordlist.txt
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/src/main/resources/stuff/wordlist.txt
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/test/java/com/example/Boot13ApplicationTests.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-app/src/test/java/com/example/Boot13ApplicationTests.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-app/src/test/java/com/example/Boot13ApplicationTests.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/.mvn/wrapper/maven-wrapper.jar b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/.mvn/wrapper/maven-wrapper.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/mvnw
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/mvnw
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/mvnw
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/mvnw.cmd
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/mvnw.cmd
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/mvnw.cmd
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/pom.xml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/pom.xml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/pom.xml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/main/java/com/example/DemoApplication.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/main/java/com/example/DemoApplication.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/main/java/com/example/DemoApplication.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/main/java/com/example/MyController.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/main/java/com/example/MyController.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/main/java/com/example/MyController.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/main/resources/application.yml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/main/resources/application.yml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/main/resources/application.yml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/main/resources/application.yml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/test/java/com/example/DemoApplicationTests.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/test/java/com/example/DemoApplicationTests.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-1.3.0-with-mongo/src/test/java/com/example/DemoApplicationTests.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-15-web-app/.gitignore b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-15-web-app/.gitignore
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-15-web-app/.gitignore
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-15-web-app/.gitignore
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-15-web-app/.mvn/wrapper/maven-wrapper.jar b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-15-web-app/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-15-web-app/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-15-web-app/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-15-web-app/.mvn/wrapper/maven-wrapper.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-15-web-app/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-15-web-app/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-15-web-app/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-15-web-app/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-15-web-app/mvnw
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-15-web-app/mvnw
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-15-web-app/mvnw
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-15-web-app/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-15-web-app/mvnw.cmd
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-15-web-app/mvnw.cmd
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-15-web-app/mvnw.cmd
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-15-web-app/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-15-web-app/pom.xml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-15-web-app/pom.xml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-15-web-app/pom.xml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-15-web-app/src/main/java/com/example/EmptyBoot15WebAppApplication.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-15-web-app/src/main/java/com/example/EmptyBoot15WebAppApplication.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-15-web-app/src/main/java/com/example/EmptyBoot15WebAppApplication.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-15-web-app/src/main/java/com/example/EmptyBoot15WebAppApplication.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-15-web-app/src/main/resources/application.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-15-web-app/src/main/resources/application.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-15-web-app/src/main/resources/application.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-15-web-app/src/main/resources/application.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-15-web-app/src/test/java/com/example/EmptyBoot15WebAppApplicationTests.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-15-web-app/src/test/java/com/example/EmptyBoot15WebAppApplicationTests.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/empty-boot-15-web-app/src/test/java/com/example/EmptyBoot15WebAppApplicationTests.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/empty-boot-15-web-app/src/test/java/com/example/EmptyBoot15WebAppApplicationTests.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/.mvn/wrapper/maven-wrapper.jar b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/.mvn/wrapper/maven-wrapper.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/manifest.yml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/manifest.yml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/manifest.yml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/manifest.yml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/mvnw
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/mvnw
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/mvnw
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/mvnw.cmd
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/mvnw.cmd
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/mvnw.cmd
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/pom.xml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/pom.xml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/pom.xml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/ClothingSize.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/ClothingSize.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/ClothingSize.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/ClothingSize.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/Color.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/Color.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/Color.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/Color.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/ColorData.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/ColorData.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/ColorData.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/ColorData.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/DemoEnumApplication.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/DemoEnumApplication.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/DemoEnumApplication.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/DemoEnumApplication.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/FooProperties.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/FooProperties.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/FooProperties.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/java/demo/FooProperties.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application-prod.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application-prod.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application-prod.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application-prod.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application-prod.yml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application-prod.yml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application-prod.yml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application-prod.yml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application.yml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application.yml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application.yml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/enums-boot-1.3.2-app/src/main/resources/application.yml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/no-actuator-boot-15-web-app/.gitignore b/headless-services/spring-boot-language-server/src/test/resources/test-projects/no-actuator-boot-15-web-app/.gitignore
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/no-actuator-boot-15-web-app/.gitignore
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/no-actuator-boot-15-web-app/.gitignore
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/no-actuator-boot-15-web-app/.mvn/wrapper/maven-wrapper.jar b/headless-services/spring-boot-language-server/src/test/resources/test-projects/no-actuator-boot-15-web-app/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/no-actuator-boot-15-web-app/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/no-actuator-boot-15-web-app/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/no-actuator-boot-15-web-app/.mvn/wrapper/maven-wrapper.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/no-actuator-boot-15-web-app/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/no-actuator-boot-15-web-app/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/no-actuator-boot-15-web-app/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/no-actuator-boot-15-web-app/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/no-actuator-boot-15-web-app/mvnw
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/no-actuator-boot-15-web-app/mvnw
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/no-actuator-boot-15-web-app/mvnw
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/no-actuator-boot-15-web-app/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/no-actuator-boot-15-web-app/mvnw.cmd
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/no-actuator-boot-15-web-app/mvnw.cmd
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/no-actuator-boot-15-web-app/mvnw.cmd
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/no-actuator-boot-15-web-app/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/no-actuator-boot-15-web-app/pom.xml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/no-actuator-boot-15-web-app/pom.xml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/no-actuator-boot-15-web-app/pom.xml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/no-actuator-boot-15-web-app/src/main/java/com/example/NoActuatorBoot15WebAppApplication.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/no-actuator-boot-15-web-app/src/main/java/com/example/NoActuatorBoot15WebAppApplication.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/no-actuator-boot-15-web-app/src/main/java/com/example/NoActuatorBoot15WebAppApplication.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/no-actuator-boot-15-web-app/src/main/java/com/example/NoActuatorBoot15WebAppApplication.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/no-actuator-boot-15-web-app/src/main/resources/application.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/no-actuator-boot-15-web-app/src/main/resources/application.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/no-actuator-boot-15-web-app/src/main/resources/application.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/no-actuator-boot-15-web-app/src/main/resources/application.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/no-actuator-boot-15-web-app/src/test/java/com/example/NoActuatorBoot15WebAppApplicationTests.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/no-actuator-boot-15-web-app/src/test/java/com/example/NoActuatorBoot15WebAppApplicationTests.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/no-actuator-boot-15-web-app/src/test/java/com/example/NoActuatorBoot15WebAppApplicationTests.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/no-actuator-boot-15-web-app/src/test/java/com/example/NoActuatorBoot15WebAppApplicationTests.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-autowired/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-autowired/mvnw
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-autowired/mvnw
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-autowired/mvnw
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-autowired/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-autowired/mvnw.cmd
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-autowired/mvnw.cmd
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-autowired/mvnw.cmd
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-autowired/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-autowired/pom.xml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-autowired/pom.xml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-autowired/pom.xml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-autowired/runtime-bean-information-automatically-wired.json b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-autowired/runtime-bean-information-automatically-wired.json
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-autowired/runtime-bean-information-automatically-wired.json
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-autowired/runtime-bean-information-automatically-wired.json
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-autowired/runtime-bean-information.json b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-autowired/runtime-bean-information.json
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-autowired/runtime-bean-information.json
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-autowired/runtime-bean-information.json
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-autowired/src/main/java/org/test/DependencyA.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-autowired/src/main/java/org/test/DependencyA.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-autowired/src/main/java/org/test/DependencyA.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-autowired/src/main/java/org/test/DependencyA.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-autowired/src/main/java/org/test/DependencyB.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-autowired/src/main/java/org/test/DependencyB.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-autowired/src/main/java/org/test/DependencyB.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-autowired/src/main/java/org/test/DependencyB.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-autowired/src/main/java/org/test/MainClass.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-autowired/src/main/java/org/test/MainClass.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-autowired/src/main/java/org/test/MainClass.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-autowired/src/main/java/org/test/MainClass.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-autowired/src/main/java/org/test/MyAutomaticallyWiredComponent.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-autowired/src/main/java/org/test/MyAutomaticallyWiredComponent.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-autowired/src/main/java/org/test/MyAutomaticallyWiredComponent.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-autowired/src/main/java/org/test/MyAutomaticallyWiredComponent.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-autowired/src/main/java/org/test/MyAutowiredComponent.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-autowired/src/main/java/org/test/MyAutowiredComponent.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-autowired/src/main/java/org/test/MyAutowiredComponent.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-autowired/src/main/java/org/test/MyAutowiredComponent.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-autowired/wrong-runtime-bean-information.json b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-autowired/wrong-runtime-bean-information.json
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-autowired/wrong-runtime-bean-information.json
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-autowired/wrong-runtime-bean-information.json
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/mvnw
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/mvnw
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/mvnw
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/mvnw.cmd
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/mvnw.cmd
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/mvnw.cmd
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/pom.xml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/pom.xml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/pom.xml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/BeanClass.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/BeanClass.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/BeanClass.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/BeanClass.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/FunctionClass.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/FunctionClass.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/FunctionClass.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/FunctionClass.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/FunctionFromSpecializedClass.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/FunctionFromSpecializedClass.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/FunctionFromSpecializedClass.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/FunctionFromSpecializedClass.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/FunctionFromSpecializedInterface.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/FunctionFromSpecializedInterface.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/FunctionFromSpecializedInterface.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/FunctionFromSpecializedInterface.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/LoopedFunctionClass.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/LoopedFunctionClass.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/LoopedFunctionClass.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/LoopedFunctionClass.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/LoopedInterface1.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/LoopedInterface1.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/LoopedInterface1.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/LoopedInterface1.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/LoopedInterface2.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/LoopedInterface2.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/LoopedInterface2.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/LoopedInterface2.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/MainClass.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/MainClass.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/MainClass.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/MainClass.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/ScannedFunctionClass.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/ScannedFunctionClass.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/ScannedFunctionClass.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/ScannedFunctionClass.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SimpleComponent.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SimpleComponent.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SimpleComponent.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SimpleComponent.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SimpleConfiguration.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SimpleConfiguration.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SimpleConfiguration.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SimpleConfiguration.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SimpleController.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SimpleController.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SimpleController.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SimpleController.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SimpleRestController.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SimpleRestController.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SimpleRestController.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SimpleRestController.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SpecialConfiguration.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SpecialConfiguration.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SpecialConfiguration.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SpecialConfiguration.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SpecialNameComponent.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SpecialNameComponent.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SpecialNameComponent.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SpecialNameComponent.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SpecializedFunctionClass.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SpecializedFunctionClass.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SpecializedFunctionClass.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SpecializedFunctionClass.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SpecializedFunctionInterface.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SpecializedFunctionInterface.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SpecializedFunctionInterface.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-beans/src/main/java/org/test/SpecializedFunctionInterface.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-parent/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/pom.xml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-parent/pom.xml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/pom.xml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/.gitignore b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/.gitignore
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/.gitignore
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/.gitignore
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/.mvn/wrapper/maven-wrapper.jar b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/.mvn/wrapper/maven-wrapper.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/mvnw
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/mvnw
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/mvnw
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/mvnw.cmd
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/mvnw.cmd
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/mvnw.cmd
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/pom.xml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/pom.xml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/pom.xml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/src/main/java/org/test/MainClass.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/src/main/java/org/test/MainClass.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/src/main/java/org/test/MainClass.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/src/main/java/org/test/MainClass.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/src/main/java/org/test/SimpleMappingClass.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/src/main/java/org/test/SimpleMappingClass.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/src/main/java/org/test/SimpleMappingClass.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/src/main/java/org/test/SimpleMappingClass.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/src/main/java/org/test/sub/MappingClassSubpackage.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/src/main/java/org/test/sub/MappingClassSubpackage.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/src/main/java/org/test/sub/MappingClassSubpackage.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotation-indexing-parent/test-annotation-indexing/src/main/java/org/test/sub/MappingClassSubpackage.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotations/.gitignore b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotations/.gitignore
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotations/.gitignore
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotations/.gitignore
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotations/.mvn/wrapper/maven-wrapper.jar b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotations/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotations/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotations/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotations/.mvn/wrapper/maven-wrapper.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotations/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotations/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotations/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotations/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotations/mvnw
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotations/mvnw
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotations/mvnw
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotations/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotations/mvnw.cmd
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotations/mvnw.cmd
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotations/mvnw.cmd
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotations/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotations/pom.xml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotations/pom.xml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotations/pom.xml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotations/src/main/java/org/test/TestAnnotationsApplication.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotations/src/main/java/org/test/TestAnnotationsApplication.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotations/src/main/java/org/test/TestAnnotationsApplication.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotations/src/main/java/org/test/TestAnnotationsApplication.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotations/src/main/java/org/test/TestScopeCompletion.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotations/src/main/java/org/test/TestScopeCompletion.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotations/src/main/java/org/test/TestScopeCompletion.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotations/src/main/java/org/test/TestScopeCompletion.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotations/src/main/java/org/test/TestValueCompletion.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotations/src/main/java/org/test/TestValueCompletion.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-annotations/src/main/java/org/test/TestValueCompletion.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-annotations/src/main/java/org/test/TestValueCompletion.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/.gitignore b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/.gitignore
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/.gitignore
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/.gitignore
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/.mvn/wrapper/maven-wrapper.jar b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/.mvn/wrapper/maven-wrapper.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/mvnw
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/mvnw
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/mvnw
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/mvnw.cmd
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/mvnw.cmd
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/mvnw.cmd
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/pom.xml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/pom.xml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/pom.xml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/ConditionalOnBeanConfig.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/ConditionalOnBeanConfig.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/ConditionalOnBeanConfig.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/ConditionalOnBeanConfig.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/ConditionalOnMissingBeanConfig.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/ConditionalOnMissingBeanConfig.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/ConditionalOnMissingBeanConfig.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/ConditionalOnMissingBeanConfig.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/Hello.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/Hello.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/Hello.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/Hello.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/HelloWorldConfiguration.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/HelloWorldConfiguration.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/HelloWorldConfiguration.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/HelloWorldConfiguration.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/MultipleConditionals.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/MultipleConditionals.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/MultipleConditionals.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/MultipleConditionals.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/MultipleConditionalsPT152535713.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/MultipleConditionalsPT152535713.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/MultipleConditionalsPT152535713.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/java/example/MultipleConditionalsPT152535713.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/src/main/resources/application.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/resources/application.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-conditionals-live-hover/src/main/resources/application.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-conditionals-live-hover/src/main/resources/application.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/.gitignore b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/.gitignore
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/.gitignore
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/.gitignore
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/.mvn/wrapper/maven-wrapper.jar b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/.mvn/wrapper/maven-wrapper.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/mvnw
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/mvnw
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/mvnw
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/mvnw.cmd
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/mvnw.cmd
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/mvnw.cmd
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/pom.xml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/pom.xml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/pom.xml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/java/example/Greeting.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/java/example/Greeting.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/java/example/Greeting.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/java/example/Greeting.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/java/example/HelloWorldConfiguration.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/java/example/HelloWorldConfiguration.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/java/example/HelloWorldConfiguration.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/java/example/HelloWorldConfiguration.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/java/example/HelloWorldController.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/java/example/HelloWorldController.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/java/example/HelloWorldController.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/java/example/HelloWorldController.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/java/example/InnerClassController.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/java/example/InnerClassController.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/java/example/InnerClassController.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/java/example/InnerClassController.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/java/example/RestApi.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/java/example/RestApi.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/java/example/RestApi.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/java/example/RestApi.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/resources/application.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/resources/application.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/resources/application.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-live-hover/src/main/resources/application.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-symbols/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-symbols/mvnw
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-symbols/mvnw
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-symbols/mvnw
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-symbols/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-symbols/mvnw.cmd
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-symbols/mvnw.cmd
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-symbols/mvnw.cmd
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-symbols/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-symbols/pom.xml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-symbols/pom.xml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-symbols/pom.xml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-symbols/src/main/java/org/test/MultiRequestMappingClass.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-symbols/src/main/java/org/test/MultiRequestMappingClass.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-symbols/src/main/java/org/test/MultiRequestMappingClass.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-symbols/src/main/java/org/test/MultiRequestMappingClass.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-symbols/src/main/java/org/test/ParentMappingClass.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-symbols/src/main/java/org/test/ParentMappingClass.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-symbols/src/main/java/org/test/ParentMappingClass.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-symbols/src/main/java/org/test/ParentMappingClass.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-symbols/src/main/java/org/test/ParentMappingClass2.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-symbols/src/main/java/org/test/ParentMappingClass2.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-symbols/src/main/java/org/test/ParentMappingClass2.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-symbols/src/main/java/org/test/ParentMappingClass2.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-symbols/src/main/java/org/test/RequestMethodClass.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-symbols/src/main/java/org/test/RequestMethodClass.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-symbols/src/main/java/org/test/RequestMethodClass.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-symbols/src/main/java/org/test/RequestMethodClass.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-symbols/src/main/java/org/test/SimpleMappingClass.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-symbols/src/main/java/org/test/SimpleMappingClass.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-request-mapping-symbols/src/main/java/org/test/SimpleMappingClass.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-request-mapping-symbols/src/main/java/org/test/SimpleMappingClass.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-spring-data-symbols/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-spring-data-symbols/mvnw
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-spring-data-symbols/mvnw
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-spring-data-symbols/mvnw
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-spring-data-symbols/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-spring-data-symbols/mvnw.cmd
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-spring-data-symbols/mvnw.cmd
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-spring-data-symbols/mvnw.cmd
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-spring-data-symbols/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-spring-data-symbols/pom.xml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-spring-data-symbols/pom.xml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-spring-data-symbols/pom.xml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-spring-data-symbols/src/main/java/org/test/Application.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-spring-data-symbols/src/main/java/org/test/Application.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-spring-data-symbols/src/main/java/org/test/Application.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-spring-data-symbols/src/main/java/org/test/Application.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-spring-data-symbols/src/main/java/org/test/Customer.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-spring-data-symbols/src/main/java/org/test/Customer.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-spring-data-symbols/src/main/java/org/test/Customer.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-spring-data-symbols/src/main/java/org/test/Customer.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-spring-data-symbols/src/main/java/org/test/CustomerRepository.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-spring-data-symbols/src/main/java/org/test/CustomerRepository.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-spring-data-symbols/src/main/java/org/test/CustomerRepository.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-spring-data-symbols/src/main/java/org/test/CustomerRepository.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/mvnw
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/mvnw
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/mvnw
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/mvnw.cmd
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/mvnw.cmd
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/mvnw.cmd
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/pom.xml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/pom.xml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/pom.xml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/Application.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/Application.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/Application.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/Application.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/NestedRouter.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/NestedRouter.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/NestedRouter.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/NestedRouter.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/PersonHandler.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/PersonHandler.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/PersonHandler.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/PersonHandler.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/Quote.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/Quote.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/Quote.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/Quote.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteGenerator.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteGenerator.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteGenerator.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteGenerator.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteHandler.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteHandler.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteHandler.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteHandler.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteRouter.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteRouter.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteRouter.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/QuoteRouter.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/TradingUser.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/TradingUser.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/TradingUser.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/TradingUser.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/TradingUserRepository.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/TradingUserRepository.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/TradingUserRepository.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/TradingUserRepository.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/UserController.java b/headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/UserController.java
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/UserController.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/test-webflux-project/src/main/java/org/test/UserController.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/.mvn/wrapper/maven-wrapper.jar b/headless-services/spring-boot-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/.mvn/wrapper/maven-wrapper.jar
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/.mvn/wrapper/maven-wrapper.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/.mvn/wrapper/maven-wrapper.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/mvnw b/headless-services/spring-boot-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/mvnw
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/mvnw
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/mvnw
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/mvnw.cmd b/headless-services/spring-boot-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/mvnw.cmd
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/mvnw.cmd
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/mvnw.cmd
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/pom.xml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/pom.xml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/pom.xml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/pom.xml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/CamelCaser.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/CamelCaser.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/CamelCaser.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/DemoApplication.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/DemoApplication.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/DemoApplication.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/Deprecater.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/Deprecater.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/Deprecater.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/TrickyGetters.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/TrickyGetters.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/java/demo/TrickyGetters.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/resources/application.properties b/headless-services/spring-boot-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/resources/application.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/resources/application.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/resources/application.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/resources/application.yml b/headless-services/spring-boot-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/resources/application.yml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/resources/application.yml
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/main/resources/application.yml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/test/java/demo/DemoApplicationTests.java b/headless-services/spring-boot-language-server/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/commons/commons-boot/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/test/java/demo/DemoApplicationTests.java
rename to headless-services/spring-boot-language-server/src/test/resources/test-projects/tricky-getters-boot-1.3.1-app/src/test/java/demo/DemoApplicationTests.java
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-property-files/mixed-multiple-files/application-dev.properties b/headless-services/spring-boot-language-server/src/test/resources/test-property-files/mixed-multiple-files/application-dev.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-property-files/mixed-multiple-files/application-dev.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-property-files/mixed-multiple-files/application-dev.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-property-files/mixed-multiple-files/application.yml b/headless-services/spring-boot-language-server/src/test/resources/test-property-files/mixed-multiple-files/application.yml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-property-files/mixed-multiple-files/application.yml
rename to headless-services/spring-boot-language-server/src/test/resources/test-property-files/mixed-multiple-files/application.yml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-property-files/mixed-multiple-files/no-props.yml b/headless-services/spring-boot-language-server/src/test/resources/test-property-files/mixed-multiple-files/no-props.yml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-property-files/mixed-multiple-files/no-props.yml
rename to headless-services/spring-boot-language-server/src/test/resources/test-property-files/mixed-multiple-files/no-props.yml
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-property-files/mixed-multiple-files/non-app-props.properties b/headless-services/spring-boot-language-server/src/test/resources/test-property-files/mixed-multiple-files/non-app-props.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-property-files/mixed-multiple-files/non-app-props.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-property-files/mixed-multiple-files/non-app-props.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-property-files/multiple-files/application-dev.properties b/headless-services/spring-boot-language-server/src/test/resources/test-property-files/multiple-files/application-dev.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-property-files/multiple-files/application-dev.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-property-files/multiple-files/application-dev.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-property-files/multiple-files/application.non-properties b/headless-services/spring-boot-language-server/src/test/resources/test-property-files/multiple-files/application.non-properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-property-files/multiple-files/application.non-properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-property-files/multiple-files/application.non-properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-property-files/multiple-files/application.properties b/headless-services/spring-boot-language-server/src/test/resources/test-property-files/multiple-files/application.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-property-files/multiple-files/application.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-property-files/multiple-files/application.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-property-files/multiple-files/non-app-props.properties b/headless-services/spring-boot-language-server/src/test/resources/test-property-files/multiple-files/non-app-props.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-property-files/multiple-files/non-app-props.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-property-files/multiple-files/non-app-props.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-property-files/multiple-files/prod-application.properties b/headless-services/spring-boot-language-server/src/test/resources/test-property-files/multiple-files/prod-application.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-property-files/multiple-files/prod-application.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-property-files/multiple-files/prod-application.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-property-files/simple-case/application.properties b/headless-services/spring-boot-language-server/src/test/resources/test-property-files/simple-case/application.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-property-files/simple-case/application.properties
rename to headless-services/spring-boot-language-server/src/test/resources/test-property-files/simple-case/application.properties
diff --git a/headless-services/commons/commons-boot/src/test/resources/test-property-files/simple-yml/application.yml b/headless-services/spring-boot-language-server/src/test/resources/test-property-files/simple-yml/application.yml
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/test-property-files/simple-yml/application.yml
rename to headless-services/spring-boot-language-server/src/test/resources/test-property-files/simple-yml/application.yml
diff --git a/headless-services/commons/commons-boot/src/test/resources/workspace/application.properties b/headless-services/spring-boot-language-server/src/test/resources/workspace/application.properties
similarity index 100%
rename from headless-services/commons/commons-boot/src/test/resources/workspace/application.properties
rename to headless-services/spring-boot-language-server/src/test/resources/workspace/application.properties