2 metrics moved from ...ecore to ...ecore.compositional
diff --git a/org.eclipse.emf.refactor.metrics.ecore.compositional/.classpath b/org.eclipse.emf.refactor.metrics.ecore.compositional/.classpath
new file mode 100644
index 0000000..8a8f166
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.compositional/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/org.eclipse.emf.refactor.metrics.ecore.compositional/.project b/org.eclipse.emf.refactor.metrics.ecore.compositional/.project
new file mode 100644
index 0000000..1cbe8cc
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.compositional/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.emf.refactor.metrics.ecore.compositional</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/org.eclipse.emf.refactor.metrics.ecore.compositional/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.emf.refactor.metrics.ecore.compositional/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f287d53
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.compositional/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

+org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.source=1.6

diff --git a/org.eclipse.emf.refactor.metrics.ecore.compositional/META-INF/MANIFEST.MF b/org.eclipse.emf.refactor.metrics.ecore.compositional/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..8aec15b
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.compositional/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: MetricsEcoreCompositional
+Bundle-SymbolicName: org.eclipse.emf.refactor.metrics.ecore.compositional;singleton:=true
+Bundle-Version: 0.7.0
+Bundle-Activator: org.eclipse.emf.refactor.metrics.ecore.compositional.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;bundle-version="2.8.1",
+ org.eclipse.emf.refactor.metrics
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.eclipse.emf.refactor.metrics.ecore.compositional/bin/org/eclipse/emf/refactor/metrics/ecore/compositional/Activator.class b/org.eclipse.emf.refactor.metrics.ecore.compositional/bin/org/eclipse/emf/refactor/metrics/ecore/compositional/Activator.class
new file mode 100644
index 0000000..6f4f314
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.compositional/bin/org/eclipse/emf/refactor/metrics/ecore/compositional/Activator.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/AvEPEOEC.class b/org.eclipse.emf.refactor.metrics.ecore.compositional/bin/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/AvEPEOEC.class
similarity index 74%
rename from org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/AvEPEOEC.class
rename to org.eclipse.emf.refactor.metrics.ecore.compositional/bin/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/AvEPEOEC.class
index 38fa58d..6473941 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/AvEPEOEC.class
+++ b/org.eclipse.emf.refactor.metrics.ecore.compositional/bin/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/AvEPEOEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NFEEC.class b/org.eclipse.emf.refactor.metrics.ecore.compositional/bin/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/NFEEC.class
similarity index 74%
rename from org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NFEEC.class
rename to org.eclipse.emf.refactor.metrics.ecore.compositional/bin/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/NFEEC.class
index c806053..34a1578 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NFEEC.class
+++ b/org.eclipse.emf.refactor.metrics.ecore.compositional/bin/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/NFEEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore.compositional/build.properties b/org.eclipse.emf.refactor.metrics.ecore.compositional/build.properties
new file mode 100644
index 0000000..b80a78c
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.compositional/build.properties
@@ -0,0 +1,13 @@
+source.. = src/

+output.. = bin/

+bin.includes = META-INF/,\

+               .,\

+               plugin.xml,\

+               bin/,\

+               build.properties,\

+               src/

+src.includes = src/,\

+               plugin.xml,\

+               build.properties,\

+               bin/,\

+               META-INF/

diff --git a/org.eclipse.emf.refactor.metrics.ecore.compositional/plugin.xml b/org.eclipse.emf.refactor.metrics.ecore.compositional/plugin.xml
new file mode 100644
index 0000000..878db6c
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.compositional/plugin.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>

+<plugin>

+   <extension

+         point="org.eclipse.emf.refactor.metrics">

+      <metric

+            id="org.eclipse.emf.refactor.metrics.ecore.avepeoec"

+            metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.compositional.eclass.AvEPEOEC"

+            metric_context="EClass"

+            metric_description="Average number of EParameters in EOperations of the given EClass."

+            metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"

+            metric_name="AvEPEOEC">

+      </metric>

+      <metric

+            id="org.eclipse.emf.refactor.metrics.ecore.nfeec"

+            metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.compositional.eclass.NFEEC"

+            metric_context="EClass"

+            metric_description="Number of features (EAttributes and EOperations) of the given EClass."

+            metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"

+            metric_name="NFEEC">

+      </metric>

+   </extension>

+

+</plugin>

diff --git a/org.eclipse.emf.refactor.metrics.ecore.compositional/src/org/eclipse/emf/refactor/metrics/ecore/compositional/Activator.java b/org.eclipse.emf.refactor.metrics.ecore.compositional/src/org/eclipse/emf/refactor/metrics/ecore/compositional/Activator.java
new file mode 100644
index 0000000..339d034
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.compositional/src/org/eclipse/emf/refactor/metrics/ecore/compositional/Activator.java
@@ -0,0 +1,50 @@
+package org.eclipse.emf.refactor.metrics.ecore.compositional;

+

+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 = "org.eclipse.emf.refactor.metrics.ecore.compositional"; //$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/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/AvEPEOEC.java b/org.eclipse.emf.refactor.metrics.ecore.compositional/src/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/AvEPEOEC.java
similarity index 93%
rename from org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/AvEPEOEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.compositional/src/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/AvEPEOEC.java
index 44f7dd4..4e109d3 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/AvEPEOEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.compositional/src/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/AvEPEOEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.compositional.eclass;
 
 import java.util.List;
 import org.eclipse.emf.ecore.EObject;
diff --git a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NFEEC.java b/org.eclipse.emf.refactor.metrics.ecore.compositional/src/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/NFEEC.java
similarity index 93%
rename from org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NFEEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.compositional/src/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/NFEEC.java
index 08805b3..6774d39 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NFEEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.compositional/src/org/eclipse/emf/refactor/metrics/ecore/compositional/eclass/NFEEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.compositional.eclass;
 
 import java.util.List;
 import org.eclipse.emf.ecore.EObject;
diff --git a/org.eclipse.emf.refactor.metrics.ecore.henshin/META-INF/MANIFEST.MF b/org.eclipse.emf.refactor.metrics.ecore.henshin/META-INF/MANIFEST.MF
index b95c72e..ea385ee 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.henshin/META-INF/MANIFEST.MF
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/META-INF/MANIFEST.MF
@@ -5,6 +5,9 @@
 Bundle-Version: 0.7.0
 Bundle-Activator: org.eclipse.emf.refactor.metrics.ecore.henshin.Activator
 Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime
+ org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;bundle-version="2.8.1",
+ org.eclipse.emf.refactor.metrics;bundle-version="0.7.0",
+ org.eclipse.emf.refactor.metrics.henshin;bundle-version="0.7.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEC.class b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEOEC.class
similarity index 71%
rename from org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEC.class
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEOEC.class
index 04757bd..f6c902c 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEC.class
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEOEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ECEPEC.class b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEPEC.class
similarity index 61%
rename from org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ECEPEC.class
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEPEC.class
index 8b3d3a9..a4b4724 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ECEPEC.class
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEPEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEC.class b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEREC.class
similarity index 71%
copy from org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEC.class
copy to org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEREC.class
index 04757bd..531d006 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEC.class
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEREC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEC.class b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPEC.class
similarity index 61%
copy from org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEC.class
copy to org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPEC.class
index 04757bd..b918a21 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEC.class
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEC.class b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPECEC.class
similarity index 70%
copy from org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEC.class
copy to org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPECEC.class
index 04757bd..c26b2a0 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEC.class
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPECEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEC.class b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPEIEC.class
similarity index 70%
copy from org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEC.class
copy to org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPEIEC.class
index 04757bd..dcd0b9a 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEC.class
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPEIEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUBEC.class b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/NSUBEC.class
similarity index 61%
rename from org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUBEC.class
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/NSUBEC.class
index 0d4061b..ee3604a 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUBEC.class
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/NSUBEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUBEC2.class b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/NSUBEC2.class
similarity index 61%
rename from org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUBEC2.class
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/NSUBEC2.class
index 03f5f8b..5fbdc68 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUBEC2.class
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/bin/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/NSUBEC2.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore.henshin/build.properties b/org.eclipse.emf.refactor.metrics.ecore.henshin/build.properties
index 34d2e4d..c1ed33c 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.henshin/build.properties
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/build.properties
@@ -1,4 +1,15 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               plugin.xml,\
+               bin/,\
+               build.properties,\
+               src/,\
+               transformations/
+src.includes = transformations/,\
+               src/,\
+               plugin.xml,\
+               build.properties,\
+               bin/,\
+               META-INF/
diff --git a/org.eclipse.emf.refactor.metrics.ecore.henshin/plugin.xml b/org.eclipse.emf.refactor.metrics.ecore.henshin/plugin.xml
new file mode 100644
index 0000000..3e4b43a
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/plugin.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>

+<plugin>

+   <extension

+         point="org.eclipse.emf.refactor.metrics">

+      <metric

+            id="org.eclipse.emf.refactor.metrics.ecore.eceoec"

+            metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclass.ECEOEC"

+            metric_context="EClass"

+            metric_description="Number of EReferences of other EClasses having the given EClass as type."

+            metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"

+            metric_name="ECEOEC">

+      </metric>

+      <metric

+            id="org.eclipse.emf.refactor.metrics.ecore.ecerec"

+            metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclass.ECEREC"

+            metric_context="EClass"

+            metric_description="Number of EReferences of other EClasses having the given EClass as type."

+            metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"

+            metric_name="ECEREC">

+      </metric>

+      <metric

+            id="org.eclipse.emf.refactor.metrics.ecore.ecepec"

+            metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclass.ECEPEC"

+            metric_context="EClass"

+            metric_description="Number of EParameters within other EClasses having the given EClass as type."

+            metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"

+            metric_name="ECEPEC">

+      </metric>

+      <metric

+            id="org.eclipse.emf.refactor.metrics.ecore.icepeiec"

+            metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclass.ICEPEIEC"

+            metric_context="EClass"

+            metric_description="Number of EParameters within the EClass having another interface as type."

+            metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"

+            metric_name="ICEPEIEC">

+      </metric>

+      <metric

+            id="org.eclipse.emf.refactor.metrics.ecore.icepecec"

+            metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclass.ICEPECEC"

+            metric_context="EClass"

+            metric_description="Number of EParameters within the EClass having another EClass as type."

+            metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"

+            metric_name="ICEPECEC">

+      </metric>

+      <metric

+            id="org.eclipse.emf.refactor.metrics.ecore.icepec"

+            metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclass.ICEPEC"

+            metric_context="EClass"

+            metric_description="Number of EParameters within the EClass having another EClass or interface as type."

+            metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"

+            metric_name="ICEPEC">

+      </metric>

+      <metric

+            id="org.eclipse.emf.refactor.metrics.ecore.nsubec2"

+            metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclass.NSUBEC2"

+            metric_context="EClass"

+            metric_description="Number of all child EClasses of the given EClass."

+            metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"

+            metric_name="NSUBEC2">

+      </metric>

+      <metric

+            id="org.eclipse.emf.refactor.metrics.ecore.nsubec"

+            metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.henshin.eclass.NSUBEC"

+            metric_context="EClass"

+            metric_description="Number of direct child EClasses of the given EClass."

+            metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"

+            metric_name="NSUBEC">

+      </metric>

+   </extension>

+

+</plugin>

diff --git a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/ECEOEC.java b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEOEC.java
similarity index 79%
rename from org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/ECEOEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEOEC.java
index 9c74631..f5cce84 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/ECEOEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEOEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.henshin.eclass;
 
 import java.io.IOException;
 import java.net.URL;
@@ -8,6 +8,7 @@
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.refactor.metrics.ecore.henshin.Activator;
 import org.eclipse.emf.refactor.metrics.henshin.managers.HenshinManager;
 import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
 
@@ -29,7 +30,7 @@
 	}
 	
 	private String getFullPath(String transformationPath){
-		URL url = FileLocator.find(org.eclipse.emf.refactor.metrics.ecore.Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
+		URL url = FileLocator.find(Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
 		URL fileUrl = null;
 		try {
 			fileUrl = FileLocator.toFileURL(url);
diff --git a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/ECEPEC.java b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEPEC.java
similarity index 79%
rename from org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/ECEPEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEPEC.java
index b062fa8..3b0836a 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/ECEPEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEPEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.henshin.eclass;
 
 import java.io.IOException;
 import java.net.URL;
@@ -8,6 +8,7 @@
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.refactor.metrics.ecore.henshin.Activator;
 import org.eclipse.emf.refactor.metrics.henshin.managers.HenshinManager;
 import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
 
@@ -30,7 +31,7 @@
 	}
 	
 	private String getFullPath(String transformationPath){
-		URL url = FileLocator.find(org.eclipse.emf.refactor.metrics.ecore.Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
+		URL url = FileLocator.find(Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
 		URL fileUrl = null;
 		try {
 			fileUrl = FileLocator.toFileURL(url);
diff --git a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/ECEREC.java b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEREC.java
similarity index 79%
rename from org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/ECEREC.java
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEREC.java
index 8dea356..18771e9 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/ECEREC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ECEREC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.henshin.eclass;
 
 import java.io.IOException;
 import java.net.URL;
@@ -8,6 +8,7 @@
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.refactor.metrics.ecore.henshin.Activator;
 import org.eclipse.emf.refactor.metrics.henshin.managers.HenshinManager;
 import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
 
@@ -29,7 +30,7 @@
 	}
 	
 	private String getFullPath(String transformationPath){
-		URL url = FileLocator.find(org.eclipse.emf.refactor.metrics.ecore.Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
+		URL url = FileLocator.find(Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
 		URL fileUrl = null;
 		try {
 			fileUrl = FileLocator.toFileURL(url);
diff --git a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEC.java b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPEC.java
similarity index 79%
rename from org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPEC.java
index d6f3bab..c838bb6 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.henshin.eclass;
 
 import java.io.IOException;
 import java.net.URL;
@@ -8,6 +8,7 @@
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.refactor.metrics.ecore.henshin.Activator;
 import org.eclipse.emf.refactor.metrics.henshin.managers.HenshinManager;
 import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
 
@@ -30,7 +31,7 @@
 	}
 	
 	private String getFullPath(String transformationPath){
-		URL url = FileLocator.find(org.eclipse.emf.refactor.metrics.ecore.Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
+		URL url = FileLocator.find(Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
 		URL fileUrl = null;
 		try {
 			fileUrl = FileLocator.toFileURL(url);
diff --git a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPECEC.java b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPECEC.java
similarity index 79%
rename from org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPECEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPECEC.java
index d97ec11..c85624b 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPECEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPECEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.henshin.eclass;
 
 import java.io.IOException;
 import java.net.URL;
@@ -8,6 +8,7 @@
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.refactor.metrics.ecore.henshin.Activator;
 import org.eclipse.emf.refactor.metrics.henshin.managers.HenshinManager;
 import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
 
@@ -29,7 +30,7 @@
 	}
 		
 	private String getFullPath(String transformationPath){
-		URL url = FileLocator.find(org.eclipse.emf.refactor.metrics.ecore.Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
+		URL url = FileLocator.find(Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
 		URL fileUrl = null;
 		try {
 			fileUrl = FileLocator.toFileURL(url);
diff --git a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEIEC.java b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPEIEC.java
similarity index 79%
rename from org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEIEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPEIEC.java
index 6af4589..e716619 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEIEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/ICEPEIEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.henshin.eclass;
 
 import java.io.IOException;
 import java.net.URL;
@@ -8,6 +8,7 @@
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.refactor.metrics.ecore.henshin.Activator;
 import org.eclipse.emf.refactor.metrics.henshin.managers.HenshinManager;
 import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
 
@@ -29,7 +30,7 @@
 	}
 		
 	private String getFullPath(String transformationPath){
-		URL url = FileLocator.find(org.eclipse.emf.refactor.metrics.ecore.Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
+		URL url = FileLocator.find(Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
 		URL fileUrl = null;
 		try {
 			fileUrl = FileLocator.toFileURL(url);
diff --git a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUBEC.java b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/NSUBEC.java
similarity index 79%
rename from org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUBEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/NSUBEC.java
index ce78b1f..ecdba82 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUBEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/NSUBEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.henshin.eclass;
 
 import java.io.IOException;
 import java.net.URL;
@@ -8,6 +8,7 @@
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.refactor.metrics.ecore.henshin.Activator;
 import org.eclipse.emf.refactor.metrics.henshin.managers.HenshinManager;
 import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
 
@@ -30,7 +31,7 @@
 	}
 	
 	private String getFullPath(String transformationPath){
-		URL url = FileLocator.find(org.eclipse.emf.refactor.metrics.ecore.Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
+		URL url = FileLocator.find(Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
 		URL fileUrl = null;
 		try {
 			fileUrl = FileLocator.toFileURL(url);
diff --git a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUBEC2.java b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/NSUBEC2.java
similarity index 79%
rename from org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUBEC2.java
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/NSUBEC2.java
index ec79e56..cb14f01 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUBEC2.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/src/org/eclipse/emf/refactor/metrics/ecore/henshin/eclass/NSUBEC2.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.henshin.eclass;
 
 import java.io.IOException;
 import java.net.URL;
@@ -8,6 +8,7 @@
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.refactor.metrics.ecore.henshin.Activator;
 import org.eclipse.emf.refactor.metrics.henshin.managers.HenshinManager;
 import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
 
@@ -30,7 +31,7 @@
 	}
 	
 	private String getFullPath(String transformationPath){
-		URL url = FileLocator.find(org.eclipse.emf.refactor.metrics.ecore.Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
+		URL url = FileLocator.find(Activator.getDefault().getBundle(), new Path(transformationPath), Collections.EMPTY_MAP);
 		URL fileUrl = null;
 		try {
 			fileUrl = FileLocator.toFileURL(url);
diff --git a/org.eclipse.emf.refactor.metrics.ecore/transformations/ECEOEC.henshin b/org.eclipse.emf.refactor.metrics.ecore.henshin/transformations/ECEOEC.henshin
similarity index 100%
rename from org.eclipse.emf.refactor.metrics.ecore/transformations/ECEOEC.henshin
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/transformations/ECEOEC.henshin
diff --git a/org.eclipse.emf.refactor.metrics.ecore/transformations/ECEPEC.henshin b/org.eclipse.emf.refactor.metrics.ecore.henshin/transformations/ECEPEC.henshin
similarity index 100%
rename from org.eclipse.emf.refactor.metrics.ecore/transformations/ECEPEC.henshin
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/transformations/ECEPEC.henshin
diff --git a/org.eclipse.emf.refactor.metrics.ecore/transformations/ECEREC.henshin b/org.eclipse.emf.refactor.metrics.ecore.henshin/transformations/ECEREC.henshin
similarity index 100%
rename from org.eclipse.emf.refactor.metrics.ecore/transformations/ECEREC.henshin
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/transformations/ECEREC.henshin
diff --git a/org.eclipse.emf.refactor.metrics.ecore/transformations/ICEPEC.henshin b/org.eclipse.emf.refactor.metrics.ecore.henshin/transformations/ICEPEC.henshin
similarity index 100%
rename from org.eclipse.emf.refactor.metrics.ecore/transformations/ICEPEC.henshin
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/transformations/ICEPEC.henshin
diff --git a/org.eclipse.emf.refactor.metrics.ecore/transformations/ICEPECEC.henshin b/org.eclipse.emf.refactor.metrics.ecore.henshin/transformations/ICEPECEC.henshin
similarity index 100%
rename from org.eclipse.emf.refactor.metrics.ecore/transformations/ICEPECEC.henshin
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/transformations/ICEPECEC.henshin
diff --git a/org.eclipse.emf.refactor.metrics.ecore/transformations/ICEPEIEC.henshin b/org.eclipse.emf.refactor.metrics.ecore.henshin/transformations/ICEPEIEC.henshin
similarity index 100%
rename from org.eclipse.emf.refactor.metrics.ecore/transformations/ICEPEIEC.henshin
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/transformations/ICEPEIEC.henshin
diff --git a/org.eclipse.emf.refactor.metrics.ecore/transformations/NSUBEC.henshin b/org.eclipse.emf.refactor.metrics.ecore.henshin/transformations/NSUBEC.henshin
similarity index 100%
rename from org.eclipse.emf.refactor.metrics.ecore/transformations/NSUBEC.henshin
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/transformations/NSUBEC.henshin
diff --git a/org.eclipse.emf.refactor.metrics.ecore/transformations/NSUBEC2.henshin b/org.eclipse.emf.refactor.metrics.ecore.henshin/transformations/NSUBEC2.henshin
similarity index 100%
rename from org.eclipse.emf.refactor.metrics.ecore/transformations/NSUBEC2.henshin
rename to org.eclipse.emf.refactor.metrics.ecore.henshin/transformations/NSUBEC2.henshin
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/META-INF/MANIFEST.MF b/org.eclipse.emf.refactor.metrics.ecore.ocl/META-INF/MANIFEST.MF
index e83e27b..4609d36 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.ocl/META-INF/MANIFEST.MF
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/META-INF/MANIFEST.MF
@@ -5,6 +5,9 @@
 Bundle-Version: 0.7.0
 Bundle-Activator: org.eclipse.emf.refactor.metrics.ecore.ocl.Activator
 Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime
+ org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;bundle-version="2.8.1",
+ org.eclipse.emf.refactor.metrics;bundle-version="0.7.0",
+ org.eclipse.emf.refactor.metrics.ocl;bundle-version="0.7.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NCEAEC.class b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NCEAEC.class
similarity index 82%
rename from org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NCEAEC.class
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NCEAEC.class
index 0e3008f..9a555f4 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NCEAEC.class
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NCEAEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NDEROEC.class b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NDEROEC.class
similarity index 82%
rename from org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NDEROEC.class
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NDEROEC.class
index 32eff5f..90ba484 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NDEROEC.class
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NDEROEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NEAEC.class b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEAEC.class
similarity index 82%
rename from org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NEAEC.class
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEAEC.class
index 8c29fd1..7d7355d 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NEAEC.class
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEAEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NEOEC.class b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEOEC.class
similarity index 82%
rename from org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NEOEC.class
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEOEC.class
index 6d65215..866b922 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NEOEC.class
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEOEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NEREC.class b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEREC.class
similarity index 82%
rename from org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NEREC.class
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEREC.class
index 19e75fe..edaf2e5 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NEREC.class
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEREC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NEROEC.class b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEROEC.class
similarity index 82%
rename from org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NEROEC.class
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEROEC.class
index 6c6f7a6..b3370cc 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NEROEC.class
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEROEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NERSEC.class b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NERSEC.class
similarity index 82%
rename from org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NERSEC.class
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NERSEC.class
index 0e037c1..47e28c6 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NERSEC.class
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NERSEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NPECEC.class b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NPECEC.class
similarity index 82%
rename from org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NPECEC.class
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NPECEC.class
index aa77de9..6db1995 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NPECEC.class
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NPECEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUPEC.class b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NSUPEC.class
similarity index 81%
rename from org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUPEC.class
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NSUPEC.class
index 1d0c237..ce66356 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUPEC.class
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NSUPEC.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUPEC2.class b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NSUPEC2.class
similarity index 81%
rename from org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUPEC2.class
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NSUPEC2.class
index 5acd1d5..0f84846 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUPEC2.class
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/bin/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NSUPEC2.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/build.properties b/org.eclipse.emf.refactor.metrics.ecore.ocl/build.properties
index 34d2e4d..d8fd41a 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.ocl/build.properties
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/build.properties
@@ -1,4 +1,13 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               plugin.xml,\
+               bin/,\
+               build.properties,\
+               src/
+src.includes = src/,\
+               plugin.xml,\
+               build.properties,\
+               bin/,\
+               META-INF/
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/plugin.xml b/org.eclipse.emf.refactor.metrics.ecore.ocl/plugin.xml
new file mode 100644
index 0000000..fbe3690
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/plugin.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>

+<plugin>

+   <extension

+         point="org.eclipse.emf.refactor.metrics">

+      <metric

+            id="org.eclipse.emf.refactor.metrics.ecore.nceaec"

+            metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclass.NCEAEC"

+            metric_context="EClass"

+            metric_description="Number of constant EAttributes of the given EClass."

+            metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"

+            metric_name="NCEAEC">

+      </metric>

+      <metric

+            id="org.eclipse.emf.refactor.metrics.ecore.nderoec"

+            metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclass.NDEROEC"

+            metric_context="EClass"

+            metric_description="Number of different EClasses being referenced by the given EClass."

+            metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"

+            metric_name="NDEROEC">

+      </metric>

+      <metric

+            id="org.eclipse.emf.refactor.metrics.ecore.npecec"

+            metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclass.NPECEC"

+            metric_context="EClass"

+            metric_description="Number of EClasses being parts of the given EClass."

+            metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"

+            metric_name="NPECEC">

+      </metric>

+      <metric

+            id="org.eclipse.emf.refactor.metrics.ecore.neroec"

+            metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclass.NEROEC"

+            metric_context="EClass"

+            metric_description="Number of EReferences of the given EClass to other EClasses."

+            metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"

+            metric_name="NEROEC">

+      </metric>

+      <metric

+            id="org.eclipse.emf.refactor.metrics.ecore.nersec"

+            metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclass.NERSEC"

+            metric_context="EClass"

+            metric_description="Number of EReferences of the given EClass to itself."

+            metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"

+            metric_name="NERSEC">

+      </metric>

+      <metric

+            id="org.eclipse.emf.refactor.metrics.ecore.nerec"

+            metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclass.NEREC"

+            metric_context="EClass"

+            metric_description="Total number of EReferences of the given EClass."

+            metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"

+            metric_name="NEREC">

+      </metric>

+      <metric

+            id="org.eclipse.emf.refactor.metrics.ecore.neaec"

+            metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclass.NEAEC"

+            metric_context="EClass"

+            metric_description="Number of EAttributes of the given EClass."

+            metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"

+            metric_name="NEAEC">

+      </metric>

+      <metric

+            id="org.eclipse.emf.refactor.metrics.ecore.neoec"

+            metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclass.NEOEC"

+            metric_context="EClass"

+            metric_description="Number of EOperations of the given EClass."

+            metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"

+            metric_name="NEOEC">

+      </metric>

+      <metric

+            id="org.eclipse.emf.refactor.metrics.ecore.nsupec2"

+            metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclass.NSUPEC2"

+            metric_context="EClass"

+            metric_description="Total number of ancestors of the given EClass."

+            metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"

+            metric_name="NSUPEC2">

+      </metric>

+      <metric

+            id="org.eclipse.emf.refactor.metrics.ecore.nsupec"

+            metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.ocl.eclass.NSUPEC"

+            metric_context="EClass"

+            metric_description="Number of direct parent EClasses of the given EClass."

+            metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"

+            metric_name="NSUPEC">

+      </metric>

+   </extension>

+

+</plugin>

diff --git a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NCEAEC.java b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NCEAEC.java
similarity index 91%
rename from org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NCEAEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NCEAEC.java
index 4fa4741..3020df1 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NCEAEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NCEAEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.ocl.eclass;
 
 import java.util.List;
 
diff --git a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NDEROEC.java b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NDEROEC.java
similarity index 91%
rename from org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NDEROEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NDEROEC.java
index 90d64cd..b94fc1d 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NDEROEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NDEROEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.ocl.eclass;
 
 import java.util.List;
 
diff --git a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NEAEC.java b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEAEC.java
similarity index 90%
rename from org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NEAEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEAEC.java
index 6c56726..dcd41ee 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NEAEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEAEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.ocl.eclass;
 
 import java.util.List;
 import org.eclipse.emf.ecore.EObject;
diff --git a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NEOEC.java b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEOEC.java
similarity index 90%
rename from org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NEOEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEOEC.java
index d5dd510..37b08c2 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NEOEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEOEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.ocl.eclass;
 
 import java.util.List;
 import org.eclipse.emf.ecore.EObject;
diff --git a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NEREC.java b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEREC.java
similarity index 90%
rename from org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NEREC.java
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEREC.java
index c1df0de..d468b17 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NEREC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEREC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.ocl.eclass;
 
 import java.util.List;
 import org.eclipse.emf.ecore.EObject;
diff --git a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NEROEC.java b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEROEC.java
similarity index 91%
rename from org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NEROEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEROEC.java
index 03cd7af..a6cebfb 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NEROEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NEROEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.ocl.eclass;
 
 import java.util.List;
 import org.eclipse.emf.ecore.EObject;
diff --git a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NERSEC.java b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NERSEC.java
similarity index 91%
rename from org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NERSEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NERSEC.java
index 991c68b..e6ea6bf 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NERSEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NERSEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.ocl.eclass;
 
 import java.util.List;
 import org.eclipse.emf.ecore.EObject;
diff --git a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NPECEC.java b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NPECEC.java
similarity index 91%
rename from org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NPECEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NPECEC.java
index 211e3dc..1a05bdd 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NPECEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NPECEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.ocl.eclass;
 
 import java.util.List;
 import org.eclipse.emf.ecore.EObject;
diff --git a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUPEC.java b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NSUPEC.java
similarity index 90%
rename from org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUPEC.java
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NSUPEC.java
index b7cd69c..429b9db 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUPEC.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NSUPEC.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.ocl.eclass;
 
 import java.util.List;
 import org.eclipse.emf.ecore.EObject;
diff --git a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUPEC2.java b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NSUPEC2.java
similarity index 91%
rename from org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUPEC2.java
rename to org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NSUPEC2.java
index fff6503..153d0f0 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/src/org/eclipse/emf/refactor/metrics/ecore/eclass/NSUPEC2.java
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/src/org/eclipse/emf/refactor/metrics/ecore/ocl/eclass/NSUPEC2.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.ecore.eclass;
+package org.eclipse.emf.refactor.metrics.ecore.ocl.eclass;
 
 import java.util.List;
 import org.eclipse.emf.ecore.EObject;
diff --git a/org.eclipse.emf.refactor.metrics.ecore/META-INF/MANIFEST.MF b/org.eclipse.emf.refactor.metrics.ecore/META-INF/MANIFEST.MF
index e8c6864..75d5303 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/META-INF/MANIFEST.MF
+++ b/org.eclipse.emf.refactor.metrics.ecore/META-INF/MANIFEST.MF
@@ -1,7 +1,8 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.eclipse.em
- f.ecore,org.eclipse.emf.refactor.metrics,org.eclipse.emf.refactor.met
- rics.ocl,org.eclipse.emf.refactor.metrics.henshin
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.refactor.metrics
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 0.7.0
 Bundle-Name: MetricsEcore
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ECEOEC.class b/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ECEOEC.class
deleted file mode 100644
index cb48056..0000000
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ECEOEC.class
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ECEREC.class b/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ECEREC.class
deleted file mode 100644
index 64aad43..0000000
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ECEREC.class
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPECEC.class b/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPECEC.class
deleted file mode 100644
index fc9211f..0000000
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPECEC.class
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEIEC.class b/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEIEC.class
deleted file mode 100644
index d061b77..0000000
--- a/org.eclipse.emf.refactor.metrics.ecore/bin/org/eclipse/emf/refactor/metrics/ecore/eclass/ICEPEIEC.class
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.ecore/build.properties b/org.eclipse.emf.refactor.metrics.ecore/build.properties
index e9863e2..872d386 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/build.properties
+++ b/org.eclipse.emf.refactor.metrics.ecore/build.properties
@@ -2,4 +2,12 @@
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml
+               plugin.xml,\
+               src/,\
+               bin/,\
+               build.properties
+src.includes = src/,\
+               plugin.xml,\
+               build.properties,\
+               bin/,\
+               META-INF/
diff --git a/org.eclipse.emf.refactor.metrics.ecore/plugin.xml b/org.eclipse.emf.refactor.metrics.ecore/plugin.xml
index 665ae08..cd4e438 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/plugin.xml
+++ b/org.eclipse.emf.refactor.metrics.ecore/plugin.xml
@@ -1,69 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <plugin>
 <extension point="org.eclipse.emf.refactor.metrics">
-<metric id="org.eclipse.emf.refactor.metrics.ecore.nsupec" metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.NSUPEC" metric_context="EClass" metric_description="Number of direct parent EClasses of the given EClass." metric_metamodel="http://www.eclipse.org/emf/2002/Ecore" metric_name="NSUPEC"/>
-<metric id="org.eclipse.emf.refactor.metrics.ecore.nsupec2" metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.NSUPEC2" metric_context="EClass" metric_description="Total number of ancestors of the given EClass." metric_metamodel="http://www.eclipse.org/emf/2002/Ecore" metric_name="NSUPEC2"/>
 <metric id="org.eclipse.emf.refactor.metrics.ecore.nepec" metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.NEPEC" metric_context="EClass" metric_description="Total number of EParameters in EOperations of the given EClass." metric_metamodel="http://www.eclipse.org/emf/2002/Ecore" metric_name="NEPEC"/>
-<metric id="org.eclipse.emf.refactor.metrics.ecore.neoec" metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.NEOEC" metric_context="EClass" metric_description="Number of EOperations of the given EClass." metric_metamodel="http://www.eclipse.org/emf/2002/Ecore" metric_name="NEOEC"/>
-<metric id="org.eclipse.emf.refactor.metrics.ecore.neaec" metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.NEAEC" metric_context="EClass" metric_description="Number of EAttributes of the given EClass." metric_metamodel="http://www.eclipse.org/emf/2002/Ecore" metric_name="NEAEC"/>
-<metric id="org.eclipse.emf.refactor.metrics.ecore.avepeoec" metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.AvEPEOEC" metric_context="EClass" metric_description="Average number of EParameters in EOperations of the given EClass." metric_metamodel="http://www.eclipse.org/emf/2002/Ecore" metric_name="AvEPEOEC"/>
-<metric id="org.eclipse.emf.refactor.metrics.ecore.nsubec" metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.NSUBEC" metric_context="EClass" metric_description="Number of direct child EClasses of the given EClass." metric_metamodel="http://www.eclipse.org/emf/2002/Ecore" metric_name="NSUBEC"/>
-<metric id="org.eclipse.emf.refactor.metrics.ecore.nsubec2" metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.NSUBEC2" metric_context="EClass" metric_description="Number of all child EClasses of the given EClass." metric_metamodel="http://www.eclipse.org/emf/2002/Ecore" metric_name="NSUBEC2"/>
-<metric id="org.eclipse.emf.refactor.metrics.ecore.nfeec" metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.NFEEC" metric_context="EClass" metric_description="Number of features (EAttributes and EOperations) of the given EClass." metric_metamodel="http://www.eclipse.org/emf/2002/Ecore" metric_name="NFEEC"/>
-<metric id="org.eclipse.emf.refactor.metrics.ecore.nerec" metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.NEREC" metric_context="EClass" metric_description="Total number of EReferences of the given EClass." metric_metamodel="http://www.eclipse.org/emf/2002/Ecore" metric_name="NEREC"/>
-<metric id="org.eclipse.emf.refactor.metrics.ecore.nersec" metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.NERSEC" metric_context="EClass" metric_description="Number of EReferences of the given EClass to itself." metric_metamodel="http://www.eclipse.org/emf/2002/Ecore" metric_name="NERSEC"/>
-<metric id="org.eclipse.emf.refactor.metrics.ecore.neroec" metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.NEROEC" metric_context="EClass" metric_description="Number of EReferences of the given EClass to other EClasses." metric_metamodel="http://www.eclipse.org/emf/2002/Ecore" metric_name="NEROEC"/>
-<metric id="org.eclipse.emf.refactor.metrics.ecore.npecec" metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.NPECEC" metric_context="EClass" metric_description="Number of EClasses being parts of the given EClass." metric_metamodel="http://www.eclipse.org/emf/2002/Ecore" metric_name="NPECEC"/>
-<metric id="org.eclipse.emf.refactor.metrics.ecore.icepec" metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.ICEPEC" metric_context="EClass" metric_description="Number of EParameters within the EClass having another EClass or interface as type." metric_metamodel="http://www.eclipse.org/emf/2002/Ecore" metric_name="ICEPEC"/>
-<metric
-      id="org.eclipse.emf.refactor.metrics.ecore.icepecec"
-      metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.ICEPECEC"
-      metric_context="EClass"
-      metric_description="Number of EParameters within the EClass having another EClass as type."
-      metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
-      metric_name="ICEPECEC">
-</metric>
-<metric
-      id="org.eclipse.emf.refactor.metrics.ecore.icepeiec"
-      metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.ICEPEIEC"
-      metric_context="EClass"
-      metric_description="Number of EParameters within the EClass having another interface as type."
-      metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
-      metric_name="ICEPEIEC">
-</metric>
-<metric id="org.eclipse.emf.refactor.metrics.ecore.ecepec" metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.ECEPEC" metric_context="EClass" metric_description="Number of EParameters within other EClasses having the given EClass as type." metric_metamodel="http://www.eclipse.org/emf/2002/Ecore" metric_name="ECEPEC"/>
-<metric
-      id="org.eclipse.emf.refactor.metrics.ecore.ecerec"
-      metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.ECEREC"
-      metric_context="EClass"
-      metric_description="Number of EReferences of other EClasses having the given EClass as type."
-      metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
-      metric_name="ECEREC">
-</metric>
-<metric
-      id="org.eclipse.emf.refactor.metrics.ecore.eceoec"
-      metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.ECEOEC"
-      metric_context="EClass"
-      metric_description="Number of EReferences of other EClasses having the given EClass as type."
-      metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
-      metric_name="ECEOEC">
-</metric>
-<metric
-      id="org.eclipse.emf.refactor.metrics.ecore.nderoec"
-      metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.NDEROEC"
-      metric_context="EClass"
-      metric_description="Number of different EClasses being referenced by the given EClass."
-      metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
-      metric_name="NDEROEC">
-</metric>
-<metric
-      id="org.eclipse.emf.refactor.metrics.ecore.nceaec"
-      metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.NCEAEC"
-      metric_context="EClass"
-      metric_description="Number of constant EAttributes of the given EClass."
-      metric_metamodel="http://www.eclipse.org/emf/2002/Ecore"
-      metric_name="NCEAEC">
-</metric>
 <metric
       id="org.eclipse.emf.refactor.metrics.ecore.haggec"
       metric_calculate_class="org.eclipse.emf.refactor.metrics.ecore.eclass.HAGGEC"
diff --git a/org.eclipse.emf.refactor.metrics.uml24.compositional/.classpath b/org.eclipse.emf.refactor.metrics.uml24.compositional/.classpath
new file mode 100644
index 0000000..8a8f166
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.uml24.compositional/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/org.eclipse.emf.refactor.metrics.uml24.compositional/.project b/org.eclipse.emf.refactor.metrics.uml24.compositional/.project
new file mode 100644
index 0000000..5a64cfc
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.uml24.compositional/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.emf.refactor.metrics.uml24.compositional</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/org.eclipse.emf.refactor.metrics.uml24.compositional/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.emf.refactor.metrics.uml24.compositional/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f287d53
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.uml24.compositional/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

+org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.source=1.6

diff --git a/org.eclipse.emf.refactor.metrics.uml24.compositional/META-INF/MANIFEST.MF b/org.eclipse.emf.refactor.metrics.uml24.compositional/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..fae1ce2
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.uml24.compositional/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: MetricsUML24Compositional
+Bundle-SymbolicName: org.eclipse.emf.refactor.metrics.uml24.compositional;singleton:=true
+Bundle-Version: 0.7.0
+Bundle-Activator: org.eclipse.emf.refactor.metrics.uml24.compositional.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.eclipse.emf.refactor.metrics.uml24.compositional/bin/org/eclipse/emf/refactor/metrics/uml24/compositional/Activator.class b/org.eclipse.emf.refactor.metrics.uml24.compositional/bin/org/eclipse/emf/refactor/metrics/uml24/compositional/Activator.class
new file mode 100644
index 0000000..3fb2c22
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.uml24.compositional/bin/org/eclipse/emf/refactor/metrics/uml24/compositional/Activator.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.metrics.uml24.compositional/build.properties b/org.eclipse.emf.refactor.metrics.uml24.compositional/build.properties
new file mode 100644
index 0000000..41eb6ad
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.uml24.compositional/build.properties
@@ -0,0 +1,4 @@
+source.. = src/

+output.. = bin/

+bin.includes = META-INF/,\

+               .

diff --git a/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/compositional/Activator.java b/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/compositional/Activator.java
new file mode 100644
index 0000000..0260616
--- /dev/null
+++ b/org.eclipse.emf.refactor.metrics.uml24.compositional/src/org/eclipse/emf/refactor/metrics/uml24/compositional/Activator.java
@@ -0,0 +1,50 @@
+package org.eclipse.emf.refactor.metrics.uml24.compositional;

+

+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 = "org.eclipse.emf.refactor.metrics.uml24.compositional"; //$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/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/henshin/Activator.class b/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/henshin/Activator.class
deleted file mode 100644
index b91c830..0000000
--- a/org.eclipse.emf.refactor.refactorings.uml24.henshin/bin/org/eclipse/emf/refactor/refactorings/uml24/henshin/Activator.class
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.emf.refactor.smells.uml24/bin/org/eclipse/emf/refactor/smells/uml24/Activator.class b/org.eclipse.emf.refactor.smells.uml24/bin/org/eclipse/emf/refactor/smells/uml24/Activator.class
deleted file mode 100644
index 8999b3b..0000000
--- a/org.eclipse.emf.refactor.smells.uml24/bin/org/eclipse/emf/refactor/smells/uml24/Activator.class
+++ /dev/null
Binary files differ