diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
new file mode 100644
index 00000000000..9d93c39fd93
--- /dev/null
+++ b/.mvn/extensions.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extensions>
+  <extension>
+    <groupId>org.eclipse.tycho.extras</groupId>
+    <artifactId>tycho-pomless</artifactId>
+    <version>1.0.0</version>
+  </extension>
+</extensions>
diff --git a/bundles/org.eclipse.tools.templates.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.tools.templates.core/META-INF/MANIFEST.MF
index 7f278de091f..2e46e0bd901 100644
--- a/bundles/org.eclipse.tools.templates.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.tools.templates.core/META-INF/MANIFEST.MF
@@ -1,12 +1,13 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Templates Core
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tools.templates.core
 Bundle-Version: 1.1.0.qualifier
 Bundle-Activator: org.eclipse.tools.templates.core.internal.Activator
-Bundle-Vendor: Eclipse CDT
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.tools.templates.core
+Bundle-Localization: plugin
+Bundle-Vendor: %providerName
diff --git a/bundles/org.eclipse.tools.templates.core/build.properties b/bundles/org.eclipse.tools.templates.core/build.properties
index 17daa5b49ca..d944674ba0b 100644
--- a/bundles/org.eclipse.tools.templates.core/build.properties
+++ b/bundles/org.eclipse.tools.templates.core/build.properties
@@ -2,4 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               about.html
+               about.html,\
+               plugin.properties
diff --git a/bundles/org.eclipse.tools.templates.core/plugin.properties b/bundles/org.eclipse.tools.templates.core/plugin.properties
new file mode 100644
index 00000000000..12de019fa36
--- /dev/null
+++ b/bundles/org.eclipse.tools.templates.core/plugin.properties
@@ -0,0 +1,10 @@
+#################################################################################
+# Copyright (c) 2017 QNX Software Systems 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
+#################################################################################
+
+pluginName=Template Engine Core
+providerName=Eclipse CDT
diff --git a/bundles/org.eclipse.tools.templates.core/pom.xml b/bundles/org.eclipse.tools.templates.core/pom.xml
deleted file mode 100644
index 155cbc71b9b..00000000000
--- a/bundles/org.eclipse.tools.templates.core/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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.tools.templates</groupId>
-		<artifactId>parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-
-	<version>1.1.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.tools.templates.core</artifactId>
-	<packaging>eclipse-plugin</packaging>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>plugin-source</id>
-						<phase>none</phase>
-					</execution>
-					<execution>
-						<id>attach-source</id>
-						<phase>none</phase>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/bundles/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF b/bundles/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF
index 7b62b334b19..dc45d52e72e 100644
--- a/bundles/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Eclipse Tools
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tools.templates.freemarker
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.tools.templates.freemarker.internal.Activator
@@ -11,3 +11,4 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.tools.templates.freemarker
+Bundle-Vendor: %providerName
diff --git a/bundles/org.eclipse.tools.templates.freemarker/build.properties b/bundles/org.eclipse.tools.templates.freemarker/build.properties
index 17daa5b49ca..d944674ba0b 100644
--- a/bundles/org.eclipse.tools.templates.freemarker/build.properties
+++ b/bundles/org.eclipse.tools.templates.freemarker/build.properties
@@ -2,4 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               about.html
+               about.html,\
+               plugin.properties
diff --git a/bundles/org.eclipse.tools.templates.freemarker/plugin.properties b/bundles/org.eclipse.tools.templates.freemarker/plugin.properties
new file mode 100644
index 00000000000..edb92f51b34
--- /dev/null
+++ b/bundles/org.eclipse.tools.templates.freemarker/plugin.properties
@@ -0,0 +1,10 @@
+#################################################################################
+# Copyright (c) 2017 QNX Software Systems 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
+#################################################################################
+
+pluginName=Template Engine Freemarker Support
+providerName=Eclipse CDT
diff --git a/bundles/org.eclipse.tools.templates.freemarker/pom.xml b/bundles/org.eclipse.tools.templates.freemarker/pom.xml
deleted file mode 100644
index e8578e7e605..00000000000
--- a/bundles/org.eclipse.tools.templates.freemarker/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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.tools.templates</groupId>
-		<artifactId>parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-
-	<version>1.0.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.tools.templates.freemarker</artifactId>
-	<packaging>eclipse-plugin</packaging>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>plugin-source</id>
-						<phase>none</phase>
-					</execution>
-					<execution>
-						<id>attach-source</id>
-						<phase>none</phase>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/bundles/org.eclipse.tools.templates.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.tools.templates.ui/META-INF/MANIFEST.MF
index c29bfb822fa..667a95e2e84 100644
--- a/bundles/org.eclipse.tools.templates.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.tools.templates.ui/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Ui
+Bundle-Name: Template Engine UI
 Bundle-SymbolicName: org.eclipse.tools.templates.ui;singleton:=true
 Bundle-Version: 1.1.1.qualifier
 Bundle-Activator: org.eclipse.tools.templates.ui.internal.Activator
@@ -13,3 +13,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.tools.templates.ui,
  org.eclipse.tools.templates.ui.internal
+Bundle-Vendor: Eclipse CDT
+Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.tools.templates.ui/build.properties b/bundles/org.eclipse.tools.templates.ui/build.properties
index 1d37c1db0f3..4edb1cf2735 100644
--- a/bundles/org.eclipse.tools.templates.ui/build.properties
+++ b/bundles/org.eclipse.tools.templates.ui/build.properties
@@ -4,4 +4,5 @@ bin.includes = META-INF/,\
                .,\
                about.html,\
                plugin.xml,\
-               schema/
+               schema/,\
+               plugin.properties
diff --git a/bundles/org.eclipse.tools.templates.ui/plugin.properties b/bundles/org.eclipse.tools.templates.ui/plugin.properties
new file mode 100644
index 00000000000..a708a5750be
--- /dev/null
+++ b/bundles/org.eclipse.tools.templates.ui/plugin.properties
@@ -0,0 +1,10 @@
+#################################################################################
+# Copyright (c) 2017 QNX Software Systems 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
+#################################################################################
+
+pluginName=Template Engine UI
+providerName=Eclipse CDT
diff --git a/bundles/org.eclipse.tools.templates.ui/pom.xml b/bundles/org.eclipse.tools.templates.ui/pom.xml
deleted file mode 100644
index f8400656356..00000000000
--- a/bundles/org.eclipse.tools.templates.ui/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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.tools.templates</groupId>
-		<artifactId>parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-
-	<version>1.1.1-SNAPSHOT</version>
-	<artifactId>org.eclipse.tools.templates.ui</artifactId>
-	<packaging>eclipse-plugin</packaging>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>plugin-source</id>
-						<phase>none</phase>
-					</execution>
-					<execution>
-						<id>attach-source</id>
-						<phase>none</phase>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/bundles/pom.xml b/bundles/pom.xml
new file mode 100644
index 00000000000..e12a5fa4e41
--- /dev/null
+++ b/bundles/pom.xml
@@ -0,0 +1,15 @@
+<?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.tools.templates</groupId>
+		<artifactId>parent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>bundle-parent</artifactId>
+	<packaging>pom</packaging>
+</project>
diff --git a/repo/category.xml b/repo/category.xml
index e74270a3fdb..63b1ea6bc91 100644
--- a/repo/category.xml
+++ b/repo/category.xml
@@ -3,11 +3,20 @@
    <bundle id="org.eclipse.tools.templates.core" version="0.0.0">
       <category name="main"/>
    </bundle>
+   <bundle id="org.eclipse.tools.templates.core.source" version="0.0.0">
+      <category name="main"/>
+   </bundle>
    <bundle id="org.eclipse.tools.templates.freemarker" version="0.0.0">
       <category name="main"/>
    </bundle>
-   <bundle id="org.eclipse.tools.templates.ui" version="0.0.0">
+   <bundle id="org.eclipse.tools.templates.freemarker.source" version="0.0.0">
       <category name="main"/>
    </bundle>
-   <category-def name="main" label="IDE Commons Templates"/>
+   <bundle id="org.eclipse.tools.templates.ui.source" version="0.0.0">
+      <category name="main"/>
+   </bundle>
+   <bundle id="org.eclipse.tools.templates.ui.source" version="0.0.0">
+      <category name="main"/>
+   </bundle>
+   <category-def name="main" label="Template Engine"/>
 </site>