diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests/pom.xml b/lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests/pom.xml
new file mode 100644
index 00000000000..1ae99f2f184
--- /dev/null
+++ b/lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.eclipse.cdt</groupId>
+        <artifactId>org.eclipse.lsp4e.cpp-parent</artifactId>
+        <version>9.6.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <version>1.0.0-SNAPSHOT</version>
+    <artifactId>org.eclipse.lsp4e.cpp.language.tests</artifactId>
+    <packaging>eclipse-test-plugin</packaging>
+
+    <properties>
+        <skipTests>${lsp4e-cpp.skip.tests}</skipTests>
+    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-surefire-plugin</artifactId>
+                <configuration>
+                <!-- If you have any UI tests, use this block -->
+                    <useUIHarness>true</useUIHarness>
+                    <useUIThread>true</useUIThread>
+                    <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
+                <!-- else, if you have no UI tests, use this block -->
+                    <!-- <useUIHarness>false</useUIHarness>
+                    <useUIThread>false</useUIThread>
+                    <argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine> -->
+                <!-- endif -->
+                    <includes>
+                        <include>**/*Test.*</include>
+                    </includes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.site/category.xml b/lsp4e-cpp/org.eclipse.lsp4e.cpp.site/category.xml
index 00b87d7ae50..30e175a9bda 100644
--- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.site/category.xml
+++ b/lsp4e-cpp/org.eclipse.lsp4e.cpp.site/category.xml
@@ -6,5 +6,8 @@
    <feature url="features/org.eclipse.lsp4e.cpp_0.0.0.qualifier.jar" id="org.eclipse.lsp4e.cpp" version="0.0.0">
       <category name="LSP4E C/C++ Support"/>
    </feature>
+   <feature url="features/org.eclipse.lsp4e.cpp.source_0.0.0.qualifier.jar" id="org.eclipse.lsp4e.cpp.source" version="0.0.0">
+      <category name="LSP4E C/C++ Support"/>
+   </feature>
    <category-def name="LSP4E C/C++ Support" label="LSP4E C/C++ Support Main Features"/>
 </site>
diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp.site/pom.xml b/lsp4e-cpp/org.eclipse.lsp4e.cpp.site/pom.xml
index a2d7d920363..b6596332034 100644
--- a/lsp4e-cpp/org.eclipse.lsp4e.cpp.site/pom.xml
+++ b/lsp4e-cpp/org.eclipse.lsp4e.cpp.site/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (C) 2016, 2017 Ericsson
+   Copyright (C) 2016, 2018 Ericsson and others.
 
    All rights reserved. This program and the accompanying materials
    are made available under the terms of the Eclipse Public License v1.0
@@ -14,12 +14,16 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.eclipse.lsp4e.cpp.group</groupId>
-    <artifactId>org.eclipse.lsp4e.cpp.parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <groupId>org.eclipse.cdt</groupId>
+    <artifactId>org.eclipse.lsp4e.cpp-parent</artifactId>
+    <version>9.6.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.lsp4e.cpp.site</artifactId>
   <packaging>eclipse-repository</packaging>
 
+  <build>
+    <finalName>org.eclipse.lsp4e.cpp.repo</finalName>
+  </build>
 </project>
diff --git a/lsp4e-cpp/org.eclipse.lsp4e.cpp/feature.xml b/lsp4e-cpp/org.eclipse.lsp4e.cpp/feature.xml
index b8d78ac606c..681d3a9ad59 100644
--- a/lsp4e-cpp/org.eclipse.lsp4e.cpp/feature.xml
+++ b/lsp4e-cpp/org.eclipse.lsp4e.cpp/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.lsp4e.cpp"
       label="%featureName"
-      version="1.0.0.qualifier"
+      version="9.6.0.qualifier"
       provider-name="%featureProvider"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/lsp4e-cpp/pom.xml b/lsp4e-cpp/pom.xml
index b2a6ccd6364..ed2f1e26c0b 100644
--- a/lsp4e-cpp/pom.xml
+++ b/lsp4e-cpp/pom.xml
@@ -1,243 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (C) 2017 Ericsson.
+   Copyright (C) 2017, 2018 Ericsson and others.
    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
 -->
+<project
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
 
-<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>
-
-  <prerequisites>
-    <maven>${required-maven-version}</maven>
-  </prerequisites>
-
-  <groupId>org.eclipse.lsp4e.cpp.group</groupId>
-  <artifactId>org.eclipse.lsp4e.cpp.parent</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>LSP4E C/C++ Support Parent</name>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License v1.0</name>
-      <comments>
-       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.htm
-      </comments>
-    </license>
-  </licenses>
-
-  <properties>
-    <required-maven-version>3.3</required-maven-version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-    <tycho-version>1.0.0</tycho-version>
-    <target-platform>lsp4e.cpp-staging</target-platform>
-  </properties>
-
-  <modules>
-    <module>org.eclipse.lsp4e.cpp</module>
-    <module>org.eclipse.lsp4e.cpp.language</module>
-    <module>org.eclipse.lsp4e.cpp.site</module>
-  </modules>
-
-  <build>
-    <plugins>
-      <plugin>
-        <inherited>true</inherited>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M1</version>
-        <executions>
-          <execution>
-            <id>enforce-maven-version</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <requireMavenVersion>
-                  <version>${required-maven-version}</version>
-                </requireMavenVersion>
-                <requireJavaVersion>
-                  <version>1.8</version>
-                </requireJavaVersion>
-              </rules>
-              <fail>true</fail>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <configuration>
-          <includePackedArtifacts>true</includePackedArtifacts>
-          <environments>
-            <environment>
-                <os>win32</os>
-                <ws>win32</ws>
-                <arch>x86</arch>
-            </environment>
-            <environment>
-                <os>win32</os>
-                <ws>win32</ws>
-                <arch>x86_64</arch>
-            </environment>
-            <environment>
-                <os>macosx</os>
-                <ws>cocoa</ws>
-                <arch>x86_64</arch>
-            </environment>
-            <environment>
-                <os>linux</os>
-                <ws>gtk</ws>
-                <arch>x86</arch>
-            </environment>
-            <environment>
-                <os>linux</os>
-                <ws>gtk</ws>
-                <arch>x86_64</arch>
-            </environment>
-          </environments>
-          <target>
-            <artifact>
-              <groupId>org.eclipse.lsp4e.cpp.group</groupId>
-              <artifactId>org.eclipse.lsp4e.cpp.target</artifactId>
-              <classifier>${target-platform}</classifier>
-              <version>1.0.0-SNAPSHOT</version>
-            </artifact>
-          </target>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-maven-plugin</artifactId>
-        <version>${tycho-version}</version>
-        <extensions>true</extensions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
-        <version>${tycho-version}</version>
-        <executions>
-          <execution>
-            <id>plugin-source</id>
-            <goals>
-              <goal>plugin-source</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-compiler-plugin</artifactId>
-          <version>${tycho-version}</version>
-          <configuration>
-            <source>1.8</source>
-            <target>1.8</target>
-            <encoding>UTF-8</encoding>
-          </configuration>
-        </plugin>
-
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>target-platform-configuration</artifactId>
-          <version>${tycho-version}</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-versions-plugin</artifactId>
-          <version>${tycho-version}</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-packaging-plugin</artifactId>
-          <version>${tycho-version}</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>3.0.1</version>
-          <configuration>
-            <encoding>UTF-8</encoding>
-          </configuration>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.8</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.10</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.eclipse.rcptt</groupId>
-          <artifactId>rcptt-maven-plugin</artifactId>
-          <version>${rcptt-version}</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>3.5.1</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-clean-plugin</artifactId>
-          <version>3.0.0</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.8.2</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-install-plugin</artifactId>
-          <version>2.5.2</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>2.9</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.10.4</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
+    <parent>
+        <groupId>org.eclipse.cdt</groupId>
+        <artifactId>cdt-parent</artifactId>
+        <version>9.6.0-SNAPSHOT</version>
+    </parent>
 
+    <artifactId>org.eclipse.lsp4e.cpp-parent</artifactId>
+    <packaging>pom</packaging>
 </project>
diff --git a/pom.xml b/pom.xml
index eb8ffc0cb6d..cb5f99772b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,6 +160,10 @@
 		<module>lrparser/org.eclipse.cdt.core.lrparser.feature</module>
 		<module>lrparser/org.eclipse.cdt.core.lrparser.sdk.feature</module>
 
+		<module>lsp4e-cpp/org.eclipse.lsp4e.cpp</module>
+		<module>lsp4e-cpp/org.eclipse.lsp4e.cpp.language</module>
+		<module>lsp4e-cpp/org.eclipse.lsp4e.cpp.site</module>
+
 		<module>memory/org.eclipse.cdt.debug.ui.memory.memorybrowser</module>
 		<module>memory/org.eclipse.cdt.debug.ui.memory.floatingpoint</module>
 		<module>memory/org.eclipse.cdt.debug.ui.memory.search</module>
@@ -236,6 +240,7 @@
 		<module>dsf-gdb/org.eclipse.cdt.dsf.gdb.tests</module>
 		<module>dsf-gdb/org.eclipse.cdt.tests.dsf.gdb</module>
 		<module>dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests</module>
+		<module>lsp4e-cpp/org.eclipse.lsp4e.cpp.language.tests</module>
 		<module>qt/org.eclipse.cdt.qt.ui.tests</module>
 		<module>testsrunner/org.eclipse.cdt.testsrunner.tests</module>
 		<module>xlc/org.eclipse.cdt.errorparsers.xlc.tests</module>
@@ -375,6 +380,7 @@
 				<cdt-ui.skip.tests>true</cdt-ui.skip.tests>
 				<dsf-gdb.skip.tests>true</dsf-gdb.skip.tests>
 				<cdt-other.skip.tests>true</cdt-other.skip.tests>
+				<lsp4e-cpp.skip.tests>true</lsp4e-cpp.skip.tests>
 			</properties>
 		</profile>
 		<profile>
@@ -382,6 +388,7 @@
 			<properties>
 				<dsf-gdb.skip.tests>true</dsf-gdb.skip.tests>
 				<cdt-other.skip.tests>true</cdt-other.skip.tests>
+				<lsp4e-cpp.skip.tests>true</lsp4e-cpp.skip.tests>
 			</properties>
 		</profile>
 		<profile>
@@ -389,6 +396,15 @@
 			<properties>
 				<cdt-ui.skip.tests>true</cdt-ui.skip.tests>
 				<cdt-other.skip.tests>true</cdt-other.skip.tests>
+				<lsp4e-cpp.skip.tests>true</lsp4e-cpp.skip.tests>
+			</properties>
+		</profile>
+		<profile>
+			<id>skip-tests-except-lsp4e-cpp</id>
+			<properties>
+				<cdt-ui.skip.tests>true</cdt-ui.skip.tests>
+				<cdt-other.skip.tests>true</cdt-other.skip.tests>
+				<dsf-gdb.skip.tests>true</dsf-gdb.skip.tests>
 			</properties>
 		</profile>
 		<profile>
@@ -396,6 +412,7 @@
 			<properties>
 				<cdt-ui.skip.tests>true</cdt-ui.skip.tests>
 				<dsf-gdb.skip.tests>true</dsf-gdb.skip.tests>
+				<lsp4e-cpp.skip.tests>true</lsp4e-cpp.skip.tests>
 			</properties>
 		</profile>
 		<profile>