diff --git a/.gitignore b/.gitignore
index 6e917b1..c20998e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
 
 # Temporary files
 *~
+target/
 
 # Virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
diff --git a/default.tpd b/default.tpd
index 04aae04..5339e63 100644
--- a/default.tpd
+++ b/default.tpd
@@ -5,19 +5,19 @@ location "http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500/"
     org.eclipse.equinox.p2.sdk.feature.group
     org.eclipse.sdk.feature.group
     org.eclipse.pde.core
-    org.eclipse.emf.ecore
-    org.eclipse.emf.ecore.xmi
-    org.eclipse.emf.ecore.change
-    org.eclipse.emf.common
+    org.eclipse.emf.ecore [2.11.2,2.12.0)
+    org.eclipse.emf.ecore.xmi [2.11.1,2.12.0)
+    org.eclipse.emf.ecore.change [2.11.0,2.12.0)
+    org.eclipse.emf.common [2.11.1,2.12.0)
 }
-location "http://download.eclipse.org/modeling/emf/updates/releases/" {    
+location "http://download.eclipse.org/modeling/emf/updates/releases/" {
 	org.eclipse.emf.databinding
  	org.eclipse.emf.databinding.edit
 }
 
 location "http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/" {
     org.apache.log4j
-    org.apache.commons.collections	
+    org.apache.commons.collections
 	org.apache.httpcomponents.httpclient
  	org.apache.httpcomponents.httpcore
 }
diff --git a/org.dawnsci.marketplace.core/pom.xml b/org.dawnsci.marketplace.core/pom.xml
index 18885b0..e6487e6 100644
--- a/org.dawnsci.marketplace.core/pom.xml
+++ b/org.dawnsci.marketplace.core/pom.xml
@@ -4,6 +4,7 @@
 
 	<groupId>org.dawnsci</groupId>
 	<artifactId>org.dawnsci.marketplace.core</artifactId>
+	<name>DAWN Marketplace Core</name>
 	<version>1.0.0-SNAPSHOT</version>
 
 	<packaging>${packaging.type}</packaging>
@@ -129,7 +130,7 @@
 			<id>client</id>
 			<properties>
 				<packaging.type>eclipse-plugin</packaging.type>
-				<tycho.version>0.24.0</tycho.version>
+				<tycho.version>0.26.0</tycho.version>
 				<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 			</properties>
 			<build>
@@ -152,19 +153,21 @@
 							</execution>
 						</executions>
 					</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-compiler-plugin</artifactId>
 						<version>${tycho.version}</version>
-						<configuration>
-							<useProjectSettings>true</useProjectSettings>
-						</configuration>
 					</plugin>
 					<plugin>
 						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>tycho-maven-plugin</artifactId>
+						<artifactId>tycho-packaging-plugin</artifactId>
 						<version>${tycho.version}</version>
-						<extensions>true</extensions>
 					</plugin>
 					<plugin>
 						<groupId>org.eclipse.tycho</groupId>
@@ -210,24 +213,6 @@
 							<pomDependencies>consider</pomDependencies>
 						</configuration>
 					</plugin>
-					<!-- computes git revision for manifest -->
-					<plugin>
-						<groupId>org.eclipse.tycho</groupId>
-						<artifactId>tycho-packaging-plugin</artifactId>
-						<version>${tycho.version}</version>
-						<configuration>
-							<archive>
-								<addMavenDescriptor>false</addMavenDescriptor>
-							</archive>
-						</configuration>
-						<dependencies>
-							<dependency>
-								<groupId>org.eclipse.tycho.extras</groupId>
-								<artifactId>tycho-sourceref-jgit</artifactId>
-								<version>${tycho.version}</version>
-							</dependency>
-						</dependencies>
-					</plugin>
 				</plugins>
 			</build>
 		</profile>
diff --git a/org.dawnsci.marketplace.server/.settings/org.eclipse.wst.common.component b/org.dawnsci.marketplace.server/.settings/org.eclipse.wst.common.component
index a1129c2..87a2a6f 100644
--- a/org.dawnsci.marketplace.server/.settings/org.eclipse.wst.common.component
+++ b/org.dawnsci.marketplace.server/.settings/org.eclipse.wst.common.component
@@ -4,7 +4,7 @@
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="org.dawnsci.marketplace.core-1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/org.dawnsci.marketplace.core/org.dawnsci.marketplace.core">
+        <dependent-module archiveName="org.dawnsci.marketplace.core-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/org.dawnsci.marketplace.core/org.dawnsci.marketplace.core">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <property name="java-output-path" value="/org.dawnsci.marketplace.server/target/classes"/>
diff --git a/org.dawnsci.marketplace.server/pom.xml b/org.dawnsci.marketplace.server/pom.xml
index 40e2762..19670dc 100644
--- a/org.dawnsci.marketplace.server/pom.xml
+++ b/org.dawnsci.marketplace.server/pom.xml
@@ -2,6 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
+	<name>DAWN Marketplace Server</name>
 	<artifactId>org.dawnsci.marketplace.server</artifactId>
 	<packaging>war</packaging>
 
diff --git a/org.dawnsci.marketplace.ui/pom.xml b/org.dawnsci.marketplace.ui/pom.xml
index b76af4e..4acda44 100644
--- a/org.dawnsci.marketplace.ui/pom.xml
+++ b/org.dawnsci.marketplace.ui/pom.xml
@@ -1,106 +1,41 @@
 <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>
-		
+
 	<parent>
 		<relativePath>../pom.xml</relativePath>
 		<artifactId>org.dawnsci.marketplace-parent</artifactId>
 		<groupId>org.dawnsci.marketplace</groupId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
-	
+
+	<name>DAWN Marketplace UI</name>
 	<artifactId>org.dawnsci.marketplace.ui</artifactId>
 	<packaging>eclipse-plugin</packaging>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>cbi</id>
-            <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
-        </pluginRepository>
-    </pluginRepositories>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>tycho-compiler-plugin</artifactId>
-                <version>${tycho.version}</version>
-                <configuration>
-                    <useProjectSettings>true</useProjectSettings>
-                </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>target-platform-configuration</artifactId>
-                <version>${tycho.version}</version>
-                <configuration>
-                    <target>
-                        <artifact>
-                            <groupId>org.dawnsci.marketplace</groupId>
-                            <artifactId>org.dawnsci.marketplace-parent</artifactId>
-                            <version>1.0.0-SNAPSHOT</version>
-                            <classifier>default</classifier>
-                        </artifact>
-                    </target>
-                    <resolver>p2</resolver>
-                    <environments>
-                        <environment>
-                            <os>linux</os>
-                            <ws>gtk</ws>
-                            <arch>x86</arch>
-                        </environment>
-                        <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>linux</os>
-                            <ws>gtk</ws>
-                            <arch>x86_64</arch>
-                        </environment>
-                        <environment>
-                            <os>macosx</os>
-                            <ws>cocoa</ws>
-                            <arch>x86_64</arch>
-                        </environment>
-                    </environments>
-                    <pomDependencies>consider</pomDependencies>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <!-- computes git revision for manifest -->
-            <plugin>
-                <groupId>org.eclipse.tycho</groupId>
-                <artifactId>tycho-packaging-plugin</artifactId>
-                <version>${tycho.version}</version>
-                <configuration>
-                    <archive>
-                        <addMavenDescriptor>false</addMavenDescriptor>
-                    </archive>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.tycho.extras</groupId>
-                        <artifactId>tycho-sourceref-jgit</artifactId>
-                        <version>${tycho.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+			</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-packaging-plugin</artifactId>
+				<version>${tycho.version}</version>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho.version}</version>
+			</plugin>
+		</plugins>
+	</build>
+
 </project>
diff --git a/org.dawnsci.marketplace/.project b/org.dawnsci.marketplace/.project
new file mode 100644
index 0000000..cf628b7
--- /dev/null
+++ b/org.dawnsci.marketplace/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.dawnsci.marketplace</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.dawnsci.marketplace/build.properties b/org.dawnsci.marketplace/build.properties
new file mode 100644
index 0000000..b692f5f
--- /dev/null
+++ b/org.dawnsci.marketplace/build.properties
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+               feature.properties
\ No newline at end of file
diff --git a/org.dawnsci.marketplace/feature.properties b/org.dawnsci.marketplace/feature.properties
new file mode 100644
index 0000000..b746e78
--- /dev/null
+++ b/org.dawnsci.marketplace/feature.properties
@@ -0,0 +1,14 @@
+###############################################################################
+# Copyright (c) 2016 Torkild U. Resheim
+# 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
+#
+# Contributors:
+#     Torkild U. Resheim - initial API and implementation
+###############################################################################
+featureName=DAWN Marketplace Client
+description=Author integration with the DAWN Marketplace.
+providerName=Diamond Light Source
+copyright=Copyright (c) 2016 Diamond Light Source and others
\ No newline at end of file
diff --git a/org.dawnsci.marketplace/feature.xml b/org.dawnsci.marketplace/feature.xml
new file mode 100644
index 0000000..da3104a
--- /dev/null
+++ b/org.dawnsci.marketplace/feature.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.dawnsci.marketplace"
+      label="%featureName"
+      version="1.0.0.qualifier"
+      provider-name="%providerName">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <plugin
+         id="org.dawnsci.marketplace.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.dawnsci.marketplace.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.emf.databinding"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.mylyn.wikitext.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.mylyn.wikitext.markdown.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.mylyn.wikitext.markdown.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.mylyn.wikitext.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.emf.databinding.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.mylyn.commons.workbench"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.emf.ecore"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.emf.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.emf.common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.mylyn.commons.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.mylyn.commons.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.mylyn.commons.screenshots"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.google.guava"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.mylyn.wikitext.core.osgi"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/org.dawnsci.marketplace/pom.xml b/org.dawnsci.marketplace/pom.xml
new file mode 100644
index 0000000..3fadfe6
--- /dev/null
+++ b/org.dawnsci.marketplace/pom.xml
@@ -0,0 +1,38 @@
+<?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>
+
+	<name>DAWN Marketplace Eclipse Feature</name>
+	<artifactId>org.dawnsci.marketplace</artifactId>
+	<packaging>eclipse-feature</packaging>
+
+	<parent>
+		<relativePath>../pom.xml</relativePath>
+		<artifactId>org.dawnsci.marketplace-parent</artifactId>
+		<groupId>org.dawnsci.marketplace</groupId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+			</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-packaging-plugin</artifactId>
+				<version>${tycho.version}</version>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/pom.xml b/pom.xml
index 76ba2ec..a3d5249 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,16 +20,11 @@
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
-	<name>DAWN Marketplace</name>
+	<name>DAWN Marketplace Parent</name>
 	<organization>
 		<name>Diamond Light Source</name>
 	</organization>
 
-	<properties>
-        <tycho.version>0.24.0</tycho.version>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
 	<issueManagement>
 		<url>https://github.com/itemaas/eclipse-marketplace-server/issues</url>
 		<system>GitHub</system>
@@ -55,20 +50,148 @@
 		</license>
 	</licenses>
 
+	<pluginRepositories>
+		<pluginRepository>
+			<id>cbi</id>
+			<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
+		</pluginRepository>
+	</pluginRepositories>
+
 	<profiles>
 		<profile>
 			<id>server</id>
 			<modules>
 				<module>org.dawnsci.marketplace.core</module>
-		        <module>org.dawnsci.marketplace.server</module>
-	        </modules>
+				<module>org.dawnsci.marketplace.server</module>
+			</modules>
 		</profile>
 		<profile>
 			<id>client</id>
+			<properties>
+				<tycho.version>0.26.0</tycho.version>
+				<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+			</properties>
 			<modules>
 				<module>org.dawnsci.marketplace.core</module>
-		        <module>org.dawnsci.marketplace.ui</module>
-	        </modules>
+				<module>org.dawnsci.marketplace.ui</module>
+				<module>org.dawnsci.marketplace</module>
+			</modules>
+			<build>
+				<pluginManagement>
+					<plugins>
+						<plugin>
+							<groupId>org.eclipse.tycho</groupId>
+							<artifactId>tycho-compiler-plugin</artifactId>
+							<version>${tycho.version}</version>
+							<configuration>
+								<useProjectSettings>true</useProjectSettings>
+							</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>target-platform-configuration</artifactId>
+							<version>${tycho.version}</version>
+							<configuration>
+								<target>
+									<artifact>
+										<groupId>org.dawnsci.marketplace</groupId>
+										<artifactId>org.dawnsci.marketplace-parent</artifactId>
+										<version>1.0.0-SNAPSHOT</version>
+										<classifier>default</classifier>
+									</artifact>
+								</target>
+								<resolver>p2</resolver>
+								<environments>
+									<environment>
+										<os>linux</os>
+										<ws>gtk</ws>
+										<arch>x86</arch>
+									</environment>
+									<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>linux</os>
+										<ws>gtk</ws>
+										<arch>x86_64</arch>
+									</environment>
+									<environment>
+										<os>macosx</os>
+										<ws>cocoa</ws>
+										<arch>x86_64</arch>
+									</environment>
+								</environments>
+								<pomDependencies>consider</pomDependencies>
+							</configuration>
+						</plugin>
+						<!-- computes git revision for manifest -->
+						<plugin>
+							<groupId>org.eclipse.tycho</groupId>
+							<artifactId>tycho-packaging-plugin</artifactId>
+							<version>${tycho.version}</version>
+							<configuration>
+								<archive>
+									<addMavenDescriptor>false</addMavenDescriptor>
+								</archive>
+							</configuration>
+							<dependencies>
+								<dependency>
+									<groupId>org.eclipse.tycho.extras</groupId>
+									<artifactId>tycho-sourceref-jgit</artifactId>
+									<version>${tycho.version}</version>
+								</dependency>
+							</dependencies>
+						</plugin>
+						<!-- This plugin's configuration is used to store Eclipse m2e settings
+							only. It has no influence on the Maven build itself. -->
+						<plugin>
+							<groupId>org.eclipse.m2e</groupId>
+							<artifactId>lifecycle-mapping</artifactId>
+							<version>1.0.0</version>
+							<configuration>
+								<lifecycleMappingMetadata>
+									<pluginExecutions>
+										<pluginExecution>
+											<pluginExecutionFilter>
+												<groupId>
+													org.eclipse.tycho
+												</groupId>
+												<artifactId>
+													tycho-packaging-plugin
+												</artifactId>
+												<versionRange>
+													[0.26.0,)
+												</versionRange>
+												<goals>
+													<goal>
+														build-qualifier-aggregator
+													</goal>
+												</goals>
+											</pluginExecutionFilter>
+											<action>
+												<ignore></ignore>
+											</action>
+										</pluginExecution>
+									</pluginExecutions>
+								</lifecycleMappingMetadata>
+							</configuration>
+						</plugin>
+					</plugins>
+				</pluginManagement>
+			</build>
 		</profile>
 	</profiles>