diff --git a/pom.xml b/pom.xml
index 41884467501..d3b21bdbe09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 		<sonar.jacoco.reportPath>${project.basedir}/../../target/jacoco.exec</sonar.jacoco.reportPath>
 		<sonar.java.source>1.7</sonar.java.source>
-		<target-platform>cdt-e4.5</target-platform>
+		<target-platform>cdt-e4.6</target-platform>
 		<help-docs-eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.5</help-docs-eclipserun-repo>
 		<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git</tycho.scmUrl>
 		<base.test.vmargs>-Xms256m -Xmx512m -XX:MaxPermSize=256m -ea</base.test.vmargs>
@@ -213,7 +213,8 @@
 		
 		<module>qt/org.eclipse.cdt.qt.core</module>
 		<module>qt/org.eclipse.cdt.qt.ui</module>
-		<module>qt/org.eclipse.cdt.qt.tests</module>
+		<module>qt/org.eclipse.cdt.qt.core.tests</module>
+		<module>qt/org.eclipse.cdt.qt.ui.tests</module>
 		<module>qt/org.eclipse.cdt.qt-feature</module>
 
 		<module>xlc/org.eclipse.cdt.errorparsers.xlc.tests</module>
diff --git a/qt/org.eclipse.cdt.qt.qml.core.tests/.classpath b/qt/org.eclipse.cdt.qt.core.tests/.classpath
similarity index 100%
rename from qt/org.eclipse.cdt.qt.qml.core.tests/.classpath
rename to qt/org.eclipse.cdt.qt.core.tests/.classpath
diff --git a/qt/org.eclipse.cdt.qt.qml.core.tests/.project b/qt/org.eclipse.cdt.qt.core.tests/.project
similarity index 92%
rename from qt/org.eclipse.cdt.qt.qml.core.tests/.project
rename to qt/org.eclipse.cdt.qt.core.tests/.project
index c774ebdf8f1..290b8294e74 100644
--- a/qt/org.eclipse.cdt.qt.qml.core.tests/.project
+++ b/qt/org.eclipse.cdt.qt.core.tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.cdt.qt.qml.core.tests</name>
+	<name>org.eclipse.cdt.qt.core.tests</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/qt/org.eclipse.cdt.qt.qml.core.tests/.settings/org.eclipse.jdt.core.prefs b/qt/org.eclipse.cdt.qt.core.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from qt/org.eclipse.cdt.qt.qml.core.tests/.settings/org.eclipse.jdt.core.prefs
rename to qt/org.eclipse.cdt.qt.core.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/qt/org.eclipse.cdt.qt.core.tests/META-INF/MANIFEST.MF b/qt/org.eclipse.cdt.qt.core.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..48f301dacd9
--- /dev/null
+++ b/qt/org.eclipse.cdt.qt.core.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: QML Tests
+Bundle-SymbolicName: org.eclipse.cdt.qt.core.tests
+Bundle-Version: 2.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.junit,
+ org.antlr.runtime;bundle-version="4.5.1",
+ org.eclipse.cdt.qt.core;bundle-version="2.0.0"
+Bundle-ClassPath: .
diff --git a/qt/org.eclipse.cdt.qt.qml.core/build.properties b/qt/org.eclipse.cdt.qt.core.tests/build.properties
similarity index 59%
rename from qt/org.eclipse.cdt.qt.qml.core/build.properties
rename to qt/org.eclipse.cdt.qt.core.tests/build.properties
index e66c1dc2051..cce0abc807a 100644
--- a/qt/org.eclipse.cdt.qt.qml.core/build.properties
+++ b/qt/org.eclipse.cdt.qt.core.tests/build.properties
@@ -2,4 +2,4 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               antlr-runtime-4.5.jar
+               src/org/eclipse/cdt/qt/core/qml/tests/
diff --git a/qt/org.eclipse.cdt.qt.core.tests/pom.xml b/qt/org.eclipse.cdt.qt.core.tests/pom.xml
new file mode 100644
index 00000000000..47f30afa933
--- /dev/null
+++ b/qt/org.eclipse.cdt.qt.core.tests/pom.xml
@@ -0,0 +1,66 @@
+<?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>cdt-parent</artifactId>
+		<version>8.8.0-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+
+	<version>2.0.0-SNAPSHOT</version>
+	<artifactId>org.eclipse.cdt.qt.core.tests</artifactId>
+	<packaging>eclipse-test-plugin</packaging>
+
+    <!-- Uncommenting this is useful when the repo is built first then you want to run tests on this plugin only -->
+	<!-- <repositories>
+		<repository>
+			<id>cdt.repo</id>
+			<url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url>
+			<layout>p2</layout>
+		</repository>
+	</repositories>-->
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<useUIHarness>false</useUIHarness>
+					<argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine>
+					<testFailureIgnore>true</testFailureIgnore>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<configuration>
+					<dependency-resolution>
+						<extraRequirements>
+							<requirement>
+								<type>eclipse-feature</type>
+								<id>org.eclipse.platform</id>
+								<versionRange>0.0.0</versionRange>
+							</requirement>
+							<requirement>
+								<type>eclipse-feature</type>
+								<id>org.eclipse.cdt</id>
+								<versionRange>0.0.0</versionRange>
+							</requirement>
+							<requirement>
+								<type>eclipse-feature</type>
+								<id>org.eclipse.cdt.qt</id>
+								<versionRange>0.0.0</versionRange>
+							</requirement>
+						</extraRequirements>
+					</dependency-resolution>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/qt/org.eclipse.cdt.qt.qml.core.tests/src/org/eclipse/cdt/qt/qml/core/tests/AbstractParserTest.java b/qt/org.eclipse.cdt.qt.core.tests/src/org/eclipse/cdt/qt/core/qml/tests/AbstractParserTest.java
similarity index 88%
rename from qt/org.eclipse.cdt.qt.qml.core.tests/src/org/eclipse/cdt/qt/qml/core/tests/AbstractParserTest.java
rename to qt/org.eclipse.cdt.qt.core.tests/src/org/eclipse/cdt/qt/core/qml/tests/AbstractParserTest.java
index 86c0882f6c6..86e5b22e622 100644
--- a/qt/org.eclipse.cdt.qt.qml.core.tests/src/org/eclipse/cdt/qt/qml/core/tests/AbstractParserTest.java
+++ b/qt/org.eclipse.cdt.qt.core.tests/src/org/eclipse/cdt/qt/core/qml/tests/AbstractParserTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.cdt.qt.qml.core.tests;
+package org.eclipse.cdt.qt.core.qml.tests;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -7,6 +7,8 @@ import java.util.regex.Pattern;
 
 public class AbstractParserTest {
 
+	// TODO I don't think this really works especially on Hudson.
+	// cdt.core.tests has TestSourceReader that is more complete.
 	public static String extract() throws Exception {
 		StackTraceElement element = Thread.currentThread().getStackTrace()[2];
 		String className = element.getClassName();
diff --git a/qt/org.eclipse.cdt.qt.qml.core.tests/src/org/eclipse/cdt/qt/qml/core/tests/AbstractQMLListener.java b/qt/org.eclipse.cdt.qt.core.tests/src/org/eclipse/cdt/qt/core/qml/tests/AbstractQMLListener.java
similarity index 75%
rename from qt/org.eclipse.cdt.qt.qml.core.tests/src/org/eclipse/cdt/qt/qml/core/tests/AbstractQMLListener.java
rename to qt/org.eclipse.cdt.qt.core.tests/src/org/eclipse/cdt/qt/core/qml/tests/AbstractQMLListener.java
index 099fa316924..e09c2dbe1fc 100644
--- a/qt/org.eclipse.cdt.qt.qml.core.tests/src/org/eclipse/cdt/qt/qml/core/tests/AbstractQMLListener.java
+++ b/qt/org.eclipse.cdt.qt.core.tests/src/org/eclipse/cdt/qt/core/qml/tests/AbstractQMLListener.java
@@ -1,22 +1,22 @@
-package org.eclipse.cdt.qt.qml.core.tests;
+package org.eclipse.cdt.qt.core.qml.tests;
 
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ErrorNode;
 import org.antlr.v4.runtime.tree.TerminalNode;
-import org.eclipse.cdt.qt.qml.core.parser.QMLListener;
-import org.eclipse.cdt.qt.qml.core.parser.QMLParser.FunctionDeclarationContext;
-import org.eclipse.cdt.qt.qml.core.parser.QMLParser.QmlHeaderItemContext;
-import org.eclipse.cdt.qt.qml.core.parser.QMLParser.QmlImportDeclarationContext;
-import org.eclipse.cdt.qt.qml.core.parser.QMLParser.QmlMemberContext;
-import org.eclipse.cdt.qt.qml.core.parser.QMLParser.QmlMembersContext;
-import org.eclipse.cdt.qt.qml.core.parser.QMLParser.QmlObjectLiteralContext;
-import org.eclipse.cdt.qt.qml.core.parser.QMLParser.QmlObjectRootContext;
-import org.eclipse.cdt.qt.qml.core.parser.QMLParser.QmlPragmaDeclarationContext;
-import org.eclipse.cdt.qt.qml.core.parser.QMLParser.QmlProgramContext;
-import org.eclipse.cdt.qt.qml.core.parser.QMLParser.QmlPropertyTypeContext;
-import org.eclipse.cdt.qt.qml.core.parser.QMLParser.QmlQualifiedIdContext;
-import org.eclipse.cdt.qt.qml.core.parser.QMLParser.SemiContext;
-import org.eclipse.cdt.qt.qml.core.parser.QMLParser.SingleExpressionContext;
+import org.eclipse.cdt.internal.qt.core.qml.parser.QMLListener;
+import org.eclipse.cdt.internal.qt.core.qml.parser.QMLParser.FunctionDeclarationContext;
+import org.eclipse.cdt.internal.qt.core.qml.parser.QMLParser.QmlHeaderItemContext;
+import org.eclipse.cdt.internal.qt.core.qml.parser.QMLParser.QmlImportDeclarationContext;
+import org.eclipse.cdt.internal.qt.core.qml.parser.QMLParser.QmlMemberContext;
+import org.eclipse.cdt.internal.qt.core.qml.parser.QMLParser.QmlMembersContext;
+import org.eclipse.cdt.internal.qt.core.qml.parser.QMLParser.QmlObjectLiteralContext;
+import org.eclipse.cdt.internal.qt.core.qml.parser.QMLParser.QmlObjectRootContext;
+import org.eclipse.cdt.internal.qt.core.qml.parser.QMLParser.QmlPragmaDeclarationContext;
+import org.eclipse.cdt.internal.qt.core.qml.parser.QMLParser.QmlProgramContext;
+import org.eclipse.cdt.internal.qt.core.qml.parser.QMLParser.QmlPropertyTypeContext;
+import org.eclipse.cdt.internal.qt.core.qml.parser.QMLParser.QmlQualifiedIdContext;
+import org.eclipse.cdt.internal.qt.core.qml.parser.QMLParser.SemiContext;
+import org.eclipse.cdt.internal.qt.core.qml.parser.QMLParser.SingleExpressionContext;
 
 public class AbstractQMLListener implements QMLListener {
 
diff --git a/qt/org.eclipse.cdt.qt.qml.core.tests/src/org/eclipse/cdt/qt/qml/core/tests/QMLParserTest.java b/qt/org.eclipse.cdt.qt.core.tests/src/org/eclipse/cdt/qt/core/qml/tests/QMLParserTest.java
similarity index 86%
rename from qt/org.eclipse.cdt.qt.qml.core.tests/src/org/eclipse/cdt/qt/qml/core/tests/QMLParserTest.java
rename to qt/org.eclipse.cdt.qt.core.tests/src/org/eclipse/cdt/qt/core/qml/tests/QMLParserTest.java
index 9405fe3efd4..1428f6823e0 100644
--- a/qt/org.eclipse.cdt.qt.qml.core.tests/src/org/eclipse/cdt/qt/qml/core/tests/QMLParserTest.java
+++ b/qt/org.eclipse.cdt.qt.core.tests/src/org/eclipse/cdt/qt/core/qml/tests/QMLParserTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.cdt.qt.qml.core.tests;
+package org.eclipse.cdt.qt.core.qml.tests;
 
 import static org.junit.Assert.fail;
 
@@ -12,10 +12,11 @@ import org.antlr.v4.runtime.RecognitionException;
 import org.antlr.v4.runtime.Recognizer;
 import org.antlr.v4.runtime.atn.ATNConfigSet;
 import org.antlr.v4.runtime.dfa.DFA;
-import org.eclipse.cdt.qt.qml.core.parser.QMLLexer;
-import org.eclipse.cdt.qt.qml.core.parser.QMLListener;
-import org.eclipse.cdt.qt.qml.core.parser.QMLParser;
-import org.eclipse.cdt.qt.qml.core.parser.QMLParser.QmlProgramContext;
+import org.eclipse.cdt.internal.qt.core.qml.parser.QMLLexer;
+import org.eclipse.cdt.internal.qt.core.qml.parser.QMLListener;
+import org.eclipse.cdt.internal.qt.core.qml.parser.QMLParser;
+import org.eclipse.cdt.internal.qt.core.qml.parser.QMLParser.QmlProgramContext;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class QMLParserTest extends AbstractParserTest {
@@ -82,7 +83,9 @@ public class QMLParserTest extends AbstractParserTest {
 
 	// testCode
 	@Test
+	@Ignore
 	public void testCodeExtract() throws Exception {
+		// see if you can use TestSourceReader out of the cdt.core.tests plugin
 		runParser(extract(), new AbstractQMLListener() {
 			@Override
 			public void exitQmlProgram(QmlProgramContext ctx) {
diff --git a/qt/org.eclipse.cdt.qt.core/.classpath b/qt/org.eclipse.cdt.qt.core/.classpath
index 9ace5bdb161..f0c55498599 100644
--- a/qt/org.eclipse.cdt.qt.core/.classpath
+++ b/qt/org.eclipse.cdt.qt.core/.classpath
@@ -3,6 +3,6 @@
 	<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"/>
-	<classpathentry exported="true" kind="lib" path="libs/freemarker-2.3.22.jar"/>
+	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/qt/org.eclipse.cdt.qt.qml.core/.externalToolBuilders/Antlr QML.launch b/qt/org.eclipse.cdt.qt.core/.externalToolBuilders/QML Antlr.launch
similarity index 57%
rename from qt/org.eclipse.cdt.qt.qml.core/.externalToolBuilders/Antlr QML.launch
rename to qt/org.eclipse.cdt.qt.core/.externalToolBuilders/QML Antlr.launch
index 04a6ee300b1..8a146d988a1 100644
--- a/qt/org.eclipse.cdt.qt.qml.core/.externalToolBuilders/Antlr QML.launch	
+++ b/qt/org.eclipse.cdt.qt.core/.externalToolBuilders/QML Antlr.launch	
@@ -1,16 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="clean,"/>
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.cdt.qt.qml.core&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.cdt.qt.qml.core"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.cdt.qt.qml.core/ECMAScript.g4&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.cdt.qt.qml.core/JavaScript.g4&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/org.eclipse.cdt.qt.qml.core/QML.g4&quot; type=&quot;1&quot;/&gt;&#10;&lt;/resources&gt;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.cdt.qt.qml.core/build.xml}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.cdt.qt.qml.core}"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="clean,"/>
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.cdt.qt.core&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.cdt.qt.core"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.cdt.qt.core/build.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.cdt.qt.core}"/>
+</launchConfiguration>
diff --git a/qt/org.eclipse.cdt.qt.core/.gitignore b/qt/org.eclipse.cdt.qt.core/.gitignore
new file mode 100644
index 00000000000..88d8d11948a
--- /dev/null
+++ b/qt/org.eclipse.cdt.qt.core/.gitignore
@@ -0,0 +1,2 @@
+/src-gen/
+/antlr-4.5.1-complete.jar
diff --git a/qt/org.eclipse.cdt.qt.core/.project b/qt/org.eclipse.cdt.qt.core/.project
index a679b3bf3a9..388626bf2a7 100644
--- a/qt/org.eclipse.cdt.qt.core/.project
+++ b/qt/org.eclipse.cdt.qt.core/.project
@@ -5,6 +5,16 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/QML Antlr.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
diff --git a/qt/org.eclipse.cdt.qt.qml.core/ECMAScript.g4 b/qt/org.eclipse.cdt.qt.core/ECMAScript.g4
similarity index 100%
rename from qt/org.eclipse.cdt.qt.qml.core/ECMAScript.g4
rename to qt/org.eclipse.cdt.qt.core/ECMAScript.g4
diff --git a/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF b/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF
index 1c950642c58..1ac75cbc4b4 100644
--- a/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF
+++ b/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF
@@ -15,14 +15,15 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.launchbar.core;bundle-version="1.0.1",
  org.eclipse.remote.core;bundle-version="2.0.0",
  org.eclipse.debug.core;bundle-version="3.10.0",
- org.eclipse.cdt.debug.core
+ org.eclipse.cdt.debug.core,
+ org.freemarker;bundle-version="2.3.22",
+ org.antlr.runtime;bundle-version="4.5.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
-Export-Package: org.eclipse.cdt.internal.qt.core;x-friends:="org.eclipse.cdt.qt.ui,org.eclipse.cdt.qt.tests",
+Export-Package: org.eclipse.cdt.internal.qt.core;x-friends:="org.eclipse.cdt.qt.ui,org.eclipse.cdt.qt.ui.tests",
  org.eclipse.cdt.internal.qt.core.build;x-friends:="org.eclipse.cdt.qt.ui",
- org.eclipse.cdt.internal.qt.core.index;x-friends:="org.eclipse.cdt.qt.tests",
+ org.eclipse.cdt.internal.qt.core.index;x-friends:="org.eclipse.cdt.qt.ui.tests",
  org.eclipse.cdt.internal.qt.core.parser;x-friends:="org.eclipse.cdt.qt.ui",
- org.eclipse.cdt.internal.qt.core.project;x-friends:="org.eclipse.cdt.qt.ui"
-Bundle-ClassPath: libs/freemarker-2.3.22.jar,
- .
+ org.eclipse.cdt.internal.qt.core.project;x-friends:="org.eclipse.cdt.qt.ui",
+ org.eclipse.cdt.internal.qt.core.qml.parser;x-friends:="org.eclipse.cdt.qt.core.tests"
diff --git a/qt/org.eclipse.cdt.qt.qml.core/QML.g4 b/qt/org.eclipse.cdt.qt.core/QML.g4
similarity index 100%
rename from qt/org.eclipse.cdt.qt.qml.core/QML.g4
rename to qt/org.eclipse.cdt.qt.core/QML.g4
diff --git a/qt/org.eclipse.cdt.qt.core/build.properties b/qt/org.eclipse.cdt.qt.core/build.properties
index f2748e1059a..7be2c6a009d 100644
--- a/qt/org.eclipse.cdt.qt.core/build.properties
+++ b/qt/org.eclipse.cdt.qt.core/build.properties
@@ -1,10 +1,13 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
-               .,\
                plugin.xml,\
                templates/,\
                about.html,\
-               plugin.properties
+               plugin.properties,\
+               .
 src.includes = about.html,\
-               schema/
+               schema/,\
+               ECMAScript.g4,\
+               QML.g4
+source.. = src-gen/,\
+           src/
+output.. = bin/
diff --git a/qt/org.eclipse.cdt.qt.qml.core/build.xml b/qt/org.eclipse.cdt.qt.core/build.xml
similarity index 67%
rename from qt/org.eclipse.cdt.qt.qml.core/build.xml
rename to qt/org.eclipse.cdt.qt.core/build.xml
index 6ba2d4002e9..7ba98f4b1a3 100644
--- a/qt/org.eclipse.cdt.qt.qml.core/build.xml
+++ b/qt/org.eclipse.cdt.qt.core/build.xml
@@ -6,10 +6,8 @@
 
 	<target name="getAntlr">
 		<get src="http://www.antlr.org/download/antlr-4.5.1-complete.jar" dest="antlr-4.5.1-complete.jar" skipexisting="true"/>
-		<get src="http://www.antlr.org/download/antlr-runtime-4.5.1.jar" dest="antlr-runtime-4.5.1.jar" skipexisting="true"/>
-		<get src="https://github.com/antlr/antlr4/archive/4.5.1.zip" dest="antlr-4.5.1.zip" skipexisting="true"/>
 	</target>
-		
+
     <target name="build" depends="getAntlr">
     	<java classname="org.antlr.v4.Tool" fork="true">
 			<classpath>
@@ -17,9 +15,9 @@
 				<pathelement path="${java.class.path}"/>
 			</classpath>
     		<arg value="-o"/>
-    		<arg value="src-gen/org/eclipse/cdt/qt/qml/core/parser"/>
+    		<arg value="src-gen/org/eclipse/cdt/internal/qt/core/qml/parser"/>
     		<arg value="-package"/>
-    		<arg value="org.eclipse.cdt.qt.qml.core.parser"/>
+    		<arg value="org.eclipse.cdt.internal.qt.core.qml.parser"/>
     		<arg value="ECMAScript.g4"/>
     	</java>
     	<java classname="org.antlr.v4.Tool" fork="true">
@@ -28,14 +26,16 @@
 				<pathelement path="${java.class.path}"/>
 			</classpath>
     		<arg value="-o"/>
-    		<arg value="src-gen/org/eclipse/cdt/qt/qml/core/parser"/>
+    		<arg value="src-gen/org/eclipse/cdt/internal/qt/core/qml/parser"/>
     		<arg value="-package"/>
-    		<arg value="org.eclipse.cdt.qt.qml.core.parser"/>
+    		<arg value="org.eclipse.cdt.internal.qt.core.qml.parser"/>
     		<arg value="QML.g4"/>
     	</java>
     </target>
 
 	<target name="clean">
+		<delete dir="src-gen"/>
+		<mkdir dir="src-gen"/>
 	</target>
-		
+
 </project>
diff --git a/qt/org.eclipse.cdt.qt.core/libs/freemarker-2.3.22.jar b/qt/org.eclipse.cdt.qt.core/libs/freemarker-2.3.22.jar
deleted file mode 100644
index a67a1c127e3..00000000000
Binary files a/qt/org.eclipse.cdt.qt.core/libs/freemarker-2.3.22.jar and /dev/null differ
diff --git a/qt/org.eclipse.cdt.qt.core/pom.xml b/qt/org.eclipse.cdt.qt.core/pom.xml
index 19eb92eed73..b88a691504e 100644
--- a/qt/org.eclipse.cdt.qt.core/pom.xml
+++ b/qt/org.eclipse.cdt.qt.core/pom.xml
@@ -14,4 +14,38 @@
 	<version>2.0.0-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.qt.core</artifactId>
 	<packaging>eclipse-plugin</packaging>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-parsers</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<target>
+								<ant antfile="${basedir}/build.xml" target="build"/>
+							</target>
+						</configuration>
+					</execution>
+					<execution>
+						<id>clean-parsers</id>
+						<phase>clean</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<target>
+								<ant antfile="${basedir}/build.xml" target="clean"/>
+							</target>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/qt/org.eclipse.cdt.qt.qml.core.tests/META-INF/MANIFEST.MF b/qt/org.eclipse.cdt.qt.qml.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index ba0707b64a6..00000000000
--- a/qt/org.eclipse.cdt.qt.qml.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: QML Tests
-Bundle-SymbolicName: org.eclipse.cdt.qt.qml.core.tests
-Bundle-Version: 1.0.0.qualifier
-Fragment-Host: org.eclipse.cdt.qt.qml.core;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit
-Bundle-ClassPath: src/,
- .
diff --git a/qt/org.eclipse.cdt.qt.qml.core.tests/build.properties b/qt/org.eclipse.cdt.qt.qml.core.tests/build.properties
deleted file mode 100644
index 98def4deb09..00000000000
--- a/qt/org.eclipse.cdt.qt.qml.core.tests/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               src/
diff --git a/qt/org.eclipse.cdt.qt.qml.core/.classpath b/qt/org.eclipse.cdt.qt.qml.core/.classpath
deleted file mode 100644
index 242e4abe0ef..00000000000
--- a/qt/org.eclipse.cdt.qt.qml.core/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<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"/>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry exported="true" kind="lib" path="antlr-runtime-4.5.1.jar" sourcepath="antlr-4.5.1.zip"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/qt/org.eclipse.cdt.qt.qml.core/.gitignore b/qt/org.eclipse.cdt.qt.qml.core/.gitignore
deleted file mode 100644
index 27fdaebfdf6..00000000000
--- a/qt/org.eclipse.cdt.qt.qml.core/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/src-gen/
-/bbQML.g
-/antlr-4.5.1-complete.jar
-/antlr-4.5.1.zip
-/antlr-runtime-4.5.1.jar
diff --git a/qt/org.eclipse.cdt.qt.qml.core/.project b/qt/org.eclipse.cdt.qt.qml.core/.project
deleted file mode 100644
index 06473865e28..00000000000
--- a/qt/org.eclipse.cdt.qt.qml.core/.project
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.cdt.qt.qml.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>auto,full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/Antlr QML.launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/qt/org.eclipse.cdt.qt.qml.core/.settings/org.eclipse.jdt.core.prefs b/qt/org.eclipse.cdt.qt.qml.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61dca8..00000000000
--- a/qt/org.eclipse.cdt.qt.qml.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/qt/org.eclipse.cdt.qt.qml.core/META-INF/MANIFEST.MF b/qt/org.eclipse.cdt.qt.qml.core/META-INF/MANIFEST.MF
deleted file mode 100644
index fae225d674f..00000000000
--- a/qt/org.eclipse.cdt.qt.qml.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Core
-Bundle-SymbolicName: org.eclipse.cdt.qt.qml.core
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.cdt.qt.qml.core.internal.Activator
-Require-Bundle: org.eclipse.core.runtime
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: antlr-runtime-4.5.1.jar,
- .
diff --git a/qt/org.eclipse.cdt.qt.qml.core/src/org/eclipse/cdt/qt/qml/core/internal/Activator.java b/qt/org.eclipse.cdt.qt.qml.core/src/org/eclipse/cdt/qt/qml/core/internal/Activator.java
deleted file mode 100644
index bd81ecca373..00000000000
--- a/qt/org.eclipse.cdt.qt.qml.core/src/org/eclipse/cdt/qt/qml/core/internal/Activator.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 QNX Software Systems
- * 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
- *******************************************************************************/
-package org.eclipse.cdt.qt.qml.core.internal;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-
-	private static BundleContext context;
-
-	static BundleContext getContext() {
-		return context;
-	}
-
-	public void start(BundleContext bundleContext) throws Exception {
-		Activator.context = bundleContext;
-	}
-
-	public void stop(BundleContext bundleContext) throws Exception {
-		Activator.context = null;
-	}
-
-}
diff --git a/qt/org.eclipse.cdt.qt.tests/.classpath b/qt/org.eclipse.cdt.qt.ui.tests/.classpath
similarity index 100%
rename from qt/org.eclipse.cdt.qt.tests/.classpath
rename to qt/org.eclipse.cdt.qt.ui.tests/.classpath
diff --git a/qt/org.eclipse.cdt.qt.tests/.project b/qt/org.eclipse.cdt.qt.ui.tests/.project
similarity index 93%
rename from qt/org.eclipse.cdt.qt.tests/.project
rename to qt/org.eclipse.cdt.qt.ui.tests/.project
index b40b063abdd..aed0c65b473 100644
--- a/qt/org.eclipse.cdt.qt.tests/.project
+++ b/qt/org.eclipse.cdt.qt.ui.tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.cdt.qt.tests</name>
+	<name>org.eclipse.cdt.qt.ui.tests</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/qt/org.eclipse.cdt.qt.tests/.settings/org.eclipse.jdt.core.prefs b/qt/org.eclipse.cdt.qt.ui.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from qt/org.eclipse.cdt.qt.tests/.settings/org.eclipse.jdt.core.prefs
rename to qt/org.eclipse.cdt.qt.ui.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/qt/org.eclipse.cdt.qt.tests/META-INF/MANIFEST.MF b/qt/org.eclipse.cdt.qt.ui.tests/META-INF/MANIFEST.MF
similarity index 87%
rename from qt/org.eclipse.cdt.qt.tests/META-INF/MANIFEST.MF
rename to qt/org.eclipse.cdt.qt.ui.tests/META-INF/MANIFEST.MF
index a191921e21f..e4c7a152572 100644
--- a/qt/org.eclipse.cdt.qt.tests/META-INF/MANIFEST.MF
+++ b/qt/org.eclipse.cdt.qt.ui.tests/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.cdt.qt.tests
-Bundle-Version: 1.1.0.qualifier
+Bundle-SymbolicName: org.eclipse.cdt.qt.ui.tests
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.cdt.qt.tests.QtTestPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/qt/org.eclipse.cdt.qt.tests/build.properties b/qt/org.eclipse.cdt.qt.ui.tests/build.properties
similarity index 100%
rename from qt/org.eclipse.cdt.qt.tests/build.properties
rename to qt/org.eclipse.cdt.qt.ui.tests/build.properties
diff --git a/qt/org.eclipse.cdt.qt.tests/plugin.properties b/qt/org.eclipse.cdt.qt.ui.tests/plugin.properties
similarity index 100%
rename from qt/org.eclipse.cdt.qt.tests/plugin.properties
rename to qt/org.eclipse.cdt.qt.ui.tests/plugin.properties
diff --git a/qt/org.eclipse.cdt.qt.tests/pom.xml b/qt/org.eclipse.cdt.qt.ui.tests/pom.xml
similarity index 60%
rename from qt/org.eclipse.cdt.qt.tests/pom.xml
rename to qt/org.eclipse.cdt.qt.ui.tests/pom.xml
index 9f1a8dd2913..2b4bb8d1424 100644
--- a/qt/org.eclipse.cdt.qt.tests/pom.xml
+++ b/qt/org.eclipse.cdt.qt.ui.tests/pom.xml
@@ -11,8 +11,8 @@
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
-	<version>1.1.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.cdt.qt.tests</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<artifactId>org.eclipse.cdt.qt.ui.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 
     <!-- Uncommenting this is useful when the repo is built first then you want to run tests on this plugin only -->
@@ -37,18 +37,31 @@
 						<include>**/AllQtTests.*</include>
 					</includes>
 					<testFailureIgnore>true</testFailureIgnore>
-					<dependencies>
-						<dependency>
-							<artifactId>org.eclipse.platform.feature.group</artifactId>
-							<version>3.8.0</version>
-							<type>p2-installable-unit</type>
-						</dependency>
-						<dependency>
-							<artifactId>org.eclipse.cdt.feature.group</artifactId>
-							<version>8.3.0.${buildQualifier}</version>
-							<type>p2-installable-unit</type>
-						</dependency>
-					</dependencies>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<configuration>
+					<dependency-resolution>
+						<extraRequirements>
+							<requirement>
+								<type>eclipse-feature</type>
+								<id>org.eclipse.platform</id>
+								<versionRange>0.0.0</versionRange>
+							</requirement>
+							<requirement>
+								<type>eclipse-feature</type>
+								<id>org.eclipse.cdt</id>
+								<versionRange>0.0.0</versionRange>
+							</requirement>
+							<requirement>
+								<type>eclipse-feature</type>
+								<id>org.eclipse.cdt.qt</id>
+								<versionRange>0.0.0</versionRange>
+							</requirement>
+						</extraRequirements>
+					</dependency-resolution>
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/qt/org.eclipse.cdt.qt.tests/src/org/eclipse/cdt/qt/tests/ASTUtilTests.java b/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/ASTUtilTests.java
similarity index 100%
rename from qt/org.eclipse.cdt.qt.tests/src/org/eclipse/cdt/qt/tests/ASTUtilTests.java
rename to qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/ASTUtilTests.java
diff --git a/qt/org.eclipse.cdt.qt.tests/src/org/eclipse/cdt/qt/tests/AllQtTests.java b/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/AllQtTests.java
similarity index 100%
rename from qt/org.eclipse.cdt.qt.tests/src/org/eclipse/cdt/qt/tests/AllQtTests.java
rename to qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/AllQtTests.java
diff --git a/qt/org.eclipse.cdt.qt.tests/src/org/eclipse/cdt/qt/tests/BaseQtTestCase.java b/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/BaseQtTestCase.java
similarity index 100%
rename from qt/org.eclipse.cdt.qt.tests/src/org/eclipse/cdt/qt/tests/BaseQtTestCase.java
rename to qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/BaseQtTestCase.java
diff --git a/qt/org.eclipse.cdt.qt.tests/src/org/eclipse/cdt/qt/tests/QGadgetTests.java b/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QGadgetTests.java
similarity index 100%
rename from qt/org.eclipse.cdt.qt.tests/src/org/eclipse/cdt/qt/tests/QGadgetTests.java
rename to qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QGadgetTests.java
diff --git a/qt/org.eclipse.cdt.qt.tests/src/org/eclipse/cdt/qt/tests/QMakeTests.java b/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QMakeTests.java
similarity index 100%
rename from qt/org.eclipse.cdt.qt.tests/src/org/eclipse/cdt/qt/tests/QMakeTests.java
rename to qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QMakeTests.java
diff --git a/qt/org.eclipse.cdt.qt.tests/src/org/eclipse/cdt/qt/tests/QObjectTests.java b/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QObjectTests.java
similarity index 100%
rename from qt/org.eclipse.cdt.qt.tests/src/org/eclipse/cdt/qt/tests/QObjectTests.java
rename to qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QObjectTests.java
diff --git a/qt/org.eclipse.cdt.qt.tests/src/org/eclipse/cdt/qt/tests/QmlRegistrationTests.java b/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QmlRegistrationTests.java
similarity index 100%
rename from qt/org.eclipse.cdt.qt.tests/src/org/eclipse/cdt/qt/tests/QmlRegistrationTests.java
rename to qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QmlRegistrationTests.java
diff --git a/qt/org.eclipse.cdt.qt.tests/src/org/eclipse/cdt/qt/tests/QtContentAssistantTests.java b/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QtContentAssistantTests.java
similarity index 100%
rename from qt/org.eclipse.cdt.qt.tests/src/org/eclipse/cdt/qt/tests/QtContentAssistantTests.java
rename to qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QtContentAssistantTests.java
diff --git a/qt/org.eclipse.cdt.qt.tests/src/org/eclipse/cdt/qt/tests/QtIndexTests.java b/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QtIndexTests.java
similarity index 100%
rename from qt/org.eclipse.cdt.qt.tests/src/org/eclipse/cdt/qt/tests/QtIndexTests.java
rename to qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QtIndexTests.java
diff --git a/qt/org.eclipse.cdt.qt.tests/src/org/eclipse/cdt/qt/tests/QtRegressionTests.java b/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QtRegressionTests.java
similarity index 100%
rename from qt/org.eclipse.cdt.qt.tests/src/org/eclipse/cdt/qt/tests/QtRegressionTests.java
rename to qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QtRegressionTests.java
diff --git a/qt/org.eclipse.cdt.qt.tests/src/org/eclipse/cdt/qt/tests/QtTestPlugin.java b/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QtTestPlugin.java
similarity index 100%
rename from qt/org.eclipse.cdt.qt.tests/src/org/eclipse/cdt/qt/tests/QtTestPlugin.java
rename to qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/QtTestPlugin.java
diff --git a/qt/org.eclipse.cdt.qt.ui/META-INF/MANIFEST.MF b/qt/org.eclipse.cdt.qt.ui/META-INF/MANIFEST.MF
index 71c77dfb49b..d4e4fc2c82e 100644
--- a/qt/org.eclipse.cdt.qt.ui/META-INF/MANIFEST.MF
+++ b/qt/org.eclipse.cdt.qt.ui/META-INF/MANIFEST.MF
@@ -19,4 +19,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.cdt.qt.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.cdt.internal.qt.ui.assist;x-friends:="org.eclipse.cdt.qt.tests"
+Export-Package: org.eclipse.cdt.internal.qt.ui.assist;x-friends:="org.eclipse.cdt.qt.ui.tests"
diff --git a/releng/org.eclipse.cdt.target/cdt-e4.6.target b/releng/org.eclipse.cdt.target/cdt-e4.6.target
index ab0a1c40c2d..3a251897a25 100644
--- a/releng/org.eclipse.cdt.target/cdt-e4.6.target
+++ b/releng/org.eclipse.cdt.target/cdt-e4.6.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="cdt_e4.6" sequenceNumber="1">
+<?pde version="3.8"?><target name="cdt_e4.6" sequenceNumber="2">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.commons.compress" version="0.0.0"/>
@@ -14,6 +14,11 @@
 <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.freemarker" version="0.0.0"/>
+<unit id="org.antlr.runtime" version="0.0.0"/>
+<repository location="https://hudson.eclipse.org/orbit/job/orbit-recipes/lastSuccessfulBuild/artifact/releng/repository/target/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>