diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF
index 70a1c87b9..37632754d 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF
@@ -8,6 +8,8 @@ Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.8.0",
  org.eclipse.core.runtime;bundle-version="3.12.0",
  org.eclipse.lsp4e;bundle-version="0.2.0"
 Import-Package: org.eclipse.jface.preference,
+ org.eclipse.lsp4j;version="0.2.0.v20170518-0647",
  org.eclipse.lsp4j.jsonrpc.messages;version="0.1.0.v20170117-0759",
  org.eclipse.lsp4j.services;version="0.1.0.v20170117-0759",
  org.osgi.framework
+Export-Package: org.springframework.tooling.cloudfoundry.manifest.ls
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/plugin.xml b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/plugin.xml
index b0ba16c8f..f13feb6b2 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/plugin.xml
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/plugin.xml
@@ -5,7 +5,7 @@
    <extension
          point="org.eclipse.lsp4e.languageServer">
       <server
-            class="org.springframework.boot.ide.cloudfoundry.server.CloudFoundryManifestLanguageServer"
+            class="org.springframework.tooling.cloudfoundry.manifest.ls.CloudFoundryManifestLanguageServer"
             id="org.eclipse.languageserver.languages.cloudfoundrymanifest"
             label="Cloud Foundry Manifest Language Server">
       </server>
@@ -18,7 +18,7 @@
    <extension
          point="org.eclipse.lsp4e.languageServer">
       <server
-            class="org.springframework.boot.ide.cloudfoundry.server.CloudFoundryManifestLanguageServer"
+            class="org.springframework.tooling.cloudfoundry.manifest.ls.CloudFoundryManifestLanguageServer"
             id="org.eclipse.languageserver.languages.cloudfoundrymanifest"
             label="Cloud Foundry Manifest Language Server">
       </server>
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/boot/ide/cloudfoundry/server/CloudFoundryManifestLanguageServer.java b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java
similarity index 74%
rename from eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/boot/ide/cloudfoundry/server/CloudFoundryManifestLanguageServer.java
rename to eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java
index 957a1ac72..ed6865da8 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/boot/ide/cloudfoundry/server/CloudFoundryManifestLanguageServer.java
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java
@@ -8,10 +8,11 @@
  * Contributors:
  *     Pivotal, Inc. - initial API and implementation
  *******************************************************************************/
-package org.springframework.boot.ide.cloudfoundry.server;
+package org.springframework.tooling.cloudfoundry.manifest.ls;
 
 import java.io.File;
 import java.io.InputStream;
+import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
@@ -24,7 +25,10 @@ import org.eclipse.jdt.internal.launching.StandardVMType;
 import org.eclipse.jdt.launching.IVMInstall;
 import org.eclipse.jdt.launching.JavaRuntime;
 import org.eclipse.lsp4e.server.ProcessStreamConnectionProvider;
+import org.eclipse.lsp4j.DidChangeConfigurationParams;
+import org.eclipse.lsp4j.InitializeResult;
 import org.eclipse.lsp4j.jsonrpc.messages.Message;
+import org.eclipse.lsp4j.jsonrpc.messages.ResponseMessage;
 import org.eclipse.lsp4j.services.LanguageServer;
 import org.osgi.framework.Bundle;
 
@@ -33,6 +37,12 @@ import org.osgi.framework.Bundle;
  */
 @SuppressWarnings("restriction")
 public class CloudFoundryManifestLanguageServer extends ProcessStreamConnectionProvider {
+	
+	private static Object cfTargetOptionSettings;
+
+	public static void setCfTargetLoginOptions(Object cfTargetOptions) {
+		cfTargetOptionSettings = cfTargetOptions;
+	}
 
 	public CloudFoundryManifestLanguageServer() {
 		List<String> commands = new ArrayList<>();
@@ -49,7 +59,23 @@ public class CloudFoundryManifestLanguageServer extends ProcessStreamConnectionP
 		setWorkingDirectory(workingDir);
 	}
 	
-	public void handleMessage(Message message, LanguageServer languageServer, String rootPath) {
+	@Override
+	public void handleMessage(Message message, LanguageServer languageServer, URI rootPath) {
+		if (message instanceof ResponseMessage) {
+			ResponseMessage responseMessage = (ResponseMessage)message;
+			if (responseMessage.getResult() instanceof InitializeResult) {
+				System.out.println("LS INITIALIZED !!!!!!");
+				
+				// enable validation: so far, no better way found than changing conf after init.
+				DidChangeConfigurationParams params = new DidChangeConfigurationParams(getInitializationOptions(rootPath));
+				languageServer.getWorkspaceService().didChangeConfiguration(params);
+			}
+		}
+	}
+	
+	@Override
+	public Object getInitializationOptions(URI rootUri) {
+		return cfTargetOptionSettings;
 	}
 	
 	protected String getJDKLocation() {
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/boot/ide/cloudfoundry/server/Constants.java b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/Constants.java
similarity index 92%
rename from eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/boot/ide/cloudfoundry/server/Constants.java
rename to eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/Constants.java
index c286d0aef..9cc4ab041 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/boot/ide/cloudfoundry/server/Constants.java
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/Constants.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Pivotal, Inc. - initial API and implementation
  *******************************************************************************/
-package org.springframework.boot.ide.cloudfoundry.server;
+package org.springframework.tooling.cloudfoundry.manifest.ls;
 
 /**
  * @author Martin Lippert