diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/plugin.xml b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/plugin.xml
index 1367acb5c..deb2be89b 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/plugin.xml
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/plugin.xml
@@ -2,43 +2,6 @@
 <?eclipse version="3.4"?>
 <plugin>
 
-   <extension
-         point="org.eclipse.core.contenttype.contentTypes">
-      <content-type
-            default-charset="UTF-8"
-            id="org.springframework.ide.eclipse.manifest.yml"
-            name="Cloudfoundry Manifest"
-            file-names="manifest.yml"
-            priority="high">
-      </content-type>
-   </extension>
-   
-   <extension
-         point="org.eclipse.ui.editors">
-      <editorContentTypeBinding
-            contentTypeId="org.springframework.ide.eclipse.manifest.yml"
-            editorId="org.eclipse.ui.genericeditor.GenericEditor">
-      </editorContentTypeBinding>
-   </extension>
 
-   <extension
-         point="org.eclipse.ui.genericeditor.presentationReconcilers">
-      <presentationReconciler
-            class="org.eclipse.tm4e.ui.text.TMPresentationReconciler"
-            contentType="org.springframework.ide.eclipse.manifest.yml">
-      </presentationReconciler>
-   </extension>
-
-   <extension
-         point="org.eclipse.tm4e.registry.grammars">
-      <grammar
-      		scopeName="source.yaml"
-            path="./syntaxes/YAML.tmLanguage" >
-      </grammar>      
-      <scopeNameContentTypeBinding
-            contentTypeId="org.springframework.ide.eclipse.manifest.yml"
-            scopeName="source.yaml">
-      </scopeNameContentTypeBinding>
-   </extension>
 
 </plugin>
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/.classpath b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/.classpath
index eca7bdba8..2885bebb5 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/.classpath
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/.classpath
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="icons/"/>
+	<classpathentry exported="true" kind="lib" path="syntaxes/"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
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 51dea4041..cde4bd441 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
@@ -11,7 +11,15 @@ Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.8.0",
  org.eclipse.lsp4j;bundle-version="0.6.0",
  org.eclipse.lsp4j.jsonrpc;bundle-version="0.6.0",
  org.springframework.tooling.ls.eclipse.commons;bundle-version="4.0.0",
- com.google.guava
+ com.google.guava,
+ org.eclipse.core.resources,
+ org.eclipse.ui.genericeditor;bundle-version="1.0.0",
+ org.eclipse.tm4e.core;bundle-version="0.1.0",
+ org.eclipse.tm4e.ui;bundle-version="0.1.0",
+ org.eclipse.ui
 Import-Package: org.eclipse.jface.preference,
  org.osgi.framework
 Export-Package: org.springframework.tooling.cloudfoundry.manifest.ls
+Bundle-ClassPath: icons/,
+ syntaxes/,
+ .
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/build.properties b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/build.properties
index c70d59d5d..d3ca8bdae 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/build.properties
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/build.properties
@@ -4,4 +4,6 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                servers/,\
-			   about.html
+               about.html,\
+               icons/,\
+               syntaxes/
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/icons/cloud_obj.png b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/icons/cloud_obj.png
new file mode 100644
index 000000000..7633c35fb
Binary files /dev/null and b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/icons/cloud_obj.png differ
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 c4ebfb612..4d699280d 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
@@ -16,4 +16,55 @@
       </contentTypeMapping>
    </extension>
 
+   <extension
+         point="org.eclipse.core.contenttype.contentTypes">
+      <content-type
+            default-charset="UTF-8"
+            id="org.springframework.ide.eclipse.manifest.yml"
+            name="Cloudfoundry Manifest"
+            file-names="manifest.yml"
+            priority="high">
+      </content-type>
+      <file-association
+            content-type="org.springframework.ide.eclipse.manifest.yml"
+            file-names="manifest.yml"
+            file-patterns="*manifest*.yml">
+      </file-association>
+   </extension>
+   
+   <extension
+         point="org.eclipse.ui.editors">
+      <editor
+            class="org.springframework.tooling.ls.eclipse.commons.YamlGenericEditor"
+            contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
+            icon="icons/cloud_obj.png"
+            id="CfManifestYMLEditor"
+            name="Generic Editor - Cloudfoundry Manifest YAML"
+            symbolicFontName="org.eclipse.jdt.ui.PropertiesFileEditor.textfont">
+         <contentTypeBinding
+               contentTypeId="org.springframework.ide.eclipse.manifest.yml">
+         </contentTypeBinding>
+      </editor>
+   </extension>
+
+   <extension
+         point="org.eclipse.ui.genericeditor.presentationReconcilers">
+      <presentationReconciler
+            class="org.eclipse.tm4e.ui.text.TMPresentationReconciler"
+            contentType="org.springframework.ide.eclipse.manifest.yml">
+      </presentationReconciler>
+   </extension>
+
+   <extension
+         point="org.eclipse.tm4e.registry.grammars">
+      <grammar
+      		scopeName="source.yaml"
+            path="syntaxes/YAML.tmLanguage" >
+      </grammar>      
+      <scopeNameContentTypeBinding
+            contentTypeId="org.springframework.ide.eclipse.manifest.yml"
+            scopeName="source.yaml">
+      </scopeNameContentTypeBinding>
+   </extension>
+   
 </plugin>
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/syntaxes/YAML.tmLanguage b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/syntaxes/YAML.tmLanguage
similarity index 100%
rename from eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/syntaxes/YAML.tmLanguage
rename to eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/syntaxes/YAML.tmLanguage
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java
index 8b6275e74..8bacdb316 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java
@@ -58,21 +58,18 @@ public abstract class STS4LanguageServerProcessStreamConnector extends ProcessSt
 				forwardTo(getLanguageServerLog(), console.out);
 			} else {
 
-				Job job = new Job("Consume LS error stream") {
+				new Thread("Consume LS error stream") {
 
 					@Override
-					protected IStatus run(IProgressMonitor monitor) {
+					public void run() {
 						try {
 							IOUtil.consume(getLanguageServerLog());
 						} catch (IOException e) {
 							// ignore
 						}
-						return Status.OK_STATUS;
 					}
 
-				};
-				job.setSystem(true);
-				job.schedule();
+				}.start();;
 			}
 		}
 	}
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index 3fbbb01c3..101c165fc 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -51,9 +51,6 @@
 		<module>org.springframework.tooling.cloudfoundry.manifest.ls.feature</module>
 		<module>org.springframework.tooling.ls.repository</module>
 
-		<module>org.springframework.tooling.cloudfoundry.manifest.ls.integration</module>
-		<module>org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature</module>
-
 		<module>org.springframework.tooling.ls.eclipse.gotosymbol</module>
 		<module>org.springframework.tooling.boot.ls</module>
 		<module>org.springframework.tooling.boot.ls.feature</module>