ocl2ac: Make naming scheme consistent

Change-Id: If26181cbcb2c29d73e057b24c5ef20b3ff328d70
Signed-off-by: Daniel Strueber <strueber@mathematik.uni-marburg.de>
diff --git a/plugins/ocl2ac/.project b/plugins/ocl2ac/.project
new file mode 100644
index 0000000..da3d0ad
--- /dev/null
+++ b/plugins/ocl2ac/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ocl2ac</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/.project b/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/.project
deleted file mode 100644
index 88c67da..0000000
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>de.unimarburg.swt.ocl2ac.gc2ac</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/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/META-INF/MANIFEST.MF b/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/META-INF/MANIFEST.MF
deleted file mode 100644
index 7efa70b..0000000
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Henshin
-Bundle-SymbolicName: de.unimarburg.swt.ocl2ac.gc2ac;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: de.unimarburg.swt.ocl2ac.gc2ac.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.henshin.model;bundle-version="1.2.0",
- de.unimarburg.swt.ocl2ac.ocl2gc;bundle-version="1.0.0",
- org.eclipse.emf.henshin.editor;bundle-version="1.2.0",
- org.eclipse.ui.ide;bundle-version="3.11.0",
- org.eclipse.emf.common.ui,
- org.eclipse.emf.edit;bundle-version="2.11.1",
- org.eclipse.core.resources,
- org.eclipse.emf.ecore,
- de.unimarburg.swt.ocl2ac.model;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Export-Package: de.unimarburg.swt.ocl2ac.gc2ac,
- de.unimarburg.swt.ocl2ac.gc2ac.actions,
- de.unimarburg.swt.ocl2ac.gc2ac.core,
- de.unimarburg.swt.ocl2ac.gc2ac.util
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/.project b/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/.project
deleted file mode 100644
index fbf08cb..0000000
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>de.unimarburg.swt.ocl2ac.model.edit</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.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/.project b/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/.project
deleted file mode 100644
index aeb84b5..0000000
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>de.unimarburg.swt.ocl2ac.model.editor</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.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/.project b/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/.project
deleted file mode 100644
index b3c52f8..0000000
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>de.unimarburg.swt.ocl2ac.model</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/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/META-INF/MANIFEST.MF b/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/META-INF/MANIFEST.MF
deleted file mode 100644
index b2b9eb6..0000000
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Translate
-Bundle-SymbolicName: de.unimarburg.swt.ocl2ac.ocl2gc;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: de.unimarburg.swt.ocl2ac.ocl2gc.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources;bundle-version="3.10.1",
- org.eclipse.emf.common;bundle-version="2.11.0",
- org.eclipse.ocl.pivot;bundle-version="1.0.1",
- de.unimarburg.swt.ocl2ac.model;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Export-Package: de.unimarburg.swt.ocl2ac.ocl2gc,
- de.unimarburg.swt.ocl2ac.ocl2gc.core,
- de.unimarburg.swt.ocl2ac.ocl2gc.util
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/.project b/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/.project
deleted file mode 100644
index 767c356..0000000
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>de.unimarburg.swt.ocl2ac.tool</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/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/META-INF/MANIFEST.MF b/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/META-INF/MANIFEST.MF
deleted file mode 100644
index d935881..0000000
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Automate
-Bundle-SymbolicName: de.unimarburg.swt.ocl2ac.tool;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: de.unimarburg.swt.ocl2ac.tool.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.common;bundle-version="2.11.1",
- org.eclipse.core.resources;bundle-version="3.10.1",
- de.unimarburg.swt.ocl2ac.ocl2gc,
- org.eclipse.ocl.pivot,
- org.eclipse.emf.henshin.model;bundle-version="1.4.0",
- org.eclipse.emf.henshin.editor;bundle-version="1.4.0",
- org.eclipse.core.filesystem;bundle-version="1.5.0",
- org.eclipse.emf.henshin.interpreter,
- de.unimarburg.swt.ocl2ac.gc2ac;bundle-version="1.0.0",
- de.unimarburg.swt.ocl2ac.model;bundle-version="1.0.0",
- org.eclipse.emf.common.ui;bundle-version="2.11.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Export-Package: de.unimarburg.swt.ocl2ac.tool,
- de.unimarburg.swt.ocl2ac.tool.commands,
- de.unimarburg.swt.ocl2ac.tool.optimizer
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/Activator.java b/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/Activator.java
deleted file mode 100644
index d22cdb0..0000000
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/Activator.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * <copyright>
- * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
- * </copyright>
- */
-package de.unimarburg.swt.ocl2ac.tool;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "de.unimarburg.swt.ocl2ac.tool"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/.project b/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/.project
deleted file mode 100644
index 5b9e0af..0000000
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>de.unimarburg.swt.ocl2ac.utils</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/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/META-INF/MANIFEST.MF b/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/META-INF/MANIFEST.MF
deleted file mode 100644
index 1cd99c3..0000000
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Utils
-Bundle-SymbolicName: de.unimarburg.swt.ocl2ac.utils;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: de.unimarburg.swt.ocl2ac.utils.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.emf.ecore;bundle-version="2.11.2",
- org.eclipse.emf.henshin.model;bundle-version="1.4.0",
- de.unimarburg.swt.ocl2ac.gc2ac;bundle-version="1.0.0",
- org.eclipse.emf.henshin.editor,
- org.eclipse.emf.henshin.interpreter;bundle-version="1.4.0",
- de.unimarburg.swt.ocl2ac.model;bundle-version="1.0.0",
- org.eclipse.emf.edit.ui;bundle-version="2.12.0",
- org.eclipse.ui.ide;bundle-version="3.12.3",
- org.apache.commons.io;bundle-version="2.2.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
-Export-Package: de.unimarburg.swt.ocl2ac.utils.henshin.simplification,
- de.unimarburg.swt.ocl2ac.utils.printer,
- de.unimarburg.swt.ocl2ac.utils.viewer
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/Activator.java b/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/Activator.java
deleted file mode 100644
index f9412ef..0000000
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/Activator.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * <copyright>
- * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
- * </copyright>
- */
-package de.unimarburg.swt.ocl2ac.utils;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "de.unimarburg.swt.ocl2ac.utils"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.
-	 * BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.
-	 * BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/plugins/ocl2ac/info.txt b/plugins/ocl2ac/info.txt
deleted file mode 100644
index e69de29..0000000
--- a/plugins/ocl2ac/info.txt
+++ /dev/null
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/.classpath b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/.classpath
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/.classpath
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/.classpath
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/.gitignore b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/.gitignore
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/.gitignore
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/.gitignore
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.project b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/.project
similarity index 92%
copy from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.project
copy to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/.project
index afc65bc..bb8d633 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.project
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>de.unimarburg.swt.ocl2ac.ocl2gc</name>
+	<name>org.eclipse.emf.henshin.ocl2ac.gc2ac</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/META-INF/MANIFEST.MF b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..0f228f7
--- /dev/null
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/META-INF/MANIFEST.MF
@@ -0,0 +1,23 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Henshin
+Bundle-SymbolicName: org.eclipse.emf.henshin.ocl2ac.gc2ac;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.emf.henshin.ocl2ac.gc2ac.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.emf.henshin.model;bundle-version="1.2.0",
+ org.eclipse.emf.henshin.ocl2ac.ocl2gc;bundle-version="1.0.0",
+ org.eclipse.emf.henshin.editor;bundle-version="1.2.0",
+ org.eclipse.ui.ide;bundle-version="3.11.0",
+ org.eclipse.emf.common.ui,
+ org.eclipse.emf.edit;bundle-version="2.11.1",
+ org.eclipse.core.resources,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.henshin.ocl2ac.model;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.emf.henshin.ocl2ac.gc2ac,
+ org.eclipse.emf.henshin.ocl2ac.gc2ac.actions,
+ org.eclipse.emf.henshin.ocl2ac.gc2ac.core,
+ org.eclipse.emf.henshin.ocl2ac.gc2ac.util
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/build.properties b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/build.properties
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/build.properties
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/build.properties
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/Activator.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/Activator.java
similarity index 88%
copy from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/Activator.java
copy to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/Activator.java
index f16bfba..29811c5 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/Activator.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/Activator.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.gc2ac;
+package org.eclipse.emf.henshin.ocl2ac.gc2ac;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
@@ -14,7 +14,7 @@
 public class Activator extends AbstractUIPlugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "de.unimarburg.swt.ocl2ac.gc2ac"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.emf.henshin.ocl2ac.gc2ac"; //$NON-NLS-1$
 
 	// The shared instance
 	private static Activator plugin;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/actions/IntegrateAction.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/actions/IntegrateAction.java
similarity index 96%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/actions/IntegrateAction.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/actions/IntegrateAction.java
index e46e708..fe04b1c 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/actions/IntegrateAction.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/actions/IntegrateAction.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.gc2ac.actions;
+package org.eclipse.emf.henshin.ocl2ac.gc2ac.actions;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -32,8 +32,8 @@
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PlatformUI;
 
-import de.unimarburg.swt.ocl2ac.gc2ac.core.Integrator;
-import de.unimarburg.swt.ocl2ac.ocl2gc.util.TranslatorResourceSet;
+import org.eclipse.emf.henshin.ocl2ac.gc2ac.core.Integrator;
+import org.eclipse.emf.henshin.ocl2ac.ocl2gc.util.TranslatorResourceSet;
 import nestedcondition.NestedCondition;
 import nestedcondition.NestedConstraint;
 import nestedcondition.NestedconditionPackage;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/actions/LeftAction.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/actions/LeftAction.java
similarity index 95%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/actions/LeftAction.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/actions/LeftAction.java
index 44ec1c1..161ad32 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/actions/LeftAction.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/actions/LeftAction.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.gc2ac.actions;
+package org.eclipse.emf.henshin.ocl2ac.gc2ac.actions;
 
 import org.eclipse.emf.common.command.AbstractCommand;
 import org.eclipse.emf.common.command.Command;
@@ -16,7 +16,7 @@
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
 
-import de.unimarburg.swt.ocl2ac.gc2ac.core.Lefter;
+import org.eclipse.emf.henshin.ocl2ac.gc2ac.core.Lefter;
 
 public class LeftAction implements IObjectActionDelegate {
 
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/core/Integrator.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/core/Integrator.java
similarity index 98%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/core/Integrator.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/core/Integrator.java
index 7ee1afa..1e3c577 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/core/Integrator.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/core/Integrator.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.gc2ac.core;
+package org.eclipse.emf.henshin.ocl2ac.gc2ac.core;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -26,8 +26,8 @@
 import org.eclipse.emf.henshin.model.Rule;
 import org.eclipse.emf.henshin.model.Xor;
 
-import de.unimarburg.swt.ocl2ac.gc2ac.util.GraphAdapter;
-import de.unimarburg.swt.ocl2ac.gc2ac.util.Shifter;
+import org.eclipse.emf.henshin.ocl2ac.gc2ac.util.GraphAdapter;
+import org.eclipse.emf.henshin.ocl2ac.gc2ac.util.Shifter;
 import graph.Attribute;
 import graph.Graph;
 import graph.util.extensions.Constants;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/core/Lefter.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/core/Lefter.java
similarity index 99%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/core/Lefter.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/core/Lefter.java
index d20a277..4e26c15 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/core/Lefter.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/core/Lefter.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.gc2ac.core;
+package org.eclipse.emf.henshin.ocl2ac.gc2ac.core;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/core/NestedConditionPreparer.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/core/NestedConditionPreparer.java
similarity index 99%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/core/NestedConditionPreparer.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/core/NestedConditionPreparer.java
index 69c098b..12b5875 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/core/NestedConditionPreparer.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/core/NestedConditionPreparer.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.gc2ac.core;
+package org.eclipse.emf.henshin.ocl2ac.gc2ac.core;
 
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EObject;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/core/OverlapOptimizer.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/core/OverlapOptimizer.java
similarity index 95%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/core/OverlapOptimizer.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/core/OverlapOptimizer.java
index 2be96d1..ee7b038 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/core/OverlapOptimizer.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/core/OverlapOptimizer.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.gc2ac.core;
+package org.eclipse.emf.henshin.ocl2ac.gc2ac.core;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -15,8 +15,8 @@
 import org.eclipse.emf.henshin.model.Node;
 import org.eclipse.emf.henshin.model.Rule;
 
-import de.unimarburg.swt.ocl2ac.gc2ac.util.RuleClassifier;
-import de.unimarburg.swt.ocl2ac.ocl2gc.util.JointPairs;
+import org.eclipse.emf.henshin.ocl2ac.gc2ac.util.RuleClassifier;
+import org.eclipse.emf.henshin.ocl2ac.ocl2gc.util.JointPairs;
 import morphisms.Pair;
 import nestedcondition.NestedCondition;
 import nestedcondition.NestedConstraint;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/util/GraphAdapter.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/util/GraphAdapter.java
similarity index 98%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/util/GraphAdapter.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/util/GraphAdapter.java
index c073239..386049f 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/util/GraphAdapter.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/util/GraphAdapter.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.gc2ac.util;
+package org.eclipse.emf.henshin.ocl2ac.gc2ac.util;
 
 import java.util.HashMap;
 
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/util/MorphismPair.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/util/MorphismPair.java
similarity index 91%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/util/MorphismPair.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/util/MorphismPair.java
index a3ac9a0..c6035d3 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/util/MorphismPair.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/util/MorphismPair.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.gc2ac.util;
+package org.eclipse.emf.henshin.ocl2ac.gc2ac.util;
 
 import nestedcondition.Morphism;
 
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/util/RuleClassifier.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/util/RuleClassifier.java
similarity index 98%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/util/RuleClassifier.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/util/RuleClassifier.java
index a7301e3..4d915dd 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/util/RuleClassifier.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/util/RuleClassifier.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.gc2ac.util;
+package org.eclipse.emf.henshin.ocl2ac.gc2ac.util;
 
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/util/Shifter.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/util/Shifter.java
similarity index 96%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/util/Shifter.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/util/Shifter.java
index 995cbbc..345bdc5 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/util/Shifter.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.gc2ac/src/org/eclipse/emf/henshin/ocl2ac/gc2ac/util/Shifter.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.gc2ac.util;
+package org.eclipse.emf.henshin.ocl2ac.gc2ac.util;
 
 import java.util.Set;
 
@@ -12,8 +12,8 @@
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.henshin.model.Rule;
 
-import de.unimarburg.swt.ocl2ac.gc2ac.core.OverlapOptimizer;
-import de.unimarburg.swt.ocl2ac.ocl2gc.util.JointPairs;
+import org.eclipse.emf.henshin.ocl2ac.gc2ac.core.OverlapOptimizer;
+import org.eclipse.emf.henshin.ocl2ac.ocl2gc.util.JointPairs;
 import laxcondition.Operator;
 import laxcondition.Quantifier;
 import morphisms.Mapping;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/.classpath b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/.classpath
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/.classpath
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/.classpath
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.project b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/.project
similarity index 91%
copy from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.project
copy to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/.project
index afc65bc..223997f 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.project
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>de.unimarburg.swt.ocl2ac.ocl2gc</name>
+	<name>org.eclipse.emf.henshin.ocl2ac.model.edit</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -22,7 +22,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/META-INF/MANIFEST.MF b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/META-INF/MANIFEST.MF
similarity index 79%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/META-INF/MANIFEST.MF
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/META-INF/MANIFEST.MF
index 5ff2dd7..e1e2c73 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/META-INF/MANIFEST.MF
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: de.unimarburg.swt.ocl2ac.model.edit;singleton:=true
+Bundle-SymbolicName: org.eclipse.emf.henshin.ocl2ac.model.edit;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: nestedconstraintmodel.provider.NestedconstraintmodelEditPlugin$Implementation
@@ -13,6 +13,6 @@
  nestedcondition.provider,
  nestedconstraintmodel.provider
 Require-Bundle: org.eclipse.core.runtime,
- de.unimarburg.swt.ocl2ac.model;visibility:=reexport,
+ org.eclipse.emf.henshin.ocl2ac.model;visibility:=reexport,
  org.eclipse.emf.edit;visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/build.properties b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/build.properties
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/build.properties
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/build.properties
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateCondition_laxCondition_Formula.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateCondition_laxCondition_Formula.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateCondition_laxCondition_Formula.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateCondition_laxCondition_Formula.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateCondition_laxCondition_QuantifiedLaxCondition.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateCondition_laxCondition_QuantifiedLaxCondition.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateCondition_laxCondition_QuantifiedLaxCondition.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateCondition_laxCondition_QuantifiedLaxCondition.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateCondition_laxCondition_True.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateCondition_laxCondition_True.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateCondition_laxCondition_True.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateCondition_laxCondition_True.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateFormula_arguments_Formula.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateFormula_arguments_Formula.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateFormula_arguments_Formula.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateFormula_arguments_Formula.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateFormula_arguments_QuantifiedCondition.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateFormula_arguments_QuantifiedCondition.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateFormula_arguments_QuantifiedCondition.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateFormula_arguments_QuantifiedCondition.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateFormula_arguments_QuantifiedLaxCondition.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateFormula_arguments_QuantifiedLaxCondition.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateFormula_arguments_QuantifiedLaxCondition.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateFormula_arguments_QuantifiedLaxCondition.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateFormula_arguments_True.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateFormula_arguments_True.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateFormula_arguments_True.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateFormula_arguments_True.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateGraph_edges_Edge.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateGraph_edges_Edge.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateGraph_edges_Edge.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateGraph_edges_Edge.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateGraph_nodes_Node.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateGraph_nodes_Node.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateGraph_nodes_Node.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateGraph_nodes_Node.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateMorphism_edgeMappings_EdgeMapping.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateMorphism_edgeMappings_EdgeMapping.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateMorphism_edgeMappings_EdgeMapping.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateMorphism_edgeMappings_EdgeMapping.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateMorphism_nodeMappings_NodeMapping.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateMorphism_nodeMappings_NodeMapping.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateMorphism_nodeMappings_NodeMapping.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateMorphism_nodeMappings_NodeMapping.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateNestedCondition_variables_Variable.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateNestedCondition_variables_Variable.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateNestedCondition_variables_Variable.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateNestedCondition_variables_Variable.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateNestedConstraintModel_nestedconstrainmodels_NestedConstraint.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateNestedConstraintModel_nestedconstrainmodels_NestedConstraint.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateNestedConstraintModel_nestedconstrainmodels_NestedConstraint.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateNestedConstraintModel_nestedconstrainmodels_NestedConstraint.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateNestedConstraint_condition_Formula.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateNestedConstraint_condition_Formula.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateNestedConstraint_condition_Formula.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateNestedConstraint_condition_Formula.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateNestedConstraint_condition_QuantifiedCondition.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateNestedConstraint_condition_QuantifiedCondition.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateNestedConstraint_condition_QuantifiedCondition.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateNestedConstraint_condition_QuantifiedCondition.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateNestedConstraint_condition_True.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateNestedConstraint_condition_True.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateNestedConstraint_condition_True.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateNestedConstraint_condition_True.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateNestedConstraint_domain_Graph.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateNestedConstraint_domain_Graph.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateNestedConstraint_domain_Graph.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateNestedConstraint_domain_Graph.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateNode_attributes_Attribute.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateNode_attributes_Attribute.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateNode_attributes_Attribute.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateNode_attributes_Attribute.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedCondition_codomain_Graph.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedCondition_codomain_Graph.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedCondition_codomain_Graph.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedCondition_codomain_Graph.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedCondition_condition_Formula.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedCondition_condition_Formula.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedCondition_condition_Formula.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedCondition_condition_Formula.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedCondition_condition_QuantifiedCondition.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedCondition_condition_QuantifiedCondition.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedCondition_condition_QuantifiedCondition.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedCondition_condition_QuantifiedCondition.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedCondition_condition_True.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedCondition_condition_True.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedCondition_condition_True.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedCondition_condition_True.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedCondition_morphism_Morphism.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedCondition_morphism_Morphism.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedCondition_morphism_Morphism.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedCondition_morphism_Morphism.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedLaxCondition_condition_Formula.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedLaxCondition_condition_Formula.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedLaxCondition_condition_Formula.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedLaxCondition_condition_Formula.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedLaxCondition_condition_QuantifiedLaxCondition.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedLaxCondition_condition_QuantifiedLaxCondition.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedLaxCondition_condition_QuantifiedLaxCondition.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedLaxCondition_condition_QuantifiedLaxCondition.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedLaxCondition_condition_True.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedLaxCondition_condition_True.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedLaxCondition_condition_True.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedLaxCondition_condition_True.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedLaxCondition_graph_Graph.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedLaxCondition_graph_Graph.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedLaxCondition_graph_Graph.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedLaxCondition_graph_Graph.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedLaxCondition_variables_Variable.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedLaxCondition_variables_Variable.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedLaxCondition_variables_Variable.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/ctool16/CreateQuantifiedLaxCondition_variables_Variable.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/Attribute.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/Attribute.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/Attribute.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/Attribute.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/Condition.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/Condition.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/Condition.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/Condition.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/Edge.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/Edge.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/Edge.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/Edge.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/EdgeMapping.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/EdgeMapping.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/EdgeMapping.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/EdgeMapping.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/Formula.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/Formula.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/Formula.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/Formula.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/Graph.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/Graph.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/Graph.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/Graph.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/Morphism.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/Morphism.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/Morphism.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/Morphism.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/NestedConstraint.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/NestedConstraint.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/NestedConstraint.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/NestedConstraint.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/NestedConstraintModel.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/NestedConstraintModel.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/NestedConstraintModel.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/NestedConstraintModel.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/Node.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/Node.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/Node.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/Node.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/NodeMapping.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/NodeMapping.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/NodeMapping.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/NodeMapping.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/QuantifiedCondition.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/QuantifiedCondition.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/QuantifiedCondition.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/QuantifiedCondition.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/QuantifiedLaxCondition.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/QuantifiedLaxCondition.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/QuantifiedLaxCondition.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/QuantifiedLaxCondition.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/True.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/True.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/True.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/True.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/Variable.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/Variable.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/icons/full/obj16/Variable.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/icons/full/obj16/Variable.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/plugin.properties b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/plugin.properties
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/plugin.properties
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/plugin.properties
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/plugin.xml b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/plugin.xml
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/plugin.xml
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/plugin.xml
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/graph/provider/AttributeItemProvider.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/graph/provider/AttributeItemProvider.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/graph/provider/AttributeItemProvider.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/graph/provider/AttributeItemProvider.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/graph/provider/EdgeItemProvider.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/graph/provider/EdgeItemProvider.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/graph/provider/EdgeItemProvider.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/graph/provider/EdgeItemProvider.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/graph/provider/GraphItemProvider.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/graph/provider/GraphItemProvider.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/graph/provider/GraphItemProvider.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/graph/provider/GraphItemProvider.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/graph/provider/GraphItemProviderAdapterFactory.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/graph/provider/GraphItemProviderAdapterFactory.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/graph/provider/GraphItemProviderAdapterFactory.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/graph/provider/GraphItemProviderAdapterFactory.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/graph/provider/NodeItemProvider.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/graph/provider/NodeItemProvider.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/graph/provider/NodeItemProvider.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/graph/provider/NodeItemProvider.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/laxcondition/provider/ConditionItemProvider.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/laxcondition/provider/ConditionItemProvider.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/laxcondition/provider/ConditionItemProvider.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/laxcondition/provider/ConditionItemProvider.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/laxcondition/provider/FormulaItemProvider.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/laxcondition/provider/FormulaItemProvider.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/laxcondition/provider/FormulaItemProvider.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/laxcondition/provider/FormulaItemProvider.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/laxcondition/provider/LaxConditionItemProvider.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/laxcondition/provider/LaxConditionItemProvider.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/laxcondition/provider/LaxConditionItemProvider.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/laxcondition/provider/LaxConditionItemProvider.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/laxcondition/provider/LaxconditionItemProviderAdapterFactory.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/laxcondition/provider/LaxconditionItemProviderAdapterFactory.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/laxcondition/provider/LaxconditionItemProviderAdapterFactory.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/laxcondition/provider/LaxconditionItemProviderAdapterFactory.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/laxcondition/provider/QuantifiedLaxConditionItemProvider.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/laxcondition/provider/QuantifiedLaxConditionItemProvider.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/laxcondition/provider/QuantifiedLaxConditionItemProvider.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/laxcondition/provider/QuantifiedLaxConditionItemProvider.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/laxcondition/provider/TrueItemProvider.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/laxcondition/provider/TrueItemProvider.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/laxcondition/provider/TrueItemProvider.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/laxcondition/provider/TrueItemProvider.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/laxcondition/provider/VariableItemProvider.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/laxcondition/provider/VariableItemProvider.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/laxcondition/provider/VariableItemProvider.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/laxcondition/provider/VariableItemProvider.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedcondition/provider/EdgeMappingItemProvider.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedcondition/provider/EdgeMappingItemProvider.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedcondition/provider/EdgeMappingItemProvider.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedcondition/provider/EdgeMappingItemProvider.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedcondition/provider/FormulaItemProvider.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedcondition/provider/FormulaItemProvider.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedcondition/provider/FormulaItemProvider.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedcondition/provider/FormulaItemProvider.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedcondition/provider/MorphismItemProvider.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedcondition/provider/MorphismItemProvider.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedcondition/provider/MorphismItemProvider.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedcondition/provider/MorphismItemProvider.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedcondition/provider/NestedConditionItemProvider.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedcondition/provider/NestedConditionItemProvider.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedcondition/provider/NestedConditionItemProvider.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedcondition/provider/NestedConditionItemProvider.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedcondition/provider/NestedConstraintItemProvider.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedcondition/provider/NestedConstraintItemProvider.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedcondition/provider/NestedConstraintItemProvider.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedcondition/provider/NestedConstraintItemProvider.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedcondition/provider/NestedconditionItemProviderAdapterFactory.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedcondition/provider/NestedconditionItemProviderAdapterFactory.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedcondition/provider/NestedconditionItemProviderAdapterFactory.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedcondition/provider/NestedconditionItemProviderAdapterFactory.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedcondition/provider/NodeMappingItemProvider.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedcondition/provider/NodeMappingItemProvider.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedcondition/provider/NodeMappingItemProvider.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedcondition/provider/NodeMappingItemProvider.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedcondition/provider/QuantifiedConditionItemProvider.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedcondition/provider/QuantifiedConditionItemProvider.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedcondition/provider/QuantifiedConditionItemProvider.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedcondition/provider/QuantifiedConditionItemProvider.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedcondition/provider/TrueItemProvider.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedcondition/provider/TrueItemProvider.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedcondition/provider/TrueItemProvider.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedcondition/provider/TrueItemProvider.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedcondition/provider/VariableItemProvider.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedcondition/provider/VariableItemProvider.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedcondition/provider/VariableItemProvider.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedcondition/provider/VariableItemProvider.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedconstraintmodel/provider/NestedConstraintModelItemProvider.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedconstraintmodel/provider/NestedConstraintModelItemProvider.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedconstraintmodel/provider/NestedConstraintModelItemProvider.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedconstraintmodel/provider/NestedConstraintModelItemProvider.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedconstraintmodel/provider/NestedconstraintmodelEditPlugin.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedconstraintmodel/provider/NestedconstraintmodelEditPlugin.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedconstraintmodel/provider/NestedconstraintmodelEditPlugin.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedconstraintmodel/provider/NestedconstraintmodelEditPlugin.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedconstraintmodel/provider/NestedconstraintmodelItemProviderAdapterFactory.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedconstraintmodel/provider/NestedconstraintmodelItemProviderAdapterFactory.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.edit/src/nestedconstraintmodel/provider/NestedconstraintmodelItemProviderAdapterFactory.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.edit/src/nestedconstraintmodel/provider/NestedconstraintmodelItemProviderAdapterFactory.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/.classpath b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/.classpath
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/.classpath
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/.classpath
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.project b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/.project
similarity index 91%
copy from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.project
copy to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/.project
index afc65bc..d3f057a 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.project
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>de.unimarburg.swt.ocl2ac.ocl2gc</name>
+	<name>org.eclipse.emf.henshin.ocl2ac.model.editor</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -22,7 +22,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>
 </projectDescription>
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/META-INF/MANIFEST.MF b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/META-INF/MANIFEST.MF
similarity index 82%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/META-INF/MANIFEST.MF
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/META-INF/MANIFEST.MF
index 897ff56..4cda2c6 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/META-INF/MANIFEST.MF
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: de.unimarburg.swt.ocl2ac.model.editor;singleton:=true
+Bundle-SymbolicName: org.eclipse.emf.henshin.ocl2ac.model.editor;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: nestedconstraintmodel.presentation.NestedconstraintmodelEditorPlugin$Implementation
@@ -14,7 +14,7 @@
  nestedconstraintmodel.presentation
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources;visibility:=reexport,
- de.unimarburg.swt.ocl2ac.model.edit;visibility:=reexport,
+ org.eclipse.emf.henshin.ocl2ac.model.edit;visibility:=reexport,
  org.eclipse.emf.ecore.xmi;visibility:=reexport,
  org.eclipse.emf.edit.ui;visibility:=reexport,
  org.eclipse.ui.ide;visibility:=reexport
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/build.properties b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/build.properties
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/build.properties
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/build.properties
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/icons/full/obj16/GraphModelFile.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/icons/full/obj16/GraphModelFile.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/icons/full/obj16/GraphModelFile.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/icons/full/obj16/GraphModelFile.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/icons/full/obj16/LaxconditionModelFile.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/icons/full/obj16/LaxconditionModelFile.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/icons/full/obj16/LaxconditionModelFile.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/icons/full/obj16/LaxconditionModelFile.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/icons/full/obj16/NestedconditionModelFile.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/icons/full/obj16/NestedconditionModelFile.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/icons/full/obj16/NestedconditionModelFile.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/icons/full/obj16/NestedconditionModelFile.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/icons/full/obj16/NestedconstraintmodelModelFile.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/icons/full/obj16/NestedconstraintmodelModelFile.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/icons/full/obj16/NestedconstraintmodelModelFile.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/icons/full/obj16/NestedconstraintmodelModelFile.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/icons/full/wizban/NewGraph.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/icons/full/wizban/NewGraph.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/icons/full/wizban/NewGraph.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/icons/full/wizban/NewGraph.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/icons/full/wizban/NewLaxcondition.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/icons/full/wizban/NewLaxcondition.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/icons/full/wizban/NewLaxcondition.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/icons/full/wizban/NewLaxcondition.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/icons/full/wizban/NewNestedcondition.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/icons/full/wizban/NewNestedcondition.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/icons/full/wizban/NewNestedcondition.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/icons/full/wizban/NewNestedcondition.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/icons/full/wizban/NewNestedconstraintmodel.gif b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/icons/full/wizban/NewNestedconstraintmodel.gif
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/icons/full/wizban/NewNestedconstraintmodel.gif
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/icons/full/wizban/NewNestedconstraintmodel.gif
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/plugin.properties b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/plugin.properties
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/plugin.properties
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/plugin.properties
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/plugin.xml b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/plugin.xml
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/plugin.xml
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/plugin.xml
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/graph/presentation/GraphActionBarContributor.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/graph/presentation/GraphActionBarContributor.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/graph/presentation/GraphActionBarContributor.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/graph/presentation/GraphActionBarContributor.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/graph/presentation/GraphEditor.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/graph/presentation/GraphEditor.java
similarity index 99%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/graph/presentation/GraphEditor.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/graph/presentation/GraphEditor.java
index bb463a4..050573e 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/graph/presentation/GraphEditor.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/graph/presentation/GraphEditor.java
@@ -566,7 +566,7 @@
 	 */
 	protected void updateProblemIndication() {
 		if (updateProblemIndication) {
-			BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, "de.unimarburg.swt.ocl2ac.model.editor", 0,
+			BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, "org.eclipse.emf.henshin.ocl2ac.model.editor", 0,
 					null, new Object[] { editingDomain.getResourceSet() });
 			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
 				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
@@ -926,13 +926,13 @@
 		boolean hasErrors = !resource.getErrors().isEmpty();
 		if (hasErrors || !resource.getWarnings().isEmpty()) {
 			BasicDiagnostic basicDiagnostic = new BasicDiagnostic(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
-					"de.unimarburg.swt.ocl2ac.model.editor", 0,
+					"org.eclipse.emf.henshin.ocl2ac.model.editor", 0,
 					getString("_UI_CreateModelError_message", resource.getURI()),
 					new Object[] { exception == null ? (Object) resource : exception });
 			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
 			return basicDiagnostic;
 		} else if (exception != null) {
-			return new BasicDiagnostic(Diagnostic.ERROR, "de.unimarburg.swt.ocl2ac.model.editor", 0,
+			return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.henshin.ocl2ac.model.editor", 0,
 					getString("_UI_CreateModelError_message", resource.getURI()), new Object[] { exception });
 		} else {
 			return Diagnostic.OK_INSTANCE;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/graph/presentation/GraphModelWizard.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/graph/presentation/GraphModelWizard.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/graph/presentation/GraphModelWizard.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/graph/presentation/GraphModelWizard.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/laxcondition/presentation/LaxconditionActionBarContributor.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/laxcondition/presentation/LaxconditionActionBarContributor.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/laxcondition/presentation/LaxconditionActionBarContributor.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/laxcondition/presentation/LaxconditionActionBarContributor.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/laxcondition/presentation/LaxconditionEditor.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/laxcondition/presentation/LaxconditionEditor.java
similarity index 99%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/laxcondition/presentation/LaxconditionEditor.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/laxcondition/presentation/LaxconditionEditor.java
index cc16087..4fc58cf 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/laxcondition/presentation/LaxconditionEditor.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/laxcondition/presentation/LaxconditionEditor.java
@@ -626,7 +626,7 @@
 			BasicDiagnostic diagnostic =
 				new BasicDiagnostic
 					(Diagnostic.OK,
-					 "de.unimarburg.swt.ocl2ac.model.editor",
+					 "org.eclipse.emf.henshin.ocl2ac.model.editor",
 					 0,
 					 null,
 					 new Object [] { editingDomain.getResourceSet() });
@@ -993,7 +993,7 @@
 			BasicDiagnostic basicDiagnostic =
 				new BasicDiagnostic
 					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
-					 "de.unimarburg.swt.ocl2ac.model.editor",
+					 "org.eclipse.emf.henshin.ocl2ac.model.editor",
 					 0,
 					 getString("_UI_CreateModelError_message", resource.getURI()),
 					 new Object [] { exception == null ? (Object)resource : exception });
@@ -1004,7 +1004,7 @@
 			return
 				new BasicDiagnostic
 					(Diagnostic.ERROR,
-					 "de.unimarburg.swt.ocl2ac.model.editor",
+					 "org.eclipse.emf.henshin.ocl2ac.model.editor",
 					 0,
 					 getString("_UI_CreateModelError_message", resource.getURI()),
 					 new Object[] { exception });
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/laxcondition/presentation/LaxconditionModelWizard.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/laxcondition/presentation/LaxconditionModelWizard.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/laxcondition/presentation/LaxconditionModelWizard.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/laxcondition/presentation/LaxconditionModelWizard.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/nestedcondition/presentation/NestedconditionActionBarContributor.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/nestedcondition/presentation/NestedconditionActionBarContributor.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/nestedcondition/presentation/NestedconditionActionBarContributor.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/nestedcondition/presentation/NestedconditionActionBarContributor.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/nestedcondition/presentation/NestedconditionEditor.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/nestedcondition/presentation/NestedconditionEditor.java
similarity index 99%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/nestedcondition/presentation/NestedconditionEditor.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/nestedcondition/presentation/NestedconditionEditor.java
index b677abb..37c4801 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/nestedcondition/presentation/NestedconditionEditor.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/nestedcondition/presentation/NestedconditionEditor.java
@@ -626,7 +626,7 @@
 			BasicDiagnostic diagnostic =
 				new BasicDiagnostic
 					(Diagnostic.OK,
-					 "de.unimarburg.swt.ocl2ac.model.editor",
+					 "org.eclipse.emf.henshin.ocl2ac.model.editor",
 					 0,
 					 null,
 					 new Object [] { editingDomain.getResourceSet() });
@@ -993,7 +993,7 @@
 			BasicDiagnostic basicDiagnostic =
 				new BasicDiagnostic
 					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
-					 "de.unimarburg.swt.ocl2ac.model.editor",
+					 "org.eclipse.emf.henshin.ocl2ac.model.editor",
 					 0,
 					 getString("_UI_CreateModelError_message", resource.getURI()),
 					 new Object [] { exception == null ? (Object)resource : exception });
@@ -1004,7 +1004,7 @@
 			return
 				new BasicDiagnostic
 					(Diagnostic.ERROR,
-					 "de.unimarburg.swt.ocl2ac.model.editor",
+					 "org.eclipse.emf.henshin.ocl2ac.model.editor",
 					 0,
 					 getString("_UI_CreateModelError_message", resource.getURI()),
 					 new Object[] { exception });
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/nestedcondition/presentation/NestedconditionModelWizard.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/nestedcondition/presentation/NestedconditionModelWizard.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/nestedcondition/presentation/NestedconditionModelWizard.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/nestedcondition/presentation/NestedconditionModelWizard.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/nestedconstraintmodel/presentation/NestedconstraintmodelActionBarContributor.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/nestedconstraintmodel/presentation/NestedconstraintmodelActionBarContributor.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/nestedconstraintmodel/presentation/NestedconstraintmodelActionBarContributor.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/nestedconstraintmodel/presentation/NestedconstraintmodelActionBarContributor.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/nestedconstraintmodel/presentation/NestedconstraintmodelEditor.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/nestedconstraintmodel/presentation/NestedconstraintmodelEditor.java
similarity index 99%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/nestedconstraintmodel/presentation/NestedconstraintmodelEditor.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/nestedconstraintmodel/presentation/NestedconstraintmodelEditor.java
index 696c825..007ddf5 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/nestedconstraintmodel/presentation/NestedconstraintmodelEditor.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/nestedconstraintmodel/presentation/NestedconstraintmodelEditor.java
@@ -624,7 +624,7 @@
 			BasicDiagnostic diagnostic =
 				new BasicDiagnostic
 					(Diagnostic.OK,
-					 "de.unimarburg.swt.ocl2ac.model.editor",
+					 "org.eclipse.emf.henshin.ocl2ac.model.editor",
 					 0,
 					 null,
 					 new Object [] { editingDomain.getResourceSet() });
@@ -991,7 +991,7 @@
 			BasicDiagnostic basicDiagnostic =
 				new BasicDiagnostic
 					(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING,
-					 "de.unimarburg.swt.ocl2ac.model.editor",
+					 "org.eclipse.emf.henshin.ocl2ac.model.editor",
 					 0,
 					 getString("_UI_CreateModelError_message", resource.getURI()),
 					 new Object [] { exception == null ? (Object)resource : exception });
@@ -1002,7 +1002,7 @@
 			return
 				new BasicDiagnostic
 					(Diagnostic.ERROR,
-					 "de.unimarburg.swt.ocl2ac.model.editor",
+					 "org.eclipse.emf.henshin.ocl2ac.model.editor",
 					 0,
 					 getString("_UI_CreateModelError_message", resource.getURI()),
 					 new Object[] { exception });
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/nestedconstraintmodel/presentation/NestedconstraintmodelEditorPlugin.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/nestedconstraintmodel/presentation/NestedconstraintmodelEditorPlugin.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/nestedconstraintmodel/presentation/NestedconstraintmodelEditorPlugin.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/nestedconstraintmodel/presentation/NestedconstraintmodelEditorPlugin.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/nestedconstraintmodel/presentation/NestedconstraintmodelModelWizard.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/nestedconstraintmodel/presentation/NestedconstraintmodelModelWizard.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model.editor/src/nestedconstraintmodel/presentation/NestedconstraintmodelModelWizard.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model.editor/src/nestedconstraintmodel/presentation/NestedconstraintmodelModelWizard.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/.classpath b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/.classpath
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/.classpath
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/.classpath
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.project b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/.project
similarity index 92%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.project
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/.project
index afc65bc..3403467 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.project
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>de.unimarburg.swt.ocl2ac.ocl2gc</name>
+	<name>org.eclipse.emf.henshin.ocl2ac.model</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/META-INF/MANIFEST.MF b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/META-INF/MANIFEST.MF
similarity index 82%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/META-INF/MANIFEST.MF
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/META-INF/MANIFEST.MF
index 155d7d5..d424f4c 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/META-INF/MANIFEST.MF
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: de.unimarburg.swt.ocl2ac.model;singleton:=true
+Bundle-SymbolicName: org.eclipse.emf.henshin.ocl2ac.model;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-Activator: de.unimarburg.swt.ocl2ac.model.Activator
+Bundle-Activator: org.eclipse.emf.henshin.ocl2ac.model.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- de.unimarburg.swt.ocl2ac.model;visibility:=reexport,
+ org.eclipse.emf.henshin.ocl2ac.model;visibility:=reexport,
  org.eclipse.core.resources;bundle-version="3.11.1",
  org.eclipse.emf.ecore.editor;bundle-version="2.12.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/build.properties b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/build.properties
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/build.properties
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/build.properties
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/model/CompactCondition.ecore b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/model/CompactCondition.ecore
similarity index 88%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/model/CompactCondition.ecore
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/model/CompactCondition.ecore
index 6f81efc..df2c6ea 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/model/CompactCondition.ecore
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/model/CompactCondition.ecore
@@ -5,7 +5,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="CompactConditionModel">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="compactconditions" upperBound="-1"
-        eType="ecore:EClass ../../de.unimarburg.swt.laxcondition/model/laxcondition.ecore#//Condition"
+        eType="ecore:EClass ../../org.eclipse.emf.henshin.laxcondition/model/laxcondition.ecore#//Condition"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="typeGraph" lowerBound="1"
         eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/model/graph.ecore b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/model/graph.ecore
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/model/graph.ecore
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/model/graph.ecore
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/model/laxcondition.ecore b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/model/laxcondition.ecore
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/model/laxcondition.ecore
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/model/laxcondition.ecore
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/model/morphisms.ecore b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/model/morphisms.ecore
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/model/morphisms.ecore
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/model/morphisms.ecore
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/model/morphisms.genmodel b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/model/morphisms.genmodel
similarity index 94%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/model/morphisms.genmodel
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/model/morphisms.genmodel
index f0b5b65..0cb8c2b 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/model/morphisms.genmodel
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/model/morphisms.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/de.unimarburg.swt.ocl2ac.model/src" modelPluginID="de.unimarburg.swt.ocl2ac.model"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.henshin.ocl2ac.model/src" modelPluginID="org.eclipse.emf.henshin.ocl2ac.model"
     modelName="Morphisms" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
     usedGenPackages="nestedconstraintmodel.genmodel#//graph" operationReflection="true"
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/model/nestedcondition.ecore b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/model/nestedcondition.ecore
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/model/nestedcondition.ecore
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/model/nestedcondition.ecore
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/model/nestedconstraintmodel.ecore b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/model/nestedconstraintmodel.ecore
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/model/nestedconstraintmodel.ecore
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/model/nestedconstraintmodel.ecore
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/model/nestedconstraintmodel.genmodel b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/model/nestedconstraintmodel.genmodel
similarity index 98%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/model/nestedconstraintmodel.genmodel
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/model/nestedconstraintmodel.genmodel
index 902eb1f..0b5a50a 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/model/nestedconstraintmodel.genmodel
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/model/nestedconstraintmodel.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/de.unimarburg.swt.ocl2ac.model/src" modelPluginID="de.unimarburg.swt.ocl2ac.model"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.henshin.ocl2ac.model/src" modelPluginID="org.eclipse.emf.henshin.ocl2ac.model"
     modelName="Nestedconstraintmodel" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
     operationReflection="true" importOrganizing="true">
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/plugin.properties b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/plugin.properties
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/plugin.properties
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/plugin.properties
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/plugin.xml b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/plugin.xml
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/plugin.xml
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/plugin.xml
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/compactconditionmodel/CompactConditionModel.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/compactconditionmodel/CompactConditionModel.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/compactconditionmodel/CompactConditionModel.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/compactconditionmodel/CompactConditionModel.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/compactconditionmodel/CompactconditionmodelFactory.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/compactconditionmodel/CompactconditionmodelFactory.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/compactconditionmodel/CompactconditionmodelFactory.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/compactconditionmodel/CompactconditionmodelFactory.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/compactconditionmodel/CompactconditionmodelPackage.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/compactconditionmodel/CompactconditionmodelPackage.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/compactconditionmodel/CompactconditionmodelPackage.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/compactconditionmodel/CompactconditionmodelPackage.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/compactconditionmodel/impl/CompactConditionModelImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/compactconditionmodel/impl/CompactConditionModelImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/compactconditionmodel/impl/CompactConditionModelImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/compactconditionmodel/impl/CompactConditionModelImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/compactconditionmodel/impl/CompactconditionmodelFactoryImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/compactconditionmodel/impl/CompactconditionmodelFactoryImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/compactconditionmodel/impl/CompactconditionmodelFactoryImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/compactconditionmodel/impl/CompactconditionmodelFactoryImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/compactconditionmodel/impl/CompactconditionmodelPackageImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/compactconditionmodel/impl/CompactconditionmodelPackageImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/compactconditionmodel/impl/CompactconditionmodelPackageImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/compactconditionmodel/impl/CompactconditionmodelPackageImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/compactconditionmodel/util/CompactconditionmodelAdapterFactory.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/compactconditionmodel/util/CompactconditionmodelAdapterFactory.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/compactconditionmodel/util/CompactconditionmodelAdapterFactory.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/compactconditionmodel/util/CompactconditionmodelAdapterFactory.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/compactconditionmodel/util/CompactconditionmodelSwitch.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/compactconditionmodel/util/CompactconditionmodelSwitch.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/compactconditionmodel/util/CompactconditionmodelSwitch.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/compactconditionmodel/util/CompactconditionmodelSwitch.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/Attribute.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/Attribute.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/Attribute.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/Attribute.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/Edge.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/Edge.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/Edge.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/Edge.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/Graph.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/Graph.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/Graph.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/Graph.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/GraphFactory.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/GraphFactory.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/GraphFactory.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/GraphFactory.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/GraphPackage.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/GraphPackage.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/GraphPackage.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/GraphPackage.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/Node.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/Node.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/Node.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/Node.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/impl/AttributeImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/impl/AttributeImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/impl/AttributeImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/impl/AttributeImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/impl/EdgeImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/impl/EdgeImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/impl/EdgeImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/impl/EdgeImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/impl/GraphFactoryImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/impl/GraphFactoryImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/impl/GraphFactoryImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/impl/GraphFactoryImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/impl/GraphImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/impl/GraphImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/impl/GraphImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/impl/GraphImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/impl/GraphPackageImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/impl/GraphPackageImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/impl/GraphPackageImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/impl/GraphPackageImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/impl/NodeImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/impl/NodeImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/impl/NodeImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/impl/NodeImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/util/GraphAdapterFactory.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/util/GraphAdapterFactory.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/util/GraphAdapterFactory.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/util/GraphAdapterFactory.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/util/GraphSwitch.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/util/GraphSwitch.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/util/GraphSwitch.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/util/GraphSwitch.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/util/GraphValidator.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/util/GraphValidator.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/util/GraphValidator.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/util/GraphValidator.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/util/extensions/Constants.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/util/extensions/Constants.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/util/extensions/Constants.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/util/extensions/Constants.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/util/extensions/ExtendedNode.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/util/extensions/ExtendedNode.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/util/extensions/ExtendedNode.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/util/extensions/ExtendedNode.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/util/extensions/GraphPrinter.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/util/extensions/GraphPrinter.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/graph/util/extensions/GraphPrinter.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/graph/util/extensions/GraphPrinter.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/Condition.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/Condition.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/Condition.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/Condition.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/Formula.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/Formula.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/Formula.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/Formula.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/LaxCondition.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/LaxCondition.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/LaxCondition.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/LaxCondition.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/LaxconditionFactory.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/LaxconditionFactory.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/LaxconditionFactory.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/LaxconditionFactory.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/LaxconditionPackage.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/LaxconditionPackage.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/LaxconditionPackage.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/LaxconditionPackage.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/Operator.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/Operator.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/Operator.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/Operator.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/QuantifiedLaxCondition.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/QuantifiedLaxCondition.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/QuantifiedLaxCondition.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/QuantifiedLaxCondition.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/Quantifier.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/Quantifier.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/Quantifier.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/Quantifier.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/True.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/True.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/True.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/True.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/Variable.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/Variable.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/Variable.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/Variable.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/impl/ConditionImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/impl/ConditionImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/impl/ConditionImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/impl/ConditionImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/impl/FormulaImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/impl/FormulaImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/impl/FormulaImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/impl/FormulaImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/impl/LaxConditionImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/impl/LaxConditionImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/impl/LaxConditionImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/impl/LaxConditionImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/impl/LaxconditionFactoryImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/impl/LaxconditionFactoryImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/impl/LaxconditionFactoryImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/impl/LaxconditionFactoryImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/impl/LaxconditionPackageImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/impl/LaxconditionPackageImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/impl/LaxconditionPackageImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/impl/LaxconditionPackageImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/impl/QuantifiedLaxConditionImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/impl/QuantifiedLaxConditionImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/impl/QuantifiedLaxConditionImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/impl/QuantifiedLaxConditionImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/impl/TrueImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/impl/TrueImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/impl/TrueImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/impl/TrueImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/impl/VariableImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/impl/VariableImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/impl/VariableImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/impl/VariableImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/util/LaxconditionAdapterFactory.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/util/LaxconditionAdapterFactory.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/util/LaxconditionAdapterFactory.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/util/LaxconditionAdapterFactory.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/util/LaxconditionSwitch.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/util/LaxconditionSwitch.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/util/LaxconditionSwitch.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/util/LaxconditionSwitch.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/util/LaxconditionValidator.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/util/LaxconditionValidator.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/util/LaxconditionValidator.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/util/LaxconditionValidator.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/util/extensions/EdgeMapping.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/util/extensions/EdgeMapping.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/util/extensions/EdgeMapping.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/util/extensions/EdgeMapping.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/util/extensions/Intersection.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/util/extensions/Intersection.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/util/extensions/Intersection.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/util/extensions/Intersection.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/util/extensions/LaxConditionConstants.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/util/extensions/LaxConditionConstants.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/util/extensions/LaxConditionConstants.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/util/extensions/LaxConditionConstants.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/util/extensions/LaxConditionSimplifier.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/util/extensions/LaxConditionSimplifier.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/util/extensions/LaxConditionSimplifier.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/util/extensions/LaxConditionSimplifier.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/util/extensions/NodeMapping.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/util/extensions/NodeMapping.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/laxcondition/util/extensions/NodeMapping.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/laxcondition/util/extensions/NodeMapping.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/Mapping.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/Mapping.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/Mapping.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/Mapping.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/Morphism.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/Morphism.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/Morphism.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/Morphism.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/MorphismsFactory.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/MorphismsFactory.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/MorphismsFactory.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/MorphismsFactory.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/MorphismsPackage.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/MorphismsPackage.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/MorphismsPackage.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/MorphismsPackage.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/Pair.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/Pair.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/Pair.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/Pair.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/impl/MappingImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/impl/MappingImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/impl/MappingImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/impl/MappingImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/impl/MorphismImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/impl/MorphismImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/impl/MorphismImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/impl/MorphismImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/impl/MorphismsFactoryImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/impl/MorphismsFactoryImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/impl/MorphismsFactoryImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/impl/MorphismsFactoryImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/impl/MorphismsPackageImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/impl/MorphismsPackageImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/impl/MorphismsPackageImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/impl/MorphismsPackageImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/impl/PairImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/impl/PairImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/impl/PairImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/impl/PairImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/util/MorphismsAdapterFactory.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/util/MorphismsAdapterFactory.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/util/MorphismsAdapterFactory.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/util/MorphismsAdapterFactory.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/util/MorphismsSwitch.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/util/MorphismsSwitch.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/morphisms/util/MorphismsSwitch.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/morphisms/util/MorphismsSwitch.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/EdgeMapping.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/EdgeMapping.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/EdgeMapping.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/EdgeMapping.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/Formula.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/Formula.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/Formula.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/Formula.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/Morphism.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/Morphism.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/Morphism.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/Morphism.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/NestedCondition.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/NestedCondition.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/NestedCondition.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/NestedCondition.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/NestedConstraint.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/NestedConstraint.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/NestedConstraint.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/NestedConstraint.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/NestedconditionFactory.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/NestedconditionFactory.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/NestedconditionFactory.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/NestedconditionFactory.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/NestedconditionPackage.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/NestedconditionPackage.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/NestedconditionPackage.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/NestedconditionPackage.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/NodeMapping.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/NodeMapping.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/NodeMapping.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/NodeMapping.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/QuantifiedCondition.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/QuantifiedCondition.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/QuantifiedCondition.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/QuantifiedCondition.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/True.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/True.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/True.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/True.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/Variable.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/Variable.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/Variable.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/Variable.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/impl/EdgeMappingImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/impl/EdgeMappingImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/impl/EdgeMappingImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/impl/EdgeMappingImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/impl/FormulaImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/impl/FormulaImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/impl/FormulaImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/impl/FormulaImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/impl/MorphismImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/impl/MorphismImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/impl/MorphismImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/impl/MorphismImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/impl/NestedConditionImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/impl/NestedConditionImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/impl/NestedConditionImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/impl/NestedConditionImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/impl/NestedConstraintImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/impl/NestedConstraintImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/impl/NestedConstraintImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/impl/NestedConstraintImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/impl/NestedconditionFactoryImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/impl/NestedconditionFactoryImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/impl/NestedconditionFactoryImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/impl/NestedconditionFactoryImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/impl/NestedconditionPackageImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/impl/NestedconditionPackageImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/impl/NestedconditionPackageImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/impl/NestedconditionPackageImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/impl/NodeMappingImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/impl/NodeMappingImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/impl/NodeMappingImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/impl/NodeMappingImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/impl/QuantifiedConditionImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/impl/QuantifiedConditionImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/impl/QuantifiedConditionImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/impl/QuantifiedConditionImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/impl/TrueImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/impl/TrueImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/impl/TrueImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/impl/TrueImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/impl/VariableImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/impl/VariableImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/impl/VariableImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/impl/VariableImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/util/NestedconditionAdapterFactory.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/util/NestedconditionAdapterFactory.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/util/NestedconditionAdapterFactory.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/util/NestedconditionAdapterFactory.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/util/NestedconditionSwitch.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/util/NestedconditionSwitch.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/util/NestedconditionSwitch.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/util/NestedconditionSwitch.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/util/NestedconditionValidator.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/util/NestedconditionValidator.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/util/NestedconditionValidator.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/util/NestedconditionValidator.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/util/extensions/NestedConditionSimplifier.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/util/extensions/NestedConditionSimplifier.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedcondition/util/extensions/NestedConditionSimplifier.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedcondition/util/extensions/NestedConditionSimplifier.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedconstraintmodel/NestedConstraintModel.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedconstraintmodel/NestedConstraintModel.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedconstraintmodel/NestedConstraintModel.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedconstraintmodel/NestedConstraintModel.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedconstraintmodel/NestedconstraintmodelFactory.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedconstraintmodel/NestedconstraintmodelFactory.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedconstraintmodel/NestedconstraintmodelFactory.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedconstraintmodel/NestedconstraintmodelFactory.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedconstraintmodel/NestedconstraintmodelPackage.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedconstraintmodel/NestedconstraintmodelPackage.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedconstraintmodel/NestedconstraintmodelPackage.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedconstraintmodel/NestedconstraintmodelPackage.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedconstraintmodel/impl/NestedConstraintModelImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedconstraintmodel/impl/NestedConstraintModelImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedconstraintmodel/impl/NestedConstraintModelImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedconstraintmodel/impl/NestedConstraintModelImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedconstraintmodel/impl/NestedconstraintmodelFactoryImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedconstraintmodel/impl/NestedconstraintmodelFactoryImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedconstraintmodel/impl/NestedconstraintmodelFactoryImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedconstraintmodel/impl/NestedconstraintmodelFactoryImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedconstraintmodel/impl/NestedconstraintmodelPackageImpl.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedconstraintmodel/impl/NestedconstraintmodelPackageImpl.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedconstraintmodel/impl/NestedconstraintmodelPackageImpl.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedconstraintmodel/impl/NestedconstraintmodelPackageImpl.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedconstraintmodel/util/NestedconstraintmodelAdapterFactory.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedconstraintmodel/util/NestedconstraintmodelAdapterFactory.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedconstraintmodel/util/NestedconstraintmodelAdapterFactory.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedconstraintmodel/util/NestedconstraintmodelAdapterFactory.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedconstraintmodel/util/NestedconstraintmodelSwitch.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedconstraintmodel/util/NestedconstraintmodelSwitch.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/nestedconstraintmodel/util/NestedconstraintmodelSwitch.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/nestedconstraintmodel/util/NestedconstraintmodelSwitch.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/de/unimarburg/swt/ocl2ac/model/Activator.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/org/eclipse/emf/henshin/ocl2ac/model/Activator.java
similarity index 86%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/de/unimarburg/swt/ocl2ac/model/Activator.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/org/eclipse/emf/henshin/ocl2ac/model/Activator.java
index 217c124..1f2d8e7 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.model/src/de/unimarburg/swt/ocl2ac/model/Activator.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.model/src/org/eclipse/emf/henshin/ocl2ac/model/Activator.java
@@ -1,4 +1,4 @@
-package de.unimarburg.swt.ocl2ac.model;
+package org.eclipse.emf.henshin.ocl2ac.model;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
@@ -9,7 +9,7 @@
 public class Activator extends AbstractUIPlugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "de.unimarburg.swt.ocl2ac.model"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.emf.henshin.ocl2ac.model"; //$NON-NLS-1$
 
 	// The shared instance
 	private static Activator plugin;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.classpath b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/.classpath
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.classpath
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/.classpath
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.gitignore b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/.gitignore
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.gitignore
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/.gitignore
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.project b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/.project
similarity index 91%
copy from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.project
copy to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/.project
index afc65bc..39748da 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.project
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>de.unimarburg.swt.ocl2ac.ocl2gc</name>
+	<name>org.eclipse.emf.henshin.ocl2ac.ocl2gc</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/META-INF/MANIFEST.MF b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..9fe7a6f
--- /dev/null
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/META-INF/MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Translate
+Bundle-SymbolicName: org.eclipse.emf.henshin.ocl2ac.ocl2gc;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.emf.henshin.ocl2ac.ocl2gc.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources;bundle-version="3.10.1",
+ org.eclipse.emf.common;bundle-version="2.11.0",
+ org.eclipse.ocl.pivot;bundle-version="1.0.1",
+ org.eclipse.emf.henshin.ocl2ac.model;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.emf.henshin.ocl2ac.ocl2gc,
+ org.eclipse.emf.henshin.ocl2ac.ocl2gc.core,
+ org.eclipse.emf.henshin.ocl2ac.ocl2gc.util
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/build.properties b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/build.properties
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/build.properties
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/build.properties
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/plugin.xml b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/plugin.xml
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/plugin.xml
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/plugin.xml
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/Activator.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/Activator.java
similarity index 88%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/Activator.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/Activator.java
index b39c39b..79a7b30 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/Activator.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/Activator.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.ocl2gc;
+package org.eclipse.emf.henshin.ocl2ac.ocl2gc;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
@@ -14,7 +14,7 @@
 public class Activator extends AbstractUIPlugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "de.unimarburg.swt.ocl2ac.ocl2gc"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.emf.henshin.ocl2ac.ocl2gc"; //$NON-NLS-1$
 
 	// The shared instance
 	private static Activator plugin;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/core/Completer.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/core/Completer.java
similarity index 97%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/core/Completer.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/core/Completer.java
index 6544574..f63f31b 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/core/Completer.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/core/Completer.java
@@ -3,14 +3,14 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.ocl2gc.core;
+package org.eclipse.emf.henshin.ocl2ac.ocl2gc.core;
 
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EPackage;
 
-import de.unimarburg.swt.ocl2ac.ocl2gc.util.MorphismHelper;
-import de.unimarburg.swt.ocl2ac.ocl2gc.util.MorphismPair;
+import org.eclipse.emf.henshin.ocl2ac.ocl2gc.util.MorphismHelper;
+import org.eclipse.emf.henshin.ocl2ac.ocl2gc.util.MorphismPair;
 import graph.Graph;
 import graph.GraphFactory;
 import laxcondition.Condition;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/core/Translator.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/core/Translator.java
similarity index 99%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/core/Translator.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/core/Translator.java
index 8525c8c..92373f9 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/core/Translator.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/core/Translator.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.ocl2gc.core;
+package org.eclipse.emf.henshin.ocl2ac.ocl2gc.core;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -66,8 +66,8 @@
 import org.eclipse.ocl.pivot.Variable;
 import org.eclipse.ocl.pivot.VariableExp;
 
-import de.unimarburg.swt.ocl2ac.ocl2gc.util.Constants;
-import de.unimarburg.swt.ocl2ac.ocl2gc.util.TranslatorResourceSet;
+import org.eclipse.emf.henshin.ocl2ac.ocl2gc.util.Constants;
+import org.eclipse.emf.henshin.ocl2ac.ocl2gc.util.TranslatorResourceSet;
 import graph.Attribute;
 import graph.Edge;
 import graph.Graph;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/util/Constants.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/util/Constants.java
similarity index 97%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/util/Constants.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/util/Constants.java
index fb672d2..1492f09 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/util/Constants.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/util/Constants.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.ocl2gc.util;
+package org.eclipse.emf.henshin.ocl2ac.ocl2gc.util;
 
 public class Constants {
 
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/util/JointPairs.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/util/JointPairs.java
similarity index 99%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/util/JointPairs.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/util/JointPairs.java
index db21055..936a587 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/util/JointPairs.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/util/JointPairs.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.ocl2gc.util;
+package org.eclipse.emf.henshin.ocl2ac.ocl2gc.util;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/util/MorphismHelper.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/util/MorphismHelper.java
similarity index 96%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/util/MorphismHelper.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/util/MorphismHelper.java
index e72d915..e2aac25 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/util/MorphismHelper.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/util/MorphismHelper.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.ocl2gc.util;
+package org.eclipse.emf.henshin.ocl2ac.ocl2gc.util;
 
 import java.util.Set;
 
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/util/MorphismPair.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/util/MorphismPair.java
similarity index 94%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/util/MorphismPair.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/util/MorphismPair.java
index 15e4db2..f6e48dd 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/util/MorphismPair.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/util/MorphismPair.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.ocl2gc.util;
+package org.eclipse.emf.henshin.ocl2ac.ocl2gc.util;
 
 import graph.Graph;
 import nestedcondition.Morphism;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/util/NodePair.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/util/NodePair.java
similarity index 91%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/util/NodePair.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/util/NodePair.java
index 6037fbb..ec0d445 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/util/NodePair.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/util/NodePair.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.ocl2gc.util;
+package org.eclipse.emf.henshin.ocl2ac.ocl2gc.util;
 
 import org.eclipse.emf.ecore.EClass;
 
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/util/TranslatorResourceSet.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/util/TranslatorResourceSet.java
similarity index 97%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/util/TranslatorResourceSet.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/util/TranslatorResourceSet.java
index 702a952..0e18fdd 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/util/TranslatorResourceSet.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.ocl2gc/src/org/eclipse/emf/henshin/ocl2ac/ocl2gc/util/TranslatorResourceSet.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.ocl2gc.util;
+package org.eclipse.emf.henshin.ocl2ac.ocl2gc.util;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/.classpath b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/.classpath
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/.classpath
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/.classpath
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.project b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/.project
similarity index 92%
copy from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.project
copy to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/.project
index afc65bc..83281fa 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.project
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>de.unimarburg.swt.ocl2ac.ocl2gc</name>
+	<name>org.eclipse.emf.henshin.ocl2ac.tool</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/META-INF/MANIFEST.MF b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..03ff154
--- /dev/null
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/META-INF/MANIFEST.MF
@@ -0,0 +1,24 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Automate
+Bundle-SymbolicName: org.eclipse.emf.henshin.ocl2ac.tool;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.emf.henshin.ocl2ac.tool.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.emf.common;bundle-version="2.11.1",
+ org.eclipse.core.resources;bundle-version="3.10.1",
+ org.eclipse.emf.henshin.ocl2ac.ocl2gc,
+ org.eclipse.ocl.pivot,
+ org.eclipse.emf.henshin.model;bundle-version="1.4.0",
+ org.eclipse.emf.henshin.editor;bundle-version="1.4.0",
+ org.eclipse.core.filesystem;bundle-version="1.5.0",
+ org.eclipse.emf.henshin.interpreter,
+ org.eclipse.emf.henshin.ocl2ac.gc2ac;bundle-version="1.0.0",
+ org.eclipse.emf.henshin.ocl2ac.model;bundle-version="1.0.0",
+ org.eclipse.emf.common.ui;bundle-version="2.11.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.emf.henshin.ocl2ac.tool,
+ org.eclipse.emf.henshin.ocl2ac.tool.commands,
+ org.eclipse.emf.henshin.ocl2ac.tool.optimizer
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/build.properties b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/build.properties
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/build.properties
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/build.properties
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/icons/import.png b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/icons/import.png
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/icons/import.png
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/icons/import.png
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/icons/integrator-16.png b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/icons/integrator-16.png
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/icons/integrator-16.png
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/icons/integrator-16.png
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/icons/integrator-32.png b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/icons/integrator-32.png
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/icons/integrator-32.png
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/icons/integrator-32.png
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/icons/ocl2ac-16.png b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/icons/ocl2ac-16.png
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/icons/ocl2ac-16.png
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/icons/ocl2ac-16.png
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/icons/ocl2ac-32.png b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/icons/ocl2ac-32.png
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/icons/ocl2ac-32.png
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/icons/ocl2ac-32.png
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/icons/ocl2ac16.png b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/icons/ocl2ac16.png
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/icons/ocl2ac16.png
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/icons/ocl2ac16.png
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/icons/printButton.png b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/icons/printButton.png
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/icons/printButton.png
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/icons/printButton.png
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/icons/translator.png b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/icons/translator.png
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/icons/translator.png
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/icons/translator.png
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/plugin.xml b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/plugin.xml
similarity index 79%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/plugin.xml
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/plugin.xml
index d10cd1c..85c9e1c 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/plugin.xml
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/plugin.xml
@@ -4,7 +4,7 @@
    <extension
          point="org.eclipse.ui.popupMenus">
       <objectContribution
-            id="de.unimarburg.swt.ocl2ac.automate.objectContribution2"
+            id="org.eclipse.emf.henshin.ocl2ac.automate.objectContribution2"
             objectClass="org.eclipse.core.resources.IFile">
          <menu
                icon="icons/ocl2ac16.png"
@@ -16,21 +16,21 @@
             </separator>
          </menu>
          <action
-               class="de.unimarburg.swt.ocl2ac.tool.action.GC2AppCondAction"
+               class="org.eclipse.emf.henshin.ocl2ac.tool.action.GC2AppCondAction"
                enablesFor="2"
                id="ocl2ac.automate.NGCtoACAction"
                label="Integrate Nested Graph Constraints as Application Conditions for Rules"
                menubarPath="ocl2ac.automate.menu/group">
          </action>
          <action
-               class="de.unimarburg.swt.ocl2ac.tool.action.OCL2GCAction"
+               class="org.eclipse.emf.henshin.ocl2ac.tool.action.OCL2GCAction"
                enablesFor="2"
                id="ocl2ac.automate.OCLtoNGCAction"
                label="Translate OCL Constraints to Nested Graph Constraints"
                menubarPath="ocl2ac.automate.menu/group">
          </action>
          <action
-               class="de.unimarburg.swt.ocl2ac.tool.action.LaxCond2GCAction"
+               class="org.eclipse.emf.henshin.ocl2ac.tool.action.LaxCond2GCAction"
                enablesFor="1"
                id="ocl2ac.automate.CCtoNGCAction"
                label="Compact Condition to Nested Condition"
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/Activator.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/Activator.java
similarity index 88%
copy from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/Activator.java
copy to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/Activator.java
index b39c39b..dd2001c 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/src/de/unimarburg/swt/ocl2ac/ocl2gc/Activator.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/Activator.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.ocl2gc;
+package org.eclipse.emf.henshin.ocl2ac.tool;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
@@ -14,7 +14,7 @@
 public class Activator extends AbstractUIPlugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "de.unimarburg.swt.ocl2ac.ocl2gc"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.emf.henshin.ocl2ac.tool"; //$NON-NLS-1$
 
 	// The shared instance
 	private static Activator plugin;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/action/CompCond2AppCondAction.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/action/CompCond2AppCondAction.java
similarity index 97%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/action/CompCond2AppCondAction.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/action/CompCond2AppCondAction.java
index 433838d..c58ad68 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/action/CompCond2AppCondAction.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/action/CompCond2AppCondAction.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.tool.action;
+package org.eclipse.emf.henshin.ocl2ac.tool.action;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -35,7 +35,7 @@
 
 import compactconditionmodel.CompactConditionModel;
 import compactconditionmodel.CompactconditionmodelPackage;
-import de.unimarburg.swt.ocl2ac.tool.ui.WizardLaxCond2AppCond;
+import org.eclipse.emf.henshin.ocl2ac.tool.ui.WizardLaxCond2AppCond;
 import laxcondition.Condition;
 
 public class CompCond2AppCondAction implements IObjectActionDelegate {
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/action/GC2AppCondAction.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/action/GC2AppCondAction.java
similarity index 97%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/action/GC2AppCondAction.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/action/GC2AppCondAction.java
index 60b17e9..292b601 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/action/GC2AppCondAction.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/action/GC2AppCondAction.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.tool.action;
+package org.eclipse.emf.henshin.ocl2ac.tool.action;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -33,7 +33,7 @@
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PlatformUI;
 
-import de.unimarburg.swt.ocl2ac.tool.ui.WizardGC2AppCond;
+import org.eclipse.emf.henshin.ocl2ac.tool.ui.WizardGC2AppCond;
 import nestedcondition.NestedConstraint;
 import nestedconstraintmodel.NestedConstraintModel;
 import nestedconstraintmodel.NestedconstraintmodelPackage;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/action/LaxCond2AppCondAction.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/action/LaxCond2AppCondAction.java
similarity index 97%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/action/LaxCond2AppCondAction.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/action/LaxCond2AppCondAction.java
index 46ad15e..4e00b8f 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/action/LaxCond2AppCondAction.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/action/LaxCond2AppCondAction.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.tool.action;
+package org.eclipse.emf.henshin.ocl2ac.tool.action;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -46,9 +46,9 @@
 import org.eclipse.ui.PlatformUI;
 
 import compactconditionmodel.CompactConditionModel;
-import de.unimarburg.swt.ocl2ac.ocl2gc.core.Completer;
-import de.unimarburg.swt.ocl2ac.ocl2gc.util.Constants;
-import de.unimarburg.swt.ocl2ac.ocl2gc.util.TranslatorResourceSet;
+import org.eclipse.emf.henshin.ocl2ac.ocl2gc.core.Completer;
+import org.eclipse.emf.henshin.ocl2ac.ocl2gc.util.Constants;
+import org.eclipse.emf.henshin.ocl2ac.ocl2gc.util.TranslatorResourceSet;
 import laxcondition.Condition;
 import laxcondition.LaxconditionPackage;
 import laxcondition.util.extensions.LaxConditionSimplifier;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/action/LaxCond2GCAction.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/action/LaxCond2GCAction.java
similarity index 97%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/action/LaxCond2GCAction.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/action/LaxCond2GCAction.java
index 2ffa843..8109489 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/action/LaxCond2GCAction.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/action/LaxCond2GCAction.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.tool.action;
+package org.eclipse.emf.henshin.ocl2ac.tool.action;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -46,9 +46,9 @@
 import org.eclipse.ui.PlatformUI;
 
 import compactconditionmodel.CompactConditionModel;
-import de.unimarburg.swt.ocl2ac.ocl2gc.core.Completer;
-import de.unimarburg.swt.ocl2ac.ocl2gc.util.Constants;
-import de.unimarburg.swt.ocl2ac.ocl2gc.util.TranslatorResourceSet;
+import org.eclipse.emf.henshin.ocl2ac.ocl2gc.core.Completer;
+import org.eclipse.emf.henshin.ocl2ac.ocl2gc.util.Constants;
+import org.eclipse.emf.henshin.ocl2ac.ocl2gc.util.TranslatorResourceSet;
 import laxcondition.Condition;
 import laxcondition.LaxconditionPackage;
 import laxcondition.util.extensions.LaxConditionSimplifier;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/action/OCL2GCAction.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/action/OCL2GCAction.java
similarity index 95%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/action/OCL2GCAction.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/action/OCL2GCAction.java
index 504a6dd..36680d4 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/action/OCL2GCAction.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/action/OCL2GCAction.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.tool.action;
+package org.eclipse.emf.henshin.ocl2ac.tool.action;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -27,10 +27,10 @@
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PlatformUI;
 
-import de.unimarburg.swt.ocl2ac.ocl2gc.core.Completer;
-import de.unimarburg.swt.ocl2ac.ocl2gc.util.Constants;
-import de.unimarburg.swt.ocl2ac.ocl2gc.util.TranslatorResourceSet;
-import de.unimarburg.swt.ocl2ac.tool.commands.OCL2LaxCondCommand;
+import org.eclipse.emf.henshin.ocl2ac.ocl2gc.core.Completer;
+import org.eclipse.emf.henshin.ocl2ac.ocl2gc.util.Constants;
+import org.eclipse.emf.henshin.ocl2ac.ocl2gc.util.TranslatorResourceSet;
+import org.eclipse.emf.henshin.ocl2ac.tool.commands.OCL2LaxCondCommand;
 import laxcondition.Condition;
 import laxcondition.util.extensions.LaxConditionSimplifier;
 import nestedcondition.NestedCondition;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/commands/GC2AppCondCommand.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/commands/GC2AppCondCommand.java
similarity index 95%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/commands/GC2AppCondCommand.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/commands/GC2AppCondCommand.java
index bc9af32..c8b89eb 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/commands/GC2AppCondCommand.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/commands/GC2AppCondCommand.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.tool.commands;
+package org.eclipse.emf.henshin.ocl2ac.tool.commands;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -20,9 +20,9 @@
 import org.eclipse.emf.henshin.model.Module;
 import org.eclipse.emf.henshin.model.Rule;
 
-import de.unimarburg.swt.ocl2ac.gc2ac.core.Integrator;
-import de.unimarburg.swt.ocl2ac.gc2ac.core.Lefter;
-import de.unimarburg.swt.ocl2ac.ocl2gc.util.TranslatorResourceSet;
+import org.eclipse.emf.henshin.ocl2ac.gc2ac.core.Integrator;
+import org.eclipse.emf.henshin.ocl2ac.gc2ac.core.Lefter;
+import org.eclipse.emf.henshin.ocl2ac.ocl2gc.util.TranslatorResourceSet;
 import nestedcondition.NestedCondition;
 import nestedcondition.NestedConstraint;
 
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/commands/LaxCond2AppCondCommand.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/commands/LaxCond2AppCondCommand.java
similarity index 92%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/commands/LaxCond2AppCondCommand.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/commands/LaxCond2AppCondCommand.java
index 21513c2..179b78e 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/commands/LaxCond2AppCondCommand.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/commands/LaxCond2AppCondCommand.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.tool.commands;
+package org.eclipse.emf.henshin.ocl2ac.tool.commands;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -18,9 +18,9 @@
 import org.eclipse.emf.henshin.model.Module;
 import org.eclipse.emf.henshin.model.Rule;
 
-import de.unimarburg.swt.ocl2ac.gc2ac.core.Integrator;
-import de.unimarburg.swt.ocl2ac.gc2ac.core.Lefter;
-import de.unimarburg.swt.ocl2ac.ocl2gc.util.TranslatorResourceSet;
+import org.eclipse.emf.henshin.ocl2ac.gc2ac.core.Integrator;
+import org.eclipse.emf.henshin.ocl2ac.gc2ac.core.Lefter;
+import org.eclipse.emf.henshin.ocl2ac.ocl2gc.util.TranslatorResourceSet;
 import laxcondition.Condition;
 import nestedcondition.NestedCondition;
 import nestedcondition.NestedConstraint;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/commands/LaxCond2GCCommand.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/commands/LaxCond2GCCommand.java
similarity index 97%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/commands/LaxCond2GCCommand.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/commands/LaxCond2GCCommand.java
index 9c763b0..453f391 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/commands/LaxCond2GCCommand.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/commands/LaxCond2GCCommand.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.tool.commands;
+package org.eclipse.emf.henshin.ocl2ac.tool.commands;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -25,7 +25,7 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IActionDelegate;
 
-import de.unimarburg.swt.ocl2ac.ocl2gc.core.Completer;
+import org.eclipse.emf.henshin.ocl2ac.ocl2gc.core.Completer;
 import laxcondition.Condition;
 import laxcondition.LaxconditionPackage;
 import laxcondition.util.extensions.LaxConditionSimplifier;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/commands/OCL2LaxCondCommand.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/commands/OCL2LaxCondCommand.java
similarity index 96%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/commands/OCL2LaxCondCommand.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/commands/OCL2LaxCondCommand.java
index a5f76a1..462922c 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/commands/OCL2LaxCondCommand.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/commands/OCL2LaxCondCommand.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.tool.commands;
+package org.eclipse.emf.henshin.ocl2ac.tool.commands;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -26,7 +26,7 @@
 import org.eclipse.ocl.pivot.PivotFactory;
 import org.eclipse.ocl.pivot.PivotPackage;
 
-import de.unimarburg.swt.ocl2ac.ocl2gc.core.Translator;
+import org.eclipse.emf.henshin.ocl2ac.ocl2gc.core.Translator;
 import graph.GraphFactory;
 import laxcondition.Condition;
 import laxcondition.LaxCondition;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/optimizer/IntegrationChecker.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/optimizer/IntegrationChecker.java
similarity index 97%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/optimizer/IntegrationChecker.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/optimizer/IntegrationChecker.java
index edfbbdf..80e53ef 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/optimizer/IntegrationChecker.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/optimizer/IntegrationChecker.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.tool.optimizer;
+package org.eclipse.emf.henshin.ocl2ac.tool.optimizer;
 
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
@@ -19,8 +19,8 @@
 import org.eclipse.emf.henshin.model.Node;
 import org.eclipse.emf.henshin.model.Rule;
 
-import de.unimarburg.swt.ocl2ac.gc2ac.core.NestedConditionPreparer;
-import de.unimarburg.swt.ocl2ac.gc2ac.util.RuleClassifier;
+import org.eclipse.emf.henshin.ocl2ac.gc2ac.core.NestedConditionPreparer;
+import org.eclipse.emf.henshin.ocl2ac.gc2ac.util.RuleClassifier;
 import laxcondition.Condition;
 import nestedcondition.NestedCondition;
 import nestedcondition.NestedConstraint;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/ui/SWTResourceManager.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/ui/SWTResourceManager.java
similarity index 99%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/ui/SWTResourceManager.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/ui/SWTResourceManager.java
index 3daa583..7fa31d4 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/ui/SWTResourceManager.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/ui/SWTResourceManager.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Google, Inc. - initial API and implementation
  *******************************************************************************/
-package de.unimarburg.swt.ocl2ac.tool.ui;
+package org.eclipse.emf.henshin.ocl2ac.tool.ui;
 
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/ui/WizardGC2AppCond.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/ui/WizardGC2AppCond.java
similarity index 98%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/ui/WizardGC2AppCond.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/ui/WizardGC2AppCond.java
index 2306369..e45d252 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/ui/WizardGC2AppCond.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/ui/WizardGC2AppCond.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.tool.ui;
+package org.eclipse.emf.henshin.ocl2ac.tool.ui;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -33,8 +33,8 @@
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.ui.PlatformUI;
 
-import de.unimarburg.swt.ocl2ac.tool.commands.GC2AppCondCommand;
-import de.unimarburg.swt.ocl2ac.tool.optimizer.IntegrationChecker;
+import org.eclipse.emf.henshin.ocl2ac.tool.commands.GC2AppCondCommand;
+import org.eclipse.emf.henshin.ocl2ac.tool.optimizer.IntegrationChecker;
 import nestedcondition.NestedConstraint;
 
 public class WizardGC2AppCond extends Shell {
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/ui/WizardLaxCond2AppCond.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/ui/WizardLaxCond2AppCond.java
similarity index 98%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/ui/WizardLaxCond2AppCond.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/ui/WizardLaxCond2AppCond.java
index 2084a71..0837917 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/de/unimarburg/swt/ocl2ac/tool/ui/WizardLaxCond2AppCond.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/emf/henshin/ocl2ac/tool/ui/WizardLaxCond2AppCond.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.tool.ui;
+package org.eclipse.emf.henshin.ocl2ac.tool.ui;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -34,8 +34,8 @@
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.ui.PlatformUI;
 
-import de.unimarburg.swt.ocl2ac.tool.commands.LaxCond2AppCondCommand;
-import de.unimarburg.swt.ocl2ac.tool.optimizer.IntegrationChecker;
+import org.eclipse.emf.henshin.ocl2ac.tool.commands.LaxCond2AppCondCommand;
+import org.eclipse.emf.henshin.ocl2ac.tool.optimizer.IntegrationChecker;
 import laxcondition.Condition;
 
 public class WizardLaxCond2AppCond extends Shell {
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/org/eclipse/wb/swt/SWTResourceManager.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/wb/swt/SWTResourceManager.java
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.tool/src/org/eclipse/wb/swt/SWTResourceManager.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.tool/src/org/eclipse/wb/swt/SWTResourceManager.java
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/.classpath b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/.classpath
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/.classpath
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/.classpath
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.project b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/.project
similarity index 92%
copy from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.project
copy to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/.project
index afc65bc..6c9b0b4 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.ocl2gc/.project
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>de.unimarburg.swt.ocl2ac.ocl2gc</name>
+	<name>org.eclipse.emf.henshin.ocl2ac.utils</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/META-INF/MANIFEST.MF b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..b5c6cf3
--- /dev/null
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/META-INF/MANIFEST.MF
@@ -0,0 +1,23 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Utils
+Bundle-SymbolicName: org.eclipse.emf.henshin.ocl2ac.utils;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.emf.henshin.ocl2ac.utils.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.emf.ecore;bundle-version="2.11.2",
+ org.eclipse.emf.henshin.model;bundle-version="1.4.0",
+ org.eclipse.emf.henshin.ocl2ac.gc2ac;bundle-version="1.0.0",
+ org.eclipse.emf.henshin.editor,
+ org.eclipse.emf.henshin.interpreter;bundle-version="1.4.0",
+ org.eclipse.emf.henshin.ocl2ac.model;bundle-version="1.0.0",
+ org.eclipse.emf.edit.ui;bundle-version="2.12.0",
+ org.eclipse.ui.ide;bundle-version="3.12.3",
+ org.apache.commons.io;bundle-version="2.2.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.emf.henshin.ocl2ac.utils.henshin.simplification,
+ org.eclipse.emf.henshin.ocl2ac.utils.printer,
+ org.eclipse.emf.henshin.ocl2ac.utils.viewer
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/build.properties b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/build.properties
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/build.properties
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/build.properties
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/icons/import.png b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/icons/import.png
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/icons/import.png
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/icons/import.png
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/icons/integrator-32.png b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/icons/integrator-32.png
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/icons/integrator-32.png
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/icons/integrator-32.png
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/icons/latex.png b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/icons/latex.png
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/icons/latex.png
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/icons/latex.png
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/icons/ocl2ac-32.png b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/icons/ocl2ac-32.png
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/icons/ocl2ac-32.png
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/icons/ocl2ac-32.png
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/icons/ocl2ac16.png b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/icons/ocl2ac16.png
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/icons/ocl2ac16.png
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/icons/ocl2ac16.png
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/icons/print1.png b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/icons/print1.png
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/icons/print1.png
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/icons/print1.png
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/icons/print2.png b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/icons/print2.png
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/icons/print2.png
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/icons/print2.png
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/icons/printButton.png b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/icons/printButton.png
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/icons/printButton.png
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/icons/printButton.png
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/icons/simplify.png b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/icons/simplify.png
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/icons/simplify.png
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/icons/simplify.png
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/icons/translator.png b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/icons/translator.png
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/icons/translator.png
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/icons/translator.png
Binary files differ
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/pattern/patterns.henshin b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/pattern/patterns.henshin
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/pattern/patterns.henshin
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/pattern/patterns.henshin
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/pattern/patterns.henshin_diagram b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/pattern/patterns.henshin_diagram
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/pattern/patterns.henshin_diagram
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/pattern/patterns.henshin_diagram
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/plugin.xml b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/plugin.xml
similarity index 77%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/plugin.xml
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/plugin.xml
index ccc2205..b0df848 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/plugin.xml
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/plugin.xml
@@ -4,7 +4,7 @@
    <extension
          point="org.eclipse.ui.popupMenus">
       <objectContribution
-            id="de.unimarburg.swt.ocl2ac.objectContribution1"
+            id="org.eclipse.emf.henshin.ocl2ac.objectContribution1"
             objectClass="nestedcondition.NestedConstraint">
          <menu
                icon="icons/ocl2ac16.png"
@@ -16,7 +16,7 @@
             </separator>
          </menu>
          <action
-               class="de.unimarburg.swt.ocl2ac.utils.printer.actions.NGCLaxGenerationActionLongVersion"
+               class="org.eclipse.emf.henshin.ocl2ac.utils.printer.actions.NGCLaxGenerationActionLongVersion"
                icon="icons/latex.png"
                id="ocl2ac.action.GenGCLV"
                label="Generating Latex File for Presenting Graph Constraint (Long Version)"
@@ -24,7 +24,7 @@
                style="push">
          </action>
          <action
-               class="de.unimarburg.swt.ocl2ac.utils.printer.actions.NGCLaxGenerationActionShortVersion"
+               class="org.eclipse.emf.henshin.ocl2ac.utils.printer.actions.NGCLaxGenerationActionShortVersion"
                icon="icons/latex.png"
                id="ocl2ac.action.GenGCSV"
                label="Generating Latex File for Presenting Graph Constraint (Short Version)"
@@ -32,7 +32,7 @@
                style="push">
          </action>
          <action
-               class="de.unimarburg.swt.ocl2ac.utils.printer.actions.NGCPrintViewActionLongVersion"
+               class="org.eclipse.emf.henshin.ocl2ac.utils.printer.actions.NGCPrintViewActionLongVersion"
                icon="icons/print1.png"
                id="ocl2ac.action.printnestedconstraint"
                label="Print and View Nested Graph Constraint (Long Version)"
@@ -40,7 +40,7 @@
                style="push">
          </action>
          <action
-               class="de.unimarburg.swt.ocl2ac.utils.printer.actions.NGCPrintViewActionShortVersion"
+               class="org.eclipse.emf.henshin.ocl2ac.utils.printer.actions.NGCPrintViewActionShortVersion"
                icon="icons/print1.png"
                id="ocl2ac.action.printnestedconstraint"
                label="Print and View Nested Graph Constraint (Short Version)"
@@ -48,7 +48,7 @@
                style="push">
          </action>
          <action
-               class="de.unimarburg.swt.ocl2ac.utils.printer.actions.NGCPrintOpenActionLongVersion"
+               class="org.eclipse.emf.henshin.ocl2ac.utils.printer.actions.NGCPrintOpenActionLongVersion"
                icon="icons/print2.png"
                id="ocl2ac.action.printnestedconstraintOpLV"
                label="Print and Open Nested Graph Constraint (Long Version)"
@@ -56,7 +56,7 @@
                style="push">
          </action>
          <action
-               class="de.unimarburg.swt.ocl2ac.utils.printer.actions.NGCPrintOpenActionShortVersion"
+               class="org.eclipse.emf.henshin.ocl2ac.utils.printer.actions.NGCPrintOpenActionShortVersion"
                icon="icons/print2.png"
                id="ocl2ac.action.printnestedconstraintOpSV"
                label="Print and Open Nested Graph Constraint (Short Version)"
@@ -80,7 +80,7 @@
             </separator>
          </menu>
          <action
-               class="de.unimarburg.swt.ocl2ac.utils.printer.actions.HenshinNACLaxGenerationActionLongVersion"
+               class="org.eclipse.emf.henshin.ocl2ac.utils.printer.actions.HenshinNACLaxGenerationActionLongVersion"
                enablesFor="1"
                icon="icons/latex.png"
                id="henshin.action.nac.GenACLV"
@@ -89,7 +89,7 @@
                style="push">
          </action>
          <action
-               class="de.unimarburg.swt.ocl2ac.utils.printer.actions.HenshinNACLaxGenerationActionShortVersion"
+               class="org.eclipse.emf.henshin.ocl2ac.utils.printer.actions.HenshinNACLaxGenerationActionShortVersion"
                enablesFor="1"
                icon="icons/latex.png"
                id="henshin.action.nac.GenACSV"
@@ -98,7 +98,7 @@
                style="push">
          </action>
          <action
-               class="de.unimarburg.swt.ocl2ac.utils.printer.actions.HenshinNACPrintViewActionLongVersion"
+               class="org.eclipse.emf.henshin.ocl2ac.utils.printer.actions.HenshinNACPrintViewActionLongVersion"
                enablesFor="1"
                icon="icons/print1.png"
                id="henshin.action.nac.printlv"
@@ -107,7 +107,7 @@
                style="push">
          </action>
          <action
-               class="de.unimarburg.swt.ocl2ac.utils.printer.actions.HenshinNACPrintViewActionShortVersion"
+               class="org.eclipse.emf.henshin.ocl2ac.utils.printer.actions.HenshinNACPrintViewActionShortVersion"
                enablesFor="1"
                icon="icons/print1.png"
                id="henshin.action.nac.printsv"
@@ -116,7 +116,7 @@
                style="push">
          </action>
          <action
-               class="de.unimarburg.swt.ocl2ac.utils.printer.actions.HenshinNACPrintOpenActionLongVersion"
+               class="org.eclipse.emf.henshin.ocl2ac.utils.printer.actions.HenshinNACPrintOpenActionLongVersion"
                enablesFor="1"
                icon="icons/print2.png"
                id="henshin.action.nac.printOpLV"
@@ -125,7 +125,7 @@
                style="push">
          </action>
          <action
-               class="de.unimarburg.swt.ocl2ac.utils.printer.actions.HenshinNACPrintOpenActionShortVersion"
+               class="org.eclipse.emf.henshin.ocl2ac.utils.printer.actions.HenshinNACPrintOpenActionShortVersion"
                enablesFor="1"
                icon="icons/print2.png"
                id="henshin.action.nac.printOpSV"
@@ -134,7 +134,7 @@
                style="push">
          </action>
          <action
-               class="de.unimarburg.swt.ocl2ac.utils.printer.actions.HenshinNACSimplifierAction"
+               class="org.eclipse.emf.henshin.ocl2ac.utils.printer.actions.HenshinNACSimplifierAction"
                enablesFor="1"
                icon="icons/simplify.png"
                id="henshin.action.nac.simplify"
@@ -156,7 +156,7 @@
             </separator>
          </menu>
          <action
-               class="de.unimarburg.swt.ocl2ac.utils.printer.actions.HenshinAllRuleNACSimplifierAction"
+               class="org.eclipse.emf.henshin.ocl2ac.utils.printer.actions.HenshinAllRuleNACSimplifierAction"
                enablesFor="1"
                id="henshin.action.nac.simplify.all"
                label="Simplify Application Conditions of All Rules "
@@ -168,7 +168,7 @@
    <extension
          point="org.eclipse.ui.views">
       <view
-            class="de.unimarburg.swt.ocl2ac.utils.viewer.PDFViewer"
+            class="org.eclipse.emf.henshin.ocl2ac.utils.viewer.PDFViewer"
             icon="icons/ocl2ac16.png"
             id="nas.ocl2ac.viewer.PDFViewer"
             name="PDF Viewer">
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/Activator.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/Activator.java
similarity index 88%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/Activator.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/Activator.java
index f16bfba..543824c 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.gc2ac/src/de/unimarburg/swt/ocl2ac/gc2ac/Activator.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/Activator.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.gc2ac;
+package org.eclipse.emf.henshin.ocl2ac.utils;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
@@ -14,7 +14,7 @@
 public class Activator extends AbstractUIPlugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "de.unimarburg.swt.ocl2ac.gc2ac"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.emf.henshin.ocl2ac.utils"; //$NON-NLS-1$
 
 	// The shared instance
 	private static Activator plugin;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/henshin/simplification/EdgeMapping.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/henshin/simplification/EdgeMapping.java
similarity index 88%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/henshin/simplification/EdgeMapping.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/henshin/simplification/EdgeMapping.java
index 396a70b..94bf17a 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/henshin/simplification/EdgeMapping.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/henshin/simplification/EdgeMapping.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.henshin.simplification;
+package org.eclipse.emf.henshin.ocl2ac.utils.henshin.simplification;
 
 import org.eclipse.emf.henshin.model.Edge;
 
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/henshin/simplification/EquivalencesSimplifier.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/henshin/simplification/EquivalencesSimplifier.java
similarity index 99%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/henshin/simplification/EquivalencesSimplifier.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/henshin/simplification/EquivalencesSimplifier.java
index 10f320b..9f74ffb 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/henshin/simplification/EquivalencesSimplifier.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/henshin/simplification/EquivalencesSimplifier.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.henshin.simplification;
+package org.eclipse.emf.henshin.ocl2ac.utils.henshin.simplification;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/henshin/simplification/HenshinNACSimplifier.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/henshin/simplification/HenshinNACSimplifier.java
similarity index 98%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/henshin/simplification/HenshinNACSimplifier.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/henshin/simplification/HenshinNACSimplifier.java
index 1ca1b2e..4e2842f 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/henshin/simplification/HenshinNACSimplifier.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/henshin/simplification/HenshinNACSimplifier.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.henshin.simplification;
+package org.eclipse.emf.henshin.ocl2ac.utils.henshin.simplification;
 
 import java.io.IOException;
 import java.net.URL;
@@ -31,7 +31,7 @@
 import org.eclipse.emf.henshin.model.Rule;
 import org.eclipse.emf.henshin.model.UnaryFormula;
 
-import de.unimarburg.swt.ocl2ac.utils.Activator;
+import org.eclipse.emf.henshin.ocl2ac.utils.Activator;
 
 public class HenshinNACSimplifier {
 
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/henshin/simplification/Intersection.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/henshin/simplification/Intersection.java
similarity index 97%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/henshin/simplification/Intersection.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/henshin/simplification/Intersection.java
index f682158..4fc3f5f 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/henshin/simplification/Intersection.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/henshin/simplification/Intersection.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.henshin.simplification;
+package org.eclipse.emf.henshin.ocl2ac.utils.henshin.simplification;
 
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/henshin/simplification/NasHenshinCommand.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/henshin/simplification/NasHenshinCommand.java
similarity index 97%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/henshin/simplification/NasHenshinCommand.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/henshin/simplification/NasHenshinCommand.java
index fb0fc93..c7b1087 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/henshin/simplification/NasHenshinCommand.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/henshin/simplification/NasHenshinCommand.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.henshin.simplification;
+package org.eclipse.emf.henshin.ocl2ac.utils.henshin.simplification;
 
 import java.util.List;
 
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/henshin/simplification/NodeMapping.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/henshin/simplification/NodeMapping.java
similarity index 88%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/henshin/simplification/NodeMapping.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/henshin/simplification/NodeMapping.java
index 1241949..876244f 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/henshin/simplification/NodeMapping.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/henshin/simplification/NodeMapping.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.henshin.simplification;
+package org.eclipse.emf.henshin.ocl2ac.utils.henshin.simplification;
 
 import org.eclipse.emf.henshin.model.Node;
 
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/CopyCommand.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/CopyCommand.java
similarity index 92%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/CopyCommand.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/CopyCommand.java
index 5b226c2..3b8d73a 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/CopyCommand.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/CopyCommand.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.printer;
+package org.eclipse.emf.henshin.ocl2ac.utils.printer;
 
 import java.io.File;
 import java.io.IOException;
@@ -15,7 +15,7 @@
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 
-import de.unimarburg.swt.ocl2ac.utils.Activator;
+import org.eclipse.emf.henshin.ocl2ac.utils.Activator;
 
 public class CopyCommand {
 
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/CoreCommand.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/CoreCommand.java
similarity index 98%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/CoreCommand.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/CoreCommand.java
index 7d823df..7239184 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/CoreCommand.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/CoreCommand.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.printer;
+package org.eclipse.emf.henshin.ocl2ac.utils.printer;
 
 import java.awt.Desktop;
 import java.io.BufferedReader;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/HenshinNACPrinter.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/HenshinNACPrinter.java
similarity index 98%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/HenshinNACPrinter.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/HenshinNACPrinter.java
index e91fbf7..cff4f07 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/HenshinNACPrinter.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/HenshinNACPrinter.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.printer;
+package org.eclipse.emf.henshin.ocl2ac.utils.printer;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -35,7 +35,7 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 
-import de.unimarburg.swt.ocl2ac.gc2ac.util.GraphAdapter;
+import org.eclipse.emf.henshin.ocl2ac.gc2ac.util.GraphAdapter;
 import graph.Graph;
 import graph.util.extensions.Constants;
 import graph.util.extensions.GraphPrinter;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/NestedConditionPrinter.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/NestedConditionPrinter.java
similarity index 98%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/NestedConditionPrinter.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/NestedConditionPrinter.java
index c581a09..72e1940 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/NestedConditionPrinter.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/NestedConditionPrinter.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.printer;
+package org.eclipse.emf.henshin.ocl2ac.utils.printer;
 
 import java.io.BufferedWriter;
 import java.io.File;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/ViewCommand.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/ViewCommand.java
similarity index 84%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/ViewCommand.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/ViewCommand.java
index 9f59c97..6639919 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/ViewCommand.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/ViewCommand.java
@@ -3,13 +3,13 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.printer;
+package org.eclipse.emf.henshin.ocl2ac.utils.printer;
 
 import java.io.File;
 
 import org.eclipse.ui.PlatformUI;
 
-import de.unimarburg.swt.ocl2ac.utils.viewer.PDFViewer;
+import org.eclipse.emf.henshin.ocl2ac.utils.viewer.PDFViewer;
 
 public class ViewCommand {
 
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinNACLaxGenerationActionLongVersion.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinNACLaxGenerationActionLongVersion.java
similarity index 92%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinNACLaxGenerationActionLongVersion.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinNACLaxGenerationActionLongVersion.java
index 805a7c5..ca7e951 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinNACLaxGenerationActionLongVersion.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinNACLaxGenerationActionLongVersion.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.printer.actions;
+package org.eclipse.emf.henshin.ocl2ac.utils.printer.actions;
 
 import org.eclipse.emf.henshin.model.Rule;
 import org.eclipse.emf.henshin.presentation.HenshinEditor;
@@ -15,7 +15,7 @@
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PlatformUI;
 
-import de.unimarburg.swt.ocl2ac.utils.printer.HenshinNACPrinter;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.HenshinNACPrinter;
 
 public class HenshinNACLaxGenerationActionLongVersion implements IObjectActionDelegate {
 
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinNACLaxGenerationActionShortVersion.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinNACLaxGenerationActionShortVersion.java
similarity index 92%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinNACLaxGenerationActionShortVersion.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinNACLaxGenerationActionShortVersion.java
index c73cc77..2b120dc 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinNACLaxGenerationActionShortVersion.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinNACLaxGenerationActionShortVersion.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.printer.actions;
+package org.eclipse.emf.henshin.ocl2ac.utils.printer.actions;
 
 import org.eclipse.emf.henshin.model.Rule;
 import org.eclipse.emf.henshin.presentation.HenshinEditor;
@@ -15,7 +15,7 @@
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PlatformUI;
 
-import de.unimarburg.swt.ocl2ac.utils.printer.HenshinNACPrinter;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.HenshinNACPrinter;
 
 public class HenshinNACLaxGenerationActionShortVersion implements IObjectActionDelegate {
 
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinNACPrintOpenActionLongVersion.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinNACPrintOpenActionLongVersion.java
similarity index 92%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinNACPrintOpenActionLongVersion.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinNACPrintOpenActionLongVersion.java
index cac1291..fef2b0d 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinNACPrintOpenActionLongVersion.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinNACPrintOpenActionLongVersion.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.printer.actions;
+package org.eclipse.emf.henshin.ocl2ac.utils.printer.actions;
 
 import java.io.File;
 
@@ -16,8 +16,8 @@
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
 
-import de.unimarburg.swt.ocl2ac.utils.printer.CoreCommand;
-import de.unimarburg.swt.ocl2ac.utils.printer.HenshinNACPrinter;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.CoreCommand;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.HenshinNACPrinter;
 import graph.util.extensions.Constants;
 
 public class HenshinNACPrintOpenActionLongVersion implements IObjectActionDelegate {
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinNACPrintOpenActionShortVersion.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinNACPrintOpenActionShortVersion.java
similarity index 92%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinNACPrintOpenActionShortVersion.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinNACPrintOpenActionShortVersion.java
index df50ba2..ef4d9df 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinNACPrintOpenActionShortVersion.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinNACPrintOpenActionShortVersion.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.printer.actions;
+package org.eclipse.emf.henshin.ocl2ac.utils.printer.actions;
 
 import java.io.File;
 
@@ -16,8 +16,8 @@
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
 
-import de.unimarburg.swt.ocl2ac.utils.printer.CoreCommand;
-import de.unimarburg.swt.ocl2ac.utils.printer.HenshinNACPrinter;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.CoreCommand;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.HenshinNACPrinter;
 import graph.util.extensions.Constants;
 
 public class HenshinNACPrintOpenActionShortVersion implements IObjectActionDelegate {
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinNACPrintViewActionLongVersion.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinNACPrintViewActionLongVersion.java
similarity index 90%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinNACPrintViewActionLongVersion.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinNACPrintViewActionLongVersion.java
index 1dea3fb..e064dbd 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinNACPrintViewActionLongVersion.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinNACPrintViewActionLongVersion.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.printer.actions;
+package org.eclipse.emf.henshin.ocl2ac.utils.printer.actions;
 
 import java.io.File;
 
@@ -16,9 +16,9 @@
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
 
-import de.unimarburg.swt.ocl2ac.utils.printer.CoreCommand;
-import de.unimarburg.swt.ocl2ac.utils.printer.HenshinNACPrinter;
-import de.unimarburg.swt.ocl2ac.utils.printer.ViewCommand;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.CoreCommand;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.HenshinNACPrinter;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.ViewCommand;
 import graph.util.extensions.Constants;
 
 public class HenshinNACPrintViewActionLongVersion implements IObjectActionDelegate {
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinNACPrintViewActionShortVersion.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinNACPrintViewActionShortVersion.java
similarity index 90%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinNACPrintViewActionShortVersion.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinNACPrintViewActionShortVersion.java
index c9f4f49..4c0dd57 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinNACPrintViewActionShortVersion.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinNACPrintViewActionShortVersion.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.printer.actions;
+package org.eclipse.emf.henshin.ocl2ac.utils.printer.actions;
 
 import java.io.File;
 
@@ -16,9 +16,9 @@
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
 
-import de.unimarburg.swt.ocl2ac.utils.printer.CoreCommand;
-import de.unimarburg.swt.ocl2ac.utils.printer.HenshinNACPrinter;
-import de.unimarburg.swt.ocl2ac.utils.printer.ViewCommand;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.CoreCommand;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.HenshinNACPrinter;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.ViewCommand;
 import graph.util.extensions.Constants;
 
 public class HenshinNACPrintViewActionShortVersion implements IObjectActionDelegate {
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinNACSimplifierAction.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinNACSimplifierAction.java
similarity index 91%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinNACSimplifierAction.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinNACSimplifierAction.java
index 2c67851..658a3a2 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinNACSimplifierAction.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinNACSimplifierAction.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.printer.actions;
+package org.eclipse.emf.henshin.ocl2ac.utils.printer.actions;
 
 import java.io.IOException;
 
@@ -18,8 +18,8 @@
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PlatformUI;
 
-import de.unimarburg.swt.ocl2ac.utils.henshin.simplification.EquivalencesSimplifier;
-import de.unimarburg.swt.ocl2ac.utils.henshin.simplification.HenshinNACSimplifier;
+import org.eclipse.emf.henshin.ocl2ac.utils.henshin.simplification.EquivalencesSimplifier;
+import org.eclipse.emf.henshin.ocl2ac.utils.henshin.simplification.HenshinNACSimplifier;
 
 public class HenshinNACSimplifierAction implements IObjectActionDelegate {
 
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinRightACPrintOpenActionShortVersion.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinRightACPrintOpenActionShortVersion.java
similarity index 92%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinRightACPrintOpenActionShortVersion.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinRightACPrintOpenActionShortVersion.java
index b480941..fbdc661 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/HenshinRightACPrintOpenActionShortVersion.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/HenshinRightACPrintOpenActionShortVersion.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.printer.actions;
+package org.eclipse.emf.henshin.ocl2ac.utils.printer.actions;
 
 import java.io.File;
 
@@ -16,8 +16,8 @@
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
 
-import de.unimarburg.swt.ocl2ac.utils.printer.CoreCommand;
-import de.unimarburg.swt.ocl2ac.utils.printer.HenshinNACPrinter;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.CoreCommand;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.HenshinNACPrinter;
 import graph.util.extensions.Constants;
 
 public class HenshinRightACPrintOpenActionShortVersion implements IObjectActionDelegate {
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/NGCLaxGenerationActionLongVersion.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/NGCLaxGenerationActionLongVersion.java
similarity index 93%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/NGCLaxGenerationActionLongVersion.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/NGCLaxGenerationActionLongVersion.java
index 6d01d94..84b5e30 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/NGCLaxGenerationActionLongVersion.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/NGCLaxGenerationActionLongVersion.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.printer.actions;
+package org.eclipse.emf.henshin.ocl2ac.utils.printer.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -13,7 +13,7 @@
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PlatformUI;
 
-import de.unimarburg.swt.ocl2ac.utils.printer.NestedConditionPrinter;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.NestedConditionPrinter;
 import nestedcondition.NestedConstraint;
 
 public class NGCLaxGenerationActionLongVersion implements IObjectActionDelegate {
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/NGCLaxGenerationActionShortVersion.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/NGCLaxGenerationActionShortVersion.java
similarity index 93%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/NGCLaxGenerationActionShortVersion.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/NGCLaxGenerationActionShortVersion.java
index adb231b..e9b1b87 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/NGCLaxGenerationActionShortVersion.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/NGCLaxGenerationActionShortVersion.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.printer.actions;
+package org.eclipse.emf.henshin.ocl2ac.utils.printer.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -13,7 +13,7 @@
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PlatformUI;
 
-import de.unimarburg.swt.ocl2ac.utils.printer.NestedConditionPrinter;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.NestedConditionPrinter;
 import nestedcondition.NestedConstraint;
 
 public class NGCLaxGenerationActionShortVersion implements IObjectActionDelegate {
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/NGCPrintOpenActionLongVersion.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/NGCPrintOpenActionLongVersion.java
similarity index 93%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/NGCPrintOpenActionLongVersion.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/NGCPrintOpenActionLongVersion.java
index d89a68c..8ae64a7 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/NGCPrintOpenActionLongVersion.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/NGCPrintOpenActionLongVersion.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.printer.actions;
+package org.eclipse.emf.henshin.ocl2ac.utils.printer.actions;
 
 import java.io.File;
 
@@ -14,8 +14,8 @@
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
 
-import de.unimarburg.swt.ocl2ac.utils.printer.CoreCommand;
-import de.unimarburg.swt.ocl2ac.utils.printer.NestedConditionPrinter;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.CoreCommand;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.NestedConditionPrinter;
 import graph.util.extensions.Constants;
 import nestedcondition.NestedConstraint;
 
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/NGCPrintOpenActionShortVersion.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/NGCPrintOpenActionShortVersion.java
similarity index 93%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/NGCPrintOpenActionShortVersion.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/NGCPrintOpenActionShortVersion.java
index 90f3a3f..01c78e4 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/NGCPrintOpenActionShortVersion.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/NGCPrintOpenActionShortVersion.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.printer.actions;
+package org.eclipse.emf.henshin.ocl2ac.utils.printer.actions;
 
 import java.io.File;
 
@@ -14,8 +14,8 @@
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
 
-import de.unimarburg.swt.ocl2ac.utils.printer.CoreCommand;
-import de.unimarburg.swt.ocl2ac.utils.printer.NestedConditionPrinter;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.CoreCommand;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.NestedConditionPrinter;
 import graph.util.extensions.Constants;
 import nestedcondition.NestedConstraint;
 
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/NGCPrintViewActionLongVersion.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/NGCPrintViewActionLongVersion.java
similarity index 91%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/NGCPrintViewActionLongVersion.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/NGCPrintViewActionLongVersion.java
index bb000c1..43843fd 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/NGCPrintViewActionLongVersion.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/NGCPrintViewActionLongVersion.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.printer.actions;
+package org.eclipse.emf.henshin.ocl2ac.utils.printer.actions;
 
 import java.io.File;
 
@@ -14,9 +14,9 @@
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
 
-import de.unimarburg.swt.ocl2ac.utils.printer.CoreCommand;
-import de.unimarburg.swt.ocl2ac.utils.printer.NestedConditionPrinter;
-import de.unimarburg.swt.ocl2ac.utils.printer.ViewCommand;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.CoreCommand;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.NestedConditionPrinter;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.ViewCommand;
 import graph.util.extensions.Constants;
 import nestedcondition.NestedConstraint;
 
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/NGCPrintViewActionShortVersion.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/NGCPrintViewActionShortVersion.java
similarity index 91%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/NGCPrintViewActionShortVersion.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/NGCPrintViewActionShortVersion.java
index 555dce7..6d5e6d8 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/printer/actions/NGCPrintViewActionShortVersion.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/printer/actions/NGCPrintViewActionShortVersion.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.printer.actions;
+package org.eclipse.emf.henshin.ocl2ac.utils.printer.actions;
 
 import java.io.File;
 
@@ -14,9 +14,9 @@
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
 
-import de.unimarburg.swt.ocl2ac.utils.printer.CoreCommand;
-import de.unimarburg.swt.ocl2ac.utils.printer.NestedConditionPrinter;
-import de.unimarburg.swt.ocl2ac.utils.printer.ViewCommand;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.CoreCommand;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.NestedConditionPrinter;
+import org.eclipse.emf.henshin.ocl2ac.utils.printer.ViewCommand;
 import graph.util.extensions.Constants;
 import nestedcondition.NestedConstraint;
 
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/viewer/PDFViewer.java b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/viewer/PDFViewer.java
similarity index 96%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/viewer/PDFViewer.java
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/viewer/PDFViewer.java
index 09b9432..ab8d1d2 100644
--- a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/src/de/unimarburg/swt/ocl2ac/utils/viewer/PDFViewer.java
+++ b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/src/org/eclipse/emf/henshin/ocl2ac/utils/viewer/PDFViewer.java
@@ -3,7 +3,7 @@
  * OCL2AC is developed by Nebras Nassar based on an initial version developed by Thorsten Arendt and Jan Steffen Becker.
  * </copyright>
  */
-package de.unimarburg.swt.ocl2ac.utils.viewer;
+package org.eclipse.emf.henshin.ocl2ac.utils.viewer;
 
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.IToolBarManager;
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/supplementary/tex/texstyles/tikz-cellular.sty b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/supplementary/tex/texstyles/tikz-cellular.sty
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/supplementary/tex/texstyles/tikz-cellular.sty
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/supplementary/tex/texstyles/tikz-cellular.sty
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/supplementary/tex/texstyles/tikz-extension.sty b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/supplementary/tex/texstyles/tikz-extension.sty
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/supplementary/tex/texstyles/tikz-extension.sty
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/supplementary/tex/texstyles/tikz-extension.sty
diff --git a/plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/supplementary/tex/texstyles/tikz-vcond.sty b/plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/supplementary/tex/texstyles/tikz-vcond.sty
similarity index 100%
rename from plugins/ocl2ac/de.unimarburg.swt.ocl2ac.utils/supplementary/tex/texstyles/tikz-vcond.sty
rename to plugins/ocl2ac/org.eclipse.emf.henshin.ocl2ac.utils/supplementary/tex/texstyles/tikz-vcond.sty