diff --git a/targetplatform/openHAB2.setup b/targetplatform/openHAB2.setup
index 55f106c7..4867f426 100644
--- a/targetplatform/openHAB2.setup
+++ b/targetplatform/openHAB2.setup
@@ -711,22 +711,43 @@
       xsi:type="jdt:JRETask"
       version="JavaSE-1.7"
       location="${jre.location-1.7}"/>
+  <setupTask
+      xsi:type="setup.p2:P2Task">
+    <requirement
+        name="org.eclipse.wst.xml_ui.feature.feature.group"/>
+    <requirement
+        name="org.eclipse.mylyn.java_feature.feature.group"/>
+    <requirement
+        name="org.codehaus.groovy.eclipse.feature.feature.group"/>
+    <requirement
+        name="org.eclipse.mylyn.git.feature.group"/>
+    <requirement
+        name="org.eclipse.pde.feature.group"/>
+    <repository
+        url="http://dist.springsource.org/snapshot/GRECLIPSE/e4.5/"/>
+  </setupTask>
+  <setupTask
+      xsi:type="git:GitCloneTask"
+      id="git.clone.openhab2"
+      remoteURI="https://github.com/openhab/openhab2.git"
+      pushURI="https://github.com/${github.user.id}/openhab2.git">
+    <annotation
+        source="http://www.eclipse.org/oomph/setup/InducedChoices">
+      <detail
+          key="label">
+        <value>OpenHAB2 Git Repository</value>
+      </detail>
+    </annotation>
+    <description>openHAB 2</description>
+  </setupTask>
+  <setupTask
+      xsi:type="pde:TargetPlatformTask"
+      id="openhab.target"
+      name="openHAB 2 Target Platform">
+    <description>Manually maintained target platform</description>
+  </setupTask>
   <project name="runtime2"
       label="openHAB 2 Development">
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="git.clone.openhab2"
-        remoteURI="https://github.com/openhab/openhab2.git"
-        pushURI="https://github.com/${github.user.id}/openhab2.git">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="label">
-          <value>OpenHAB2 Git Repository</value>
-        </detail>
-      </annotation>
-      <description>openHAB 2</description>
-    </setupTask>
     <setupTask
         xsi:type="setup.workingsets:WorkingSetTask">
       <workingSet
@@ -748,70 +769,209 @@
             pattern=".*/features/.*"/>
       </workingSet>
     </setupTask>
-    <setupTask
-        xsi:type="setup.p2:P2Task">
-      <requirement
-          name="org.eclipse.wst.xml_ui.feature.feature.group"/>
-      <requirement
-          name="org.eclipse.mylyn.java_feature.feature.group"/>
-      <requirement
-          name="org.codehaus.groovy.eclipse.feature.feature.group"/>
-      <requirement
-          name="org.eclipse.mylyn.git.feature.group"/>
-      <requirement
-          name="org.eclipse.pde.feature.group"/>
-      <repository
-          url="http://dist.springsource.org/snapshot/GRECLIPSE/e4.5/"/>
-    </setupTask>
     <setupTask
         xsi:type="projects:ProjectsImportTask">
       <sourceLocator
           rootFolder="${git.clone.openhab2.location/addons}"
           locateNestedProjects="true"/>
-    </setupTask>
-    <setupTask
-        xsi:type="projects:ProjectsImportTask">
       <sourceLocator
           rootFolder="${git.clone.openhab2.location/bundles}"
           locateNestedProjects="true"/>
-    </setupTask>
-    <setupTask
-        xsi:type="projects:ProjectsImportTask">
       <sourceLocator
           rootFolder="${git.clone.openhab2.location/distribution}"
           locateNestedProjects="true"/>
-    </setupTask>
-    <setupTask
-        xsi:type="projects:ProjectsImportTask">
       <sourceLocator
           rootFolder="${git.clone.openhab2.location/features}"
           locateNestedProjects="true"/>
-    </setupTask>
-    <setupTask
-        xsi:type="projects:ProjectsImportTask">
       <sourceLocator
           rootFolder="${git.clone.openhab2.location/docs}"
           locateNestedProjects="true"/>
-    </setupTask>
-    <setupTask
-        xsi:type="projects:ProjectsImportTask">
       <sourceLocator
           rootFolder="${git.clone.openhab2.location/targetplatform}"
           locateNestedProjects="true"/>
-    </setupTask>
-    <setupTask
-        xsi:type="projects:ProjectsImportTask">
       <sourceLocator
           rootFolder="${git.clone.openhab2.location/products}"
           locateNestedProjects="true"/>
     </setupTask>
+    <stream
+        name="master"/>
+  </project>
+  <project name="1addons"
+      label="openHAB 1 Add-on Development">
     <setupTask
-        xsi:type="pde:TargetPlatformTask"
-        id="openhab.target"
-        name="openHAB 2 Target Platform">
-      <description>
-        Manually maintained target platform
-      </description>
+        xsi:type="git:GitCloneTask"
+        id="git.clone.openhab"
+        remoteURI="https://github.com/openhab/openhab.git"
+        pushURI="https://github.com/${github.user.id}/openhab.git">
+      <annotation
+          source="http://www.eclipse.org/oomph/setup/InducedChoices">
+        <detail
+            key="label">
+          <value>openHAB 1 Git Repository</value>
+        </detail>
+      </annotation>
+      <description>openHAB 1</description>
+    </setupTask>
+    <setupTask
+        xsi:type="setup.workingsets:WorkingSetTask">
+      <workingSet
+          name="2.x Core Bundles">
+        <predicate
+            xsi:type="predicates:LocationPredicate"
+            pattern=".*/openhab2/bundles/core/.*"/>
+        <predicate
+            xsi:type="predicates:LocationPredicate"
+            pattern=".*/openhab2/bundles/ui/.*"/>
+        <predicate
+            xsi:type="predicates:LocationPredicate"
+            pattern=".*/openhab2/bundles/io/.*"/>
+      </workingSet>
+      <workingSet
+          name="1.x Addons">
+        <predicate
+            xsi:type="predicates:LocationPredicate"
+            pattern=".*/openhab/bundles/.*"/>
+      </workingSet>
+      <workingSet
+          name="Features">
+        <predicate
+            xsi:type="predicates:LocationPredicate"
+            pattern=".*/features/.*"/>
+      </workingSet>
+    </setupTask>
+    <setupTask
+        xsi:type="projects:ProjectsImportTask">
+      <sourceLocator
+          rootFolder="${git.clone.openhab.location/bundles/binding}">
+        <excludedPath>org.openhab.binding.fritzaha</excludedPath>
+        <excludedPath>org.openhab.binding.hue</excludedPath>
+        <excludedPath>org.openhab.binding.sonos</excludedPath>
+        <excludedPath>org.openhab.binding.wemo</excludedPath>
+      </sourceLocator>
+      <sourceLocator
+          rootFolder="${git.clone.openhab.location/bundles/action}"/>
+      <sourceLocator
+          rootFolder="${git.clone.openhab.location/bundles/persistence}"/>
+      <sourceLocator
+          rootFolder="${git.clone.openhab.location/bundles/io}">
+        <excludedPath>org.openhab.io.multimedia</excludedPath>
+        <excludedPath>org.openhab.io.console</excludedPath>
+        <excludedPath>org.openhab.io.monitor</excludedPath>
+        <excludedPath>org.openhab.io.cv</excludedPath>
+        <excludedPath>org.openhab.io.net</excludedPath>
+        <excludedPath>org.openhab.io.net.test</excludedPath>
+        <excludedPath>org.openhab.io.myopenhab</excludedPath>
+        <excludedPath>org.openhab.io.rest</excludedPath>
+        <excludedPath>org.openhab.io.rest.lib</excludedPath>
+        <excludedPath>org.openhab.io.rest.test</excludedPath>
+      </sourceLocator>
+      <sourceLocator
+          rootFolder="${git.clone.openhab2.location/bundles}"
+          locateNestedProjects="true"/>
+      <sourceLocator
+          rootFolder="${git.clone.openhab2.location/distribution}"
+          locateNestedProjects="true"/>
+      <sourceLocator
+          rootFolder="${git.clone.openhab2.location/features}"
+          locateNestedProjects="true"/>
+      <sourceLocator
+          rootFolder="${git.clone.openhab2.location/docs}"
+          locateNestedProjects="true"/>
+      <sourceLocator
+          rootFolder="${git.clone.openhab2.location/targetplatform}"
+          locateNestedProjects="true"/>
+      <sourceLocator
+          rootFolder="${git.clone.openhab2.location/products}"
+          locateNestedProjects="true"/>
+    </setupTask>
+    <stream
+        name="master"/>
+  </project>
+  <project name="esh"
+      label="openHAB 2 with Eclipse SmartHome Core">
+    <setupTask
+        xsi:type="git:GitCloneTask"
+        id="git.clone.esh"
+        remoteURI="https://github.com/eclipse/smarthome.git"
+        pushURI="https://github.com/${github.user.id}/smarthome.git">
+      <annotation
+          source="http://www.eclipse.org/oomph/setup/InducedChoices">
+        <detail
+            key="label">
+          <value>Eclipse SmartHome Git Repository</value>
+        </detail>
+      </annotation>
+      <description>Eclipse SmartHome</description>
+    </setupTask>
+    <setupTask
+        xsi:type="setup.workingsets:WorkingSetTask">
+      <workingSet
+          name="OH2 Core Bundles">
+        <predicate
+            xsi:type="predicates:LocationPredicate"
+            pattern=".*/openhab2/bundles/core/.*"/>
+        <predicate
+            xsi:type="predicates:LocationPredicate"
+            pattern=".*/openhab2/bundles/ui/.*"/>
+        <predicate
+            xsi:type="predicates:LocationPredicate"
+            pattern=".*/openhab2/bundles/io/.*"/>
+      </workingSet>
+      <workingSet
+          name="OH2 Addons">
+        <predicate
+            xsi:type="predicates:LocationPredicate"
+            pattern=".*/addons/.*"/>
+      </workingSet>
+      <workingSet
+          name="ESH Bundles">
+        <predicate
+            xsi:type="predicates:LocationPredicate"
+            pattern=".*/smarthome/bundles/.*"/>
+      </workingSet>
+      <workingSet
+          name="ESH Extensions">
+        <predicate
+            xsi:type="predicates:LocationPredicate"
+            pattern=".*/smarthome/extensions/.*"/>
+      </workingSet>
+    </setupTask>
+    <setupTask
+        xsi:type="projects:ProjectsImportTask">
+      <sourceLocator
+          rootFolder="${git.clone.esh.location/bundles/core}"/>
+      <sourceLocator
+          rootFolder="${git.clone.esh.location/bundles/config}"/>
+      <sourceLocator
+          rootFolder="${git.clone.esh.location/bundles/storage}"/>
+      <sourceLocator
+          rootFolder="${git.clone.esh.location/bundles/ui}"/>
+      <sourceLocator
+          rootFolder="${git.clone.esh.location/bundles/io}">
+        <excludedPath>org.eclipse.smarthome.io.console.karaf</excludedPath>
+      </sourceLocator>
+      <sourceLocator
+          rootFolder="${git.clone.esh.location/extensions}"/>
+      <sourceLocator
+          rootFolder="${git.clone.openhab2.location/bundles}"
+          locateNestedProjects="true"/>
+      <sourceLocator
+          rootFolder="${git.clone.openhab2.location/distribution}"
+          locateNestedProjects="true"/>
+      <sourceLocator
+          rootFolder="${git.clone.openhab2.location/features}"
+          locateNestedProjects="true"/>
+      <sourceLocator
+          rootFolder="${git.clone.openhab2.location/docs}"
+          locateNestedProjects="true"/>
+      <sourceLocator
+          rootFolder="${git.clone.openhab2.location/targetplatform}"
+          locateNestedProjects="true"/>
+      <sourceLocator
+          rootFolder="${git.clone.openhab2.location/products}"
+          locateNestedProjects="true"/>
+      <sourceLocator
+          rootFolder="${git.clone.openhab2.location/addons}"/>
     </setupTask>
     <stream
         name="master"/>
diff --git a/targetplatform/openHAB_with_ESH.launch b/targetplatform/openHAB_with_ESH.launch
new file mode 100644
index 00000000..2aeac365
--- /dev/null
+++ b/targetplatform/openHAB_with_ESH.launch
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="false"/>
+<booleanAttribute key="automaticValidate" value="true"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/openHAB_with_ESH"/>
+<booleanAttribute key="default" value="false"/>
+<booleanAttribute key="default_auto_start" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../runtime-org.openhab.runtime.product.product"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.clean=true -Dosgi.noShutdown=true -Dlogback.configurationFile=./runtime/etc/logback_debug.xml -Djava.library.path=./lib -Djetty.home.bundle=org.openhab.io.jetty -Dorg.quartz.properties=./runtime/etc/quartz.properties -Dorg.osgi.service.http.port=8080 -Dorg.osgi.service.http.port.secure=8443 -DmdnsName=openhab -Dopenhab.logdir=./userdata/logs -Dsmarthome.servicecfg=./runtime/etc/services.cfg -Dsmarthome.servicepid=org.openhab -Dsmarthome.userdata=userdata -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-ssl.xml,etc/jetty-deployer.xml,etc/jetty-https.xml,etc/jetty-selector.xml"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:distribution/openhabhome}"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value=""/>
+<stringAttribute key="productFile" value="/org.openhab.runtime.product/org.openhab.runtime.product.product"/>
+<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@1:default,ch.qos.logback.core@1:default,ch.qos.logback.slf4j@default:false,com.eclipsesource.jaxrs.jersey-min@default:true,com.eclipsesource.jaxrs.provider.gson@default:true,com.eclipsesource.jaxrs.publisher@default:true,com.google.gson*2.2.4.v201311231704@default:default,com.google.guava@default:default,com.google.inject@default:default,javax.activation@default:default,javax.jmdns@default:default,javax.servlet*3.1.0.v20140303-1611@default:default,javax.transaction@default:false,javax.xml.bind@default:default,javax.xml.stream@default:default,javax.xml@default:default,org.antlr.runtime@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.exec@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:true,org.apache.felix.gogo.runtime@default:true,org.apache.felix.gogo.shell@default:true,org.apache.httpcomponents.httpclient*4.2.6.v201311072007@default:default,org.apache.httpcomponents.httpclient*4.3.6.v201411290715@default:default,org.apache.httpcomponents.httpcore*4.2.5.v201311072007@default:default,org.apache.httpcomponents.httpcore*4.3.3.v201411290715@default:default,org.eclipse.core.jobs@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@1:true,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@3:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http*9.2.12.v20150709@default:default,org.eclipse.jetty.io*9.2.12.v20150709@default:default,org.eclipse.jetty.osgi.boot@2:true,org.eclipse.jetty.osgi.httpservice@default:true,org.eclipse.jetty.rewrite@default:default,org.eclipse.jetty.security*9.2.12.v20150709@default:default,org.eclipse.jetty.server*9.2.12.v20150709@default:default,org.eclipse.jetty.servlet*9.2.12.v20150709@default:default,org.eclipse.jetty.util*9.2.12.v20150709@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.paho.client.mqttv3@default:default,org.eclipse.smarthome.binding.yahooweather@default:default,org.eclipse.smarthome.model.core@5:true,org.eclipse.smarthome.model.item.runtime@3:true,org.eclipse.smarthome.model.item@3:true,org.eclipse.smarthome.model.persistence.runtime@3:true,org.eclipse.smarthome.model.persistence@3:default,org.eclipse.smarthome.model.rule.runtime@3:true,org.eclipse.smarthome.model.rule@3:true,org.eclipse.smarthome.model.script.runtime@3:true,org.eclipse.smarthome.model.script@3:true,org.eclipse.smarthome.model.sitemap.runtime@3:true,org.eclipse.smarthome.model.sitemap@3:true,org.eclipse.smarthome.model.thing.runtime@3:true,org.eclipse.smarthome.model.thing@3:true,org.eclipse.smarthome.ui.paperui@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtext.common.types@default:true,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext@default:default,org.jupnp@default:true,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.slf4j.jul@default:default,org.slf4j.log4j@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.smarthome.config.core@default:default,org.eclipse.smarthome.config.discovery@default:default,org.eclipse.smarthome.config.dispatch@default:default,org.eclipse.smarthome.config.xml@default:default,org.eclipse.smarthome.core.autoupdate@default:default,org.eclipse.smarthome.core.binding.xml@default:default,org.eclipse.smarthome.core.id@default:default,org.eclipse.smarthome.core.persistence@default:default,org.eclipse.smarthome.core.scheduler@default:default,org.eclipse.smarthome.core.scriptengine@default:default,org.eclipse.smarthome.core.thing.xml@default:default,org.eclipse.smarthome.core.thing@default:default,org.eclipse.smarthome.core.transform@default:default,org.eclipse.smarthome.core@default:default,org.eclipse.smarthome.io.console.eclipse@default:default,org.eclipse.smarthome.io.console@default:default,org.eclipse.smarthome.io.monitor@default:default,org.eclipse.smarthome.io.multimedia@default:default,org.eclipse.smarthome.io.net@default:default,org.eclipse.smarthome.io.rest.core@default:default,org.eclipse.smarthome.io.rest.sitemap@default:default,org.eclipse.smarthome.io.rest.sse@default:default,org.eclipse.smarthome.io.rest@default:default,org.eclipse.smarthome.io.transport.mdns@default:default,org.eclipse.smarthome.io.transport.mqtt@default:default,org.eclipse.smarthome.io.transport.upnp@default:default,org.eclipse.smarthome.transform.map@default:default,org.eclipse.smarthome.ui.classic@default:default,org.eclipse.smarthome.ui.icon@default:default,org.eclipse.smarthome.ui.iconset.classic@default:default,org.eclipse.smarthome.ui@default:default,org.openhab.binding.astro@default:default,org.openhab.core.compat1x@default:true,org.openhab.core.init@1:true,org.openhab.core@5:true,org.openhab.io.jetty@default:default,org.openhab.io.rest.docs@default:true,org.openhab.io.transport.serial@default:default,org.openhab.ui.classicui@default:default,org.openhab.ui.dashboard@default:true,org.openhab.ui.iconset.classic@default:default,org.openhab.ui.paperui@default:false"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<booleanAttribute key="useProduct" value="true"/>
+<booleanAttribute key="usefeatures" value="false"/>
+</launchConfiguration>