diff --git a/concourse/tasks/build-mvn-cache.sh b/concourse/tasks/build-mvn-cache.sh
index 32514d9a7..5f08175a5 100755
--- a/concourse/tasks/build-mvn-cache.sh
+++ b/concourse/tasks/build-mvn-cache.sh
@@ -6,6 +6,9 @@ sources=$workdir/sts4/vscode-extensions/$extension_id
 cd sts4/vscode-extensions
 ./mvnw -DskipTests package
 
+cd ${workdir}/sts4/headless-services
+./mvnw -DskipTests package
+
 timestamp=`date +%s`
 tarfile=${workdir}/out/sts4-mvn-cache-${timestamp}.tar.gz
 tar -czvf ${tarfile} -C ${HOME} .m2/repository
diff --git a/headless-services/.mvn/wrapper/maven-wrapper.jar b/headless-services/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 000000000..c6feb8bb6
Binary files /dev/null and b/headless-services/.mvn/wrapper/maven-wrapper.jar differ
diff --git a/headless-services/.mvn/wrapper/maven-wrapper.properties b/headless-services/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 000000000..6637cedb2
--- /dev/null
+++ b/headless-services/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1 @@
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip
\ No newline at end of file
diff --git a/headless-services/.project b/headless-services/.project
new file mode 100644
index 000000000..9e5b79ccb
--- /dev/null
+++ b/headless-services/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>headless-services-aggregator</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/vscode-extensions/commons/.settings/org.eclipse.m2e.core.prefs b/headless-services/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vscode-extensions/commons/.settings/org.eclipse.m2e.core.prefs
rename to headless-services/.settings/org.eclipse.m2e.core.prefs
diff --git a/vscode-extensions/commons/.project b/headless-services/commons/.project
similarity index 100%
rename from vscode-extensions/commons/.project
rename to headless-services/commons/.project
diff --git a/vscode-extensions/commons/.settings/org.eclipse.core.resources.prefs b/headless-services/commons/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from vscode-extensions/commons/.settings/org.eclipse.core.resources.prefs
rename to headless-services/commons/.settings/org.eclipse.core.resources.prefs
diff --git a/vscode-extensions/commons/commons-cf/.settings/org.eclipse.m2e.core.prefs b/headless-services/commons/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vscode-extensions/commons/commons-cf/.settings/org.eclipse.m2e.core.prefs
rename to headless-services/commons/.settings/org.eclipse.m2e.core.prefs
diff --git a/vscode-extensions/commons/commons-cf/.classpath b/headless-services/commons/commons-cf/.classpath
similarity index 100%
rename from vscode-extensions/commons/commons-cf/.classpath
rename to headless-services/commons/commons-cf/.classpath
diff --git a/vscode-extensions/commons/commons-cf/.project b/headless-services/commons/commons-cf/.project
similarity index 100%
rename from vscode-extensions/commons/commons-cf/.project
rename to headless-services/commons/commons-cf/.project
diff --git a/vscode-extensions/commons/commons-cf/.settings/org.eclipse.core.resources.prefs b/headless-services/commons/commons-cf/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from vscode-extensions/commons/commons-cf/.settings/org.eclipse.core.resources.prefs
rename to headless-services/commons/commons-cf/.settings/org.eclipse.core.resources.prefs
diff --git a/vscode-extensions/commons/commons-cf/.settings/org.eclipse.jdt.core.prefs b/headless-services/commons/commons-cf/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vscode-extensions/commons/commons-cf/.settings/org.eclipse.jdt.core.prefs
rename to headless-services/commons/commons-cf/.settings/org.eclipse.jdt.core.prefs
diff --git a/vscode-extensions/commons/commons-gradle/.settings/org.eclipse.m2e.core.prefs b/headless-services/commons/commons-cf/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/.settings/org.eclipse.m2e.core.prefs
rename to headless-services/commons/commons-cf/.settings/org.eclipse.m2e.core.prefs
diff --git a/vscode-extensions/commons/commons-cf/pom.xml b/headless-services/commons/commons-cf/pom.xml
similarity index 100%
rename from vscode-extensions/commons/commons-cf/pom.xml
rename to headless-services/commons/commons-cf/pom.xml
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFBuildpack.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFBuildpack.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFBuildpack.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFBuildpack.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFBuildpackImpl.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFBuildpackImpl.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFBuildpackImpl.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFBuildpackImpl.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFDomain.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFDomain.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFDomain.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFDomain.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFDomainImpl.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFDomainImpl.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFDomainImpl.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFDomainImpl.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFEntities.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFEntities.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFEntities.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFEntities.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFEntity.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFEntity.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFEntity.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFEntity.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFExceptions.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFExceptions.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFExceptions.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFExceptions.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFServiceInstance.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFServiceInstance.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFServiceInstance.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFServiceInstance.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFServiceInstanceImpl.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFServiceInstanceImpl.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFServiceInstanceImpl.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFServiceInstanceImpl.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/ClientRequests.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/ClientRequests.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/ClientRequests.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/ClientRequests.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/ClientTimeouts.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/ClientTimeouts.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/ClientTimeouts.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/ClientTimeouts.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CloudFoundryClientFactory.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CloudFoundryClientFactory.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CloudFoundryClientFactory.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CloudFoundryClientFactory.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/LoginMethod.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/LoginMethod.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/LoginMethod.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/LoginMethod.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/RequestErrorHandler.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/RequestErrorHandler.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/RequestErrorHandler.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/RequestErrorHandler.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFCallableContext.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFCallableContext.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFCallableContext.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFCallableContext.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFClientParams.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFClientParams.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFClientParams.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFClientParams.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFCredentials.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFCredentials.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFCredentials.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFCredentials.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFParamsProviderMessages.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFParamsProviderMessages.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFParamsProviderMessages.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFParamsProviderMessages.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFTarget.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFTarget.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFTarget.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFTarget.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFTargetCache.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFTargetCache.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFTargetCache.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFTargetCache.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliParamsProvider.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliParamsProvider.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliParamsProvider.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliParamsProvider.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliProviderMessages.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliProviderMessages.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliProviderMessages.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliProviderMessages.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/ClientParamsCacheKey.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/ClientParamsCacheKey.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/ClientParamsCacheKey.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/ClientParamsCacheKey.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/ClientParamsProvider.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/ClientParamsProvider.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/ClientParamsProvider.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/ClientParamsProvider.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/ConnectionException.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/ConnectionException.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/ConnectionException.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/ConnectionException.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/NoTargetsException.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/NoTargetsException.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/NoTargetsException.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/NoTargetsException.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/CFClientProvider.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/CFClientProvider.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/CFClientProvider.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/CFClientProvider.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/CFWrappingV2.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/CFWrappingV2.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/CFWrappingV2.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/CFWrappingV2.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/CancelationTokens.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/CancelationTokens.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/CancelationTokens.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/CancelationTokens.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/CloudFoundryClientCache.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/CloudFoundryClientCache.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/CloudFoundryClientCache.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/CloudFoundryClientCache.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/DefaultClientRequestsV2.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/DefaultClientRequestsV2.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/DefaultClientRequestsV2.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/DefaultClientRequestsV2.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/DefaultCloudFoundryClientFactoryV2.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/DefaultCloudFoundryClientFactoryV2.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/DefaultCloudFoundryClientFactoryV2.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/DefaultCloudFoundryClientFactoryV2.java
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/ReactorUtils.java b/headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/ReactorUtils.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/ReactorUtils.java
rename to headless-services/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/v2/ReactorUtils.java
diff --git a/vscode-extensions/commons/commons-cf/src/test/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFClientTest.java b/headless-services/commons/commons-cf/src/test/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFClientTest.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/test/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFClientTest.java
rename to headless-services/commons/commons-cf/src/test/java/org/springframework/ide/vscode/commons/cloudfoundry/client/CFClientTest.java
diff --git a/vscode-extensions/commons/commons-cf/src/test/java/org/springframework/ide/vscode/commons/cloudfoundry/client/MockCfCli.java b/headless-services/commons/commons-cf/src/test/java/org/springframework/ide/vscode/commons/cloudfoundry/client/MockCfCli.java
similarity index 100%
rename from vscode-extensions/commons/commons-cf/src/test/java/org/springframework/ide/vscode/commons/cloudfoundry/client/MockCfCli.java
rename to headless-services/commons/commons-cf/src/test/java/org/springframework/ide/vscode/commons/cloudfoundry/client/MockCfCli.java
diff --git a/vscode-extensions/commons/commons-gradle/.classpath b/headless-services/commons/commons-gradle/.classpath
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/.classpath
rename to headless-services/commons/commons-gradle/.classpath
diff --git a/vscode-extensions/commons/commons-gradle/.project b/headless-services/commons/commons-gradle/.project
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/.project
rename to headless-services/commons/commons-gradle/.project
diff --git a/vscode-extensions/commons/commons-gradle/.settings/org.eclipse.core.resources.prefs b/headless-services/commons/commons-gradle/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/.settings/org.eclipse.core.resources.prefs
rename to headless-services/commons/commons-gradle/.settings/org.eclipse.core.resources.prefs
diff --git a/vscode-extensions/commons/commons-gradle/.settings/org.eclipse.jdt.core.prefs b/headless-services/commons/commons-gradle/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/.settings/org.eclipse.jdt.core.prefs
rename to headless-services/commons/commons-gradle/.settings/org.eclipse.jdt.core.prefs
diff --git a/vscode-extensions/commons/commons-java/.settings/org.eclipse.m2e.core.prefs b/headless-services/commons/commons-gradle/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vscode-extensions/commons/commons-java/.settings/org.eclipse.m2e.core.prefs
rename to headless-services/commons/commons-gradle/.settings/org.eclipse.m2e.core.prefs
diff --git a/vscode-extensions/commons/commons-gradle/pom.xml b/headless-services/commons/commons-gradle/pom.xml
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/pom.xml
rename to headless-services/commons/commons-gradle/pom.xml
diff --git a/vscode-extensions/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java b/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java
rename to headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java
diff --git a/vscode-extensions/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleException.java b/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleException.java
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleException.java
rename to headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleException.java
diff --git a/vscode-extensions/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleJavaProject.java b/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleJavaProject.java
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleJavaProject.java
rename to headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleJavaProject.java
diff --git a/vscode-extensions/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleProjectClasspath.java b/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleProjectClasspath.java
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleProjectClasspath.java
rename to headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleProjectClasspath.java
diff --git a/vscode-extensions/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleProjectFinderStrategy.java b/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleProjectFinderStrategy.java
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleProjectFinderStrategy.java
rename to headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleProjectFinderStrategy.java
diff --git a/vscode-extensions/commons/commons-gradle/src/test/java/org/springframework/ide/vscode/commons/gradle/GradleProjectTest.java b/headless-services/commons/commons-gradle/src/test/java/org/springframework/ide/vscode/commons/gradle/GradleProjectTest.java
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/test/java/org/springframework/ide/vscode/commons/gradle/GradleProjectTest.java
rename to headless-services/commons/commons-gradle/src/test/java/org/springframework/ide/vscode/commons/gradle/GradleProjectTest.java
diff --git a/vscode-extensions/commons/commons-gradle/src/test/resources/empty-gradle-project/.gitignore b/headless-services/commons/commons-gradle/src/test/resources/empty-gradle-project/.gitignore
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/test/resources/empty-gradle-project/.gitignore
rename to headless-services/commons/commons-gradle/src/test/resources/empty-gradle-project/.gitignore
diff --git a/vscode-extensions/commons/commons-gradle/src/test/resources/empty-gradle-project/build.gradle b/headless-services/commons/commons-gradle/src/test/resources/empty-gradle-project/build.gradle
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/test/resources/empty-gradle-project/build.gradle
rename to headless-services/commons/commons-gradle/src/test/resources/empty-gradle-project/build.gradle
diff --git a/vscode-extensions/commons/commons-gradle/src/test/resources/empty-gradle-project/gradle/wrapper/gradle-wrapper.jar b/headless-services/commons/commons-gradle/src/test/resources/empty-gradle-project/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/test/resources/empty-gradle-project/gradle/wrapper/gradle-wrapper.jar
rename to headless-services/commons/commons-gradle/src/test/resources/empty-gradle-project/gradle/wrapper/gradle-wrapper.jar
diff --git a/vscode-extensions/commons/commons-gradle/src/test/resources/empty-gradle-project/gradle/wrapper/gradle-wrapper.properties b/headless-services/commons/commons-gradle/src/test/resources/empty-gradle-project/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/test/resources/empty-gradle-project/gradle/wrapper/gradle-wrapper.properties
rename to headless-services/commons/commons-gradle/src/test/resources/empty-gradle-project/gradle/wrapper/gradle-wrapper.properties
diff --git a/vscode-extensions/commons/commons-gradle/src/test/resources/empty-gradle-project/gradlew b/headless-services/commons/commons-gradle/src/test/resources/empty-gradle-project/gradlew
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/test/resources/empty-gradle-project/gradlew
rename to headless-services/commons/commons-gradle/src/test/resources/empty-gradle-project/gradlew
diff --git a/vscode-extensions/commons/commons-gradle/src/test/resources/empty-gradle-project/gradlew.bat b/headless-services/commons/commons-gradle/src/test/resources/empty-gradle-project/gradlew.bat
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/test/resources/empty-gradle-project/gradlew.bat
rename to headless-services/commons/commons-gradle/src/test/resources/empty-gradle-project/gradlew.bat
diff --git a/vscode-extensions/commons/commons-gradle/src/test/resources/empty-gradle-project/src/main/java/com/example/EmptyGradleProjectApplication.java b/headless-services/commons/commons-gradle/src/test/resources/empty-gradle-project/src/main/java/com/example/EmptyGradleProjectApplication.java
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/test/resources/empty-gradle-project/src/main/java/com/example/EmptyGradleProjectApplication.java
rename to headless-services/commons/commons-gradle/src/test/resources/empty-gradle-project/src/main/java/com/example/EmptyGradleProjectApplication.java
diff --git a/vscode-extensions/commons/commons-gradle/src/test/resources/empty-gradle-project/src/main/resources/application.properties b/headless-services/commons/commons-gradle/src/test/resources/empty-gradle-project/src/main/resources/application.properties
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/test/resources/empty-gradle-project/src/main/resources/application.properties
rename to headless-services/commons/commons-gradle/src/test/resources/empty-gradle-project/src/main/resources/application.properties
diff --git a/vscode-extensions/commons/commons-gradle/src/test/resources/empty-gradle-project/src/test/java/com/example/EmptyGradleProjectApplicationTests.java b/headless-services/commons/commons-gradle/src/test/resources/empty-gradle-project/src/test/java/com/example/EmptyGradleProjectApplicationTests.java
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/test/resources/empty-gradle-project/src/test/java/com/example/EmptyGradleProjectApplicationTests.java
rename to headless-services/commons/commons-gradle/src/test/resources/empty-gradle-project/src/test/java/com/example/EmptyGradleProjectApplicationTests.java
diff --git a/vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/.gradle/3.3/taskArtifacts/fileHashes.bin b/headless-services/commons/commons-gradle/src/test/resources/test-app-1/.gradle/3.3/taskArtifacts/fileHashes.bin
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/.gradle/3.3/taskArtifacts/fileHashes.bin
rename to headless-services/commons/commons-gradle/src/test/resources/test-app-1/.gradle/3.3/taskArtifacts/fileHashes.bin
diff --git a/vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/.gradle/3.3/taskArtifacts/fileSnapshots.bin b/headless-services/commons/commons-gradle/src/test/resources/test-app-1/.gradle/3.3/taskArtifacts/fileSnapshots.bin
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/.gradle/3.3/taskArtifacts/fileSnapshots.bin
rename to headless-services/commons/commons-gradle/src/test/resources/test-app-1/.gradle/3.3/taskArtifacts/fileSnapshots.bin
diff --git a/vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/.gradle/3.3/taskArtifacts/taskArtifacts.bin b/headless-services/commons/commons-gradle/src/test/resources/test-app-1/.gradle/3.3/taskArtifacts/taskArtifacts.bin
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/.gradle/3.3/taskArtifacts/taskArtifacts.bin
rename to headless-services/commons/commons-gradle/src/test/resources/test-app-1/.gradle/3.3/taskArtifacts/taskArtifacts.bin
diff --git a/vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/.gradle/3.3/taskArtifacts/taskArtifacts.lock b/headless-services/commons/commons-gradle/src/test/resources/test-app-1/.gradle/3.3/taskArtifacts/taskArtifacts.lock
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/.gradle/3.3/taskArtifacts/taskArtifacts.lock
rename to headless-services/commons/commons-gradle/src/test/resources/test-app-1/.gradle/3.3/taskArtifacts/taskArtifacts.lock
diff --git a/vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/build.gradle b/headless-services/commons/commons-gradle/src/test/resources/test-app-1/build.gradle
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/build.gradle
rename to headless-services/commons/commons-gradle/src/test/resources/test-app-1/build.gradle
diff --git a/vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/gradle/wrapper/gradle-wrapper.properties b/headless-services/commons/commons-gradle/src/test/resources/test-app-1/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/gradle/wrapper/gradle-wrapper.properties
rename to headless-services/commons/commons-gradle/src/test/resources/test-app-1/gradle/wrapper/gradle-wrapper.properties
diff --git a/vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/gradlew b/headless-services/commons/commons-gradle/src/test/resources/test-app-1/gradlew
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/gradlew
rename to headless-services/commons/commons-gradle/src/test/resources/test-app-1/gradlew
diff --git a/vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/gradlew.bat b/headless-services/commons/commons-gradle/src/test/resources/test-app-1/gradlew.bat
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/gradlew.bat
rename to headless-services/commons/commons-gradle/src/test/resources/test-app-1/gradlew.bat
diff --git a/vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/settings.gradle b/headless-services/commons/commons-gradle/src/test/resources/test-app-1/settings.gradle
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/settings.gradle
rename to headless-services/commons/commons-gradle/src/test/resources/test-app-1/settings.gradle
diff --git a/vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/src/main/java/Library.java b/headless-services/commons/commons-gradle/src/test/resources/test-app-1/src/main/java/Library.java
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/src/main/java/Library.java
rename to headless-services/commons/commons-gradle/src/test/resources/test-app-1/src/main/java/Library.java
diff --git a/vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/src/test/java/LibraryTest.java b/headless-services/commons/commons-gradle/src/test/resources/test-app-1/src/test/java/LibraryTest.java
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/src/test/java/LibraryTest.java
rename to headless-services/commons/commons-gradle/src/test/resources/test-app-1/src/test/java/LibraryTest.java
diff --git a/vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/src/test/resources/test-resource-1.txt b/headless-services/commons/commons-gradle/src/test/resources/test-app-1/src/test/resources/test-resource-1.txt
similarity index 100%
rename from vscode-extensions/commons/commons-gradle/src/test/resources/test-app-1/src/test/resources/test-resource-1.txt
rename to headless-services/commons/commons-gradle/src/test/resources/test-app-1/src/test/resources/test-resource-1.txt
diff --git a/vscode-extensions/commons/commons-java/.classpath b/headless-services/commons/commons-java/.classpath
similarity index 100%
rename from vscode-extensions/commons/commons-java/.classpath
rename to headless-services/commons/commons-java/.classpath
diff --git a/vscode-extensions/commons/commons-java/.project b/headless-services/commons/commons-java/.project
similarity index 100%
rename from vscode-extensions/commons/commons-java/.project
rename to headless-services/commons/commons-java/.project
diff --git a/vscode-extensions/commons/commons-java/.settings/org.eclipse.core.resources.prefs b/headless-services/commons/commons-java/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from vscode-extensions/commons/commons-java/.settings/org.eclipse.core.resources.prefs
rename to headless-services/commons/commons-java/.settings/org.eclipse.core.resources.prefs
diff --git a/vscode-extensions/commons/commons-java/.settings/org.eclipse.jdt.core.prefs b/headless-services/commons/commons-java/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vscode-extensions/commons/commons-java/.settings/org.eclipse.jdt.core.prefs
rename to headless-services/commons/commons-java/.settings/org.eclipse.jdt.core.prefs
diff --git a/vscode-extensions/commons/commons-language-server/.settings/org.eclipse.m2e.core.prefs b/headless-services/commons/commons-java/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/.settings/org.eclipse.m2e.core.prefs
rename to headless-services/commons/commons-java/.settings/org.eclipse.m2e.core.prefs
diff --git a/vscode-extensions/commons/commons-java/pom.xml b/headless-services/commons/commons-java/pom.xml
similarity index 100%
rename from vscode-extensions/commons/commons-java/pom.xml
rename to headless-services/commons/commons-java/pom.xml
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/AnnotationImpl.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/AnnotationImpl.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/AnnotationImpl.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/AnnotationImpl.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/ArrayTypeWrapper.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/ArrayTypeWrapper.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/ArrayTypeWrapper.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/ArrayTypeWrapper.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/ClassTypeWrapper.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/ClassTypeWrapper.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/ClassTypeWrapper.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/ClassTypeWrapper.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/FieldImpl.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/FieldImpl.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/FieldImpl.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/FieldImpl.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/JandexClasspath.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/JandexClasspath.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/JandexClasspath.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/JandexClasspath.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/JandexIndex.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/JandexIndex.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/JandexIndex.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/JandexIndex.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/MethodImpl.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/MethodImpl.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/MethodImpl.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/MethodImpl.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/ParameterizedTypeWrapper.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/ParameterizedTypeWrapper.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/ParameterizedTypeWrapper.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/ParameterizedTypeWrapper.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/TypeImpl.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/TypeImpl.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/TypeImpl.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/TypeImpl.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/TypeVariableWrapper.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/TypeVariableWrapper.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/TypeVariableWrapper.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/TypeVariableWrapper.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/TypeWrapper.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/TypeWrapper.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/TypeWrapper.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/TypeWrapper.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/UnresolvedTypeVariableWrapper.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/UnresolvedTypeVariableWrapper.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/UnresolvedTypeVariableWrapper.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/UnresolvedTypeVariableWrapper.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/WildcardTypeWrapper.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/WildcardTypeWrapper.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/WildcardTypeWrapper.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/WildcardTypeWrapper.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/Wrappers.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/Wrappers.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/Wrappers.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/Wrappers.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/ClassFileConstants.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/ClassFileConstants.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/ClassFileConstants.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/ClassFileConstants.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/Flags.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/Flags.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/Flags.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/Flags.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IAnnotatable.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IAnnotatable.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IAnnotatable.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IAnnotatable.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IAnnotation.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IAnnotation.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IAnnotation.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IAnnotation.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IArrayType.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IArrayType.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IArrayType.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IArrayType.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IClassType.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IClassType.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IClassType.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IClassType.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IClasspath.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IClasspath.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IClasspath.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IClasspath.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IField.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IField.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IField.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IField.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavaElement.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavaElement.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavaElement.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavaElement.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavaProject.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavaProject.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavaProject.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavaProject.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavaType.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavaType.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavaType.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavaType.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavadocProvider.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavadocProvider.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavadocProvider.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IJavadocProvider.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMember.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMember.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMember.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMember.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMemberValuePair.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMemberValuePair.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMemberValuePair.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMemberValuePair.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMethod.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMethod.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMethod.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IMethod.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IParameterizedType.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IParameterizedType.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IParameterizedType.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IParameterizedType.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IPrimitiveType.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IPrimitiveType.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IPrimitiveType.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IPrimitiveType.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IType.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IType.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IType.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IType.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/ITypeVariable.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/ITypeVariable.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/ITypeVariable.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/ITypeVariable.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IUnresolvedTypeVariable.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IUnresolvedTypeVariable.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IUnresolvedTypeVariable.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IUnresolvedTypeVariable.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IVoidType.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IVoidType.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IVoidType.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IVoidType.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IWildcardType.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IWildcardType.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IWildcardType.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/IWildcardType.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/Signature.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/Signature.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/Signature.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/Signature.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/parser/CompilationUnitIndex.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/parser/CompilationUnitIndex.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/parser/CompilationUnitIndex.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/parser/CompilationUnitIndex.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/parser/ParserJavadocProvider.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/parser/ParserJavadocProvider.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/parser/ParserJavadocProvider.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/parser/ParserJavadocProvider.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/HtmlJavadoc.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/HtmlJavadoc.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/HtmlJavadoc.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/HtmlJavadoc.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/HtmlJavadocIndex.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/HtmlJavadocIndex.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/HtmlJavadocIndex.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/HtmlJavadocIndex.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/HtmlJavadocProvider.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/HtmlJavadocProvider.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/HtmlJavadocProvider.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/HtmlJavadocProvider.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/IJavadoc.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/IJavadoc.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/IJavadoc.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/IJavadoc.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/RawJavadoc.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/RawJavadoc.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/RawJavadoc.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/RawJavadoc.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/SourceUrlProvider.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/SourceUrlProvider.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/SourceUrlProvider.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/SourceUrlProvider.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/SourceUrlProviderFromSourceContainer.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/SourceUrlProviderFromSourceContainer.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/SourceUrlProviderFromSourceContainer.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/SourceUrlProviderFromSourceContainer.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/internal/CharOperation.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/internal/CharOperation.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/internal/CharOperation.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/internal/CharOperation.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/internal/HashtableOfObjectToIntArray.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/internal/HashtableOfObjectToIntArray.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/internal/HashtableOfObjectToIntArray.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/internal/HashtableOfObjectToIntArray.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/internal/JavadocConstants.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/internal/JavadocConstants.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/internal/JavadocConstants.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/internal/JavadocConstants.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/internal/JavadocContents.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/internal/JavadocContents.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/internal/JavadocContents.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/internal/JavadocContents.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/internal/ScannerHelper.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/internal/ScannerHelper.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/internal/ScannerHelper.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/javadoc/internal/ScannerHelper.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/DefaultJavaProjectFinder.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/DefaultJavaProjectFinder.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/DefaultJavaProjectFinder.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/DefaultJavaProjectFinder.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/IJavaProjectFinderStrategy.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/IJavaProjectFinderStrategy.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/IJavaProjectFinderStrategy.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/IJavaProjectFinderStrategy.java
diff --git a/vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/JavaProjectFinder.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/JavaProjectFinder.java
similarity index 100%
rename from vscode-extensions/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/JavaProjectFinder.java
rename to headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/JavaProjectFinder.java
diff --git a/vscode-extensions/commons/commons-language-server/.classpath b/headless-services/commons/commons-language-server/.classpath
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/.classpath
rename to headless-services/commons/commons-language-server/.classpath
diff --git a/vscode-extensions/commons/commons-language-server/.project b/headless-services/commons/commons-language-server/.project
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/.project
rename to headless-services/commons/commons-language-server/.project
diff --git a/vscode-extensions/commons/commons-language-server/.settings/org.eclipse.core.resources.prefs b/headless-services/commons/commons-language-server/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/.settings/org.eclipse.core.resources.prefs
rename to headless-services/commons/commons-language-server/.settings/org.eclipse.core.resources.prefs
diff --git a/vscode-extensions/commons/commons-language-server/.settings/org.eclipse.jdt.core.prefs b/headless-services/commons/commons-language-server/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/.settings/org.eclipse.jdt.core.prefs
rename to headless-services/commons/commons-language-server/.settings/org.eclipse.jdt.core.prefs
diff --git a/vscode-extensions/commons/commons-language-server/.settings/org.eclipse.jdt.ui.prefs b/headless-services/commons/commons-language-server/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/.settings/org.eclipse.jdt.ui.prefs
rename to headless-services/commons/commons-language-server/.settings/org.eclipse.jdt.ui.prefs
diff --git a/vscode-extensions/commons/commons-maven/.settings/org.eclipse.m2e.core.prefs b/headless-services/commons/commons-language-server/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vscode-extensions/commons/commons-maven/.settings/org.eclipse.m2e.core.prefs
rename to headless-services/commons/commons-language-server/.settings/org.eclipse.m2e.core.prefs
diff --git a/vscode-extensions/commons/commons-language-server/pom.xml b/headless-services/commons/commons-language-server/pom.xml
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/pom.xml
rename to headless-services/commons/commons-language-server/pom.xml
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/LanguageIds.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/LanguageIds.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/LanguageIds.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/LanguageIds.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/LaunguageServerApp.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/LaunguageServerApp.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/LaunguageServerApp.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/LaunguageServerApp.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/ProgressParams.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/ProgressParams.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/ProgressParams.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/ProgressParams.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/ProgressService.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/ProgressService.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/ProgressService.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/ProgressService.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/STS4LanguageClient.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/STS4LanguageClient.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/STS4LanguageClient.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/STS4LanguageClient.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/DocumentEdits.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/DocumentEdits.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/DocumentEdits.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/DocumentEdits.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/ICompletionEngine.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/ICompletionEngine.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/ICompletionEngine.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/ICompletionEngine.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/ICompletionProposal.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/ICompletionProposal.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/ICompletionProposal.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/ICompletionProposal.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/LazyProposalApplier.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/LazyProposalApplier.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/LazyProposalApplier.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/LazyProposalApplier.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/ProposalApplier.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/ProposalApplier.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/ProposalApplier.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/ProposalApplier.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/ScoreableProposal.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/ScoreableProposal.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/ScoreableProposal.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/ScoreableProposal.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngine.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngine.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngine.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngine.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/completion/VscodeCompletionEngineAdapter.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/definition/SimpleDefinitionFinder.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/definition/SimpleDefinitionFinder.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/definition/SimpleDefinitionFinder.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/definition/SimpleDefinitionFinder.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/hover/HoverInfoProvider.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/hover/HoverInfoProvider.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/hover/HoverInfoProvider.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/hover/HoverInfoProvider.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/hover/VscodeHoverEngine.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/hover/VscodeHoverEngine.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/hover/VscodeHoverEngine.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/hover/VscodeHoverEngine.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/hover/VscodeHoverEngineAdapter.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/hover/VscodeHoverEngineAdapter.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/hover/VscodeHoverEngineAdapter.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/hover/VscodeHoverEngineAdapter.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/quickfix/ProblemFixer.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/quickfix/ProblemFixer.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/quickfix/ProblemFixer.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/quickfix/ProblemFixer.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/quickfix/QuickfixContext.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/quickfix/QuickfixContext.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/quickfix/QuickfixContext.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/quickfix/QuickfixContext.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/BadWordReconcileEngine.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/BadWordReconcileEngine.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/BadWordReconcileEngine.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/BadWordReconcileEngine.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/IProblemCollector.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/IProblemCollector.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/IProblemCollector.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/IProblemCollector.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/IReconcileEngine.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/IReconcileEngine.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/IReconcileEngine.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/IReconcileEngine.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ProblemSeverity.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ProblemSeverity.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ProblemSeverity.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ProblemSeverity.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ProblemType.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ProblemType.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ProblemType.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ProblemType.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ProblemTypeProvider.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ProblemTypeProvider.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ProblemTypeProvider.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ProblemTypeProvider.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ReconcileException.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ReconcileException.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ReconcileException.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ReconcileException.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ReconcileProblem.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ReconcileProblem.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ReconcileProblem.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ReconcileProblem.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ReconcileProblemImpl.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ReconcileProblemImpl.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ReconcileProblemImpl.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/reconcile/ReconcileProblemImpl.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/CompletionHandler.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/CompletionHandler.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/CompletionHandler.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/CompletionHandler.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/CompletionResolveHandler.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/CompletionResolveHandler.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/CompletionResolveHandler.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/CompletionResolveHandler.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DefinitionHandler.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DefinitionHandler.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DefinitionHandler.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DefinitionHandler.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentRegion.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentRegion.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentRegion.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentRegion.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentUtil.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentUtil.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentUtil.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/DocumentUtil.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/HoverHandler.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/HoverHandler.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/HoverHandler.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/HoverHandler.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/JSON.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/JSON.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/JSON.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/JSON.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/ListenerList.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/ListenerList.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/ListenerList.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/ListenerList.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/LoggingFormat.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/LoggingFormat.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/LoggingFormat.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/LoggingFormat.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/PrefixFinder.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/PrefixFinder.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/PrefixFinder.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/PrefixFinder.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/ReferencesHandler.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/ReferencesHandler.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/ReferencesHandler.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/ReferencesHandler.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/ServiceNotificationsClient.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/ServiceNotificationsClient.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/ServiceNotificationsClient.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/ServiceNotificationsClient.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/Settings.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/Settings.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/Settings.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/Settings.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/ShowMessageException.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/ShowMessageException.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/ShowMessageException.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/ShowMessageException.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleWorkspaceService.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleWorkspaceService.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleWorkspaceService.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleWorkspaceService.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SortKeys.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SortKeys.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SortKeys.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SortKeys.java
diff --git a/vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/TextDocumentContentChange.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/TextDocumentContentChange.java
similarity index 100%
rename from vscode-extensions/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/TextDocumentContentChange.java
rename to headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/TextDocumentContentChange.java
diff --git a/vscode-extensions/commons/commons-maven/.classpath b/headless-services/commons/commons-maven/.classpath
similarity index 100%
rename from vscode-extensions/commons/commons-maven/.classpath
rename to headless-services/commons/commons-maven/.classpath
diff --git a/vscode-extensions/commons/commons-maven/.project b/headless-services/commons/commons-maven/.project
similarity index 100%
rename from vscode-extensions/commons/commons-maven/.project
rename to headless-services/commons/commons-maven/.project
diff --git a/vscode-extensions/commons/commons-maven/.settings/org.eclipse.core.resources.prefs b/headless-services/commons/commons-maven/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from vscode-extensions/commons/commons-maven/.settings/org.eclipse.core.resources.prefs
rename to headless-services/commons/commons-maven/.settings/org.eclipse.core.resources.prefs
diff --git a/vscode-extensions/commons/commons-maven/.settings/org.eclipse.jdt.core.prefs b/headless-services/commons/commons-maven/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vscode-extensions/commons/commons-maven/.settings/org.eclipse.jdt.core.prefs
rename to headless-services/commons/commons-maven/.settings/org.eclipse.jdt.core.prefs
diff --git a/vscode-extensions/commons/commons-util/.settings/org.eclipse.m2e.core.prefs b/headless-services/commons/commons-maven/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vscode-extensions/commons/commons-util/.settings/org.eclipse.m2e.core.prefs
rename to headless-services/commons/commons-maven/.settings/org.eclipse.m2e.core.prefs
diff --git a/vscode-extensions/commons/commons-maven/pom.xml b/headless-services/commons/commons-maven/pom.xml
similarity index 100%
rename from vscode-extensions/commons/commons-maven/pom.xml
rename to headless-services/commons/commons-maven/pom.xml
diff --git a/vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/DefaultMavenConfiguration.java b/headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/DefaultMavenConfiguration.java
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/DefaultMavenConfiguration.java
rename to headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/DefaultMavenConfiguration.java
diff --git a/vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/IMavenConfiguration.java b/headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/IMavenConfiguration.java
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/IMavenConfiguration.java
rename to headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/IMavenConfiguration.java
diff --git a/vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/JavaProjectWithClasspathFileFinderStrategy.java b/headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/JavaProjectWithClasspathFileFinderStrategy.java
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/JavaProjectWithClasspathFileFinderStrategy.java
rename to headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/JavaProjectWithClasspathFileFinderStrategy.java
diff --git a/vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/MavenBridge.java b/headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/MavenBridge.java
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/MavenBridge.java
rename to headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/MavenBridge.java
diff --git a/vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/MavenBuilder.java b/headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/MavenBuilder.java
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/MavenBuilder.java
rename to headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/MavenBuilder.java
diff --git a/vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/MavenCore.java b/headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/MavenCore.java
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/MavenCore.java
rename to headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/MavenCore.java
diff --git a/vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/MavenException.java b/headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/MavenException.java
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/MavenException.java
rename to headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/MavenException.java
diff --git a/vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/MavenProjectFinderStrategy.java b/headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/MavenProjectFinderStrategy.java
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/MavenProjectFinderStrategy.java
rename to headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/MavenProjectFinderStrategy.java
diff --git a/vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/java/MavenJavaProject.java b/headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/java/MavenJavaProject.java
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/java/MavenJavaProject.java
rename to headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/java/MavenJavaProject.java
diff --git a/vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/java/MavenProjectClasspath.java b/headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/java/MavenProjectClasspath.java
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/java/MavenProjectClasspath.java
rename to headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/java/MavenProjectClasspath.java
diff --git a/vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/java/classpathfile/FileClasspath.java b/headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/java/classpathfile/FileClasspath.java
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/java/classpathfile/FileClasspath.java
rename to headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/java/classpathfile/FileClasspath.java
diff --git a/vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/java/classpathfile/JavaProjectWithClasspathFile.java b/headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/java/classpathfile/JavaProjectWithClasspathFile.java
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/java/classpathfile/JavaProjectWithClasspathFile.java
rename to headless-services/commons/commons-maven/src/main/java/org/springframework/ide/vscode/commons/maven/java/classpathfile/JavaProjectWithClasspathFile.java
diff --git a/vscode-extensions/commons/commons-maven/src/test/java/org/springframework/ide/vscode/commons/maven/DependencyTreeTest.java b/headless-services/commons/commons-maven/src/test/java/org/springframework/ide/vscode/commons/maven/DependencyTreeTest.java
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/java/org/springframework/ide/vscode/commons/maven/DependencyTreeTest.java
rename to headless-services/commons/commons-maven/src/test/java/org/springframework/ide/vscode/commons/maven/DependencyTreeTest.java
diff --git a/vscode-extensions/commons/commons-maven/src/test/java/org/springframework/ide/vscode/commons/maven/HtmlJavadocTest.java b/headless-services/commons/commons-maven/src/test/java/org/springframework/ide/vscode/commons/maven/HtmlJavadocTest.java
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/java/org/springframework/ide/vscode/commons/maven/HtmlJavadocTest.java
rename to headless-services/commons/commons-maven/src/test/java/org/springframework/ide/vscode/commons/maven/HtmlJavadocTest.java
diff --git a/vscode-extensions/commons/commons-maven/src/test/java/org/springframework/ide/vscode/commons/maven/JavaIndexTest.java b/headless-services/commons/commons-maven/src/test/java/org/springframework/ide/vscode/commons/maven/JavaIndexTest.java
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/java/org/springframework/ide/vscode/commons/maven/JavaIndexTest.java
rename to headless-services/commons/commons-maven/src/test/java/org/springframework/ide/vscode/commons/maven/JavaIndexTest.java
diff --git a/vscode-extensions/commons/commons-maven/src/test/java/org/springframework/ide/vscode/commons/maven/SourceJavadocTest.java b/headless-services/commons/commons-maven/src/test/java/org/springframework/ide/vscode/commons/maven/SourceJavadocTest.java
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/java/org/springframework/ide/vscode/commons/maven/SourceJavadocTest.java
rename to headless-services/commons/commons-maven/src/test/java/org/springframework/ide/vscode/commons/maven/SourceJavadocTest.java
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/.gitignore b/headless-services/commons/commons-maven/src/test/resources/.gitignore
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/.gitignore
rename to headless-services/commons/commons-maven/src/test/resources/.gitignore
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/.gitignore b/headless-services/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/.gitignore
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/.gitignore
rename to headless-services/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/.gitignore
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/.mvn/wrapper/maven-wrapper.jar b/headless-services/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/.mvn/wrapper/maven-wrapper.jar
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/.mvn/wrapper/maven-wrapper.properties b/headless-services/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/.mvn/wrapper/maven-wrapper.properties
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/mvnw b/headless-services/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/mvnw
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/mvnw
rename to headless-services/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/mvnw
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/mvnw.cmd b/headless-services/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/mvnw.cmd
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/mvnw.cmd
rename to headless-services/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/mvnw.cmd
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/pom.xml b/headless-services/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/pom.xml
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/pom.xml
rename to headless-services/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/pom.xml
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/src/main/java/com/example/EmptyBootProjectWithClasspathFileApplication.java b/headless-services/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/src/main/java/com/example/EmptyBootProjectWithClasspathFileApplication.java
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/src/main/java/com/example/EmptyBootProjectWithClasspathFileApplication.java
rename to headless-services/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/src/main/java/com/example/EmptyBootProjectWithClasspathFileApplication.java
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/src/main/resources/application.properties b/headless-services/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/src/main/resources/application.properties
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/src/main/resources/application.properties
rename to headless-services/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/src/main/resources/application.properties
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/src/test/java/com/example/EmptyBootProjectWithClasspathFileApplicationTests.java b/headless-services/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/src/test/java/com/example/EmptyBootProjectWithClasspathFileApplicationTests.java
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/src/test/java/com/example/EmptyBootProjectWithClasspathFileApplicationTests.java
rename to headless-services/commons/commons-maven/src/test/resources/empty-boot-project-with-classpath-file/src/test/java/com/example/EmptyBootProjectWithClasspathFileApplicationTests.java
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/.gitignore b/headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/.gitignore
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/.gitignore
rename to headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/.gitignore
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/.mvn/wrapper/maven-wrapper.jar b/headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/.mvn/wrapper/maven-wrapper.jar
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/.mvn/wrapper/maven-wrapper.jar
rename to headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/.mvn/wrapper/maven-wrapper.jar
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/.mvn/wrapper/maven-wrapper.properties b/headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/.mvn/wrapper/maven-wrapper.properties
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/.mvn/wrapper/maven-wrapper.properties
rename to headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/.mvn/wrapper/maven-wrapper.properties
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/build.gradle b/headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/build.gradle
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/build.gradle
rename to headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/build.gradle
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/gradle/wrapper/gradle-wrapper.properties b/headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/gradle/wrapper/gradle-wrapper.properties
rename to headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/gradle/wrapper/gradle-wrapper.properties
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/gradlew b/headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/gradlew
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/gradlew
rename to headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/gradlew
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/gradlew.bat b/headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/gradlew.bat
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/gradlew.bat
rename to headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/gradlew.bat
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/manifest.yml b/headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/manifest.yml
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/manifest.yml
rename to headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/manifest.yml
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/mvnw b/headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/mvnw
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/mvnw
rename to headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/mvnw
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/mvnw.cmd b/headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/mvnw.cmd
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/mvnw.cmd
rename to headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/mvnw.cmd
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/pom.xml b/headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/pom.xml
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/pom.xml
rename to headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/pom.xml
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/public/hello.js b/headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/public/hello.js
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/public/hello.js
rename to headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/public/hello.js
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/public/index.html b/headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/public/index.html
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/public/index.html
rename to headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/public/index.html
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/src/main/java/hello/Application.java b/headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/src/main/java/hello/Application.java
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/src/main/java/hello/Application.java
rename to headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/src/main/java/hello/Application.java
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/src/main/java/hello/Greeting.java b/headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/src/main/java/hello/Greeting.java
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/src/main/java/hello/Greeting.java
rename to headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/src/main/java/hello/Greeting.java
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/src/main/java/hello/GreetingController.java b/headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/src/main/java/hello/GreetingController.java
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/src/main/java/hello/GreetingController.java
rename to headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/src/main/java/hello/GreetingController.java
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/src/test/java/hello/GreetingIntegrationTests.java b/headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/src/test/java/hello/GreetingIntegrationTests.java
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/src/test/java/hello/GreetingIntegrationTests.java
rename to headless-services/commons/commons-maven/src/test/resources/gs-rest-service-cors-boot-1.4.1-with-classpath-file/src/test/java/hello/GreetingIntegrationTests.java
diff --git a/vscode-extensions/commons/commons-maven/src/test/resources/maven-config/settings.xml b/headless-services/commons/commons-maven/src/test/resources/maven-config/settings.xml
similarity index 100%
rename from vscode-extensions/commons/commons-maven/src/test/resources/maven-config/settings.xml
rename to headless-services/commons/commons-maven/src/test/resources/maven-config/settings.xml
diff --git a/vscode-extensions/commons/commons-util/.classpath b/headless-services/commons/commons-util/.classpath
similarity index 100%
rename from vscode-extensions/commons/commons-util/.classpath
rename to headless-services/commons/commons-util/.classpath
diff --git a/vscode-extensions/commons/commons-util/.project b/headless-services/commons/commons-util/.project
similarity index 100%
rename from vscode-extensions/commons/commons-util/.project
rename to headless-services/commons/commons-util/.project
diff --git a/vscode-extensions/commons/commons-util/.settings/org.eclipse.core.resources.prefs b/headless-services/commons/commons-util/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from vscode-extensions/commons/commons-util/.settings/org.eclipse.core.resources.prefs
rename to headless-services/commons/commons-util/.settings/org.eclipse.core.resources.prefs
diff --git a/vscode-extensions/commons/commons-util/.settings/org.eclipse.jdt.core.prefs b/headless-services/commons/commons-util/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vscode-extensions/commons/commons-util/.settings/org.eclipse.jdt.core.prefs
rename to headless-services/commons/commons-util/.settings/org.eclipse.jdt.core.prefs
diff --git a/vscode-extensions/commons/commons-yaml/.settings/org.eclipse.m2e.core.prefs b/headless-services/commons/commons-util/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/.settings/org.eclipse.m2e.core.prefs
rename to headless-services/commons/commons-util/.settings/org.eclipse.m2e.core.prefs
diff --git a/vscode-extensions/commons/commons-util/pom.xml b/headless-services/commons/commons-util/pom.xml
similarity index 100%
rename from vscode-extensions/commons/commons-util/pom.xml
rename to headless-services/commons/commons-util/pom.xml
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/AlwaysFailingParser.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/AlwaysFailingParser.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/AlwaysFailingParser.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/AlwaysFailingParser.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ArrayUtils.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ArrayUtils.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ArrayUtils.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ArrayUtils.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Assert.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Assert.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Assert.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Assert.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/BadLocationException.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/BadLocationException.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/BadLocationException.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/BadLocationException.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/CollectionUtil.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/CollectionUtil.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/CollectionUtil.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/CollectionUtil.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Collector.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Collector.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Collector.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Collector.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/EnumValueParser.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/EnumValueParser.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/EnumValueParser.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/EnumValueParser.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExceptionUtil.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExceptionUtil.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExceptionUtil.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExceptionUtil.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExternalCommand.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExternalCommand.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExternalCommand.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExternalCommand.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExternalProcess.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExternalProcess.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExternalProcess.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ExternalProcess.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/FileUtils.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/FileUtils.java
similarity index 96%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/FileUtils.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/FileUtils.java
index 4f9848ba5..d968c80b5 100644
--- a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/FileUtils.java
+++ b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/FileUtils.java
@@ -1,42 +1,42 @@
-/*******************************************************************************
- * Copyright (c) 2016 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.commons.util;
-
-import java.io.File;
-
-/**
- * Utilitity methods for working with  files
- * 
- * @authro Kris De Volder
- * @author Alex Boyko
- *
- */
-public class FileUtils {
-
-	/**
-	 * Find file given its fil name in the given folder or its parent folders
-	 * @param folder Starting folder
-	 * @param fileNameToFind Name of the file to find
-	 * @return Found <code>File</code>
-	 */
-	public static File findFile(File folder, String fileNameToFind) {
-		if (folder!=null && folder.exists()) {
-			File file = new File(folder, fileNameToFind);
-			if (file.isFile()) {
-				return file;
-			} else {
-				return findFile(folder.getParentFile(), fileNameToFind);
-			}
-		}
-		return null;
-	}
-
-}
+/*******************************************************************************
+ * Copyright (c) 2016 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.commons.util;
+
+import java.io.File;
+
+/**
+ * Utilitity methods for working with  files
+ * 
+ * @authro Kris De Volder
+ * @author Alex Boyko
+ *
+ */
+public class FileUtils {
+
+	/**
+	 * Find file given its fil name in the given folder or its parent folders
+	 * @param folder Starting folder
+	 * @param fileNameToFind Name of the file to find
+	 * @return Found <code>File</code>
+	 */
+	public static File findFile(File folder, String fileNameToFind) {
+		if (folder!=null && folder.exists()) {
+			File file = new File(folder, fileNameToFind);
+			if (file.isFile()) {
+				return file;
+			} else {
+				return findFile(folder.getParentFile(), fileNameToFind);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Futures.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Futures.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Futures.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Futures.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/FuzzyMap.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/FuzzyMap.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/FuzzyMap.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/FuzzyMap.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/FuzzyMatcher.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/FuzzyMatcher.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/FuzzyMatcher.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/FuzzyMatcher.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/HtmlBuffer.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/HtmlBuffer.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/HtmlBuffer.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/HtmlBuffer.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/HtmlSnippet.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/HtmlSnippet.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/HtmlSnippet.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/HtmlSnippet.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/HtmlUtil.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/HtmlUtil.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/HtmlUtil.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/HtmlUtil.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/IOUtil.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/IOUtil.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/IOUtil.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/IOUtil.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/IRequestor.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/IRequestor.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/IRequestor.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/IRequestor.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/IntegerRange.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/IntegerRange.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/IntegerRange.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/IntegerRange.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/LazyProvider.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/LazyProvider.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/LazyProvider.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/LazyProvider.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ListenerList.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ListenerList.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ListenerList.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ListenerList.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Log.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Log.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Log.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Log.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/MimeTypes.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/MimeTypes.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/MimeTypes.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/MimeTypes.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/RegexpParser.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/RegexpParser.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/RegexpParser.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/RegexpParser.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/RememberLast.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/RememberLast.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/RememberLast.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/RememberLast.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Renderable.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Renderable.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Renderable.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Renderable.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Renderables.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Renderables.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Renderables.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/Renderables.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/StringUtil.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/StringUtil.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/StringUtil.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/StringUtil.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ValueParseException.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ValueParseException.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ValueParseException.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ValueParseException.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ValueParser.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ValueParser.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ValueParser.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ValueParser.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ValueParsers.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ValueParsers.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ValueParsers.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/ValueParsers.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/IDocument.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/IDocument.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/IDocument.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/IDocument.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/IRegion.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/IRegion.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/IRegion.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/IRegion.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/Region.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/Region.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/Region.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/Region.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/TextDocument.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/TextDocument.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/TextDocument.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/TextDocument.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/AbstractLineTracker.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/AbstractLineTracker.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/AbstractLineTracker.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/AbstractLineTracker.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/DefaultLineTracker.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/DefaultLineTracker.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/DefaultLineTracker.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/DefaultLineTracker.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/DocumentRewriteSession.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/DocumentRewriteSession.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/DocumentRewriteSession.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/DocumentRewriteSession.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/DocumentRewriteSessionType.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/DocumentRewriteSessionType.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/DocumentRewriteSessionType.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/DocumentRewriteSessionType.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/ILineTracker.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/ILineTracker.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/ILineTracker.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/ILineTracker.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/ILineTrackerExtension.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/ILineTrackerExtension.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/ILineTrackerExtension.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/ILineTrackerExtension.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/Line.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/Line.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/Line.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/Line.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/ListLineTracker.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/ListLineTracker.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/ListLineTracker.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/ListLineTracker.java
diff --git a/vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/TreeLineTracker.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/TreeLineTracker.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/TreeLineTracker.java
rename to headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/linetracker/TreeLineTracker.java
diff --git a/vscode-extensions/commons/commons-util/src/test/java/org/springframework/ide/vscode/commons/util/FuzzyMapTest.java b/headless-services/commons/commons-util/src/test/java/org/springframework/ide/vscode/commons/util/FuzzyMapTest.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/test/java/org/springframework/ide/vscode/commons/util/FuzzyMapTest.java
rename to headless-services/commons/commons-util/src/test/java/org/springframework/ide/vscode/commons/util/FuzzyMapTest.java
diff --git a/vscode-extensions/commons/commons-util/src/test/java/org/springframework/ide/vscode/commons/util/StringUtilTest.java b/headless-services/commons/commons-util/src/test/java/org/springframework/ide/vscode/commons/util/StringUtilTest.java
similarity index 100%
rename from vscode-extensions/commons/commons-util/src/test/java/org/springframework/ide/vscode/commons/util/StringUtilTest.java
rename to headless-services/commons/commons-util/src/test/java/org/springframework/ide/vscode/commons/util/StringUtilTest.java
diff --git a/vscode-extensions/commons/commons-yaml/.classpath b/headless-services/commons/commons-yaml/.classpath
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/.classpath
rename to headless-services/commons/commons-yaml/.classpath
diff --git a/vscode-extensions/commons/commons-yaml/.project b/headless-services/commons/commons-yaml/.project
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/.project
rename to headless-services/commons/commons-yaml/.project
diff --git a/vscode-extensions/commons/commons-yaml/.settings/org.eclipse.core.resources.prefs b/headless-services/commons/commons-yaml/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/.settings/org.eclipse.core.resources.prefs
rename to headless-services/commons/commons-yaml/.settings/org.eclipse.core.resources.prefs
diff --git a/vscode-extensions/commons/commons-yaml/.settings/org.eclipse.jdt.core.prefs b/headless-services/commons/commons-yaml/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/.settings/org.eclipse.jdt.core.prefs
rename to headless-services/commons/commons-yaml/.settings/org.eclipse.jdt.core.prefs
diff --git a/vscode-extensions/commons/java-properties/.settings/org.eclipse.m2e.core.prefs b/headless-services/commons/commons-yaml/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vscode-extensions/commons/java-properties/.settings/org.eclipse.m2e.core.prefs
rename to headless-services/commons/commons-yaml/.settings/org.eclipse.m2e.core.prefs
diff --git a/vscode-extensions/commons/commons-yaml/pom.xml b/headless-services/commons/commons-yaml/pom.xml
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/pom.xml
rename to headless-services/commons/commons-yaml/pom.xml
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/NodeRef.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/NodeRef.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/NodeRef.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/NodeRef.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/NodeUtil.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/NodeUtil.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/NodeUtil.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/NodeUtil.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlASTProvider.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlASTProvider.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlASTProvider.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlASTProvider.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlFileAST.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlFileAST.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlFileAST.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlFileAST.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlParser.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlParser.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlParser.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/ast/YamlParser.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/AbstractYamlAssistContext.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/AbstractYamlAssistContext.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/AbstractYamlAssistContext.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/AbstractYamlAssistContext.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/CompletionFactory.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/CompletionFactory.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/CompletionFactory.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/CompletionFactory.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/DefaultCompletionFactory.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/DefaultCompletionFactory.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/DefaultCompletionFactory.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/DefaultCompletionFactory.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/SchemaBasedYamlAssistContextProvider.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/SchemaBasedYamlAssistContextProvider.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/SchemaBasedYamlAssistContextProvider.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/SchemaBasedYamlAssistContextProvider.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/TopLevelAssistContext.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/TopLevelAssistContext.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/TopLevelAssistContext.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/TopLevelAssistContext.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YTypeAssistContext.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YTypeAssistContext.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YTypeAssistContext.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YTypeAssistContext.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlAssistContext.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlAssistContext.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlAssistContext.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlAssistContext.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlAssistContextProvider.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlAssistContextProvider.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlAssistContextProvider.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlAssistContextProvider.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlCompletionEngine.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlCompletionEngine.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlCompletionEngine.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlCompletionEngine.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlPathEdits.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlPathEdits.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlPathEdits.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/completion/YamlPathEdits.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/hover/YPropertyInfoTemplates.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/hover/YPropertyInfoTemplates.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/hover/YPropertyInfoTemplates.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/hover/YPropertyInfoTemplates.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/hover/YamlHoverInfoProvider.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/hover/YamlHoverInfoProvider.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/hover/YamlHoverInfoProvider.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/hover/YamlHoverInfoProvider.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/ASTCursor.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/ASTCursor.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/ASTCursor.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/ASTCursor.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/ASTRootCursor.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/ASTRootCursor.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/ASTRootCursor.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/ASTRootCursor.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/KeyAliases.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/KeyAliases.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/KeyAliases.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/KeyAliases.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/NodeCursor.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/NodeCursor.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/NodeCursor.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/NodeCursor.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlNavigable.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlNavigable.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlNavigable.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlNavigable.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlPath.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlPath.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlPath.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlPath.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlPathSegment.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlPathSegment.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlPathSegment.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/path/YamlPathSegment.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/ITypeCollector.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/ITypeCollector.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/ITypeCollector.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/ITypeCollector.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlASTReconciler.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlASTReconciler.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlASTReconciler.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlASTReconciler.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlReconcileEngine.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlReconcileEngine.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlReconcileEngine.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlReconcileEngine.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlSchemaBasedReconcileEngine.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlSchemaBasedReconcileEngine.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlSchemaBasedReconcileEngine.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlSchemaBasedReconcileEngine.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlSchemaProblems.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlSchemaProblems.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlSchemaProblems.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlSchemaProblems.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/ASTDynamicSchemaContext.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/ASTDynamicSchemaContext.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/ASTDynamicSchemaContext.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/ASTDynamicSchemaContext.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/BasicYValueHint.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/BasicYValueHint.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/BasicYValueHint.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/BasicYValueHint.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/CachingSchemaContext.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/CachingSchemaContext.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/CachingSchemaContext.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/CachingSchemaContext.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/DynamicSchemaContext.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/DynamicSchemaContext.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/DynamicSchemaContext.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/DynamicSchemaContext.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/SNodeDynamicSchemaContext.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/SNodeDynamicSchemaContext.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/SNodeDynamicSchemaContext.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/SNodeDynamicSchemaContext.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/SchemaContextAware.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/SchemaContextAware.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/SchemaContextAware.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/SchemaContextAware.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YType.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YType.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YType.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YType.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeFactory.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeFactory.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeFactory.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeFactory.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeUtil.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeUtil.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeUtil.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeUtil.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypedProperty.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypedProperty.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypedProperty.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypedProperty.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YValueHint.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YValueHint.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YValueHint.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YValueHint.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YamlSchema.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YamlSchema.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YamlSchema.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YamlSchema.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/constraints/Constraint.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/constraints/Constraint.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/constraints/Constraint.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/constraints/Constraint.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/constraints/Constraints.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/constraints/Constraints.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/constraints/Constraints.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/constraints/Constraints.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlDocument.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlDocument.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlDocument.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlDocument.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlStructureParser.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlStructureParser.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlStructureParser.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlStructureParser.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlStructureProvider.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlStructureProvider.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlStructureProvider.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/structure/YamlStructureProvider.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/Streams.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/Streams.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/Streams.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/Streams.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/YamlIndentUtil.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/YamlIndentUtil.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/YamlIndentUtil.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/YamlIndentUtil.java
diff --git a/vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/YamlUtil.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/YamlUtil.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/YamlUtil.java
rename to headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/util/YamlUtil.java
diff --git a/vscode-extensions/commons/commons-yaml/src/test/java/org/springframework/ide/vscode/yaml/structure/MockYamlEditor.java b/headless-services/commons/commons-yaml/src/test/java/org/springframework/ide/vscode/yaml/structure/MockYamlEditor.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/test/java/org/springframework/ide/vscode/yaml/structure/MockYamlEditor.java
rename to headless-services/commons/commons-yaml/src/test/java/org/springframework/ide/vscode/yaml/structure/MockYamlEditor.java
diff --git a/vscode-extensions/commons/commons-yaml/src/test/java/org/springframework/ide/vscode/yaml/structure/YamlAstTest.java b/headless-services/commons/commons-yaml/src/test/java/org/springframework/ide/vscode/yaml/structure/YamlAstTest.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/test/java/org/springframework/ide/vscode/yaml/structure/YamlAstTest.java
rename to headless-services/commons/commons-yaml/src/test/java/org/springframework/ide/vscode/yaml/structure/YamlAstTest.java
diff --git a/vscode-extensions/commons/commons-yaml/src/test/java/org/springframework/ide/vscode/yaml/structure/YamlStructureParserTest.java b/headless-services/commons/commons-yaml/src/test/java/org/springframework/ide/vscode/yaml/structure/YamlStructureParserTest.java
similarity index 100%
rename from vscode-extensions/commons/commons-yaml/src/test/java/org/springframework/ide/vscode/yaml/structure/YamlStructureParserTest.java
rename to headless-services/commons/commons-yaml/src/test/java/org/springframework/ide/vscode/yaml/structure/YamlStructureParserTest.java
diff --git a/vscode-extensions/commons/java-properties/.classpath b/headless-services/commons/java-properties/.classpath
similarity index 100%
rename from vscode-extensions/commons/java-properties/.classpath
rename to headless-services/commons/java-properties/.classpath
diff --git a/vscode-extensions/commons/java-properties/.gitignore b/headless-services/commons/java-properties/.gitignore
similarity index 100%
rename from vscode-extensions/commons/java-properties/.gitignore
rename to headless-services/commons/java-properties/.gitignore
diff --git a/vscode-extensions/commons/java-properties/.project b/headless-services/commons/java-properties/.project
similarity index 100%
rename from vscode-extensions/commons/java-properties/.project
rename to headless-services/commons/java-properties/.project
diff --git a/vscode-extensions/commons/java-properties/.settings/org.eclipse.core.resources.prefs b/headless-services/commons/java-properties/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from vscode-extensions/commons/java-properties/.settings/org.eclipse.core.resources.prefs
rename to headless-services/commons/java-properties/.settings/org.eclipse.core.resources.prefs
diff --git a/vscode-extensions/commons/java-properties/.settings/org.eclipse.jdt.core.prefs b/headless-services/commons/java-properties/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vscode-extensions/commons/java-properties/.settings/org.eclipse.jdt.core.prefs
rename to headless-services/commons/java-properties/.settings/org.eclipse.jdt.core.prefs
diff --git a/vscode-extensions/commons/language-server-test-harness/.settings/org.eclipse.m2e.core.prefs b/headless-services/commons/java-properties/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vscode-extensions/commons/language-server-test-harness/.settings/org.eclipse.m2e.core.prefs
rename to headless-services/commons/java-properties/.settings/org.eclipse.m2e.core.prefs
diff --git a/vscode-extensions/commons/java-properties/pom.xml b/headless-services/commons/java-properties/pom.xml
similarity index 100%
rename from vscode-extensions/commons/java-properties/pom.xml
rename to headless-services/commons/java-properties/pom.xml
diff --git a/vscode-extensions/commons/java-properties/resources/JavaProperties.g4 b/headless-services/commons/java-properties/resources/JavaProperties.g4
similarity index 100%
rename from vscode-extensions/commons/java-properties/resources/JavaProperties.g4
rename to headless-services/commons/java-properties/resources/JavaProperties.g4
diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/AntlrParser.java b/headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/AntlrParser.java
similarity index 100%
rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/AntlrParser.java
rename to headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/AntlrParser.java
diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaProperties.tokens b/headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaProperties.tokens
similarity index 100%
rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaProperties.tokens
rename to headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaProperties.tokens
diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesBaseListener.java b/headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesBaseListener.java
similarity index 100%
rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesBaseListener.java
rename to headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesBaseListener.java
diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesLexer.java b/headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesLexer.java
similarity index 100%
rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesLexer.java
rename to headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesLexer.java
diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesLexer.tokens b/headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesLexer.tokens
similarity index 100%
rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesLexer.tokens
rename to headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesLexer.tokens
diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesListener.java b/headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesListener.java
similarity index 100%
rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesListener.java
rename to headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesListener.java
diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesParser.java b/headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesParser.java
similarity index 100%
rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesParser.java
rename to headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/antlr/parser/JavaPropertiesParser.java
diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/ParseResults.java b/headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/ParseResults.java
similarity index 100%
rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/ParseResults.java
rename to headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/ParseResults.java
diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/Parser.java b/headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/Parser.java
similarity index 100%
rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/Parser.java
rename to headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/Parser.java
diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/Problem.java b/headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/Problem.java
similarity index 100%
rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/Problem.java
rename to headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/Problem.java
diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/ProblemCodes.java b/headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/ProblemCodes.java
similarity index 100%
rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/ProblemCodes.java
rename to headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/ProblemCodes.java
diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/PropertiesAst.java b/headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/PropertiesAst.java
similarity index 100%
rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/PropertiesAst.java
rename to headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/PropertiesAst.java
diff --git a/vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/PropertiesFileEscapes.java b/headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/PropertiesFileEscapes.java
similarity index 100%
rename from vscode-extensions/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/PropertiesFileEscapes.java
rename to headless-services/commons/java-properties/src/main/java/org/springframework/ide/vscode/java/properties/parser/PropertiesFileEscapes.java
diff --git a/vscode-extensions/commons/java-properties/src/test/java/org/springframework/ide/vscode/java/properties/parser/test/PropertiesAntlrParserTest.java b/headless-services/commons/java-properties/src/test/java/org/springframework/ide/vscode/java/properties/parser/test/PropertiesAntlrParserTest.java
similarity index 100%
rename from vscode-extensions/commons/java-properties/src/test/java/org/springframework/ide/vscode/java/properties/parser/test/PropertiesAntlrParserTest.java
rename to headless-services/commons/java-properties/src/test/java/org/springframework/ide/vscode/java/properties/parser/test/PropertiesAntlrParserTest.java
diff --git a/vscode-extensions/commons/java-properties/src/test/java/org/springframework/ide/vscode/java/properties/parser/test/PropertiesAstTest.java b/headless-services/commons/java-properties/src/test/java/org/springframework/ide/vscode/java/properties/parser/test/PropertiesAstTest.java
similarity index 100%
rename from vscode-extensions/commons/java-properties/src/test/java/org/springframework/ide/vscode/java/properties/parser/test/PropertiesAstTest.java
rename to headless-services/commons/java-properties/src/test/java/org/springframework/ide/vscode/java/properties/parser/test/PropertiesAstTest.java
diff --git a/vscode-extensions/commons/language-server-test-harness/.classpath b/headless-services/commons/language-server-test-harness/.classpath
similarity index 100%
rename from vscode-extensions/commons/language-server-test-harness/.classpath
rename to headless-services/commons/language-server-test-harness/.classpath
diff --git a/vscode-extensions/commons/language-server-test-harness/.project b/headless-services/commons/language-server-test-harness/.project
similarity index 100%
rename from vscode-extensions/commons/language-server-test-harness/.project
rename to headless-services/commons/language-server-test-harness/.project
diff --git a/vscode-extensions/commons/language-server-test-harness/.settings/org.eclipse.core.resources.prefs b/headless-services/commons/language-server-test-harness/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from vscode-extensions/commons/language-server-test-harness/.settings/org.eclipse.core.resources.prefs
rename to headless-services/commons/language-server-test-harness/.settings/org.eclipse.core.resources.prefs
diff --git a/vscode-extensions/commons/language-server-test-harness/.settings/org.eclipse.jdt.core.prefs b/headless-services/commons/language-server-test-harness/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vscode-extensions/commons/language-server-test-harness/.settings/org.eclipse.jdt.core.prefs
rename to headless-services/commons/language-server-test-harness/.settings/org.eclipse.jdt.core.prefs
diff --git a/vscode-extensions/commons/language-server-test-harness/.settings/org.eclipse.jdt.ui.prefs b/headless-services/commons/language-server-test-harness/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from vscode-extensions/commons/language-server-test-harness/.settings/org.eclipse.jdt.ui.prefs
rename to headless-services/commons/language-server-test-harness/.settings/org.eclipse.jdt.ui.prefs
diff --git a/vscode-extensions/vscode-concourse/.settings/org.eclipse.m2e.core.prefs b/headless-services/commons/language-server-test-harness/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from vscode-extensions/vscode-concourse/.settings/org.eclipse.m2e.core.prefs
rename to headless-services/commons/language-server-test-harness/.settings/org.eclipse.m2e.core.prefs
diff --git a/vscode-extensions/commons/language-server-test-harness/pom.xml b/headless-services/commons/language-server-test-harness/pom.xml
similarity index 100%
rename from vscode-extensions/commons/language-server-test-harness/pom.xml
rename to headless-services/commons/language-server-test-harness/pom.xml
diff --git a/vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java
similarity index 100%
rename from vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java
rename to headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java
diff --git a/vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java
similarity index 100%
rename from vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java
rename to headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java
diff --git a/vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/TestAsserts.java b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/TestAsserts.java
similarity index 100%
rename from vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/TestAsserts.java
rename to headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/TestAsserts.java
diff --git a/vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/TextDocumentInfo.java b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/TextDocumentInfo.java
similarity index 100%
rename from vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/TextDocumentInfo.java
rename to headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/TextDocumentInfo.java
diff --git a/vscode-extensions/commons/language-server-test-harness/src/test/java/org/springframework/ide/vscode/commons/languageserver/completion/DocumentEditsTest.java b/headless-services/commons/language-server-test-harness/src/test/java/org/springframework/ide/vscode/commons/languageserver/completion/DocumentEditsTest.java
similarity index 100%
rename from vscode-extensions/commons/language-server-test-harness/src/test/java/org/springframework/ide/vscode/commons/languageserver/completion/DocumentEditsTest.java
rename to headless-services/commons/language-server-test-harness/src/test/java/org/springframework/ide/vscode/commons/languageserver/completion/DocumentEditsTest.java
diff --git a/vscode-extensions/commons/pom.xml b/headless-services/commons/pom.xml
similarity index 100%
rename from vscode-extensions/commons/pom.xml
rename to headless-services/commons/pom.xml
diff --git a/headless-services/concourse-language-server/.classpath b/headless-services/concourse-language-server/.classpath
new file mode 100644
index 000000000..fae1a2b37
--- /dev/null
+++ b/headless-services/concourse-language-server/.classpath
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/vscode-extensions/vscode-concourse/.project b/headless-services/concourse-language-server/.project
similarity index 92%
rename from vscode-extensions/vscode-concourse/.project
rename to headless-services/concourse-language-server/.project
index 58e18ec26..84650a273 100644
--- a/vscode-extensions/vscode-concourse/.project
+++ b/headless-services/concourse-language-server/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>vscode-concourse</name>
+	<name>concourse-language-server</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/vscode-extensions/vscode-concourse/.settings/org.eclipse.core.resources.prefs b/headless-services/concourse-language-server/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from vscode-extensions/vscode-concourse/.settings/org.eclipse.core.resources.prefs
rename to headless-services/concourse-language-server/.settings/org.eclipse.core.resources.prefs
diff --git a/vscode-extensions/vscode-concourse/.settings/org.eclipse.jdt.core.prefs b/headless-services/concourse-language-server/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from vscode-extensions/vscode-concourse/.settings/org.eclipse.jdt.core.prefs
rename to headless-services/concourse-language-server/.settings/org.eclipse.jdt.core.prefs
diff --git a/headless-services/concourse-language-server/.settings/org.eclipse.m2e.core.prefs b/headless-services/concourse-language-server/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 000000000..f897a7f1c
--- /dev/null
+++ b/headless-services/concourse-language-server/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/headless-services/concourse-language-server/README.md b/headless-services/concourse-language-server/README.md
new file mode 100644
index 000000000..ec8a3049c
--- /dev/null
+++ b/headless-services/concourse-language-server/README.md
@@ -0,0 +1,4 @@
+# Concourse Language Server
+
+TODO: add a decent readme explaining what's in here. 
+
diff --git a/headless-services/concourse-language-server/build.sh b/headless-services/concourse-language-server/build.sh
new file mode 100755
index 000000000..313aa50b9
--- /dev/null
+++ b/headless-services/concourse-language-server/build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+set -e
+../mvnw -U -f ../pom.xml -pl concourse-language-server -am clean install
diff --git a/headless-services/concourse-language-server/pom.xml b/headless-services/concourse-language-server/pom.xml
new file mode 100644
index 000000000..5b762b4a7
--- /dev/null
+++ b/headless-services/concourse-language-server/pom.xml
@@ -0,0 +1,76 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>concourse-language-server</artifactId>
+	<packaging>jar</packaging>
+	
+	<parent>
+		<groupId>org.springframework.ide.vscode</groupId>
+		<artifactId>commons-parent</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../commons/pom.xml</relativePath>
+	</parent>
+	<version>0.0.2-SNAPSHOT</version>
+	
+	<properties>
+		<dependencies.version>0.0.1-SNAPSHOT</dependencies.version>
+	</properties>
+	
+	<distributionManagement>
+		<repository>
+			<id>distribution-repository</id>
+			<name>Temporary Staging Repository</name>
+			<url>file://${basedir}/dist</url>
+		</repository>
+	</distributionManagement>
+
+	<dependencies>
+		<!-- Language Servers -->
+		<dependency>
+			<groupId>org.springframework.ide.vscode</groupId>
+			<artifactId>commons-language-server</artifactId>
+			<version>${dependencies.version}</version>
+		</dependency>
+		<!-- Yaml -->
+		<dependency>
+			<groupId>org.springframework.ide.vscode</groupId>
+			<artifactId>commons-yaml</artifactId>
+			<version>${dependencies.version}</version>
+		</dependency>
+		<!-- Test harness -->
+		<dependency>
+			<groupId>org.springframework.ide.vscode</groupId>
+			<artifactId>language-server-test-harness</artifactId>
+			<version>${dependencies.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<!-- Set source 1.8 -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.3</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+			<!-- Configure fat jar -->
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<version>1.4.1.RELEASE</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/vscode-extensions/vscode-concourse/pom.xml b/headless-services/concourse-language-server/pom.xml~
similarity index 100%
rename from vscode-extensions/vscode-concourse/pom.xml
rename to headless-services/concourse-language-server/pom.xml~
diff --git a/vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/ASTTypeCache.java b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/ASTTypeCache.java
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/ASTTypeCache.java
rename to headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/ASTTypeCache.java
diff --git a/vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/ConcourseDefinitionFinder.java b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/ConcourseDefinitionFinder.java
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/ConcourseDefinitionFinder.java
rename to headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/ConcourseDefinitionFinder.java
diff --git a/vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/ConcourseLanguageServer.java b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/ConcourseLanguageServer.java
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/ConcourseLanguageServer.java
rename to headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/ConcourseLanguageServer.java
diff --git a/vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/ConcourseModel.java b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/ConcourseModel.java
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/ConcourseModel.java
rename to headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/ConcourseModel.java
diff --git a/vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/ConcourseValueParsers.java b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/ConcourseValueParsers.java
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/ConcourseValueParsers.java
rename to headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/ConcourseValueParsers.java
diff --git a/vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/Main.java b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/Main.java
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/Main.java
rename to headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/Main.java
diff --git a/vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java
rename to headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java
diff --git a/vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/ResourceTypeRegistry.java b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/ResourceTypeRegistry.java
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/ResourceTypeRegistry.java
rename to headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/ResourceTypeRegistry.java
diff --git a/vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/util/CollectorUtil.java b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/util/CollectorUtil.java
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/util/CollectorUtil.java
rename to headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/util/CollectorUtil.java
diff --git a/vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/util/StaleFallbackCache.java b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/util/StaleFallbackCache.java
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/util/StaleFallbackCache.java
rename to headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/util/StaleFallbackCache.java
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/AggregateStep/aggregate.html b/headless-services/concourse-language-server/src/main/resources/desc/AggregateStep/aggregate.html
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/AggregateStep/aggregate.html
rename to headless-services/concourse-language-server/src/main/resources/desc/AggregateStep/aggregate.html
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Command/args.md b/headless-services/concourse-language-server/src/main/resources/desc/Command/args.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Command/args.md
rename to headless-services/concourse-language-server/src/main/resources/desc/Command/args.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Command/dir.md b/headless-services/concourse-language-server/src/main/resources/desc/Command/dir.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Command/dir.md
rename to headless-services/concourse-language-server/src/main/resources/desc/Command/dir.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Command/path.md b/headless-services/concourse-language-server/src/main/resources/desc/Command/path.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Command/path.md
rename to headless-services/concourse-language-server/src/main/resources/desc/Command/path.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Command/user.md b/headless-services/concourse-language-server/src/main/resources/desc/Command/user.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Command/user.md
rename to headless-services/concourse-language-server/src/main/resources/desc/Command/user.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DoStep/do.md b/headless-services/concourse-language-server/src/main/resources/desc/DoStep/do.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DoStep/do.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DoStep/do.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageGetParams/rootfs.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImageGetParams/rootfs.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageGetParams/rootfs.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImageGetParams/rootfs.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageGetParams/save.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImageGetParams/save.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageGetParams/save.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImageGetParams/save.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageGetParams/skip_download.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImageGetParams/skip_download.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageGetParams/skip_download.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImageGetParams/skip_download.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/build.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/build.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/build.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/build.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/build_args.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/build_args.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/build_args.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/build_args.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/build_args_file.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/build_args_file.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/build_args_file.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/build_args_file.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/cache.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/cache.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/cache.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/cache.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/cache_tag.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/cache_tag.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/cache_tag.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/cache_tag.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/dockerfile.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/dockerfile.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/dockerfile.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/dockerfile.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/import_file.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/import_file.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/import_file.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/import_file.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/load.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/load.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/load.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/load.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/load_base.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/load_base.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/load_base.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/load_base.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/load_file.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/load_file.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/load_file.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/load_file.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/load_repository.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/load_repository.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/load_repository.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/load_repository.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/load_tag.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/load_tag.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/load_tag.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/load_tag.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/pull_repository.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/pull_repository.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/pull_repository.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/pull_repository.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/pull_tag.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/pull_tag.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/pull_tag.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/pull_tag.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/tag.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/tag.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/tag.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/tag.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/tag_as_latest.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/tag_as_latest.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/tag_as_latest.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/tag_as_latest.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/tag_prefix.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/tag_prefix.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImagePutParams/tag_prefix.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImagePutParams/tag_prefix.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageSource/aws_access_key_id.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImageSource/aws_access_key_id.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageSource/aws_access_key_id.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImageSource/aws_access_key_id.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageSource/aws_secret_access_key.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImageSource/aws_secret_access_key.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageSource/aws_secret_access_key.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImageSource/aws_secret_access_key.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageSource/ca_certs.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImageSource/ca_certs.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageSource/ca_certs.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImageSource/ca_certs.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageSource/client_certs.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImageSource/client_certs.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageSource/client_certs.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImageSource/client_certs.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageSource/insecure_registries.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImageSource/insecure_registries.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageSource/insecure_registries.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImageSource/insecure_registries.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageSource/password.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImageSource/password.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageSource/password.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImageSource/password.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageSource/registry_mirror.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImageSource/registry_mirror.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageSource/registry_mirror.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImageSource/registry_mirror.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageSource/repository.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImageSource/repository.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageSource/repository.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImageSource/repository.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageSource/tag.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImageSource/tag.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageSource/tag.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImageSource/tag.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageSource/username.md b/headless-services/concourse-language-server/src/main/resources/desc/DockerImageSource/username.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/DockerImageSource/username.md
rename to headless-services/concourse-language-server/src/main/resources/desc/DockerImageSource/username.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GetStep/get.md b/headless-services/concourse-language-server/src/main/resources/desc/GetStep/get.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GetStep/get.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GetStep/get.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GetStep/params.html b/headless-services/concourse-language-server/src/main/resources/desc/GetStep/params.html
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GetStep/params.html
rename to headless-services/concourse-language-server/src/main/resources/desc/GetStep/params.html
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GetStep/passed.html b/headless-services/concourse-language-server/src/main/resources/desc/GetStep/passed.html
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GetStep/passed.html
rename to headless-services/concourse-language-server/src/main/resources/desc/GetStep/passed.html
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GetStep/resource.html b/headless-services/concourse-language-server/src/main/resources/desc/GetStep/resource.html
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GetStep/resource.html
rename to headless-services/concourse-language-server/src/main/resources/desc/GetStep/resource.html
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GetStep/trigger.html b/headless-services/concourse-language-server/src/main/resources/desc/GetStep/trigger.html
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GetStep/trigger.html
rename to headless-services/concourse-language-server/src/main/resources/desc/GetStep/trigger.html
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GetStep/version.html b/headless-services/concourse-language-server/src/main/resources/desc/GetStep/version.html
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GetStep/version.html
rename to headless-services/concourse-language-server/src/main/resources/desc/GetStep/version.html
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitGetParams/depth.md b/headless-services/concourse-language-server/src/main/resources/desc/GitGetParams/depth.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitGetParams/depth.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitGetParams/depth.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitGetParams/disable_git_lfs.md b/headless-services/concourse-language-server/src/main/resources/desc/GitGetParams/disable_git_lfs.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitGetParams/disable_git_lfs.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitGetParams/disable_git_lfs.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitGetParams/submodules.md b/headless-services/concourse-language-server/src/main/resources/desc/GitGetParams/submodules.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitGetParams/submodules.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitGetParams/submodules.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitPutParams/annotate.md b/headless-services/concourse-language-server/src/main/resources/desc/GitPutParams/annotate.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitPutParams/annotate.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitPutParams/annotate.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitPutParams/force.md b/headless-services/concourse-language-server/src/main/resources/desc/GitPutParams/force.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitPutParams/force.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitPutParams/force.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitPutParams/only_tag.md b/headless-services/concourse-language-server/src/main/resources/desc/GitPutParams/only_tag.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitPutParams/only_tag.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitPutParams/only_tag.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitPutParams/rebase.md b/headless-services/concourse-language-server/src/main/resources/desc/GitPutParams/rebase.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitPutParams/rebase.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitPutParams/rebase.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitPutParams/repository.md b/headless-services/concourse-language-server/src/main/resources/desc/GitPutParams/repository.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitPutParams/repository.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitPutParams/repository.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitPutParams/tag.md b/headless-services/concourse-language-server/src/main/resources/desc/GitPutParams/tag.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitPutParams/tag.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitPutParams/tag.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitPutParams/tag_prefix.md b/headless-services/concourse-language-server/src/main/resources/desc/GitPutParams/tag_prefix.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitPutParams/tag_prefix.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitPutParams/tag_prefix.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitSemverSource/branch.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSemverSource/branch.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitSemverSource/branch.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitSemverSource/branch.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitSemverSource/file.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSemverSource/file.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitSemverSource/file.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitSemverSource/file.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitSemverSource/git_user.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSemverSource/git_user.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitSemverSource/git_user.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitSemverSource/git_user.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitSemverSource/password.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSemverSource/password.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitSemverSource/password.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitSemverSource/password.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitSemverSource/private_key.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSemverSource/private_key.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitSemverSource/private_key.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitSemverSource/private_key.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitSemverSource/uri.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSemverSource/uri.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitSemverSource/uri.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitSemverSource/uri.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitSemverSource/username.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSemverSource/username.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitSemverSource/username.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitSemverSource/username.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/branch.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSource/branch.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/branch.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitSource/branch.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/commit_verification_key_ids.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSource/commit_verification_key_ids.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/commit_verification_key_ids.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitSource/commit_verification_key_ids.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/commit_verification_keys.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSource/commit_verification_keys.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/commit_verification_keys.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitSource/commit_verification_keys.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/disable_ci_skip.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSource/disable_ci_skip.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/disable_ci_skip.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitSource/disable_ci_skip.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/git_config.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSource/git_config.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/git_config.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitSource/git_config.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/gpg_keyserver.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSource/gpg_keyserver.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/gpg_keyserver.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitSource/gpg_keyserver.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/ignore_paths.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSource/ignore_paths.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/ignore_paths.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitSource/ignore_paths.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/password.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSource/password.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/password.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitSource/password.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/paths.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSource/paths.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/paths.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitSource/paths.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/private_key.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSource/private_key.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/private_key.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitSource/private_key.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/skip_ssl_verification.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSource/skip_ssl_verification.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/skip_ssl_verification.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitSource/skip_ssl_verification.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/tag_filter.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSource/tag_filter.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/tag_filter.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitSource/tag_filter.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/uri.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSource/uri.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/uri.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitSource/uri.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/username.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSource/username.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/GitSource/username.md
rename to headless-services/concourse-language-server/src/main/resources/desc/GitSource/username.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Group/jobs.md b/headless-services/concourse-language-server/src/main/resources/desc/Group/jobs.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Group/jobs.md
rename to headless-services/concourse-language-server/src/main/resources/desc/Group/jobs.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Group/name.md b/headless-services/concourse-language-server/src/main/resources/desc/Group/name.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Group/name.md
rename to headless-services/concourse-language-server/src/main/resources/desc/Group/name.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Group/resources.md b/headless-services/concourse-language-server/src/main/resources/desc/Group/resources.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Group/resources.md
rename to headless-services/concourse-language-server/src/main/resources/desc/Group/resources.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Job/build_logs_to_retain.html b/headless-services/concourse-language-server/src/main/resources/desc/Job/build_logs_to_retain.html
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Job/build_logs_to_retain.html
rename to headless-services/concourse-language-server/src/main/resources/desc/Job/build_logs_to_retain.html
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Job/disable_manual_trigger.html b/headless-services/concourse-language-server/src/main/resources/desc/Job/disable_manual_trigger.html
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Job/disable_manual_trigger.html
rename to headless-services/concourse-language-server/src/main/resources/desc/Job/disable_manual_trigger.html
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Job/max_in_flight.html b/headless-services/concourse-language-server/src/main/resources/desc/Job/max_in_flight.html
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Job/max_in_flight.html
rename to headless-services/concourse-language-server/src/main/resources/desc/Job/max_in_flight.html
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Job/name.html b/headless-services/concourse-language-server/src/main/resources/desc/Job/name.html
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Job/name.html
rename to headless-services/concourse-language-server/src/main/resources/desc/Job/name.html
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Job/plan.html b/headless-services/concourse-language-server/src/main/resources/desc/Job/plan.html
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Job/plan.html
rename to headless-services/concourse-language-server/src/main/resources/desc/Job/plan.html
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Job/public.html b/headless-services/concourse-language-server/src/main/resources/desc/Job/public.html
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Job/public.html
rename to headless-services/concourse-language-server/src/main/resources/desc/Job/public.html
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Job/serial.html b/headless-services/concourse-language-server/src/main/resources/desc/Job/serial.html
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Job/serial.html
rename to headless-services/concourse-language-server/src/main/resources/desc/Job/serial.html
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Job/serial_groups.html b/headless-services/concourse-language-server/src/main/resources/desc/Job/serial_groups.html
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Job/serial_groups.html
rename to headless-services/concourse-language-server/src/main/resources/desc/Job/serial_groups.html
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Pipeline/groups.md b/headless-services/concourse-language-server/src/main/resources/desc/Pipeline/groups.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Pipeline/groups.md
rename to headless-services/concourse-language-server/src/main/resources/desc/Pipeline/groups.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Pipeline/jobs.html b/headless-services/concourse-language-server/src/main/resources/desc/Pipeline/jobs.html
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Pipeline/jobs.html
rename to headless-services/concourse-language-server/src/main/resources/desc/Pipeline/jobs.html
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Pipeline/resource_types.html b/headless-services/concourse-language-server/src/main/resources/desc/Pipeline/resource_types.html
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Pipeline/resource_types.html
rename to headless-services/concourse-language-server/src/main/resources/desc/Pipeline/resource_types.html
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Pipeline/resources.html b/headless-services/concourse-language-server/src/main/resources/desc/Pipeline/resources.html
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Pipeline/resources.html
rename to headless-services/concourse-language-server/src/main/resources/desc/Pipeline/resources.html
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/PoolPutParams/acquire.md b/headless-services/concourse-language-server/src/main/resources/desc/PoolPutParams/acquire.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/PoolPutParams/acquire.md
rename to headless-services/concourse-language-server/src/main/resources/desc/PoolPutParams/acquire.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/PoolPutParams/add.md b/headless-services/concourse-language-server/src/main/resources/desc/PoolPutParams/add.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/PoolPutParams/add.md
rename to headless-services/concourse-language-server/src/main/resources/desc/PoolPutParams/add.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/PoolPutParams/add_claimed.md b/headless-services/concourse-language-server/src/main/resources/desc/PoolPutParams/add_claimed.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/PoolPutParams/add_claimed.md
rename to headless-services/concourse-language-server/src/main/resources/desc/PoolPutParams/add_claimed.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/PoolPutParams/claim.md b/headless-services/concourse-language-server/src/main/resources/desc/PoolPutParams/claim.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/PoolPutParams/claim.md
rename to headless-services/concourse-language-server/src/main/resources/desc/PoolPutParams/claim.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/PoolPutParams/release.md b/headless-services/concourse-language-server/src/main/resources/desc/PoolPutParams/release.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/PoolPutParams/release.md
rename to headless-services/concourse-language-server/src/main/resources/desc/PoolPutParams/release.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/PoolPutParams/remove.md b/headless-services/concourse-language-server/src/main/resources/desc/PoolPutParams/remove.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/PoolPutParams/remove.md
rename to headless-services/concourse-language-server/src/main/resources/desc/PoolPutParams/remove.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/PoolSource/branch.md b/headless-services/concourse-language-server/src/main/resources/desc/PoolSource/branch.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/PoolSource/branch.md
rename to headless-services/concourse-language-server/src/main/resources/desc/PoolSource/branch.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/PoolSource/password.md b/headless-services/concourse-language-server/src/main/resources/desc/PoolSource/password.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/PoolSource/password.md
rename to headless-services/concourse-language-server/src/main/resources/desc/PoolSource/password.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/PoolSource/pool.md b/headless-services/concourse-language-server/src/main/resources/desc/PoolSource/pool.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/PoolSource/pool.md
rename to headless-services/concourse-language-server/src/main/resources/desc/PoolSource/pool.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/PoolSource/private_key.md b/headless-services/concourse-language-server/src/main/resources/desc/PoolSource/private_key.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/PoolSource/private_key.md
rename to headless-services/concourse-language-server/src/main/resources/desc/PoolSource/private_key.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/PoolSource/retry_delay.md b/headless-services/concourse-language-server/src/main/resources/desc/PoolSource/retry_delay.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/PoolSource/retry_delay.md
rename to headless-services/concourse-language-server/src/main/resources/desc/PoolSource/retry_delay.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/PoolSource/uri.md b/headless-services/concourse-language-server/src/main/resources/desc/PoolSource/uri.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/PoolSource/uri.md
rename to headless-services/concourse-language-server/src/main/resources/desc/PoolSource/uri.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/PoolSource/username.md b/headless-services/concourse-language-server/src/main/resources/desc/PoolSource/username.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/PoolSource/username.md
rename to headless-services/concourse-language-server/src/main/resources/desc/PoolSource/username.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/PutStep/get_params.md b/headless-services/concourse-language-server/src/main/resources/desc/PutStep/get_params.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/PutStep/get_params.md
rename to headless-services/concourse-language-server/src/main/resources/desc/PutStep/get_params.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/PutStep/params.md b/headless-services/concourse-language-server/src/main/resources/desc/PutStep/params.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/PutStep/params.md
rename to headless-services/concourse-language-server/src/main/resources/desc/PutStep/params.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/PutStep/put.md b/headless-services/concourse-language-server/src/main/resources/desc/PutStep/put.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/PutStep/put.md
rename to headless-services/concourse-language-server/src/main/resources/desc/PutStep/put.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/PutStep/resource.md b/headless-services/concourse-language-server/src/main/resources/desc/PutStep/resource.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/PutStep/resource.md
rename to headless-services/concourse-language-server/src/main/resources/desc/PutStep/resource.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Resource/check_every.md b/headless-services/concourse-language-server/src/main/resources/desc/Resource/check_every.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Resource/check_every.md
rename to headless-services/concourse-language-server/src/main/resources/desc/Resource/check_every.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Resource/name.md b/headless-services/concourse-language-server/src/main/resources/desc/Resource/name.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Resource/name.md
rename to headless-services/concourse-language-server/src/main/resources/desc/Resource/name.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Resource/source.md b/headless-services/concourse-language-server/src/main/resources/desc/Resource/source.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Resource/source.md
rename to headless-services/concourse-language-server/src/main/resources/desc/Resource/source.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Resource/type.md b/headless-services/concourse-language-server/src/main/resources/desc/Resource/type.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Resource/type.md
rename to headless-services/concourse-language-server/src/main/resources/desc/Resource/type.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/ResourceType/name.md b/headless-services/concourse-language-server/src/main/resources/desc/ResourceType/name.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/ResourceType/name.md
rename to headless-services/concourse-language-server/src/main/resources/desc/ResourceType/name.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/ResourceType/source.md b/headless-services/concourse-language-server/src/main/resources/desc/ResourceType/source.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/ResourceType/source.md
rename to headless-services/concourse-language-server/src/main/resources/desc/ResourceType/source.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/ResourceType/type.md b/headless-services/concourse-language-server/src/main/resources/desc/ResourceType/type.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/ResourceType/type.md
rename to headless-services/concourse-language-server/src/main/resources/desc/ResourceType/type.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/S3PutParams/acl.md b/headless-services/concourse-language-server/src/main/resources/desc/S3PutParams/acl.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/S3PutParams/acl.md
rename to headless-services/concourse-language-server/src/main/resources/desc/S3PutParams/acl.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/S3PutParams/content_type.md b/headless-services/concourse-language-server/src/main/resources/desc/S3PutParams/content_type.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/S3PutParams/content_type.md
rename to headless-services/concourse-language-server/src/main/resources/desc/S3PutParams/content_type.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/S3PutParams/file.md b/headless-services/concourse-language-server/src/main/resources/desc/S3PutParams/file.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/S3PutParams/file.md
rename to headless-services/concourse-language-server/src/main/resources/desc/S3PutParams/file.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/S3SemverSource/access_key_id.md b/headless-services/concourse-language-server/src/main/resources/desc/S3SemverSource/access_key_id.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/S3SemverSource/access_key_id.md
rename to headless-services/concourse-language-server/src/main/resources/desc/S3SemverSource/access_key_id.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/S3SemverSource/bucket.md b/headless-services/concourse-language-server/src/main/resources/desc/S3SemverSource/bucket.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/S3SemverSource/bucket.md
rename to headless-services/concourse-language-server/src/main/resources/desc/S3SemverSource/bucket.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/S3SemverSource/disable_ssl.md b/headless-services/concourse-language-server/src/main/resources/desc/S3SemverSource/disable_ssl.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/S3SemverSource/disable_ssl.md
rename to headless-services/concourse-language-server/src/main/resources/desc/S3SemverSource/disable_ssl.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/S3SemverSource/endpoint.md b/headless-services/concourse-language-server/src/main/resources/desc/S3SemverSource/endpoint.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/S3SemverSource/endpoint.md
rename to headless-services/concourse-language-server/src/main/resources/desc/S3SemverSource/endpoint.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/S3SemverSource/key.md b/headless-services/concourse-language-server/src/main/resources/desc/S3SemverSource/key.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/S3SemverSource/key.md
rename to headless-services/concourse-language-server/src/main/resources/desc/S3SemverSource/key.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/S3SemverSource/region_name.md b/headless-services/concourse-language-server/src/main/resources/desc/S3SemverSource/region_name.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/S3SemverSource/region_name.md
rename to headless-services/concourse-language-server/src/main/resources/desc/S3SemverSource/region_name.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/S3SemverSource/secret_access_key.md b/headless-services/concourse-language-server/src/main/resources/desc/S3SemverSource/secret_access_key.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/S3SemverSource/secret_access_key.md
rename to headless-services/concourse-language-server/src/main/resources/desc/S3SemverSource/secret_access_key.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/access_key_id.md b/headless-services/concourse-language-server/src/main/resources/desc/S3Source/access_key_id.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/access_key_id.md
rename to headless-services/concourse-language-server/src/main/resources/desc/S3Source/access_key_id.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/bucket.md b/headless-services/concourse-language-server/src/main/resources/desc/S3Source/bucket.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/bucket.md
rename to headless-services/concourse-language-server/src/main/resources/desc/S3Source/bucket.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/cloudfront_url.md b/headless-services/concourse-language-server/src/main/resources/desc/S3Source/cloudfront_url.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/cloudfront_url.md
rename to headless-services/concourse-language-server/src/main/resources/desc/S3Source/cloudfront_url.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/disable_ssl.md b/headless-services/concourse-language-server/src/main/resources/desc/S3Source/disable_ssl.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/disable_ssl.md
rename to headless-services/concourse-language-server/src/main/resources/desc/S3Source/disable_ssl.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/endpoint.md b/headless-services/concourse-language-server/src/main/resources/desc/S3Source/endpoint.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/endpoint.md
rename to headless-services/concourse-language-server/src/main/resources/desc/S3Source/endpoint.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/private.md b/headless-services/concourse-language-server/src/main/resources/desc/S3Source/private.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/private.md
rename to headless-services/concourse-language-server/src/main/resources/desc/S3Source/private.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/regexp.md b/headless-services/concourse-language-server/src/main/resources/desc/S3Source/regexp.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/regexp.md
rename to headless-services/concourse-language-server/src/main/resources/desc/S3Source/regexp.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/region_name.md b/headless-services/concourse-language-server/src/main/resources/desc/S3Source/region_name.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/region_name.md
rename to headless-services/concourse-language-server/src/main/resources/desc/S3Source/region_name.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/secret_access_key.md b/headless-services/concourse-language-server/src/main/resources/desc/S3Source/secret_access_key.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/secret_access_key.md
rename to headless-services/concourse-language-server/src/main/resources/desc/S3Source/secret_access_key.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/server_side_encryption.md b/headless-services/concourse-language-server/src/main/resources/desc/S3Source/server_side_encryption.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/server_side_encryption.md
rename to headless-services/concourse-language-server/src/main/resources/desc/S3Source/server_side_encryption.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/sse_kms_key_id.md b/headless-services/concourse-language-server/src/main/resources/desc/S3Source/sse_kms_key_id.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/sse_kms_key_id.md
rename to headless-services/concourse-language-server/src/main/resources/desc/S3Source/sse_kms_key_id.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/use_v2_signing.md b/headless-services/concourse-language-server/src/main/resources/desc/S3Source/use_v2_signing.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/use_v2_signing.md
rename to headless-services/concourse-language-server/src/main/resources/desc/S3Source/use_v2_signing.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/versioned_file.md b/headless-services/concourse-language-server/src/main/resources/desc/S3Source/versioned_file.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/S3Source/versioned_file.md
rename to headless-services/concourse-language-server/src/main/resources/desc/S3Source/versioned_file.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/SemverGetParams/bump.md b/headless-services/concourse-language-server/src/main/resources/desc/SemverGetParams/bump.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/SemverGetParams/bump.md
rename to headless-services/concourse-language-server/src/main/resources/desc/SemverGetParams/bump.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/SemverGetParams/pre.md b/headless-services/concourse-language-server/src/main/resources/desc/SemverGetParams/pre.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/SemverGetParams/pre.md
rename to headless-services/concourse-language-server/src/main/resources/desc/SemverGetParams/pre.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/SemverPutParams/file.md b/headless-services/concourse-language-server/src/main/resources/desc/SemverPutParams/file.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/SemverPutParams/file.md
rename to headless-services/concourse-language-server/src/main/resources/desc/SemverPutParams/file.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/SemverSource/driver.md b/headless-services/concourse-language-server/src/main/resources/desc/SemverSource/driver.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/SemverSource/driver.md
rename to headless-services/concourse-language-server/src/main/resources/desc/SemverSource/driver.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/SemverSource/initial_version.md b/headless-services/concourse-language-server/src/main/resources/desc/SemverSource/initial_version.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/SemverSource/initial_version.md
rename to headless-services/concourse-language-server/src/main/resources/desc/SemverSource/initial_version.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Step/attempts.md b/headless-services/concourse-language-server/src/main/resources/desc/Step/attempts.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Step/attempts.md
rename to headless-services/concourse-language-server/src/main/resources/desc/Step/attempts.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Step/ensure.md b/headless-services/concourse-language-server/src/main/resources/desc/Step/ensure.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Step/ensure.md
rename to headless-services/concourse-language-server/src/main/resources/desc/Step/ensure.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Step/on_failure.md b/headless-services/concourse-language-server/src/main/resources/desc/Step/on_failure.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Step/on_failure.md
rename to headless-services/concourse-language-server/src/main/resources/desc/Step/on_failure.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Step/on_success.md b/headless-services/concourse-language-server/src/main/resources/desc/Step/on_success.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Step/on_success.md
rename to headless-services/concourse-language-server/src/main/resources/desc/Step/on_success.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Step/tags.md b/headless-services/concourse-language-server/src/main/resources/desc/Step/tags.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Step/tags.md
rename to headless-services/concourse-language-server/src/main/resources/desc/Step/tags.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/Step/timeout.md b/headless-services/concourse-language-server/src/main/resources/desc/Step/timeout.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/Step/timeout.md
rename to headless-services/concourse-language-server/src/main/resources/desc/Step/timeout.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/SwiftSemverSource/openstack.md b/headless-services/concourse-language-server/src/main/resources/desc/SwiftSemverSource/openstack.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/SwiftSemverSource/openstack.md
rename to headless-services/concourse-language-server/src/main/resources/desc/SwiftSemverSource/openstack.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TaskConfig/image.md b/headless-services/concourse-language-server/src/main/resources/desc/TaskConfig/image.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TaskConfig/image.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TaskConfig/image.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TaskConfig/image_resource.md b/headless-services/concourse-language-server/src/main/resources/desc/TaskConfig/image_resource.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TaskConfig/image_resource.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TaskConfig/image_resource.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TaskConfig/inputs.md b/headless-services/concourse-language-server/src/main/resources/desc/TaskConfig/inputs.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TaskConfig/inputs.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TaskConfig/inputs.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TaskConfig/outputs.md b/headless-services/concourse-language-server/src/main/resources/desc/TaskConfig/outputs.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TaskConfig/outputs.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TaskConfig/outputs.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TaskConfig/params.md b/headless-services/concourse-language-server/src/main/resources/desc/TaskConfig/params.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TaskConfig/params.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TaskConfig/params.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TaskConfig/platform.md b/headless-services/concourse-language-server/src/main/resources/desc/TaskConfig/platform.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TaskConfig/platform.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TaskConfig/platform.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TaskConfig/run.md b/headless-services/concourse-language-server/src/main/resources/desc/TaskConfig/run.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TaskConfig/run.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TaskConfig/run.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TaskInput/name.md b/headless-services/concourse-language-server/src/main/resources/desc/TaskInput/name.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TaskInput/name.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TaskInput/name.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TaskInput/path.md b/headless-services/concourse-language-server/src/main/resources/desc/TaskInput/path.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TaskInput/path.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TaskInput/path.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TaskOutput/name.md b/headless-services/concourse-language-server/src/main/resources/desc/TaskOutput/name.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TaskOutput/name.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TaskOutput/name.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TaskOutput/path.md b/headless-services/concourse-language-server/src/main/resources/desc/TaskOutput/path.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TaskOutput/path.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TaskOutput/path.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TaskStep/config.md b/headless-services/concourse-language-server/src/main/resources/desc/TaskStep/config.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TaskStep/config.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TaskStep/config.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TaskStep/file.md b/headless-services/concourse-language-server/src/main/resources/desc/TaskStep/file.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TaskStep/file.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TaskStep/file.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TaskStep/image.md b/headless-services/concourse-language-server/src/main/resources/desc/TaskStep/image.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TaskStep/image.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TaskStep/image.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TaskStep/input_mapping.md b/headless-services/concourse-language-server/src/main/resources/desc/TaskStep/input_mapping.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TaskStep/input_mapping.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TaskStep/input_mapping.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TaskStep/output_mapping.md b/headless-services/concourse-language-server/src/main/resources/desc/TaskStep/output_mapping.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TaskStep/output_mapping.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TaskStep/output_mapping.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TaskStep/params.md b/headless-services/concourse-language-server/src/main/resources/desc/TaskStep/params.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TaskStep/params.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TaskStep/params.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TaskStep/privileged.html b/headless-services/concourse-language-server/src/main/resources/desc/TaskStep/privileged.html
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TaskStep/privileged.html
rename to headless-services/concourse-language-server/src/main/resources/desc/TaskStep/privileged.html
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TaskStep/task.md b/headless-services/concourse-language-server/src/main/resources/desc/TaskStep/task.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TaskStep/task.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TaskStep/task.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TimeSource/days.md b/headless-services/concourse-language-server/src/main/resources/desc/TimeSource/days.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TimeSource/days.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TimeSource/days.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TimeSource/interval.md b/headless-services/concourse-language-server/src/main/resources/desc/TimeSource/interval.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TimeSource/interval.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TimeSource/interval.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TimeSource/location.md b/headless-services/concourse-language-server/src/main/resources/desc/TimeSource/location.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TimeSource/location.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TimeSource/location.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TimeSource/start.md b/headless-services/concourse-language-server/src/main/resources/desc/TimeSource/start.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TimeSource/start.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TimeSource/start.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TimeSource/stop.md b/headless-services/concourse-language-server/src/main/resources/desc/TimeSource/stop.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TimeSource/stop.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TimeSource/stop.md
diff --git a/vscode-extensions/vscode-concourse/src/main/resources/desc/TryStep/try.md b/headless-services/concourse-language-server/src/main/resources/desc/TryStep/try.md
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/main/resources/desc/TryStep/try.md
rename to headless-services/concourse-language-server/src/main/resources/desc/TryStep/try.md
diff --git a/vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java b/headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java
rename to headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java
diff --git a/vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/ConcourseLanguageServerTest.java b/headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/ConcourseLanguageServerTest.java
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/ConcourseLanguageServerTest.java
rename to headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/ConcourseLanguageServerTest.java
diff --git a/vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/DurationParserTest.java b/headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/DurationParserTest.java
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/DurationParserTest.java
rename to headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/DurationParserTest.java
diff --git a/vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/TimeOfDayParserTest.java b/headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/TimeOfDayParserTest.java
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/TimeOfDayParserTest.java
rename to headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/TimeOfDayParserTest.java
diff --git a/vscode-extensions/vscode-concourse/src/test/resources/workspace/another-pipeline.yml b/headless-services/concourse-language-server/src/test/resources/workspace/another-pipeline.yml
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/test/resources/workspace/another-pipeline.yml
rename to headless-services/concourse-language-server/src/test/resources/workspace/another-pipeline.yml
diff --git a/vscode-extensions/vscode-concourse/src/test/resources/workspace/pipeline-with-bad-resources.yml b/headless-services/concourse-language-server/src/test/resources/workspace/pipeline-with-bad-resources.yml
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/test/resources/workspace/pipeline-with-bad-resources.yml
rename to headless-services/concourse-language-server/src/test/resources/workspace/pipeline-with-bad-resources.yml
diff --git a/vscode-extensions/vscode-concourse/src/test/resources/workspace/pipeline.yml b/headless-services/concourse-language-server/src/test/resources/workspace/pipeline.yml
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/test/resources/workspace/pipeline.yml
rename to headless-services/concourse-language-server/src/test/resources/workspace/pipeline.yml
diff --git a/vscode-extensions/vscode-concourse/src/test/resources/workspace/tasks/build-stuff.yml b/headless-services/concourse-language-server/src/test/resources/workspace/tasks/build-stuff.yml
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/test/resources/workspace/tasks/build-stuff.yml
rename to headless-services/concourse-language-server/src/test/resources/workspace/tasks/build-stuff.yml
diff --git a/vscode-extensions/vscode-concourse/src/test/resources/workspace/tasks/build-vscode-extensions.sh b/headless-services/concourse-language-server/src/test/resources/workspace/tasks/build-vscode-extensions.sh
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/test/resources/workspace/tasks/build-vscode-extensions.sh
rename to headless-services/concourse-language-server/src/test/resources/workspace/tasks/build-vscode-extensions.sh
diff --git a/vscode-extensions/vscode-concourse/src/test/resources/workspace/tasks/build-vscode-extensions.yml b/headless-services/concourse-language-server/src/test/resources/workspace/tasks/build-vscode-extensions.yml
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/test/resources/workspace/tasks/build-vscode-extensions.yml
rename to headless-services/concourse-language-server/src/test/resources/workspace/tasks/build-vscode-extensions.yml
diff --git a/vscode-extensions/vscode-concourse/src/test/resources/workspace/tasks/build-website.sh b/headless-services/concourse-language-server/src/test/resources/workspace/tasks/build-website.sh
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/test/resources/workspace/tasks/build-website.sh
rename to headless-services/concourse-language-server/src/test/resources/workspace/tasks/build-website.sh
diff --git a/vscode-extensions/vscode-concourse/src/test/resources/workspace/tasks/build-website.yml b/headless-services/concourse-language-server/src/test/resources/workspace/tasks/build-website.yml
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/test/resources/workspace/tasks/build-website.yml
rename to headless-services/concourse-language-server/src/test/resources/workspace/tasks/build-website.yml
diff --git a/vscode-extensions/vscode-concourse/src/test/resources/workspace/tasks/test-stuff.yml b/headless-services/concourse-language-server/src/test/resources/workspace/tasks/test-stuff.yml
similarity index 100%
rename from vscode-extensions/vscode-concourse/src/test/resources/workspace/tasks/test-stuff.yml
rename to headless-services/concourse-language-server/src/test/resources/workspace/tasks/test-stuff.yml
diff --git a/headless-services/mvnw b/headless-services/mvnw
new file mode 100755
index 000000000..6ecc150ae
--- /dev/null
+++ b/headless-services/mvnw
@@ -0,0 +1,236 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+           #
+           # Look for the Apple JDKs first to preserve the existing behaviour, and then look
+           # for the new JDKs provided by Oracle.
+           #
+           if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then
+             #
+             # Apple JDKs
+             #
+             export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
+           fi
+
+           if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then
+             #
+             # Apple JDKs
+             #
+             export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
+           fi
+
+           if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then
+             #
+             # Oracle JDKs
+             #
+             export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
+           fi
+
+           if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
+             #
+             # Apple JDKs
+             #
+             export JAVA_HOME=`/usr/libexec/java_home`
+           fi
+           ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Migwn, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+  # TODO classpath?
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`which java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+  local basedir=$(pwd)
+  local wdir=$(pwd)
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    wdir=$(cd "$wdir/.."; pwd)
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+# avoid using MAVEN_CMD_LINE_ARGS below since that would loose parameter escaping in $@
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/headless-services/mvnw.cmd b/headless-services/mvnw.cmd
new file mode 100644
index 000000000..8bb827541
--- /dev/null
+++ b/headless-services/mvnw.cmd
@@ -0,0 +1,146 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+set MAVEN_CMD_LINE_ARGS=%MAVEN_CONFIG% %*
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+
+set WRAPPER_JAR=""%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar""
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+# avoid using MAVEN_CMD_LINE_ARGS below since that would loose parameter escaping in %*
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/headless-services/pom.xml b/headless-services/pom.xml
new file mode 100644
index 000000000..12e63e880
--- /dev/null
+++ b/headless-services/pom.xml
@@ -0,0 +1,17 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+                             http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>org.springframework.ide.vscode</groupId>
+	<artifactId>headless-services-aggregator</artifactId>
+	<packaging>pom</packaging>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>aggregator</name>
+
+    <modules>
+		<module>commons</module>
+		<module>concourse-language-server</module>
+	</modules>
+
+</project>
diff --git a/vscode-extensions/pom.xml b/vscode-extensions/pom.xml
index d0abfc259..d4735c974 100644
--- a/vscode-extensions/pom.xml
+++ b/vscode-extensions/pom.xml
@@ -10,10 +10,9 @@
 	<name>aggregator</name>
 
 	<modules>
-		<module>commons</module>
+		<module>../headless-services/commons</module>
 		<module>vscode-boot-properties</module>
 		<module>vscode-boot-java</module>
 		<module>vscode-manifest-yaml</module>
-		<module>vscode-concourse</module>
 	</modules>
 </project>
diff --git a/vscode-extensions/vscode-boot-java/pom.xml b/vscode-extensions/vscode-boot-java/pom.xml
index dab097386..189314f37 100644
--- a/vscode-extensions/vscode-boot-java/pom.xml
+++ b/vscode-extensions/vscode-boot-java/pom.xml
@@ -9,7 +9,7 @@
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
-		<relativePath>../commons/pom.xml</relativePath>
+		<relativePath>../../headless-services/commons/pom.xml</relativePath>
 	</parent>
 
 	<repositories>
diff --git a/vscode-extensions/vscode-boot-properties/pom.xml b/vscode-extensions/vscode-boot-properties/pom.xml
index badc4a90a..96e3e1c6c 100644
--- a/vscode-extensions/vscode-boot-properties/pom.xml
+++ b/vscode-extensions/vscode-boot-properties/pom.xml
@@ -9,7 +9,7 @@
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
-		<relativePath>../commons/pom.xml</relativePath>
+		<relativePath>../../headless-services/commons/pom.xml</relativePath>
 	</parent>
 	
 	<repositories>
diff --git a/vscode-extensions/vscode-concourse/.vscodeignore b/vscode-extensions/vscode-concourse/.vscodeignore
index 3902f54bb..f7be2f963 100644
--- a/vscode-extensions/vscode-concourse/.vscodeignore
+++ b/vscode-extensions/vscode-concourse/.vscodeignore
@@ -23,7 +23,6 @@ scripts/**
 # Compiler output
 out/test/**
 target/**
-!target/vscode-concourse-*.jar
 
 # Extensions
 .gitignore
diff --git a/vscode-extensions/vscode-concourse/lib/Main.ts b/vscode-extensions/vscode-concourse/lib/Main.ts
index 283cf559e..8032d37d3 100644
--- a/vscode-extensions/vscode-concourse/lib/Main.ts
+++ b/vscode-extensions/vscode-concourse/lib/Main.ts
@@ -34,7 +34,7 @@ export function activate(context: VSCode.ExtensionContext) {
         DEBUG : false,
         CONNECT_TO_LS: false,
         extensionId: 'vscode-concourse',
-        fatJarFile: 'target/vscode-concourse-0.0.2-SNAPSHOT.jar',
+        fatJarFile: 'jars/language-server.jar',
         jvmHeap: "48m",
         clientOptions: {
             documentSelector: [ PIPELINE_LANGUAGE_ID, TASK_LANGUAGE_ID ],
diff --git a/vscode-extensions/vscode-concourse/scripts/preinstall.sh b/vscode-extensions/vscode-concourse/scripts/preinstall.sh
index 2e796a0fe..a7fb9223b 100755
--- a/vscode-extensions/vscode-concourse/scripts/preinstall.sh
+++ b/vscode-extensions/vscode-concourse/scripts/preinstall.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 set -e
+
+workdir=`pwd`
+
 # Download yaml TextMate grammar
 curl https://raw.githubusercontent.com/textmate/yaml.tmbundle/master/Syntaxes/YAML.tmLanguage > yaml-support/yaml.tmLanguage
 
@@ -8,4 +11,9 @@ curl https://raw.githubusercontent.com/textmate/yaml.tmbundle/master/Syntaxes/YA
 npm install ../commons-vscode
 
 # Use maven to build fat jar of the language server
-../mvnw -U -f ../pom.xml -pl vscode-concourse -am clean install
+cd ../../headless-services/concourse-language-server
+./build.sh
+
+mkdir -p ${workdir}/jars
+cp target/*.jar ${workdir}/jars/language-server.jar
+
diff --git a/vscode-extensions/vscode-manifest-yaml/pom.xml b/vscode-extensions/vscode-manifest-yaml/pom.xml
index 6d98da0ed..fef0dca84 100644
--- a/vscode-extensions/vscode-manifest-yaml/pom.xml
+++ b/vscode-extensions/vscode-manifest-yaml/pom.xml
@@ -9,7 +9,7 @@
 		<groupId>org.springframework.ide.vscode</groupId>
 		<artifactId>commons-parent</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
-		<relativePath>../commons/pom.xml</relativePath>
+		<relativePath>../../headless-services/commons/pom.xml</relativePath>
 	</parent>
 	<version>0.0.3-SNAPSHOT</version>