diff --git a/org.eclipse.emf.refactor.generator.feature/feature.xml b/org.eclipse.emf.refactor.generator.feature/feature.xml
index 9ef94ac..31aa4b9 100644
--- a/org.eclipse.emf.refactor.generator.feature/feature.xml
+++ b/org.eclipse.emf.refactor.generator.feature/feature.xml
@@ -2,35 +2,29 @@
 <feature
       id="org.eclipse.emf.refactor.generator.feature"
       label="EMF Refactor - Generator (Incubation)"
-      version="0.5.0.qualifier"
+      version="0.6.0.qualifier"
       provider-name="Eclipse Modeling Project">
 
    <description>
       EMF Refactor - Generator (Incubation)
    </description>
 
-
-
-
-<copyright url="http://www.eclipse.org/legal/epl-v10.html">
-Copyright (c) 2010 Philipps University in Marburg and others. 
+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+      Copyright (c) 2010 Philipps University in Marburg and others. 
 All rights reserved. This program and the accompanying materials are made 
 available under the terms of the Eclipse Public License v1.0
 which accompanies this distribution, and is available at
 http://www.eclipse.org/legal/epl-v10.html
-</copyright>
+   </copyright>
 
-
-
-
-<license url="license.html">
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT
+   <license url="license.html">
+      ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT
 March 17, 2005
 
 Usage Of Content
 
 THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY &quot;CONTENT&quot;).
 USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS
 AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR
 NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU
@@ -45,51 +39,51 @@
 
 Unless otherwise indicated, all Content made available by the Eclipse Foundation
 is provided to you under the terms and conditions of the Eclipse Public
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this
+License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is provided with this
 Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
-For purposes of the EPL, "Program" will mean the Content.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.
 
 Content includes, but is not limited to, source code, object code,
 documentation and other files maintained in the Eclipse.org CVS
-repository ("Repository") in CVS modules ("Modules") and made available
-as downloadable archives ("Downloads").
+repository (&quot;Repository&quot;) in CVS modules (&quot;Modules&quot;) and made available
+as downloadable archives (&quot;Downloads&quot;).
 
    - Content may be structured and packaged into modules to facilitate delivering,
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),
-     plug-in fragments ("Fragments"), and features ("Features").
+     extending, and upgrading the Content. Typical modules may include plug-ins (&quot;Plug-ins&quot;),
+     plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).
    - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java ARchive)
-     in a directory named "plugins".
+     in a directory named &quot;plugins&quot;.
    - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.
-     Each Feature may be packaged as a sub-directory in a directory named "features".
-     Within a Feature, files named "feature.xml" may contain a list of the names and version
+     Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.
+     Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version
      numbers of the Plug-ins and/or Fragments associated with that Feature.
-   - Features may also include other Features ("Included Features"). Within a Feature, files
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.
+   - Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files
+     named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.
 
-Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of
+Features may also include other Features (&quot;Included Features&quot;). Files named
+&quot;feature.xml&quot; may contain a list of the names and version numbers of
 Included Features.
 
 The terms and conditions governing Plug-ins and Fragments should be
-contained in files named "about.html" ("Abouts"). The terms and
+contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and
 conditions governing Features and Included Features should be contained
-in files named "license.html" ("Feature Licenses"). Abouts and Feature
+in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and Feature
 Licenses may be located in any directory of a Download or Module
 including, but not limited to the following locations:
 
    - The top-level (root) directory
    - Plug-in and Fragment directories
    - Inside Plug-ins and Fragments packaged as JARs
-   - Sub-directories of the directory named "src" of certain Plug-ins
+   - Sub-directories of the directory named &quot;src&quot; of certain Plug-ins
    - Feature directories
 
 Note: if a Feature made available by the Eclipse Foundation is installed using the
-Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains
+Eclipse Update Manager, you must agree to a license (&quot;Feature Update
+License&quot;) during the installation process. If the Feature contains
 Included Features, the Feature Update License should either provide you
 with the terms and conditions governing the Included Features or inform
 you where you can locate them. Feature Update Licenses may be found in
-the "license" property of files named "feature.properties". Such Abouts,
+the &quot;license&quot; property of files named &quot;feature.properties&quot;. Such Abouts,
 Feature Licenses and Feature Update Licenses contain the terms and
 conditions (or references to such terms and conditions) that govern your
 use of the associated Content in that directory.
@@ -115,15 +109,12 @@
 Content may contain encryption software. The country in which you are
 currently may have restrictions on the import, possession, and use,
 and/or re-export to another country, of encryption software. BEFORE
-using any encryption software, please check the country's laws,
+using any encryption software, please check the country&apos;s laws,
 regulations and policies concerning the import, possession, or use,
 and re-export of encryption software, to see if this is permitted.
 
 Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-</license>
-
-
-
+   </license>
 
    <url>
       <update label="Eclipse Modeling Framework Technologies (EMFT) Updates" url="http://www.eclipse.org/modeling/emft/updates/"/>
diff --git a/org.eclipse.emf.refactor.henshin.feature/feature.xml b/org.eclipse.emf.refactor.henshin.feature/feature.xml
index 0a06aeb..1d46a62 100644
--- a/org.eclipse.emf.refactor.henshin.feature/feature.xml
+++ b/org.eclipse.emf.refactor.henshin.feature/feature.xml
@@ -2,32 +2,29 @@
 <feature
       id="org.eclipse.emf.refactor.henshin.feature"
       label="EMF Refactor - Henshin Adapter (Incubation)"
-      version="0.5.0.qualifier"
+      version="0.6.0.qualifier"
       provider-name="Eclipse Modeling Project">
 
    <description>
       EMF Refactor - Henshin Adapter (Incubation)
    </description>
 
-<copyright url="http://www.eclipse.org/legal/epl-v10.html">
-Copyright (c) 2010 Philipps University in Marburg and others. 
+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+      Copyright (c) 2010 Philipps University in Marburg and others. 
 All rights reserved. This program and the accompanying materials are made 
 available under the terms of the Eclipse Public License v1.0
 which accompanies this distribution, and is available at
 http://www.eclipse.org/legal/epl-v10.html
-</copyright>
+   </copyright>
 
-
-
-
-<license url="license.html">
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT
+   <license url="license.html">
+      ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT
 March 17, 2005
 
 Usage Of Content
 
 THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY &quot;CONTENT&quot;).
 USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS
 AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR
 NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU
@@ -42,51 +39,51 @@
 
 Unless otherwise indicated, all Content made available by the Eclipse Foundation
 is provided to you under the terms and conditions of the Eclipse Public
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this
+License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is provided with this
 Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
-For purposes of the EPL, "Program" will mean the Content.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.
 
 Content includes, but is not limited to, source code, object code,
 documentation and other files maintained in the Eclipse.org CVS
-repository ("Repository") in CVS modules ("Modules") and made available
-as downloadable archives ("Downloads").
+repository (&quot;Repository&quot;) in CVS modules (&quot;Modules&quot;) and made available
+as downloadable archives (&quot;Downloads&quot;).
 
    - Content may be structured and packaged into modules to facilitate delivering,
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),
-     plug-in fragments ("Fragments"), and features ("Features").
+     extending, and upgrading the Content. Typical modules may include plug-ins (&quot;Plug-ins&quot;),
+     plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).
    - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java ARchive)
-     in a directory named "plugins".
+     in a directory named &quot;plugins&quot;.
    - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.
-     Each Feature may be packaged as a sub-directory in a directory named "features".
-     Within a Feature, files named "feature.xml" may contain a list of the names and version
+     Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.
+     Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version
      numbers of the Plug-ins and/or Fragments associated with that Feature.
-   - Features may also include other Features ("Included Features"). Within a Feature, files
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.
+   - Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files
+     named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.
 
-Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of
+Features may also include other Features (&quot;Included Features&quot;). Files named
+&quot;feature.xml&quot; may contain a list of the names and version numbers of
 Included Features.
 
 The terms and conditions governing Plug-ins and Fragments should be
-contained in files named "about.html" ("Abouts"). The terms and
+contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and
 conditions governing Features and Included Features should be contained
-in files named "license.html" ("Feature Licenses"). Abouts and Feature
+in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and Feature
 Licenses may be located in any directory of a Download or Module
 including, but not limited to the following locations:
 
    - The top-level (root) directory
    - Plug-in and Fragment directories
    - Inside Plug-ins and Fragments packaged as JARs
-   - Sub-directories of the directory named "src" of certain Plug-ins
+   - Sub-directories of the directory named &quot;src&quot; of certain Plug-ins
    - Feature directories
 
 Note: if a Feature made available by the Eclipse Foundation is installed using the
-Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains
+Eclipse Update Manager, you must agree to a license (&quot;Feature Update
+License&quot;) during the installation process. If the Feature contains
 Included Features, the Feature Update License should either provide you
 with the terms and conditions governing the Included Features or inform
 you where you can locate them. Feature Update Licenses may be found in
-the "license" property of files named "feature.properties". Such Abouts,
+the &quot;license&quot; property of files named &quot;feature.properties&quot;. Such Abouts,
 Feature Licenses and Feature Update Licenses contain the terms and
 conditions (or references to such terms and conditions) that govern your
 use of the associated Content in that directory.
@@ -112,12 +109,12 @@
 Content may contain encryption software. The country in which you are
 currently may have restrictions on the import, possession, and use,
 and/or re-export to another country, of encryption software. BEFORE
-using any encryption software, please check the country's laws,
+using any encryption software, please check the country&apos;s laws,
 regulations and policies concerning the import, possession, or use,
 and re-export of encryption software, to see if this is permitted.
 
 Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-</license>
+   </license>
 
    <url>
       <update label="Eclipse Modeling Framework Technologies (EMFT) Updates" url="http://www.eclipse.org/modeling/emft/updates/"/>
@@ -132,8 +129,8 @@
       <import plugin="org.eclipse.emf.ecore" version="2.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.ecore.change" version="2.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.edit" version="2.6.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.henshin.common" version="0.5.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.henshin.interpreter" version="0.5.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.emf.henshin.common" version="0.6.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.emf.henshin.interpreter" version="0.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.henshin.model" version="0.6.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.refactor.common" version="0.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.refactor.generator" version="0.5.0" match="greaterOrEqual"/>
diff --git a/org.eclipse.emf.refactor.runtime.feature/feature.xml b/org.eclipse.emf.refactor.runtime.feature/feature.xml
index fa99a02..f848375 100644
--- a/org.eclipse.emf.refactor.runtime.feature/feature.xml
+++ b/org.eclipse.emf.refactor.runtime.feature/feature.xml
@@ -2,32 +2,29 @@
 <feature
       id="org.eclipse.emf.refactor.runtime.feature"
       label="EMF Refactor - Runtime (Incubation)"
-      version="0.5.0.qualifier"
+      version="0.6.0.qualifier"
       provider-name="Eclipse Modeling Project">
 
    <description>
       EMF Refactor - Runtime (Incubation)
    </description>
 
-<copyright url="http://www.eclipse.org/legal/epl-v10.html">
-Copyright (c) 2010 Philipps University in Marburg and others. 
+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+      Copyright (c) 2010 Philipps University in Marburg and others. 
 All rights reserved. This program and the accompanying materials are made 
 available under the terms of the Eclipse Public License v1.0
 which accompanies this distribution, and is available at
 http://www.eclipse.org/legal/epl-v10.html
-</copyright>
+   </copyright>
 
-
-
-
-<license url="license.html">
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT
+   <license url="license.html">
+      ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT
 March 17, 2005
 
 Usage Of Content
 
 THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").
+AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY &quot;CONTENT&quot;).
 USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS
 AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR
 NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU
@@ -42,51 +39,51 @@
 
 Unless otherwise indicated, all Content made available by the Eclipse Foundation
 is provided to you under the terms and conditions of the Eclipse Public
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this
+License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is provided with this
 Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
-For purposes of the EPL, "Program" will mean the Content.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.
 
 Content includes, but is not limited to, source code, object code,
 documentation and other files maintained in the Eclipse.org CVS
-repository ("Repository") in CVS modules ("Modules") and made available
-as downloadable archives ("Downloads").
+repository (&quot;Repository&quot;) in CVS modules (&quot;Modules&quot;) and made available
+as downloadable archives (&quot;Downloads&quot;).
 
    - Content may be structured and packaged into modules to facilitate delivering,
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),
-     plug-in fragments ("Fragments"), and features ("Features").
+     extending, and upgrading the Content. Typical modules may include plug-ins (&quot;Plug-ins&quot;),
+     plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).
    - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java ARchive)
-     in a directory named "plugins".
+     in a directory named &quot;plugins&quot;.
    - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.
-     Each Feature may be packaged as a sub-directory in a directory named "features".
-     Within a Feature, files named "feature.xml" may contain a list of the names and version
+     Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.
+     Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version
      numbers of the Plug-ins and/or Fragments associated with that Feature.
-   - Features may also include other Features ("Included Features"). Within a Feature, files
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.
+   - Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files
+     named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.
 
-Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of
+Features may also include other Features (&quot;Included Features&quot;). Files named
+&quot;feature.xml&quot; may contain a list of the names and version numbers of
 Included Features.
 
 The terms and conditions governing Plug-ins and Fragments should be
-contained in files named "about.html" ("Abouts"). The terms and
+contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and
 conditions governing Features and Included Features should be contained
-in files named "license.html" ("Feature Licenses"). Abouts and Feature
+in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and Feature
 Licenses may be located in any directory of a Download or Module
 including, but not limited to the following locations:
 
    - The top-level (root) directory
    - Plug-in and Fragment directories
    - Inside Plug-ins and Fragments packaged as JARs
-   - Sub-directories of the directory named "src" of certain Plug-ins
+   - Sub-directories of the directory named &quot;src&quot; of certain Plug-ins
    - Feature directories
 
 Note: if a Feature made available by the Eclipse Foundation is installed using the
-Eclipse Update Manager, you must agree to a license ("Feature Update
-License") during the installation process. If the Feature contains
+Eclipse Update Manager, you must agree to a license (&quot;Feature Update
+License&quot;) during the installation process. If the Feature contains
 Included Features, the Feature Update License should either provide you
 with the terms and conditions governing the Included Features or inform
 you where you can locate them. Feature Update Licenses may be found in
-the "license" property of files named "feature.properties". Such Abouts,
+the &quot;license&quot; property of files named &quot;feature.properties&quot;. Such Abouts,
 Feature Licenses and Feature Update Licenses contain the terms and
 conditions (or references to such terms and conditions) that govern your
 use of the associated Content in that directory.
@@ -112,12 +109,12 @@
 Content may contain encryption software. The country in which you are
 currently may have restrictions on the import, possession, and use,
 and/or re-export to another country, of encryption software. BEFORE
-using any encryption software, please check the country's laws,
+using any encryption software, please check the country&apos;s laws,
 regulations and policies concerning the import, possession, or use,
 and re-export of encryption software, to see if this is permitted.
 
 Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-</license>
+   </license>
 
    <url>
       <update label="Eclipse Modeling Framework Technologies (EMFT) Updates" url="http://www.eclipse.org/modeling/emft/updates/"/>