Fixed build and licensing

Change-Id: I811cf9f7a7f760ec742a59266c16b26e5998aa0d
Signed-off-by: Dirk Fauth <dirk.fauth@de.bosch.com>
diff --git a/eclipse-tools/emf-graphical-viewer/.mvn/extensions.xml b/eclipse-tools/emf-graphical-viewer/.mvn/extensions.xml
index 710a9ec..3f486b3 100644
--- a/eclipse-tools/emf-graphical-viewer/.mvn/extensions.xml
+++ b/eclipse-tools/emf-graphical-viewer/.mvn/extensions.xml
@@ -3,6 +3,6 @@
   <extension>
     <groupId>org.eclipse.tycho.extras</groupId>
     <artifactId>tycho-pomless</artifactId>
-    <version>1.6.0</version>
+    <version>2.0.0</version>
   </extension>
 </extensions>
\ No newline at end of file
diff --git a/eclipse-tools/emf-graphical-viewer/pom.xml b/eclipse-tools/emf-graphical-viewer/pom.xml
index 1335b56..58c2c0e 100644
--- a/eclipse-tools/emf-graphical-viewer/pom.xml
+++ b/eclipse-tools/emf-graphical-viewer/pom.xml
@@ -13,7 +13,7 @@
   <name>Eclipse APP4MC EMF Viewers</name>
  
   <properties>
-    <tycho.version>1.6.0</tycho.version>
+    <tycho.version>2.0.0</tycho.version>
     
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/eclipse-tools/emf-graphical-viewer/releng/org.eclipse.app4mc.emf.viewers.p2repo/build.properties b/eclipse-tools/emf-graphical-viewer/releng/org.eclipse.app4mc.emf.viewers.p2repo/build.properties
new file mode 100644
index 0000000..65db891
--- /dev/null
+++ b/eclipse-tools/emf-graphical-viewer/releng/org.eclipse.app4mc.emf.viewers.p2repo/build.properties
@@ -0,0 +1,2 @@
+pom.model.artifactId = org.eclipse.app4mc.emf.viewers.p2repo
+pom.model.name = EMF Viewers P2 Updatesite
\ No newline at end of file
diff --git a/eclipse-tools/emf-graphical-viewer/releng/org.eclipse.app4mc.emf.viewers.p2repo/pom.xml b/eclipse-tools/emf-graphical-viewer/releng/org.eclipse.app4mc.emf.viewers.p2repo/pom.xml
deleted file mode 100644
index 4140389..0000000
--- a/eclipse-tools/emf-graphical-viewer/releng/org.eclipse.app4mc.emf.viewers.p2repo/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>org.eclipse.app4mc.emf.viewers.p2repo</artifactId>
-
-  <packaging>eclipse-repository</packaging>
-
-  <parent>
-  	<groupId>org.eclipse.app4mc.emf.viewers</groupId>
-  	<artifactId>parent</artifactId>
-	<version>0.9.8-SNAPSHOT</version>
-  	<relativePath>../../pom.xml</relativePath>
-  </parent>
-</project>
\ No newline at end of file
diff --git a/eclipse-tools/model-transformation/.mvn/extensions.xml b/eclipse-tools/model-transformation/.mvn/extensions.xml
index 710a9ec..3f486b3 100644
--- a/eclipse-tools/model-transformation/.mvn/extensions.xml
+++ b/eclipse-tools/model-transformation/.mvn/extensions.xml
@@ -3,6 +3,6 @@
   <extension>
     <groupId>org.eclipse.tycho.extras</groupId>
     <artifactId>tycho-pomless</artifactId>
-    <version>1.6.0</version>
+    <version>2.0.0</version>
   </extension>
 </extensions>
\ No newline at end of file
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/META-INF/MANIFEST.MF b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/META-INF/MANIFEST.MF
index 39cfaa6..3042e49 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/META-INF/MANIFEST.MF
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/META-INF/MANIFEST.MF
@@ -1,16 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: APP4MC Transformation Example - Application
+Bundle-Name: APP4MC Model Transformation Example - Application
 Bundle-SymbolicName: app4mc.example.transform.app;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Eclipse APP4MC
 Automatic-Module-Name: app4mc.example.transform.app
-Import-Package: javax.inject;version="1.0.0",
- org.apache.felix.service.command;version="1.0.0",
- org.eclipse.app4mc.transformation.application.base,
- org.eclipse.app4mc.transformation.extensions,
- org.eclipse.app4mc.transformation.extensions.base.templates,
- org.eclipse.app4mc.transformation.extensions.executiontype,
- org.osgi.service.component;version="1.4.0",
- org.osgi.service.component.annotations;version="1.3.0"
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/Transformation.product b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/Transformation.product
index 7d0107d..bf2a915 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/Transformation.product
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/Transformation.product
@@ -15,6 +15,8 @@
       </vmArgsMac>
    </launcherArgs>
 
+   <windowImages/>
+
    <launcher>
       <win useIco="false">
          <bmp/>
@@ -29,46 +31,32 @@
       <plugin id="app4mc.example.transform.m2m"/>
       <plugin id="app4mc.example.transform.m2t"/>
       <plugin id="app4mc.example.transform.samplemodel"/>
-      <plugin id="biz.aQute.bnd.embedded-repo" fragment="true"/>
-      <plugin id="biz.aQute.bndlib"/>
-      <plugin id="biz.aQute.repository"/>
-      <plugin id="biz.aQute.resolve"/>
       <plugin id="com.google.guava"/>
-      <plugin id="com.google.inject"/>
       <plugin id="com.ibm.icu"/>
-      <plugin id="javax.annotation"/>
       <plugin id="javax.inject"/>
       <plugin id="javax.xml"/>
-      <plugin id="javax.xml.stream"/>
       <plugin id="org.apache.commons.cli"/>
       <plugin id="org.apache.commons.lang"/>
       <plugin id="org.apache.commons.logging"/>
       <plugin id="org.apache.commons.math3"/>
       <plugin id="org.apache.felix.gogo.command"/>
-      <plugin id="org.apache.felix.gogo.command.source"/>
       <plugin id="org.apache.felix.gogo.runtime"/>
-      <plugin id="org.apache.felix.gogo.runtime.source"/>
       <plugin id="org.apache.felix.gogo.shell"/>
-      <plugin id="org.apache.felix.gogo.shell.source"/>
       <plugin id="org.apache.felix.scr"/>
-      <plugin id="org.apache.felix.scr.source"/>
       <plugin id="org.apache.log4j"/>
       <plugin id="org.apache.xerces"/>
       <plugin id="org.apache.xml.resolver"/>
       <plugin id="org.apache.xml.serializer"/>
-      <plugin id="org.eclipse.app4mc.amalthea.converters.log4j.configuration" fragment="true"/>
       <plugin id="org.eclipse.app4mc.amalthea.model"/>
       <plugin id="org.eclipse.app4mc.transformation.application"/>
       <plugin id="org.eclipse.app4mc.transformation.extensions"/>
-      <plugin id="org.eclipse.app4mc.transformation.log4j.headless.configuration" fragment="true"/>
+      <plugin id="org.eclipse.app4mc.transformation.log4j.configuration" fragment="true"/>
       <plugin id="org.eclipse.core.commands"/>
       <plugin id="org.eclipse.core.contenttype"/>
       <plugin id="org.eclipse.core.expressions"/>
       <plugin id="org.eclipse.core.filesystem"/>
-      <plugin id="org.eclipse.core.filesystem.win32.x86_64" fragment="true"/>
       <plugin id="org.eclipse.core.jobs"/>
       <plugin id="org.eclipse.core.resources"/>
-      <plugin id="org.eclipse.core.resources.win32.x86_64" fragment="true"/>
       <plugin id="org.eclipse.core.runtime"/>
       <plugin id="org.eclipse.emf"/>
       <plugin id="org.eclipse.emf.common"/>
@@ -84,21 +72,15 @@
       <plugin id="org.eclipse.equinox.common"/>
       <plugin id="org.eclipse.equinox.console"/>
       <plugin id="org.eclipse.equinox.preferences"/>
-      <plugin id="org.eclipse.equinox.region" fragment="true"/>
       <plugin id="org.eclipse.equinox.registry"/>
-      <plugin id="org.eclipse.equinox.supplement"/>
-      <plugin id="org.eclipse.equinox.transforms.hook" fragment="true"/>
-      <plugin id="org.eclipse.equinox.weaving.hook" fragment="true"/>
-      <plugin id="org.eclipse.fx.osgi" fragment="true"/>
       <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
       <plugin id="org.eclipse.osgi.services"/>
+      <plugin id="org.eclipse.osgi.util"/>
       <plugin id="org.eclipse.sphinx.emf"/>
       <plugin id="org.eclipse.sphinx.emf.workspace"/>
       <plugin id="org.eclipse.sphinx.platform"/>
       <plugin id="org.eclipse.xtend.lib"/>
       <plugin id="org.eclipse.xtend.lib.macro"/>
-      <plugin id="org.eclipse.xtext.logging" fragment="true"/>
       <plugin id="org.eclipse.xtext.xbase.lib"/>
       <plugin id="org.jdom"/>
       <plugin id="org.slf4j.api"/>
@@ -111,4 +93,11 @@
       <property name="log4j.configuration" value="headless_log4j.xml" />
    </configurations>
 
+   <preferencesInfo>
+      <targetfile overwrite="false"/>
+   </preferencesInfo>
+
+   <cssInfo>
+   </cssInfo>
+
 </product>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/Transformation.product.launch b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/Transformation.product.launch
deleted file mode 100644
index 286b5e0..0000000
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/Transformation.product.launch
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<setAttribute key="additional_plugins"/>
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="true"/>
-<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="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Transformation.product"/>
-<booleanAttribute key="default" value="false"/>
-<setAttribute key="deselected_workspace_bundles"/>
-<stringAttribute key="featureDefaultLocation" value="workspace"/>
-<stringAttribute key="featurePluginResolution" value="workspace"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-Transformation.product"/>
-<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.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog --properties &quot;${project_loc:/app4mc.example.transform.app}/input.properties&quot; -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.noShutdown=true -Dlog4j.configuration=headless_log4j.xml"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value=""/>
-<stringAttribute key="productFile" value="\app4mc.example.transform.app\Transformation.product"/>
-<setAttribute key="selected_features">
-<setEntry value="app4mc.example.transform.cust.feature:default"/>
-<setEntry value="app4mc.example.transform.feature:default"/>
-<setEntry value="net.sourceforge.plantuml.ecore.feature:default"/>
-<setEntry value="net.sourceforge.plantuml.feature:default"/>
-<setEntry value="net.sourceforge.plantuml.lib.feature:default"/>
-<setEntry value="openjfx.media.feature:default"/>
-<setEntry value="openjfx.standard.feature:default"/>
-<setEntry value="openjfx.swing.feature:default"/>
-<setEntry value="openjfx.swt.feature:default"/>
-<setEntry value="openjfx.web.feature:default"/>
-<setEntry value="org.eclipse.acceleo.query:default"/>
-<setEntry value="org.eclipse.acceleo:default"/>
-<setEntry value="org.eclipse.app4mc.amalthea.converters.headless:default"/>
-<setEntry value="org.eclipse.app4mc.amalthea.converters.sdk:default"/>
-<setEntry value="org.eclipse.app4mc.amalthea.converters:default"/>
-<setEntry value="org.eclipse.app4mc.amalthea.edit.sdk:default"/>
-<setEntry value="org.eclipse.app4mc.amalthea.edit:default"/>
-<setEntry value="org.eclipse.app4mc.amalthea.editors.sdk:default"/>
-<setEntry value="org.eclipse.app4mc.amalthea.editors:default"/>
-<setEntry value="org.eclipse.app4mc.amalthea.export.sdk:default"/>
-<setEntry value="org.eclipse.app4mc.amalthea.export:default"/>
-<setEntry value="org.eclipse.app4mc.amalthea.import.sdk:default"/>
-<setEntry value="org.eclipse.app4mc.amalthea.import:default"/>
-<setEntry value="org.eclipse.app4mc.amalthea.models.sdk:default"/>
-<setEntry value="org.eclipse.app4mc.amalthea.models:default"/>
-<setEntry value="org.eclipse.app4mc.amalthea.visualizations.sdk:default"/>
-<setEntry value="org.eclipse.app4mc.amalthea.visualizations:default"/>
-<setEntry value="org.eclipse.app4mc.amalthea.workflow.mwe.sdk:default"/>
-<setEntry value="org.eclipse.app4mc.amalthea.workflow.mwe:default"/>
-<setEntry value="org.eclipse.app4mc.amalthea.workflow.scripting.sdk:default"/>
-<setEntry value="org.eclipse.app4mc.amalthea.workflow.scripting:default"/>
-<setEntry value="org.eclipse.app4mc.docu.sdk:default"/>
-<setEntry value="org.eclipse.app4mc.docu:default"/>
-<setEntry value="org.eclipse.app4mc.emf.metamodelviewers:default"/>
-<setEntry value="org.eclipse.app4mc.emf.viewers.graphical:default"/>
-<setEntry value="org.eclipse.app4mc.examples.sdk:default"/>
-<setEntry value="org.eclipse.app4mc.examples:default"/>
-<setEntry value="org.eclipse.app4mc.multicore.sdk:default"/>
-<setEntry value="org.eclipse.app4mc.multicore:default"/>
-<setEntry value="org.eclipse.app4mc.platform.3rdparty:default"/>
-<setEntry value="org.eclipse.app4mc.platform.sdk:default"/>
-<setEntry value="org.eclipse.app4mc.platform:default"/>
-<setEntry value="org.eclipse.app4mc.sca2amalthea.feature.sdk:default"/>
-<setEntry value="org.eclipse.app4mc.sca2amalthea.feature:default"/>
-<setEntry value="org.eclipse.app4mc.tracing.sdk:default"/>
-<setEntry value="org.eclipse.app4mc.tracing:default"/>
-<setEntry value="org.eclipse.app4mc.transformation.core.feature:default"/>
-<setEntry value="org.eclipse.app4mc.transformation.examples.feature:default"/>
-<setEntry value="org.eclipse.app4mc.validation.sdk:default"/>
-<setEntry value="org.eclipse.app4mc.validation:default"/>
-<setEntry value="org.eclipse.draw2d:default"/>
-<setEntry value="org.eclipse.e4.core.tools.feature:default"/>
-<setEntry value="org.eclipse.e4.rcp:default"/>
-<setEntry value="org.eclipse.ease.feature:default"/>
-<setEntry value="org.eclipse.ease.lang.javascript.feature:default"/>
-<setEntry value="org.eclipse.ease.lang.jvm.feature:default"/>
-<setEntry value="org.eclipse.ease.modules.feature:default"/>
-<setEntry value="org.eclipse.ease.ui.feature:default"/>
-<setEntry value="org.eclipse.ecf.core.feature:default"/>
-<setEntry value="org.eclipse.ecf.core.ssl.feature:default"/>
-<setEntry value="org.eclipse.ecf.filetransfer.feature:default"/>
-<setEntry value="org.eclipse.ecf.filetransfer.httpclient45.feature:default"/>
-<setEntry value="org.eclipse.ecf.filetransfer.ssl.feature:default"/>
-<setEntry value="org.eclipse.egit:default"/>
-<setEntry value="org.eclipse.emf.codegen.ecore.ui:default"/>
-<setEntry value="org.eclipse.emf.codegen.ecore:default"/>
-<setEntry value="org.eclipse.emf.codegen.ui:default"/>
-<setEntry value="org.eclipse.emf.codegen:default"/>
-<setEntry value="org.eclipse.emf.common.ui:default"/>
-<setEntry value="org.eclipse.emf.common:default"/>
-<setEntry value="org.eclipse.emf.compare.ide.ui:default"/>
-<setEntry value="org.eclipse.emf.compare.rcp.ui:default"/>
-<setEntry value="org.eclipse.emf.compare:default"/>
-<setEntry value="org.eclipse.emf.converter:default"/>
-<setEntry value="org.eclipse.emf.databinding.edit:default"/>
-<setEntry value="org.eclipse.emf.databinding:default"/>
-<setEntry value="org.eclipse.emf.ecore.edit:default"/>
-<setEntry value="org.eclipse.emf.ecore.editor:default"/>
-<setEntry value="org.eclipse.emf.ecore.xcore.lib:default"/>
-<setEntry value="org.eclipse.emf.ecore.xcore.ui:default"/>
-<setEntry value="org.eclipse.emf.ecore.xcore:default"/>
-<setEntry value="org.eclipse.emf.ecore:default"/>
-<setEntry value="org.eclipse.emf.edit.ui:default"/>
-<setEntry value="org.eclipse.emf.edit:default"/>
-<setEntry value="org.eclipse.emf.mapping.ecore.editor:default"/>
-<setEntry value="org.eclipse.emf.mapping.ecore:default"/>
-<setEntry value="org.eclipse.emf.mapping.ui:default"/>
-<setEntry value="org.eclipse.emf.mapping:default"/>
-<setEntry value="org.eclipse.emf.mwe.core.feature:default"/>
-<setEntry value="org.eclipse.emf.mwe.ui.feature:default"/>
-<setEntry value="org.eclipse.emf.mwe2.language.sdk:default"/>
-<setEntry value="org.eclipse.emf.mwe2.launcher.source:default"/>
-<setEntry value="org.eclipse.emf.mwe2.launcher:default"/>
-<setEntry value="org.eclipse.emf.mwe2.runtime.sdk:default"/>
-<setEntry value="org.eclipse.emf.transaction:default"/>
-<setEntry value="org.eclipse.emf.validation.ocl:default"/>
-<setEntry value="org.eclipse.emf.validation:default"/>
-<setEntry value="org.eclipse.emf.workspace:default"/>
-<setEntry value="org.eclipse.emf:default"/>
-<setEntry value="org.eclipse.equinox.compendium.sdk:default"/>
-<setEntry value="org.eclipse.equinox.core.feature:default"/>
-<setEntry value="org.eclipse.equinox.core.sdk:default"/>
-<setEntry value="org.eclipse.equinox.executable:default"/>
-<setEntry value="org.eclipse.equinox.p2.core.feature:default"/>
-<setEntry value="org.eclipse.equinox.p2.discovery.feature:default"/>
-<setEntry value="org.eclipse.equinox.p2.extras.feature:default"/>
-<setEntry value="org.eclipse.equinox.p2.rcp.feature:default"/>
-<setEntry value="org.eclipse.equinox.p2.user.ui:default"/>
-<setEntry value="org.eclipse.equinox.sdk:default"/>
-<setEntry value="org.eclipse.equinox.server.core:default"/>
-<setEntry value="org.eclipse.equinox.server.jetty:default"/>
-<setEntry value="org.eclipse.equinox.server.p2:default"/>
-<setEntry value="org.eclipse.equinox.serverside.sdk:default"/>
-<setEntry value="org.eclipse.fx.ide.basic.feature:default"/>
-<setEntry value="org.eclipse.fx.ide.converter.feature:default"/>
-<setEntry value="org.eclipse.fx.ide.css.feature:default"/>
-<setEntry value="org.eclipse.fx.ide.feature:default"/>
-<setEntry value="org.eclipse.fx.ide.fxgraph.feature:default"/>
-<setEntry value="org.eclipse.fx.ide.fxml.feature:default"/>
-<setEntry value="org.eclipse.fx.ide.gmod.feature:default"/>
-<setEntry value="org.eclipse.fx.ide.l10n.feature:default"/>
-<setEntry value="org.eclipse.fx.ide.ldef.feature:default"/>
-<setEntry value="org.eclipse.fx.ide.m2e.feature:default"/>
-<setEntry value="org.eclipse.fx.ide.pde.feature:default"/>
-<setEntry value="org.eclipse.fx.ide.rrobot.feature:default"/>
-<setEntry value="org.eclipse.fx.runtime.min.feature:default"/>
-<setEntry value="org.eclipse.gef:default"/>
-<setEntry value="org.eclipse.gmf.runtime.notation:default"/>
-<setEntry value="org.eclipse.gmf.runtime.thirdparty:default"/>
-<setEntry value="org.eclipse.gmf:default"/>
-<setEntry value="org.eclipse.help:default"/>
-<setEntry value="org.eclipse.jdt:default"/>
-<setEntry value="org.eclipse.jgit.http.apache:default"/>
-<setEntry value="org.eclipse.jgit.ssh.apache:default"/>
-<setEntry value="org.eclipse.jgit:default"/>
-<setEntry value="org.eclipse.m2e.feature:default"/>
-<setEntry value="org.eclipse.ocl:default"/>
-<setEntry value="org.eclipse.pde:default"/>
-<setEntry value="org.eclipse.platform:default"/>
-<setEntry value="org.eclipse.rcp:default"/>
-<setEntry value="org.eclipse.sirius.runtime.acceleo:default"/>
-<setEntry value="org.eclipse.sirius.runtime.aql:default"/>
-<setEntry value="org.eclipse.sirius.runtime.ide.ui:default"/>
-<setEntry value="org.eclipse.sirius.runtime:default"/>
-<setEntry value="org.eclipse.sirius.specifier.ide.ui.acceleo:default"/>
-<setEntry value="org.eclipse.sphinx.core:default"/>
-<setEntry value="org.eclipse.sphinx.emf.check:default"/>
-<setEntry value="org.eclipse.sphinx.emf.compare:default"/>
-<setEntry value="org.eclipse.sphinx.emf.editors.forms:default"/>
-<setEntry value="org.eclipse.sphinx.emf.editors:default"/>
-<setEntry value="org.eclipse.sphinx.emf.metamodelgen:default"/>
-<setEntry value="org.eclipse.sphinx.emf.mwe.dynamic:default"/>
-<setEntry value="org.eclipse.sphinx.emf.navigators:default"/>
-<setEntry value="org.eclipse.sphinx.emf.search:default"/>
-<setEntry value="org.eclipse.sphinx.emf.serialization.generators:default"/>
-<setEntry value="org.eclipse.sphinx.emf.serialization:default"/>
-<setEntry value="org.eclipse.sphinx.emf.validation:default"/>
-<setEntry value="org.eclipse.sphinx.gmf.editors:default"/>
-<setEntry value="org.eclipse.sphinx.jdtpde:default"/>
-<setEntry value="org.eclipse.sphinx.xtendxpand:default"/>
-<setEntry value="org.eclipse.sphinx:default"/>
-<setEntry value="org.eclipse.uml2.codegen.ecore.ui:default"/>
-<setEntry value="org.eclipse.uml2.common.edit:default"/>
-<setEntry value="org.eclipse.uml2.common:default"/>
-<setEntry value="org.eclipse.uml2.uml.edit:default"/>
-<setEntry value="org.eclipse.uml2.uml:default"/>
-<setEntry value="org.eclipse.uml2:default"/>
-<setEntry value="org.eclipse.wst.common_core.feature:default"/>
-<setEntry value="org.eclipse.wst.common_ui.feature:default"/>
-<setEntry value="org.eclipse.wst.jsdt.chromium.debug.feature:default"/>
-<setEntry value="org.eclipse.wst.jsdt.feature:default"/>
-<setEntry value="org.eclipse.wst.jsdt.nodejs.feature:default"/>
-<setEntry value="org.eclipse.wst.xml_core.feature:default"/>
-<setEntry value="org.eclipse.wst.xml_ui.feature:default"/>
-<setEntry value="org.eclipse.wst.xml_userdoc.feature:default"/>
-<setEntry value="org.eclipse.xpand.ui:default"/>
-<setEntry value="org.eclipse.xpand:default"/>
-<setEntry value="org.eclipse.xsd.ecore.converter:default"/>
-<setEntry value="org.eclipse.xsd.edit:default"/>
-<setEntry value="org.eclipse.xsd.editor:default"/>
-<setEntry value="org.eclipse.xsd.mapping:default"/>
-<setEntry value="org.eclipse.xsd:default"/>
-<setEntry value="org.eclipse.xtend.dependencies:default"/>
-<setEntry value="org.eclipse.xtend.sdk:default"/>
-<setEntry value="org.eclipse.xtend.typesystem.emf:default"/>
-<setEntry value="org.eclipse.xtend.ui:default"/>
-<setEntry value="org.eclipse.xtend:default"/>
-<setEntry value="org.eclipse.xtext.docs:default"/>
-<setEntry value="org.eclipse.xtext.examples:default"/>
-<setEntry value="org.eclipse.xtext.redist:default"/>
-<setEntry value="org.eclipse.xtext.runtime:default"/>
-<setEntry value="org.eclipse.xtext.sdk:default"/>
-<setEntry value="org.eclipse.xtext.ui:default"/>
-<setEntry value="org.eclipse.xtext.xbase.lib:default"/>
-<setEntry value="org.eclipse.xtext.xbase:default"/>
-<setEntry value="org.eclipse.xtext.xtext.ui.graph:default"/>
-<setEntry value="org.eclipse.xtext.xtext.ui:default"/>
-</setAttribute>
-<setAttribute key="selected_target_bundles">
-<setEntry value="org.eclipse.core.contenttype@default:default"/>
-<setEntry value="org.eclipse.core.jobs@default:default"/>
-<setEntry value="org.eclipse.equinox.app@default:default"/>
-<setEntry value="org.eclipse.equinox.common@2:true"/>
-<setEntry value="org.eclipse.equinox.preferences@default:default"/>
-<setEntry value="org.eclipse.equinox.registry@default:default"/>
-</setAttribute>
-<setAttribute key="selected_workspace_bundles">
-<setEntry value="app4mc.example.transform.app@default:default"/>
-<setEntry value="app4mc.example.transform.m2m@default:default"/>
-<setEntry value="app4mc.example.transform.m2t@default:default"/>
-<setEntry value="app4mc.example.transform.samplemodel@default:default"/>
-<setEntry value="org.eclipse.app4mc.transformation.application@5:false"/>
-<setEntry value="org.eclipse.app4mc.transformation.extensions@default:default"/>
-</setAttribute>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="true"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<booleanAttribute key="usefeatures" value="false"/>
-</launchConfiguration>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/build.properties b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/build.properties
index 0c7b25b..e14855e 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/build.properties
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/build.properties
@@ -13,7 +13,6 @@
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml,\
                epl-2.0.html,\
                about.html
 src.includes = about.html,\
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/plugin.xml b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/plugin.xml
deleted file mode 100644
index 5e71408..0000000
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/plugin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   
- 
- 
-</plugin>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/pom.xml b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/pom.xml
index d994e66..2ba36db 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/pom.xml
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.app/pom.xml
@@ -8,7 +8,7 @@
 		<relativePath>../../../pom.xml</relativePath>
 		<groupId>org.eclipse.app4mc.transformation</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.3.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<properties>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/META-INF/MANIFEST.MF b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/META-INF/MANIFEST.MF
index 400ac88..ee297b9 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/META-INF/MANIFEST.MF
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/META-INF/MANIFEST.MF
@@ -1,23 +1,21 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: APP4MC Transformation Example - M2M
+Bundle-Name: APP4MC Model Transformation Example - M2M
 Bundle-SymbolicName: app4mc.example.transform.m2m;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse APP4MC
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: com.google.inject;bundle-version="3.0.0",
- org.eclipse.emf;bundle-version="2.6.0",
+Require-Bundle: org.eclipse.emf;bundle-version="2.6.0",
  app4mc.example.transform.samplemodel,
  org.eclipse.app4mc.amalthea.model;bundle-version="0.9.9"
 Automatic-Module-Name: app4mc.example.transform.m2m
 Import-Package: javax.inject;version="1.0.0",
- org.apache.felix.service.command;version="1.0.0",
  org.eclipse.app4mc.transformation.application.base,
  org.eclipse.app4mc.transformation.extensions,
  org.eclipse.app4mc.transformation.extensions.base.templates,
  org.eclipse.app4mc.transformation.extensions.executiontype,
  org.osgi.service.component;version="1.4.0",
- org.osgi.service.component.annotations;version="1.3.0",
+ org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
  org.slf4j;version="1.7.2"
 Service-Component: OSGI-INF/model.loader.AmaltheaMultiFileLoader.xml,
  OSGI-INF/templates.SWTransformer.xml,
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/build.properties b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/build.properties
index b638bf2..09eb741 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/build.properties
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/build.properties
@@ -9,7 +9,8 @@
 #  	 Robert Bosch GmbH - initial API and implementation
 # 
 # *******************************************************************************
-source.. = src/
+source.. = src/,\
+           xtend-gen/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/pom.xml b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/pom.xml
index b166eab..8e1d8f1 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/pom.xml
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/pom.xml
@@ -8,7 +8,7 @@
 		<relativePath>../../../pom.xml</relativePath>
 		<groupId>org.eclipse.app4mc.transformation</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.3.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
 	<properties>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/configuration/M2MTransformationConfig.java b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/configuration/M2MTransformationConfig.java
index c7b27e8..31b495e 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/configuration/M2MTransformationConfig.java
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/configuration/M2MTransformationConfig.java
@@ -1,6 +1,6 @@
  /**
  ********************************************************************************
- * Copyright (c) 2018 Robert Bosch GmbH.
+ * Copyright (c) 2018, 2020 Robert Bosch GmbH.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -31,7 +31,6 @@
 
 @Component(
 	    property= {
-//	        CommandProcessor.COMMAND_SCOPE + ":String=app4mc",
 	        "transformation=Amalthea2SampleModel"
 	    },
 	    service=IModelToModelConfig.class
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/model/loader/AmaltheaMultiFileLoader.java b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/model/loader/AmaltheaMultiFileLoader.java
index 1567072..abe0517 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/model/loader/AmaltheaMultiFileLoader.java
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/model/loader/AmaltheaMultiFileLoader.java
@@ -1,6 +1,6 @@
  /**
  ********************************************************************************
- * Copyright (c) 2018 Robert Bosch GmbH.
+ * Copyright (c) 2018, 2020 Robert Bosch GmbH.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/model/loader/IMultiFileLoader.java b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/model/loader/IMultiFileLoader.java
index 191ed90..7f41376 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/model/loader/IMultiFileLoader.java
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/model/loader/IMultiFileLoader.java
@@ -1,3 +1,17 @@
+ /**
+ ********************************************************************************
+ * Copyright (c) 2020 Robert Bosch GmbH.
+ * 
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ * Contributors:
+ *     Robert Bosch GmbH - initial API and implementation
+ ********************************************************************************
+ */
 package model.loader;
 
 import org.eclipse.emf.ecore.resource.ResourceSet;
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/AmaltheaModel2ModelTransformer.xtend b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/AmaltheaModel2ModelTransformer.xtend
index 8924aa8..0b51c4a 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/AmaltheaModel2ModelTransformer.xtend
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/AmaltheaModel2ModelTransformer.xtend
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 Robert Bosch GmbH.
+ * Copyright (c) 2018, 2020 Robert Bosch GmbH.
  * 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
@@ -23,11 +23,9 @@
 import org.eclipse.emf.ecore.resource.ResourceSet
 import org.osgi.service.component.annotations.Component
 import org.osgi.service.component.annotations.Reference
-import org.osgi.service.component.annotations.ReferencePolicyOption
 import org.osgi.service.component.annotations.ReferenceScope
 
 @Component(property=#[
-//	CommandProcessor.COMMAND_SCOPE + ":String=app4mc",
 	"transformation=Amalthea2SampleModel"
 ], service=Model2ModelRootTransformer)
 class AmaltheaModel2ModelTransformer extends Model2ModelRootTransformer {
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/HWTransformer.xtend b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/HWTransformer.xtend
index 64d8f18..0f46320 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/HWTransformer.xtend
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/HWTransformer.xtend
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 Robert Bosch GmbH.
+ * Copyright (c) 2018, 2020 Robert Bosch GmbH.
  * 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
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/LabelTransformer.xtend b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/LabelTransformer.xtend
index 42ee7f5..57c1288 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/LabelTransformer.xtend
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/LabelTransformer.xtend
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 Robert Bosch GmbH.
+ * Copyright (c) 2018, 2020 Robert Bosch GmbH.
  * 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
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/MappingTransformer.xtend b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/MappingTransformer.xtend
index e176b4d..4b95c29 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/MappingTransformer.xtend
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/MappingTransformer.xtend
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 Robert Bosch GmbH.
+ * Copyright (c) 2018, 2020 Robert Bosch GmbH.
  * 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
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/OSTransformer.xtend b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/OSTransformer.xtend
index 8e00534..06ee713 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/OSTransformer.xtend
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/OSTransformer.xtend
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 Robert Bosch GmbH.
+ * Copyright (c) 2018, 2020 Robert Bosch GmbH.
  * 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
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/SWTransformer.xtend b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/SWTransformer.xtend
index fd236fc..6d873aa 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/SWTransformer.xtend
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/src/templates/SWTransformer.xtend
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 Robert Bosch GmbH.
+ * Copyright (c) 2018, 2020 Robert Bosch GmbH.
  * 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
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/xtend-gen/.gitignore b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/xtend-gen/.gitignore
deleted file mode 100644
index e69de29..0000000
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2m/xtend-gen/.gitignore
+++ /dev/null
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t.cust/xtend-gen/.gitignore b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t.cust/xtend-gen/.gitignore
deleted file mode 100644
index e69de29..0000000
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t.cust/xtend-gen/.gitignore
+++ /dev/null
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/META-INF/MANIFEST.MF b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/META-INF/MANIFEST.MF
index b3323d3..c8e12e1 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/META-INF/MANIFEST.MF
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/META-INF/MANIFEST.MF
@@ -1,12 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: APP4MC Transformation Example - M2T
+Bundle-Name: APP4MC Model Transformation Example - M2T
 Bundle-SymbolicName: app4mc.example.transform.m2t;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse APP4MC
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: com.google.inject;bundle-version="3.0.0",
- org.eclipse.emf;bundle-version="2.6.0",
+Require-Bundle: org.eclipse.emf;bundle-version="2.6.0",
  org.eclipse.app4mc.amalthea.model;bundle-version="0.9.9"
 Automatic-Module-Name: app4mc.example.transform.m2t
 Service-Component: OSGI-INF/model.loader.AmaltheaMultiFileLoader.xml,
@@ -14,13 +13,12 @@
  OSGI-INF/configuration.M2TTransformationConfig.xml,
  OSGI-INF/templates.M2T_Output_Transformer.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.apache.felix.service.command;version="1.0.0",
- org.eclipse.app4mc.transformation.application.base,
+Import-Package: org.eclipse.app4mc.transformation.application.base,
  org.eclipse.app4mc.transformation.extensions,
  org.eclipse.app4mc.transformation.extensions.base.templates,
  org.eclipse.app4mc.transformation.extensions.executiontype,
  org.osgi.service.component;version="1.4.0",
- org.osgi.service.component.annotations;version="1.3.0",
+ org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
  org.slf4j;version="1.7.2"
 Export-Package: configuration,
  model.loader,
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/pom.xml b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/pom.xml
index 8b01bdf..4b5146c 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/pom.xml
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/pom.xml
@@ -8,7 +8,7 @@
 		<relativePath>../../../pom.xml</relativePath>
 		<groupId>org.eclipse.app4mc.transformation</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.3.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<properties>
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/configuration/M2TTransformationConfig.java b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/configuration/M2TTransformationConfig.java
index c134ef2..fef9438 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/configuration/M2TTransformationConfig.java
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/configuration/M2TTransformationConfig.java
@@ -1,6 +1,6 @@
  /**
  ********************************************************************************
- * Copyright (c) 2018 Robert Bosch GmbH.
+ * Copyright (c) 2018, 2020 Robert Bosch GmbH.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -28,7 +28,6 @@
 import model.loader.AmaltheaMultiFileLoader;
 @Component(
 	    property= {
-//	        CommandProcessor.COMMAND_SCOPE + ":String=app4mc",
 	        "transformation=Amalthea2Text"
 	    },
 	    service=IModelToTextConfig.class
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/model/loader/AmaltheaMultiFileLoader.java b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/model/loader/AmaltheaMultiFileLoader.java
index 265edaf..21294cd 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/model/loader/AmaltheaMultiFileLoader.java
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/model/loader/AmaltheaMultiFileLoader.java
@@ -1,6 +1,6 @@
  /**
  ********************************************************************************
- * Copyright (c) 2018 Robert Bosch GmbH.
+ * Copyright (c) 2018, 2020 Robert Bosch GmbH.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/templates/AmaltheaModel2TextTransformer.xtend b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/templates/AmaltheaModel2TextTransformer.xtend
index 8817ce6..f45c8d6 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/templates/AmaltheaModel2TextTransformer.xtend
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/templates/AmaltheaModel2TextTransformer.xtend
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 Robert Bosch GmbH.
+ * Copyright (c) 2018, 2020 Robert Bosch GmbH.
  * 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
@@ -14,17 +14,14 @@
 import java.io.BufferedWriter
 import java.io.File
 import java.io.FileWriter
-import org.apache.felix.service.command.CommandProcessor
 import org.eclipse.app4mc.amalthea.model.Amalthea
 import org.eclipse.app4mc.transformation.extensions.ICustomObjectsStore
 import org.eclipse.app4mc.transformation.extensions.base.templates.Model2TextRootTransformer
 import org.eclipse.emf.ecore.resource.ResourceSet
 import org.osgi.service.component.annotations.Component
 import org.osgi.service.component.annotations.Reference
-import org.osgi.service.component.annotations.ReferencePolicyOption
 
 @Component(property=#[
-//	CommandProcessor.COMMAND_SCOPE + ":String=app4mc",
 	"transformation=Amalthea2Text"
 ], service=Model2TextRootTransformer)
 class AmaltheaModel2TextTransformer extends Model2TextRootTransformer {
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/templates/M2T_Output_Transformer.xtend b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/templates/M2T_Output_Transformer.xtend
index df31d34..07c8ef7 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/templates/M2T_Output_Transformer.xtend
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/src/templates/M2T_Output_Transformer.xtend
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 Robert Bosch GmbH.
+ * Copyright (c) 2018, 2020 Robert Bosch GmbH.
  * 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
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/xtend-gen/.gitignore b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/xtend-gen/.gitignore
deleted file mode 100644
index e69de29..0000000
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.m2t/xtend-gen/.gitignore
+++ /dev/null
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.samplemodel/META-INF/MANIFEST.MF b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.samplemodel/META-INF/MANIFEST.MF
index c79e578..e05bf7f 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.samplemodel/META-INF/MANIFEST.MF
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.samplemodel/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: APP4MC Transformation Example -Sample Model
+Bundle-Name: APP4MC Model Transformation Example -Sample Model
 Bundle-SymbolicName: app4mc.example.transform.samplemodel;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
diff --git a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.samplemodel/pom.xml b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.samplemodel/pom.xml
index b60274e..64869cd 100644
--- a/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.samplemodel/pom.xml
+++ b/eclipse-tools/model-transformation/examples/sample-model-transformation/app4mc.example.transform.samplemodel/pom.xml
@@ -8,7 +8,7 @@
 		<relativePath>../../../pom.xml</relativePath>
 		<groupId>org.eclipse.app4mc.transformation</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.3.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	
 	<properties>
diff --git a/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.core.feature/feature.xml b/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.core.feature/feature.xml
index 5eb30c1..1c5f043 100644
--- a/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.core.feature/feature.xml
+++ b/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.core.feature/feature.xml
@@ -2,16 +2,17 @@
 <feature
       id="org.eclipse.app4mc.transformation.core.feature"
       label="APP4MC Model Transformation Core Feature"
-      version="0.3.0.qualifier"
+      version="1.0.0.qualifier"
       provider-name="Eclipse APP4MC"
-      license-feature-version="1.0.1.qualifier">
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
 
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
+   <description url="https://projects.eclipse.org/projects/technology.app4mc">
+      APP4MC Model Transformation Core
    </description>
 
    <copyright url="https://projects.eclipse.org/projects/technology.app4mc">
-      (c) Copyright Eclipse APP4MC contributors. 2018. 
+      (c) Copyright Eclipse APP4MC contributors and others. 2018-2020.
 All rights reserved.
    </copyright>
 
@@ -33,20 +34,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.app4mc.amalthea.converters.log4j.configuration"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.app4mc.transformation.log4j.headless.configuration"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
 </feature>
diff --git a/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.examples.feature/feature.xml b/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.examples.feature/feature.xml
index 131e8c7..e9aa06a 100644
--- a/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.examples.feature/feature.xml
+++ b/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.examples.feature/feature.xml
@@ -2,15 +2,17 @@
 <feature
       id="org.eclipse.app4mc.transformation.examples.feature"
       label="APP4MC Model Transformation Examples Feature"
-      version="0.3.0.qualifier"
-      provider-name="Eclipse APP4MC">
+      version="1.0.0.qualifier"
+      provider-name="Eclipse APP4MC"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
 
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
+   <description url="https://projects.eclipse.org/projects/technology.app4mc">
+      APP4MC Model Transformation Examples
    </description>
 
-   <copyright url="http://www.example.com/copyright">
-      (c) Copyright Eclipse APP4MC contributors. 2018. 
+   <copyright url="https://projects.eclipse.org/projects/technology.app4mc">
+      (c) Copyright Eclipse APP4MC contributors and others. 2018-2020.
 All rights reserved.
    </copyright>
 
@@ -18,9 +20,9 @@
       [Enter License Description here.]
    </license>
 
-   <includes
-         id="org.eclipse.app4mc.transformation.core.feature"
-         version="0.0.0"/>
+   <requires>
+      <import feature="org.eclipse.app4mc.transformation.core.feature" version="1.0.0.qualifier"/>
+   </requires>
 
    <plugin
          id="org.eclipse.app4mc.transformation.examples.installer"
diff --git a/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.log4j.configuration.feature/.project b/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.log4j.configuration.feature/.project
new file mode 100644
index 0000000..4755fcb
--- /dev/null
+++ b/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.log4j.configuration.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.app4mc.transformation.log4j.configuration.feature</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/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.log4j.configuration.feature/about.html b/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.log4j.configuration.feature/about.html
new file mode 100644
index 0000000..164f781
--- /dev/null
+++ b/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.log4j.configuration.feature/about.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>About</title>
+</head>
+<body lang="EN-US">
+	<h2>About This Content</h2>
+
+	<p>November 30, 2017</p>
+	<h3>License</h3>
+
+	<p>
+		The Eclipse Foundation makes available all content in this plug-in
+		(&quot;Content&quot;). Unless otherwise indicated below, the Content
+		is provided to you under the terms and conditions of the Eclipse
+		Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is
+		available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
+		For purposes of the EPL, &quot;Program&quot; will mean the Content.
+	</p>
+
+	<p>
+		If you did not receive this Content directly from the Eclipse
+		Foundation, the Content is being redistributed by another party
+		(&quot;Redistributor&quot;) and different terms and conditions may
+		apply to your use of any object code in the Content. Check the
+		Redistributor's license that was provided with the Content. If no such
+		license exists, contact the Redistributor. Unless otherwise indicated
+		below, the terms and conditions of the EPL still apply to any source
+		code in the Content and such source code may be obtained at <a
+			href="http://www.eclipse.org/">http://www.eclipse.org</a>.
+	</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.log4j.configuration.feature/build.properties b/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.log4j.configuration.feature/build.properties
new file mode 100644
index 0000000..64f93a9
--- /dev/null
+++ b/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.log4j.configuration.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.log4j.configuration.feature/epl-2.0.html b/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.log4j.configuration.feature/epl-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.log4j.configuration.feature/epl-2.0.html
@@ -0,0 +1,300 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Eclipse Public License - Version 2.0</title>
+    <style type="text/css">
+      body {
+        margin: 1.5em 3em;
+      }
+      h1{
+        font-size:1.5em;
+      }
+      h2{
+        font-size:1em;
+        margin-bottom:0.5em;
+        margin-top:1em;
+      }
+      p {
+        margin-top:  0.5em;
+        margin-bottom: 0.5em;
+      }
+      ul, ol{
+        list-style-type:none;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>Eclipse Public License - v 2.0</h1>
+    <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+      PUBLIC LICENSE (&ldquo;AGREEMENT&rdquo;). ANY USE, REPRODUCTION OR DISTRIBUTION
+      OF THE PROGRAM CONSTITUTES RECIPIENT&#039;S ACCEPTANCE OF THIS AGREEMENT.
+    </p>
+    <h2 id="definitions">1. DEFINITIONS</h2>
+    <p>&ldquo;Contribution&rdquo; means:</p>
+    <ul>
+      <li>a) in the case of the initial Contributor, the initial content
+        Distributed under this Agreement, and
+      </li>
+      <li>
+        b) in the case of each subsequent Contributor:
+        <ul>
+          <li>i) changes to the Program, and</li>
+          <li>ii) additions to the Program;</li>
+        </ul>
+        where such changes and/or additions to the Program originate from
+        and are Distributed by that particular Contributor. A Contribution
+        &ldquo;originates&rdquo; from a Contributor if it was added to the Program by such
+        Contributor itself or anyone acting on such Contributor&#039;s behalf.
+        Contributions do not include changes or additions to the Program that
+        are not Modified Works.
+      </li>
+    </ul>
+    <p>&ldquo;Contributor&rdquo; means any person or entity that Distributes the Program.</p>
+    <p>&ldquo;Licensed Patents&rdquo; mean patent claims licensable by a Contributor which
+      are necessarily infringed by the use or sale of its Contribution alone
+      or when combined with the Program.
+    </p>
+    <p>&ldquo;Program&rdquo; means the Contributions Distributed in accordance with this
+      Agreement.
+    </p>
+    <p>&ldquo;Recipient&rdquo; means anyone who receives the Program under this Agreement
+      or any Secondary License (as applicable), including Contributors.
+    </p>
+    <p>&ldquo;Derivative Works&rdquo; shall mean any work, whether in Source Code or other
+      form, that is based on (or derived from) the Program and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship.
+    </p>
+    <p>&ldquo;Modified Works&rdquo; shall mean any work in Source Code or other form that
+      results from an addition to, deletion from, or modification of the
+      contents of the Program, including, for purposes of clarity any new file
+      in Source Code form that contains any contents of the Program. Modified
+      Works shall not include works that contain only declarations, interfaces,
+      types, classes, structures, or files of the Program solely in each case
+      in order to link to, bind by name, or subclass the Program or Modified
+      Works thereof.
+    </p>
+    <p>&ldquo;Distribute&rdquo; means the acts of a) distributing or b) making available
+      in any manner that enables the transfer of a copy.
+    </p>
+    <p>&ldquo;Source Code&rdquo; means the form of a Program preferred for making
+      modifications, including but not limited to software source code,
+      documentation source, and configuration files.
+    </p>
+    <p>&ldquo;Secondary License&rdquo; means either the GNU General Public License,
+      Version 2.0, or any later versions of that license, including any
+      exceptions or additional permissions as identified by the initial
+      Contributor.
+    </p>
+    <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2>
+    <ul>
+      <li>a) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free copyright
+        license to reproduce, prepare Derivative Works of, publicly display,
+        publicly perform, Distribute and sublicense the Contribution of such
+        Contributor, if any, and such Derivative Works.
+      </li>
+      <li>b) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free patent
+        license under Licensed Patents to make, use, sell, offer to sell,
+        import and otherwise transfer the Contribution of such Contributor,
+        if any, in Source Code or other form. This patent license shall
+        apply to the combination of the Contribution and the Program if,
+        at the time the Contribution is added by the Contributor, such
+        addition of the Contribution causes such combination to be covered
+        by the Licensed Patents. The patent license shall not apply to any
+        other combinations which include the Contribution. No hardware per
+        se is licensed hereunder.
+      </li>
+      <li>c) Recipient understands that although each Contributor grants the
+        licenses to its Contributions set forth herein, no assurances are
+        provided by any Contributor that the Program does not infringe the
+        patent or other intellectual property rights of any other entity.
+        Each Contributor disclaims any liability to Recipient for claims
+        brought by any other entity based on infringement of intellectual
+        property rights or otherwise. As a condition to exercising the rights
+        and licenses granted hereunder, each Recipient hereby assumes sole
+        responsibility to secure any other intellectual property rights needed,
+        if any. For example, if a third party patent license is required to
+        allow Recipient to Distribute the Program, it is Recipient&#039;s
+        responsibility to acquire that license before distributing the Program.
+      </li>
+      <li>d) Each Contributor represents that to its knowledge it has sufficient
+        copyright rights in its Contribution, if any, to grant the copyright
+        license set forth in this Agreement.
+      </li>
+      <li>e) Notwithstanding the terms of any Secondary License, no Contributor
+        makes additional grants to any Recipient (other than those set forth
+        in this Agreement) as a result of such Recipient&#039;s receipt of the
+        Program under the terms of a Secondary License (if permitted under
+        the terms of Section 3).
+      </li>
+    </ul>
+    <h2 id="requirements">3. REQUIREMENTS</h2>
+    <p>3.1 If a Contributor Distributes the Program in any form, then:</p>
+    <ul>
+      <li>a) the Program must also be made available as Source Code, in
+        accordance with section 3.2, and the Contributor must accompany
+        the Program with a statement that the Source Code for the Program
+        is available under this Agreement, and informs Recipients how to
+        obtain it in a reasonable manner on or through a medium customarily
+        used for software exchange; and
+      </li>
+      <li>
+        b) the Contributor may Distribute the Program under a license
+        different than this Agreement, provided that such license:
+        <ul>
+          <li>i) effectively disclaims on behalf of all other Contributors all
+            warranties and conditions, express and implied, including warranties
+            or conditions of title and non-infringement, and implied warranties
+            or conditions of merchantability and fitness for a particular purpose;
+          </li>
+          <li>ii) effectively excludes on behalf of all other Contributors all
+            liability for damages, including direct, indirect, special, incidental
+            and consequential damages, such as lost profits;
+          </li>
+          <li>iii) does not attempt to limit or alter the recipients&#039; rights in the
+            Source Code under section 3.2; and
+          </li>
+          <li>iv) requires any subsequent distribution of the Program by any party
+            to be under a license that satisfies the requirements of this section 3.
+          </li>
+        </ul>
+      </li>
+    </ul>
+    <p>3.2 When the Program is Distributed as Source Code:</p>
+    <ul>
+      <li>a) it must be made available under this Agreement, or if the Program (i)
+        is combined with other material in a separate file or files made available
+        under a Secondary License, and (ii) the initial Contributor attached to
+        the Source Code the notice described in Exhibit A of this Agreement,
+        then the Program may be made available under the terms of such
+        Secondary Licenses, and
+      </li>
+      <li>b) a copy of this Agreement must be included with each copy of the Program.</li>
+    </ul>
+    <p>3.3 Contributors may not remove or alter any copyright, patent, trademark,
+      attribution notices, disclaimers of warranty, or limitations of liability
+      (&lsquo;notices&rsquo;) contained within the Program from any copy of the Program which
+      they Distribute, provided that Contributors may add their own appropriate
+      notices.
+    </p>
+    <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2>
+    <p>Commercial distributors of software may accept certain responsibilities
+      with respect to end users, business partners and the like. While this
+      license is intended to facilitate the commercial use of the Program, the
+      Contributor who includes the Program in a commercial product offering should
+      do so in a manner which does not create potential liability for other
+      Contributors. Therefore, if a Contributor includes the Program in a
+      commercial product offering, such Contributor (&ldquo;Commercial Contributor&rdquo;)
+      hereby agrees to defend and indemnify every other Contributor
+      (&ldquo;Indemnified Contributor&rdquo;) against any losses, damages and costs
+      (collectively &ldquo;Losses&rdquo;) arising from claims, lawsuits and other legal actions
+      brought by a third party against the Indemnified Contributor to the extent
+      caused by the acts or omissions of such Commercial Contributor in connection
+      with its distribution of the Program in a commercial product offering.
+      The obligations in this section do not apply to any claims or Losses relating
+      to any actual or alleged intellectual property infringement. In order to
+      qualify, an Indemnified Contributor must: a) promptly notify the
+      Commercial Contributor in writing of such claim, and b) allow the Commercial
+      Contributor to control, and cooperate with the Commercial Contributor in,
+      the defense and any related settlement negotiations. The Indemnified
+      Contributor may participate in any such claim at its own expense.
+    </p>
+    <p>For example, a Contributor might include the Program
+      in a commercial product offering, Product X. That Contributor is then a
+      Commercial Contributor. If that Commercial Contributor then makes performance
+      claims, or offers warranties related to Product X, those performance claims
+      and warranties are such Commercial Contributor&#039;s responsibility alone.
+      Under this section, the Commercial Contributor would have to defend claims
+      against the other Contributors related to those performance claims and
+      warranties, and if a court requires any other Contributor to pay any damages
+      as a result, the Commercial Contributor must pay those damages.
+    </p>
+    <h2 id="warranty">5. NO WARRANTY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN &ldquo;AS IS&rdquo; BASIS, WITHOUT
+      WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+      WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+      MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
+      solely responsible for determining the appropriateness of using and
+      distributing the Program and assumes all risks associated with its
+      exercise of rights under this Agreement, including but not limited to the
+      risks and costs of program errors, compliance with applicable laws, damage
+      to or loss of data, programs or equipment, and unavailability or
+      interruption of operations.
+    </p>
+    <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY
+      LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+      OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
+      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+      LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+      OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+      GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+    </p>
+    <h2 id="general">7. GENERAL</h2>
+    <p>If any provision of this Agreement is invalid or unenforceable under
+      applicable law, it shall not affect the validity or enforceability of the
+      remainder of the terms of this Agreement, and without further action by the
+      parties hereto, such provision shall be reformed to the minimum extent
+      necessary to make such provision valid and enforceable.
+    </p>
+    <p>If Recipient institutes patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+      (excluding combinations of the Program with other software or hardware)
+      infringes such Recipient&#039;s patent(s), then such Recipient&#039;s rights granted
+      under Section 2(b) shall terminate as of the date such litigation is filed.
+    </p>
+    <p>All Recipient&#039;s rights under this Agreement shall terminate if it fails to
+      comply with any of the material terms or conditions of this Agreement and
+      does not cure such failure in a reasonable period of time after becoming
+      aware of such noncompliance. If all Recipient&#039;s rights under this Agreement
+      terminate, Recipient agrees to cease use and distribution of the Program
+      as soon as reasonably practicable. However, Recipient&#039;s obligations under
+      this Agreement and any licenses granted by Recipient relating to the
+      Program shall continue and survive.
+    </p>
+    <p>Everyone is permitted to copy and distribute copies of this Agreement,
+      but in order to avoid inconsistency the Agreement is copyrighted and may
+      only be modified in the following manner. The Agreement Steward reserves
+      the right to publish new versions (including revisions) of this Agreement
+      from time to time. No one other than the Agreement Steward has the right
+      to modify this Agreement. The Eclipse Foundation is the initial Agreement
+      Steward. The Eclipse Foundation may assign the responsibility to serve as
+      the Agreement Steward to a suitable separate entity. Each new version of
+      the Agreement will be given a distinguishing version number. The Program
+      (including Contributions) may always be Distributed subject to the version
+      of the Agreement under which it was received. In addition, after a new
+      version of the Agreement is published, Contributor may elect to Distribute
+      the Program (including its Contributions) under the new version.
+    </p>
+    <p>Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+      receives no rights or licenses to the intellectual property of any
+      Contributor under this Agreement, whether expressly, by implication,
+      estoppel or otherwise. All rights in the Program not expressly granted
+      under this Agreement are reserved. Nothing in this Agreement is intended
+      to be enforceable by any entity that is not a Contributor or Recipient.
+      No third-party beneficiary rights are created under this Agreement.
+    </p>
+    <h2 id="exhibit-a">Exhibit A &ndash; Form of Secondary Licenses Notice</h2>
+    <p>&ldquo;This Source Code may also be made available under the following 
+    	Secondary Licenses when the conditions for such availability set forth 
+    	in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+    	version(s), and exceptions or additional permissions here}.&rdquo;
+    </p>
+    <blockquote>
+      <p>Simply including a copy of this Agreement, including this Exhibit A
+        is not sufficient to license the Source Code under Secondary Licenses.
+      </p>
+      <p>If it is not possible or desirable to put the notice in a particular file,
+        then You may include the notice in a location (such as a LICENSE file in a
+        relevant directory) where a recipient would be likely to look for
+        such a notice.
+      </p>
+      <p>You may add additional accurate notices of copyright ownership.</p>
+    </blockquote>
+  </body>
+</html>
\ No newline at end of file
diff --git a/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.log4j.configuration.feature/feature.xml b/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.log4j.configuration.feature/feature.xml
new file mode 100644
index 0000000..fb1ce10
--- /dev/null
+++ b/eclipse-tools/model-transformation/features/org.eclipse.app4mc.transformation.log4j.configuration.feature/feature.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.app4mc.transformation.log4j.configuration.feature"
+      label="Log4j Configuration Feature"
+      version="1.0.0.qualifier"
+      provider-name="Eclipse APP4MC"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
+
+   <description url="https://projects.eclipse.org/projects/technology.app4mc">
+      Log4j configuration feature for model transformation.
+Includes appender for the Eclipse UI and an appender per transformation session.
+   </description>
+
+   <copyright url="https://projects.eclipse.org/projects/technology.app4mc">
+      (c) Copyright Eclipse APP4MC contributors and others. 2018-2020.
+All rights reserved.
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <plugin
+         id="org.eclipse.app4mc.transformation.log4j.configuration"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+</feature>
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/.settings/org.eclipse.pde.ds.annotations.prefs b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..73a356b
--- /dev/null
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,8 @@
+classpath=true
+dsVersion=V1_3
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/META-INF/MANIFEST.MF b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/META-INF/MANIFEST.MF
index 752e7ef..710c2c4 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/META-INF/MANIFEST.MF
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: APP4MC Transformation Base Application
+Bundle-Name: APP4MC Model Transformation Base Application
 Bundle-SymbolicName: org.eclipse.app4mc.transformation.application;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse APP4MC
@@ -11,14 +11,13 @@
  org.eclipse.xtend.lib,
  org.eclipse.xtend.lib.macro
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.app4mc.transformation.application.base
+Export-Package: org.eclipse.app4mc.transformation.application.base;version="1.0.0"
 Automatic-Module-Name: org.eclipse.app4mc.transformation.application
 Service-Component: OSGI-INF/org.eclipse.app4mc.transformation.application.base.TransformerFactoryComponent.xml,
  OSGI-INF/org.eclipse.app4mc.transformation.application.base.EquinoxTransformationStarter.xml,
  OSGI-INF/org.eclipse.app4mc.transformation.application.base.StartTransformationCommand.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.apache.felix.service.command;version="1.0.0",
- org.eclipse.app4mc.transformation.extensions,
+Import-Package: org.eclipse.app4mc.transformation.extensions,
  org.eclipse.app4mc.transformation.extensions.base.templates,
  org.eclipse.app4mc.transformation.extensions.executiontype,
  org.osgi.service.component;version="1.4.0",
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/OSGI-INF/org.eclipse.app4mc.transformation.application.base.EquinoxTransformationStarter.xml b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/OSGI-INF/org.eclipse.app4mc.transformation.application.base.EquinoxTransformationStarter.xml
index 0e674ec..93d322c 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/OSGI-INF/org.eclipse.app4mc.transformation.application.base.EquinoxTransformationStarter.xml
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/OSGI-INF/org.eclipse.app4mc.transformation.application.base.EquinoxTransformationStarter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" activate="activate" immediate="true" name="org.eclipse.app4mc.transformation.application.base.EquinoxTransformationStarter">
-   <reference bind="setModelTransformationCommand" interface="org.eclipse.app4mc.transformation.application.base.StartTransformationCommand" name="ModelTransformationCommand"/>
    <reference cardinality="1..1" field="environmentInfo" interface="org.eclipse.osgi.service.environment.EnvironmentInfo" name="environmentInfo"/>
+   <reference cardinality="1..1" field="startTransformationcommand" interface="org.eclipse.app4mc.transformation.application.base.StartTransformationCommand" name="startTransformationcommand"/>
    <implementation class="org.eclipse.app4mc.transformation.application.base.EquinoxTransformationStarter"/>
 </scr:component>
\ No newline at end of file
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/OSGI-INF/org.eclipse.app4mc.transformation.application.base.TransformerFactoryComponent.xml b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/OSGI-INF/org.eclipse.app4mc.transformation.application.base.TransformerFactoryComponent.xml
index 284a7cd..30316ca 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/OSGI-INF/org.eclipse.app4mc.transformation.application.base.TransformerFactoryComponent.xml
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/OSGI-INF/org.eclipse.app4mc.transformation.application.base.TransformerFactoryComponent.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" activate="activate" factory="TRANSFORMER_FACTORY" name="org.eclipse.app4mc.transformation.application.base.TransformerFactoryComponent">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" factory="TRANSFORMER_FACTORY" name="org.eclipse.app4mc.transformation.application.base.TransformerFactoryComponent">
    <reference cardinality="0..n" field="allModelToModelConfig" interface="org.eclipse.app4mc.transformation.extensions.executiontype.IModelToModelConfig" name="allModelToModelConfig"/>
    <reference cardinality="0..n" field="allModelToTextConfig" interface="org.eclipse.app4mc.transformation.extensions.executiontype.IModelToTextConfig" name="allModelToTextConfig"/>
    <reference cardinality="0..n" field="m2mTransformers" interface="org.eclipse.app4mc.transformation.extensions.base.templates.Model2ModelRootTransformer" name="m2mTransformers"/>
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/build.properties b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/build.properties
index e36a226..8f89d56 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/build.properties
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/build.properties
@@ -13,11 +13,8 @@
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml,\
                about.html,\
                epl-2.0.html,\
-               OSGI-INF/org.eclipse.app4mc.transformation.application.base.TransformerFactoryComponent.xml,\
-               OSGI-INF/org.eclipse.app4mc.transformation.application.base.EquinoxTransformationStarter.xml,\
-               OSGI-INF/org.eclipse.app4mc.transformation.application.base.StartTransformationCommand.xml
+               OSGI-INF/
 src.includes = about.html,\
                epl-2.0.html
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/plugin.xml b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/plugin.xml
deleted file mode 100644
index 2baf585..0000000
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
- 
- 
-
-</plugin>
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/src/org/eclipse/app4mc/transformation/application/base/EquinoxTransformationStarter.java b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/src/org/eclipse/app4mc/transformation/application/base/EquinoxTransformationStarter.java
index 808f896..03c43a4 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/src/org/eclipse/app4mc/transformation/application/base/EquinoxTransformationStarter.java
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/src/org/eclipse/app4mc/transformation/application/base/EquinoxTransformationStarter.java
@@ -1,6 +1,6 @@
 /**
  ********************************************************************************
- * Copyright (c) 2019 Robert Bosch GmbH and others.
+ * Copyright (c) 2019, 2020 Robert Bosch GmbH and others.
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -38,21 +38,16 @@
  * </p>
  */
 @Component(immediate = true)
-public class EquinoxTransformationStarter   {
+public class EquinoxTransformationStarter {
 
 	/**
 	 * Launcher arguments provided by the Equinox launcher.
 	 */
 	@Reference
 	EnvironmentInfo environmentInfo;
-
  
-	protected StartTransformationCommand startTransformationcommand;
-	
 	@Reference
-	void setModelTransformationCommand(StartTransformationCommand command) {
-		this.startTransformationcommand = command;
-	}
+	protected StartTransformationCommand startTransformationcommand;
 
 	@Activate
 	void activate() {
@@ -64,19 +59,15 @@
 			boolean isProduct =
 					Arrays.stream(environmentInfo.getNonFrameworkArgs()).anyMatch(arg -> "-product".equals(arg))
 					|| this.environmentInfo.getProperty("eclipse.product") != null;
-			boolean isApplication =
-					Arrays.stream(environmentInfo.getNonFrameworkArgs()).anyMatch(arg -> "-application".equals(arg))
-					|| this.environmentInfo.getProperty("eclipse.application") != null;
+			
+			boolean ignoreApp = Boolean.valueOf(System.getProperty("eclipse.ignoreApp"));
+			boolean isApplication = !ignoreApp &&
+					(Arrays.stream(environmentInfo.getNonFrameworkArgs()).anyMatch(arg -> "-application".equals(arg))
+					|| this.environmentInfo.getProperty("eclipse.application") != null);
 
-//			if (!isProduct && !isApplication) {
-				// check if -console or -consoleLog was provided as launch argument
-//				boolean isInteractive = Arrays.stream(environmentInfo.getFrameworkArgs())
-//						.anyMatch(arg -> "-console".equals(arg));
-//				boolean showConsoleLog = Arrays.stream(environmentInfo.getFrameworkArgs())
-//						.anyMatch(arg -> "-consoleLog".equals(arg));
-
-				startTransformationcommand.startTransformation(this.environmentInfo.getNonFrameworkArgs());
-//			}
+			if (!isProduct && !isApplication) {
+				this.startTransformationcommand.startTransformation(this.environmentInfo.getNonFrameworkArgs());
+			}
 		}
 	}
 }
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/src/org/eclipse/app4mc/transformation/application/base/StartTransformationCommand.java b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/src/org/eclipse/app4mc/transformation/application/base/StartTransformationCommand.java
index 2244a24..0ca7a9f 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/src/org/eclipse/app4mc/transformation/application/base/StartTransformationCommand.java
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/src/org/eclipse/app4mc/transformation/application/base/StartTransformationCommand.java
@@ -1,3 +1,17 @@
+/**
+ ********************************************************************************
+ * Copyright (c) 2020 Robert Bosch GmbH and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Robert Bosch GmbH - initial API and implementation
+ ********************************************************************************
+ */
 package org.eclipse.app4mc.transformation.application.base;
 
 import java.io.File;
@@ -9,8 +23,6 @@
 import java.util.List;
 import java.util.Properties;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.eclipse.app4mc.transformation.extensions.ICustomObjectsStore;
 import org.eclipse.app4mc.transformation.extensions.base.templates.Model2ModelRootTransformer;
 import org.eclipse.app4mc.transformation.extensions.base.templates.Model2TextRootTransformer;
@@ -20,6 +32,8 @@
 import org.osgi.service.component.ComponentInstance;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @Component(service = StartTransformationCommand.class)
 public class StartTransformationCommand {
@@ -187,14 +201,11 @@
 	}
 
 	protected Logger getLogger(Properties inputParameters) {
-
 		
 		String logFilePath = inputParameters.getProperty("log_file");
 		System.setProperty("APP4MC_TRANSFORMATION_LOG_FILE", logFilePath);
 		Logger logger = LoggerFactory.getLogger(StartTransformationCommand.class);
 
-		System.out.println("Following log4j configuration  is considered :"+System.getProperty("log4j.configuration"));
-
 		return logger;
 	}
 
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/src/org/eclipse/app4mc/transformation/application/base/TransformerFactoryComponent.java b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/src/org/eclipse/app4mc/transformation/application/base/TransformerFactoryComponent.java
index 21f6f72..9759d21 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/src/org/eclipse/app4mc/transformation/application/base/TransformerFactoryComponent.java
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.application/src/org/eclipse/app4mc/transformation/application/base/TransformerFactoryComponent.java
@@ -1,21 +1,31 @@
+/**
+ ********************************************************************************
+ * Copyright (c) 2020 Robert Bosch GmbH and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Robert Bosch GmbH - initial API and implementation
+ ********************************************************************************
+ */
 package org.eclipse.app4mc.transformation.application.base;
  
 import java.util.List;
-import java.util.Map;
 
 import org.eclipse.app4mc.transformation.extensions.base.templates.Model2ModelRootTransformer;
 import org.eclipse.app4mc.transformation.extensions.base.templates.Model2TextRootTransformer;
 import org.eclipse.app4mc.transformation.extensions.executiontype.IModelToModelConfig;
 import org.eclipse.app4mc.transformation.extensions.executiontype.IModelToTextConfig;
-import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.component.annotations.ReferenceCardinality;
  
 @Component(factory = "TRANSFORMER_FACTORY")
 public class TransformerFactoryComponent { 
 	
-	
 	@Reference
 	List<Model2ModelRootTransformer> m2mTransformers;
 	
@@ -28,11 +38,6 @@
 	@Reference
 	List<IModelToTextConfig> allModelToTextConfig;
 	
-	@Activate
-	void activate(Map<String, Object> properties) {
-	}
-	
-	
 	public List<Model2ModelRootTransformer>  getAllM2MTransformers(){
 		return m2mTransformers;
 	}
@@ -41,15 +46,12 @@
 		return m2tTransformers;
 	}
 
-
 	public List<IModelToModelConfig> getAllModelToModelConfig() {
 		return allModelToModelConfig;
 	}
 
-
 	public List<IModelToTextConfig> getAllModelToTextConfig() {
 		return allModelToTextConfig;
 	}
 
-	
 }
\ No newline at end of file
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/.settings/org.eclipse.pde.ds.annotations.prefs b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..73a356b
--- /dev/null
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,8 @@
+classpath=true
+dsVersion=V1_3
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/META-INF/MANIFEST.MF b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/META-INF/MANIFEST.MF
index 49bbb2f..b1a603c 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/META-INF/MANIFEST.MF
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: APP4MC Transformation Extensions
+Bundle-Name: APP4MC Model Transformation Extensions
 Bundle-SymbolicName: org.eclipse.app4mc.transformation.extensions;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse APP4MC
@@ -10,9 +10,9 @@
  org.eclipse.emf.ecore.xmi;visibility:=reexport,
  org.eclipse.xtext.xbase.lib;visibility:=reexport,
  org.eclipse.emf;bundle-version="2.6.0";visibility:=reexport
-Export-Package: org.eclipse.app4mc.transformation.extensions,
- org.eclipse.app4mc.transformation.extensions.base.templates,
- org.eclipse.app4mc.transformation.extensions.executiontype
+Export-Package: org.eclipse.app4mc.transformation.extensions;version="1.0.0",
+ org.eclipse.app4mc.transformation.extensions.base.templates;version="1.0.0",
+ org.eclipse.app4mc.transformation.extensions.executiontype;version="1.0.0"
 Automatic-Module-Name: org.eclipse.app4mc.transformation.extensions
 Import-Package: org.osgi.service.component.annotations;version="[1.3.0,2.0.0)";resolution:=optional,
  org.slf4j;version="1.7.2"
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/build.properties b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/build.properties
index f331d08..2edb372 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/build.properties
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/build.properties
@@ -14,9 +14,8 @@
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml,\
                epl-2.0.html,\
                about.html,\
-               OSGI-INF/org.eclipse.app4mc.transformation.extensions.CustomObjectsStore.xml
+               OSGI-INF/
 src.includes = about.html,\
                epl-2.0.html
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/plugin.xml b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/plugin.xml
deleted file mode 100644
index 5535690..0000000
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-</plugin>
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/CustomObjectsStore.xtend b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/CustomObjectsStore.xtend
index 2ab5a0c..236c3ce 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/CustomObjectsStore.xtend
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/CustomObjectsStore.xtend
@@ -1,6 +1,6 @@
 /**
  ********************************************************************************
- * Copyright (c) 2018-2019 Robert Bosch GmbH.
+ * Copyright (c) 2018-2020 Robert Bosch GmbH.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -22,36 +22,29 @@
 @Component(scope =ServiceScope.SINGLETON)
 class CustomObjectsStore implements ICustomObjectsStore{
 
-	private var cls_instance_map = new HashMap();
+	var clsInstanceMap = new HashMap();
 
-	private var  data_map = new HashMap<String, Object>();
-
+	var  dataMap = new HashMap<String, Object>();
 	
-	public override <T> T getInstance(Object cls) {
-
-		val value = cls_instance_map.get(cls);
-
+	override <T> T getInstance(Object cls) {
+		val value = clsInstanceMap.get(cls);
 		return value as T
 	}
 
-	public override <T> void injectMembers(Object cls, T instance) {
-		cls_instance_map.put(cls, instance);
-
+	override <T> void injectMembers(Object cls, T instance) {
+		clsInstanceMap.put(cls, instance);
 	}
 	
-	public override <T> void indexData(String key, T value){
-		
-		data_map.put(key, value);		
+	override <T> void indexData(String key, T value){
+		dataMap.put(key, value);		
 	}
 	
-	public override <T> getData(String key){
-		data_map.get(key) as T
+	override <T> getData(String key){
+		dataMap.get(key) as T
 	}
 
-	public override void clearCache() {
-		cls_instance_map.clear
-		data_map.clear
+	override void clearCache() {
+		clsInstanceMap.clear
+		dataMap.clear
 	}
-	
- 
 }
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/ICustomObjectsStore.java b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/ICustomObjectsStore.java
index ded2561..41e9466 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/ICustomObjectsStore.java
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/ICustomObjectsStore.java
@@ -1,3 +1,17 @@
+/**
+ ********************************************************************************
+ * Copyright (c) 2020 Robert Bosch GmbH and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Robert Bosch GmbH - initial API and implementation
+ ********************************************************************************
+ */
 package org.eclipse.app4mc.transformation.extensions;
 
 public interface ICustomObjectsStore {
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/base/templates/AbstractTransformer.xtend b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/base/templates/AbstractTransformer.xtend
index aeeb05a..fd6d777 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/base/templates/AbstractTransformer.xtend
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/base/templates/AbstractTransformer.xtend
@@ -1,6 +1,6 @@
 /**
  * *******************************************************************************
- * Copyright (c) 2018-2019 Robert Bosch GmbH.
+ * Copyright (c) 2018-2020 Robert Bosch GmbH.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/base/templates/IRootTransformer.java b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/base/templates/IRootTransformer.java
index 30d8f88..9957e95 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/base/templates/IRootTransformer.java
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/base/templates/IRootTransformer.java
@@ -1,3 +1,17 @@
+/**
+ ********************************************************************************
+ * Copyright (c) 2020 Robert Bosch GmbH and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Robert Bosch GmbH - initial API and implementation
+ ********************************************************************************
+ */
 package org.eclipse.app4mc.transformation.extensions.base.templates;
 
 public interface IRootTransformer {
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/base/templates/ISubTransformer.java b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/base/templates/ISubTransformer.java
index f19b159..75b5fb0 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/base/templates/ISubTransformer.java
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/base/templates/ISubTransformer.java
@@ -1,3 +1,17 @@
+/**
+ ********************************************************************************
+ * Copyright (c) 2020 Robert Bosch GmbH and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Robert Bosch GmbH - initial API and implementation
+ ********************************************************************************
+ */
 package org.eclipse.app4mc.transformation.extensions.base.templates;
 
 public interface ISubTransformer {
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/base/templates/Model2ModelRootTransformer.xtend b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/base/templates/Model2ModelRootTransformer.xtend
index c2c6636..d5f8770 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/base/templates/Model2ModelRootTransformer.xtend
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/base/templates/Model2ModelRootTransformer.xtend
@@ -1,6 +1,6 @@
 /**
  ********************************************************************************
- * Copyright (c) 2018-2019 Robert Bosch GmbH.
+ * Copyright (c) 2018-2020 Robert Bosch GmbH.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/base/templates/Model2TextRootTransformer.xtend b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/base/templates/Model2TextRootTransformer.xtend
index 145d2a3..8792a96 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/base/templates/Model2TextRootTransformer.xtend
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/base/templates/Model2TextRootTransformer.xtend
@@ -1,6 +1,6 @@
 /**
  ********************************************************************************
- * Copyright (c) 2018-2019 Robert Bosch GmbH.
+ * Copyright (c) 2018-2020 Robert Bosch GmbH.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/executiontype/IModelToModelConfig.java b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/executiontype/IModelToModelConfig.java
index 929081b..f43ad03 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/executiontype/IModelToModelConfig.java
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/executiontype/IModelToModelConfig.java
@@ -1,6 +1,6 @@
 /**
  ********************************************************************************
- * Copyright (c) 2018-2019 Robert Bosch GmbH.
+ * Copyright (c) 2018-2020 Robert Bosch GmbH.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/executiontype/IModelToTextConfig.java b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/executiontype/IModelToTextConfig.java
index 3a4d10e..30c620e 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/executiontype/IModelToTextConfig.java
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/src/org/eclipse/app4mc/transformation/extensions/executiontype/IModelToTextConfig.java
@@ -1,6 +1,6 @@
 /**
  ********************************************************************************
- * Copyright (c) 2018-2019 Robert Bosch GmbH.
+ * Copyright (c) 2018-2020 Robert Bosch GmbH.
  * 
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/xtend-gen/.gitignore b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/xtend-gen/.gitignore
deleted file mode 100644
index e69de29..0000000
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.extensions/xtend-gen/.gitignore
+++ /dev/null
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.ui.configuration/.classpath b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/.classpath
similarity index 100%
rename from eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.ui.configuration/.classpath
rename to eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/.classpath
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.ui.configuration/.project b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/.project
similarity index 89%
rename from eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.ui.configuration/.project
rename to eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/.project
index 296788c..f56fc7f 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.ui.configuration/.project
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.app4mc.transformation.log4j.ui.configuration</name>
+	<name>org.eclipse.app4mc.transformation.log4j.configuration</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.ui.configuration/.settings/org.eclipse.core.resources.prefs b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.ui.configuration/.settings/org.eclipse.core.resources.prefs
rename to eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/.settings/org.eclipse.core.resources.prefs
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.ui.configuration/.settings/org.eclipse.jdt.core.prefs b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.ui.configuration/.settings/org.eclipse.jdt.core.prefs
rename to eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/.settings/org.eclipse.jdt.core.prefs
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/META-INF/MANIFEST.MF b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..abe9351
--- /dev/null
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/META-INF/MANIFEST.MF
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: APP4MC Transformation Log4j Configuration
+Bundle-SymbolicName: org.eclipse.app4mc.transformation.log4j.configuration
+Bundle-Version: 1.0.0.qualifier
+Fragment-Host: org.apache.log4j;bundle-version="1.2.15"
+Automatic-Module-Name: org.eclipse.app4mc.amalthea.converters.log4j.configuration
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.equinox.common;bundle-version="3.10.0";resolution:=optional,
+ org.eclipse.core.runtime;bundle-version="3.14.0";resolution:=optional,
+ org.eclipse.ui.console;resolution:=optional,
+ org.eclipse.ui;bundle-version="3.115.0";resolution:=optional
+Bundle-Vendor: Eclipse APP4MC
+Import-Package: javax.xml.parsers,
+ org.eclipse.equinox.log;version="1.0.0";resolution:=optional,
+ org.osgi.framework;version="1.9.0";resolution:=optional,
+ org.osgi.service.log;version="1.4.0";resolution:=optional,
+ org.osgi.util.tracker;version="1.5.2";resolution:=optional,
+ org.w3c.dom,
+ org.xml.sax
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/build.properties b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/build.properties
new file mode 100644
index 0000000..a73d166
--- /dev/null
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/build.properties
@@ -0,0 +1,8 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               log4j.xml,\
+               headless_log4j.xml
+src.includes = log4j.xml,\
+               headless_log4j.xml
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.headless.configuration/headless_log4j.xml b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/headless_log4j.xml
similarity index 89%
rename from eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.headless.configuration/headless_log4j.xml
rename to eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/headless_log4j.xml
index c4cc99e..0c36838 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.headless.configuration/headless_log4j.xml
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/headless_log4j.xml
@@ -10,9 +10,8 @@
 	    </layout>
 	</appender>
 
-	<appender name="FILE" class="org.eclipse.app4mc.transformation.log4j.headless.configuration.TransformationFileAppender">
+	<appender name="FILE" class="org.eclipse.app4mc.transformation.log4j.configuration.TransformationFileAppender">
 		<param name="append" value="true"/>
-		<param name="dateFormat" value="yyyy-MM-dd_HH_mm_ss"/>
 	    <layout class="org.apache.log4j.PatternLayout">
 			<param name="ConversionPattern"
 			  value="%d{yyyy-MM-dd_HH_mm_ss} - %-5p:  %m%n" />
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.ui.configuration/log4j.xml b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/log4j.xml
similarity index 69%
rename from eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.ui.configuration/log4j.xml
rename to eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/log4j.xml
index 4937684..a39068c 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.ui.configuration/log4j.xml
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/log4j.xml
@@ -2,18 +2,23 @@
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 <log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
 
-	 
+	<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+		<!-- only log errors to the console -->
+		<param name="Threshold" value="${app4mc.log.level}"/>
+	    <layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%m%n" />
+	    </layout>
+	</appender>
 
-<appender name="FILE" class="org.eclipse.app4mc.transformation.log4j.headless.configuration.TransformationFileAppender">
+	<appender name="FILE" class="org.eclipse.app4mc.transformation.log4j.configuration.TransformationFileAppender">
 		<param name="append" value="true"/>
-		<param name="dateFormat" value="yyyy-MM-dd_HH_mm_ss"/>
 	    <layout class="org.apache.log4j.PatternLayout">
 			<param name="ConversionPattern"
 			  value="%d{yyyy-MM-dd_HH_mm_ss} - %-5p:  %m%n" />
 	    </layout>
 	</appender>
 
-	<appender name="ECLIPSE" class="org.eclipse.app4mc.amalthea.converters.log4j.configuration.EclipseLogAppender">
+	<appender name="ECLIPSE" class="org.eclipse.app4mc.transformation.log4j.configuration.EclipseLogAppender">
 		<!-- only log errors to the eclipse log -->
 		<param name="Threshold" value="ERROR"/>
 	</appender>
@@ -26,7 +31,6 @@
 			  value="%d{yyyy-MM-dd_HH_mm_ss} - %-5p:  %m%n" />
 	    </layout>
 	</appender>
-	
 
 	<root>
 		<!-- set the log level to debug to catch everything -->
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.ui.configuration/src/org/eclipse/app4mc/transformation/log4j/configuration/CustomConsoleAppender.java b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/src/org/eclipse/app4mc/transformation/log4j/configuration/CustomConsoleAppender.java
similarity index 83%
rename from eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.ui.configuration/src/org/eclipse/app4mc/transformation/log4j/configuration/CustomConsoleAppender.java
rename to eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/src/org/eclipse/app4mc/transformation/log4j/configuration/CustomConsoleAppender.java
index 99bfb63..1e45da8 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.ui.configuration/src/org/eclipse/app4mc/transformation/log4j/configuration/CustomConsoleAppender.java
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/src/org/eclipse/app4mc/transformation/log4j/configuration/CustomConsoleAppender.java
@@ -1,3 +1,17 @@
+/**
+ ********************************************************************************
+ * Copyright (c) 2020 Robert Bosch GmbH and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Robert Bosch GmbH - initial API and implementation
+ ********************************************************************************
+ */
 package org.eclipse.app4mc.transformation.log4j.configuration;
 
 import org.apache.log4j.ConsoleAppender;
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.ui.configuration/src/org/eclipse/app4mc/transformation/log4j/configuration/EclipseLogAppender.java b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/src/org/eclipse/app4mc/transformation/log4j/configuration/EclipseLogAppender.java
similarity index 100%
rename from eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.ui.configuration/src/org/eclipse/app4mc/transformation/log4j/configuration/EclipseLogAppender.java
rename to eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/src/org/eclipse/app4mc/transformation/log4j/configuration/EclipseLogAppender.java
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.headless.configuration/src/org/eclipse/app4mc/transformation/log4j/headless/configuration/TransformationFileAppender.java b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/src/org/eclipse/app4mc/transformation/log4j/configuration/TransformationFileAppender.java
similarity index 91%
rename from eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.headless.configuration/src/org/eclipse/app4mc/transformation/log4j/headless/configuration/TransformationFileAppender.java
rename to eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/src/org/eclipse/app4mc/transformation/log4j/configuration/TransformationFileAppender.java
index 80394b6..548833b 100644
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.headless.configuration/src/org/eclipse/app4mc/transformation/log4j/headless/configuration/TransformationFileAppender.java
+++ b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.configuration/src/org/eclipse/app4mc/transformation/log4j/configuration/TransformationFileAppender.java
@@ -1,6 +1,6 @@
 /**
  ********************************************************************************
- * Copyright (c) 2019 Robert Bosch GmbH and others.
+ * Copyright (c) 2019, 2020 Robert Bosch GmbH and others.
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -12,7 +12,7 @@
  *     Robert Bosch GmbH - initial API and implementation
  ********************************************************************************
  */
-package org.eclipse.app4mc.transformation.log4j.headless.configuration;
+package org.eclipse.app4mc.transformation.log4j.configuration;
 
 import java.io.File;
 
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.headless.configuration/.classpath b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.headless.configuration/.classpath
deleted file mode 100644
index eca7bdb..0000000
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.headless.configuration/.classpath
+++ /dev/null
@@ -1,7 +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="output" path="bin"/>
-</classpath>
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.headless.configuration/.project b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.headless.configuration/.project
deleted file mode 100644
index 9cdaba3..0000000
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.headless.configuration/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.app4mc.transformation.log4j.headless.configuration</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<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/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.headless.configuration/.settings/org.eclipse.jdt.core.prefs b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.headless.configuration/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61..0000000
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.headless.configuration/.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/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.headless.configuration/META-INF/MANIFEST.MF b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.headless.configuration/META-INF/MANIFEST.MF
deleted file mode 100644
index 246087c..0000000
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.headless.configuration/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Configuration
-Bundle-SymbolicName: org.eclipse.app4mc.transformation.log4j.headless.configuration
-Bundle-Version: 1.0.0.qualifier
-Fragment-Host: org.apache.log4j;bundle-version="1.2.15"
-Automatic-Module-Name: org.eclipse.app4mc.amalthea.converters.log4j.configuration
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.equinox.common;bundle-version="3.10.0",
- org.eclipse.core.runtime;bundle-version="3.14.0";resolution:=optional,
- org.eclipse.ui.console,
- org.eclipse.ui;bundle-version="3.115.0"
-Bundle-Vendor: Eclipse APP4MC
-Import-Package: javax.xml.parsers,
- org.eclipse.equinox.log;version="1.0.0",
- org.osgi.framework;version="1.9.0",
- org.osgi.service.log;version="1.4.0",
- org.osgi.util.tracker;version="1.5.2",
- org.w3c.dom,
- org.xml.sax
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.headless.configuration/build.properties b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.headless.configuration/build.properties
deleted file mode 100644
index ffbfb7c..0000000
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.headless.configuration/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               headless_log4j.xml
-src.includes = headless_log4j.xml
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.ui.configuration/META-INF/MANIFEST.MF b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.ui.configuration/META-INF/MANIFEST.MF
deleted file mode 100644
index aa9d6eb..0000000
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.ui.configuration/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: APP4MC Transformation Log4j UI Configuration
-Bundle-SymbolicName: org.eclipse.app4mc.transformation.log4j.ui.configuration
-Bundle-Version: 1.0.0.qualifier
-Fragment-Host: org.apache.log4j;bundle-version="1.2.15"
-Automatic-Module-Name: org.eclipse.app4mc.amalthea.converters.log4j.configuration
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.equinox.common;bundle-version="3.10.0",
- org.eclipse.core.runtime;bundle-version="3.14.0";resolution:=optional,
- org.eclipse.ui.console,
- org.eclipse.ui;bundle-version="3.115.0"
-Bundle-Vendor: Eclipse APP4MC
-Import-Package: javax.xml.parsers,
- org.eclipse.equinox.log;version="1.0.0",
- org.osgi.framework;version="1.9.0",
- org.osgi.service.log;version="1.4.0",
- org.osgi.util.tracker;version="1.5.2",
- org.w3c.dom,
- org.xml.sax
diff --git a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.ui.configuration/build.properties b/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.ui.configuration/build.properties
deleted file mode 100644
index c9f9f78..0000000
--- a/eclipse-tools/model-transformation/plugins/org.eclipse.app4mc.transformation.log4j.ui.configuration/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               headless_log4j.xml,\
-               log4j.xml
-src.includes = headless_log4j.xml,\
-               log4j.xml
diff --git a/eclipse-tools/model-transformation/pom.xml b/eclipse-tools/model-transformation/pom.xml
index 5a96e20..e5cf7f0 100644
--- a/eclipse-tools/model-transformation/pom.xml
+++ b/eclipse-tools/model-transformation/pom.xml
@@ -6,17 +6,19 @@
 
   <groupId>org.eclipse.app4mc.transformation</groupId>
   <artifactId>parent</artifactId>
-  <version>0.3.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
    
   <packaging>pom</packaging>
   
-  <name>Model Transformation</name>
+  <name>APP4MC Model Transformation</name>
  
   <properties>
-    <tycho.version>1.6.0</tycho.version>
+    <tycho.version>2.0.0</tycho.version>
     
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+	
+	
   </properties>
  
 	<pluginRepositories>
@@ -122,7 +124,7 @@
 						<artifact>
 							<groupId>org.eclipse.app4mc.transformation</groupId>
 							<artifactId>org.eclipse.app4mc.transformation.target</artifactId>
-							<version>0.3.0-SNAPSHOT</version>
+							<version>1.0.0-SNAPSHOT</version>
 						</artifact>
 					</target>
 					<targetDefinitionIncludeSource>honor</targetDefinitionIncludeSource>
@@ -133,13 +135,6 @@
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
 				<version>${tycho.version}</version>
-				<configuration>
-					<!-- argLine>${tycho.testArgLine}</argLine> -->
-					<forkMode>never</forkMode>
-					<includes>
-						<include>**/*Test.*</include>
-					</includes>
-				</configuration>
 			</plugin>
 
 			<plugin>
diff --git a/eclipse-tools/model-transformation/releng/org.eclipse.app4mc.transformation.p2repo/build.properties b/eclipse-tools/model-transformation/releng/org.eclipse.app4mc.transformation.p2repo/build.properties
new file mode 100644
index 0000000..2ff86d7
--- /dev/null
+++ b/eclipse-tools/model-transformation/releng/org.eclipse.app4mc.transformation.p2repo/build.properties
@@ -0,0 +1,2 @@
+pom.model.artifactId = org.eclipse.app4mc.transformation.p2repo
+pom.model.name = APP4MC Model Transformation P2 Updatesite
\ No newline at end of file
diff --git a/eclipse-tools/model-transformation/releng/org.eclipse.app4mc.transformation.p2repo/category.xml b/eclipse-tools/model-transformation/releng/org.eclipse.app4mc.transformation.p2repo/category.xml
index 3cdc72e..5eda46a 100644
--- a/eclipse-tools/model-transformation/releng/org.eclipse.app4mc.transformation.p2repo/category.xml
+++ b/eclipse-tools/model-transformation/releng/org.eclipse.app4mc.transformation.p2repo/category.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.eclipse.app4mc.transformation.core.feature_0.3.0.qualifier.jar" id="org.eclipse.app4mc.transformation.core.feature" version="0.3.0.qualifier">
-      <category name="APP4MC EMF Model Transformation"/>
+   <feature id="org.eclipse.app4mc.transformation.core.feature">
+      <category name="APP4MC Model Transformation"/>
    </feature>
-   <feature url="features/org.eclipse.app4mc.transformation.examples.feature_0.3.0.qualifier.jar" id="org.eclipse.app4mc.transformation.examples.feature" version="0.3.0.qualifier">
-      <category name="APP4MC EMF Model Transformation"/>
+   <feature id="org.eclipse.app4mc.transformation.examples.feature">
+      <category name="APP4MC Model Transformation"/>
    </feature>
-   <category-def name="APP4MC EMF Model Transformation" label="org.eclipse.app4mc.transformation.p2repo"/>
+   <feature id="org.eclipse.app4mc.transformation.log4j.configuration.feature">
+      <category name="APP4MC Model Transformation"/>
+   </feature>
+   <category-def name="APP4MC Model Transformation" label="org.eclipse.app4mc.transformation.p2repo"/>
 </site>
diff --git a/eclipse-tools/model-transformation/releng/org.eclipse.app4mc.transformation.p2repo/pom.xml b/eclipse-tools/model-transformation/releng/org.eclipse.app4mc.transformation.p2repo/pom.xml
deleted file mode 100644
index f83d361..0000000
--- a/eclipse-tools/model-transformation/releng/org.eclipse.app4mc.transformation.p2repo/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>org.eclipse.app4mc.transformation.p2repo</artifactId>
-
-  <packaging>eclipse-repository</packaging>
-
-  <parent>
-	<relativePath>../../pom.xml</relativePath>
-	<groupId>org.eclipse.app4mc.transformation</groupId>
-	<artifactId>parent</artifactId>
-	<version>0.3.0-SNAPSHOT</version>
-  </parent>
-</project>
\ No newline at end of file
diff --git a/eclipse-tools/model-transformation/releng/org.eclipse.app4mc.transformation.target/org.eclipse.app4mc.transformation.target.target b/eclipse-tools/model-transformation/releng/org.eclipse.app4mc.transformation.target/org.eclipse.app4mc.transformation.target.target
index 5e21542..1992725 100644
--- a/eclipse-tools/model-transformation/releng/org.eclipse.app4mc.transformation.target/org.eclipse.app4mc.transformation.target.target
+++ b/eclipse-tools/model-transformation/releng/org.eclipse.app4mc.transformation.target/org.eclipse.app4mc.transformation.target.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Model Transformation Target" sequenceNumber="1589780902">
+<target name="Model Transformation Target" sequenceNumber="1600851042">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sdk.ide" version="4.14.0.I20191210-0610"/>
@@ -25,13 +25,20 @@
       <unit id="org.apache.xml.serializer" version="2.7.1.v201005080400"/>
       <unit id="javax.xml" version="1.3.4.v201005080400"/>
       <unit id="org.jdom" version="1.1.1.v201101151400"/>
+      <unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
+      <unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
       <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
       <unit id="com.google.inject" version="3.0.0.v201605172100"/>
       <repository location="http://download.eclipse.org/releases/2019-12"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.app4mc.platform.sdk.feature.group" version="0.9.8.202004301410"/>
-      <repository location="http://download.eclipse.org/app4mc/updatesites/releases/0.9.8"/>
+      <unit id="org.apache.commons.math" version="2.1.0.v201105210652"/>
+      <unit id="org.apache.commons.math3" version="3.5.0.v20190611-1023"/>
+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20191126223242/repository"/>
+    </location>
+    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.app4mc.platform.sdk.feature.group" version="0.9.9.202007301332"/>
+      <repository location="http://download.eclipse.org/app4mc/updatesites/releases/0.9.9"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sphinx.sdk.feature.group" version="0.11.2.201802230805"/>
diff --git a/eclipse-tools/model-transformation/releng/org.eclipse.app4mc.transformation.target/org.eclipse.app4mc.transformation.target.tpd b/eclipse-tools/model-transformation/releng/org.eclipse.app4mc.transformation.target/org.eclipse.app4mc.transformation.target.tpd
index 1b99f40..d74abf2 100644
--- a/eclipse-tools/model-transformation/releng/org.eclipse.app4mc.transformation.target/org.eclipse.app4mc.transformation.target.tpd
+++ b/eclipse-tools/model-transformation/releng/org.eclipse.app4mc.transformation.target/org.eclipse.app4mc.transformation.target.tpd
@@ -24,11 +24,21 @@
 	org.apache.xml.serializer
 	javax.xml
 	org.jdom
+
+	// SLF4J	
+	org.slf4j.api [1.7.2,1.7.3)
+	org.slf4j.impl.log4j12 [1.7.2,1.7.3)
+
 	com.google.guava
 	com.google.inject
 }
 
-location "http://download.eclipse.org/app4mc/updatesites/releases/0.9.8" {
+location "http://download.eclipse.org/tools/orbit/downloads/drops/R20191126223242/repository" {
+	org.apache.commons.math
+	org.apache.commons.math3
+}
+
+location "http://download.eclipse.org/app4mc/updatesites/releases/0.9.9" {
 	org.eclipse.app4mc.platform.sdk.feature.group
 }