Tests for Xtend Scoping API are green

115 files changed, 64 insertions, 20418 deletions

diff --git a/plugins/org.eclipse.xtext.xtend/src/org/eclipse/xtext/xtend/crossref/AbstractXtendScopeProvider.java b/plugins/org.eclipse.xtext.xtend/src/org/eclipse/xtext/xtend/crossref/AbstractXtendScopeProvider.java
index 9e6f7ce..ce55fb6 100644
--- a/plugins/org.eclipse.xtext.xtend/src/org/eclipse/xtext/xtend/crossref/AbstractXtendScopeProvider.java
+++ b/plugins/org.eclipse.xtext.xtend/src/org/eclipse/xtext/xtend/crossref/AbstractXtendScopeProvider.java
@@ -8,9 +8,12 @@
 package org.eclipse.xtext.xtend.crossref;
 
 import static org.eclipse.xtext.util.CollectionUtils.filter;
+import static org.eclipse.xtext.util.CollectionUtils.nextOrNull;
+import static org.eclipse.xtext.util.CollectionUtils.list;
 
+import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
+import java.util.HashSet;
 import java.util.List;
 
 import org.apache.log4j.Logger;
@@ -31,12 +34,20 @@ public abstract class AbstractXtendScopeProvider extends AbstractXtendService im
 
 	private static final String SCOPE_EXTENSION_PREFIX = "scope_";
 
-	public IScope getScope(EObject context, EReference reference) {
+	public IScope getScope(EObject context, final EReference reference) {
 		try {
 			List<IScopedElement> scopedElements = invokeExtension(extensionName(context, reference), Collections
 					.singletonList(context));
-			// TODO: filter elements
-			return new XtendScope(scopedElements);
+			final Collection<String> names = new HashSet<String>(scopedElements.size()); 
+			return new XtendScope(list(filter(scopedElements, new Filter<IScopedElement>() {
+				public boolean matches(IScopedElement param) {
+					boolean result = reference.getEReferenceType().isSuperTypeOf(param.element().eClass());
+					if (result) {
+						result = names.add(param.name());
+					}
+					return result;
+				}
+			})));
 		}
 		catch (Throwable e) {
 			log.error("Error invoking scope extension", e);
@@ -69,12 +80,12 @@ public abstract class AbstractXtendScopeProvider extends AbstractXtendService im
 		}
 
 		public IScopedElement getScopedElement(final EObject element) {
-			Iterator<IScopedElement> matchesIterator = filter(scopedElements, new Filter<IScopedElement>() {
+			Iterable<IScopedElement> allMatches = filter(scopedElements, new Filter<IScopedElement>() {
 				public boolean matches(IScopedElement param) {
 					return param.element().equals(element);
 				}
-			}).iterator();
-			return (matchesIterator.hasNext()) ? matchesIterator.next() : null;
+			});
+			return nextOrNull(allMatches);
 		}
 
 	}
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext
index 0f31b99..185fe2a 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/GenXtextGrammarTestLanguageScopeProvider.ext
@@ -17,33 +17,39 @@ extension org::eclipse::xtend::util::stdlib::io;
  */
 
 
+List[IScopedElement] scope_hiddenTokens(ParserRule this):
+	allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
+	
+List[IScopedElement] scope_hiddenTokens(emf::EObject this) :
+	allElements().collect(x | createScopedElement(x.referenceName(), x));
+
+List[IScopedElement] scope_rule(CrossReference this):
+	allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
+	
+List[IScopedElement] scope_rule(emf::EObject this) :
+	allElements().collect(x | createScopedElement(x.referenceName(), x));
+
 List[IScopedElement] scope_ePackage(AbstractMetamodelDeclaration this):
 	allElements().typeSelect(ecore::EPackage).collect(x | createScopedElement(x.referenceName(), x));
+	
 List[IScopedElement] scope_ePackage(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
-List[IScopedElement] scope_rule(RuleCall this):
-	allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
-List[IScopedElement] scope_rule(emf::EObject this) :
+List[IScopedElement] scope_metamodel(TypeRef this):
+	allElements().typeSelect(AbstractMetamodelDeclaration).collect(x | createScopedElement(x.referenceName(), x));
+	
+List[IScopedElement] scope_metamodel(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
 List[IScopedElement] scope_type(TypeRef this):
 	allElements().typeSelect(ecore::EClassifier).collect(x | createScopedElement(x.referenceName(), x));
+	
 List[IScopedElement] scope_type(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
-List[IScopedElement] scope_rule(CrossReference this):
+List[IScopedElement] scope_rule(RuleCall this):
 	allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
+	
 List[IScopedElement] scope_rule(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
-List[IScopedElement] scope_hiddenTokens(ParserRule this):
-	allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
-List[IScopedElement] scope_hiddenTokens(emf::EObject this) :
-	allElements().collect(x | createScopedElement(x.referenceName(), x));
-
-List[IScopedElement] scope_metamodel(TypeRef this):
-	allElements().typeSelect(AbstractMetamodelDeclaration).collect(x | createScopedElement(x.referenceName(), x));
-List[IScopedElement] scope_metamodel(emf::EObject this) :
-	allElements().collect(x | createScopedElement(x.referenceName(), x));
-
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextTest.ecore b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextTest.ecore
index 6edbed4..050e1ba 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextTest.ecore
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/XtextTest.ecore
@@ -20,12 +20,12 @@
     </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="AbstractMetamodelDeclaration">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ePackage">
-      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
-    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias">
       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="ePackage">
+      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="GeneratedMetamodel" eSuperTypes="//AbstractMetamodelDeclaration">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/KeywordsTestLanguageFactory.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/KeywordsTestLanguageFactory.java
deleted file mode 100644
index 55a2277..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/KeywordsTestLanguageFactory.java
+++ b/dev/null
@@ -1,47 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: KeywordsTestLanguageFactory.java,v 1.1 2009/02/06 09:46:52 jkohnlein Exp $
- */
-package org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.KeywordsTestLanguagePackage
- * @generated
- */
-public interface KeywordsTestLanguageFactory extends EFactory
-{
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  KeywordsTestLanguageFactory eINSTANCE = org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.impl.KeywordsTestLanguageFactoryImpl.init();
-
-  /**
-   * Returns a new object of class '<em>Model</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Model</em>'.
-   * @generated
-   */
-  Model createModel();
-
-  /**
-   * Returns the package supported by this factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the package supported by this factory.
-   * @generated
-   */
-  KeywordsTestLanguagePackage getKeywordsTestLanguagePackage();
-
-} //KeywordsTestLanguageFactory
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/KeywordsTestLanguagePackage.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/KeywordsTestLanguagePackage.java
deleted file mode 100644
index 24102a0..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/KeywordsTestLanguagePackage.java
+++ b/dev/null
@@ -1,239 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: KeywordsTestLanguagePackage.java,v 1.1 2009/02/06 09:46:52 jkohnlein Exp $
- */
-package org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.KeywordsTestLanguageFactory
- * @model kind="package"
- * @generated
- */
-public interface KeywordsTestLanguagePackage extends EPackage
-{
-  /**
-   * The package name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNAME = "KeywordsTestLanguage";
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_URI = "http://www.eclipse.org/2009/tmf/xtext/KeywordsTestLanguage";
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_PREFIX = "KeywordsTestLanguage";
-
-  /**
-   * The singleton instance of the package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  KeywordsTestLanguagePackage eINSTANCE = org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.impl.KeywordsTestLanguagePackageImpl.init();
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.impl.ModelImpl <em>Model</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.impl.ModelImpl
-   * @see org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.impl.KeywordsTestLanguagePackageImpl#getModel()
-   * @generated
-   */
-  int MODEL = 0;
-
-  /**
-   * The feature id for the '<em><b>First</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MODEL__FIRST = 0;
-
-  /**
-   * The feature id for the '<em><b>Second</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MODEL__SECOND = 1;
-
-  /**
-   * The feature id for the '<em><b>Third</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MODEL__THIRD = 2;
-
-  /**
-   * The feature id for the '<em><b>Forth</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MODEL__FORTH = 3;
-
-  /**
-   * The number of structural features of the '<em>Model</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MODEL_FEATURE_COUNT = 4;
-
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.Model <em>Model</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Model</em>'.
-   * @see org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.Model
-   * @generated
-   */
-  EClass getModel();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.Model#isFirst <em>First</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>First</em>'.
-   * @see org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.Model#isFirst()
-   * @see #getModel()
-   * @generated
-   */
-  EAttribute getModel_First();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.Model#isSecond <em>Second</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Second</em>'.
-   * @see org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.Model#isSecond()
-   * @see #getModel()
-   * @generated
-   */
-  EAttribute getModel_Second();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.Model#isThird <em>Third</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Third</em>'.
-   * @see org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.Model#isThird()
-   * @see #getModel()
-   * @generated
-   */
-  EAttribute getModel_Third();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.Model#isForth <em>Forth</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Forth</em>'.
-   * @see org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.Model#isForth()
-   * @see #getModel()
-   * @generated
-   */
-  EAttribute getModel_Forth();
-
-  /**
-   * Returns the factory that creates the instances of the model.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the factory that creates the instances of the model.
-   * @generated
-   */
-  KeywordsTestLanguageFactory getKeywordsTestLanguageFactory();
-
-  /**
-   * <!-- begin-user-doc -->
-   * Defines literals for the meta objects that represent
-   * <ul>
-   *   <li>each class,</li>
-   *   <li>each feature of each class,</li>
-   *   <li>each enum,</li>
-   *   <li>and each data type</li>
-   * </ul>
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  interface Literals
-  {
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.impl.ModelImpl <em>Model</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.impl.ModelImpl
-     * @see org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.impl.KeywordsTestLanguagePackageImpl#getModel()
-     * @generated
-     */
-    EClass MODEL = eINSTANCE.getModel();
-
-    /**
-     * The meta object literal for the '<em><b>First</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute MODEL__FIRST = eINSTANCE.getModel_First();
-
-    /**
-     * The meta object literal for the '<em><b>Second</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute MODEL__SECOND = eINSTANCE.getModel_Second();
-
-    /**
-     * The meta object literal for the '<em><b>Third</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute MODEL__THIRD = eINSTANCE.getModel_Third();
-
-    /**
-     * The meta object literal for the '<em><b>Forth</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute MODEL__FORTH = eINSTANCE.getModel_Forth();
-
-  }
-
-} //KeywordsTestLanguagePackage
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/Model.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/Model.java
deleted file mode 100644
index 99ac2ac..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/Model.java
+++ b/dev/null
@@ -1,136 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Model.java,v 1.1 2009/02/06 09:46:52 jkohnlein Exp $
- */
-package org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Model</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.Model#isFirst <em>First</em>}</li>
- *   <li>{@link org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.Model#isSecond <em>Second</em>}</li>
- *   <li>{@link org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.Model#isThird <em>Third</em>}</li>
- *   <li>{@link org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.Model#isForth <em>Forth</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.KeywordsTestLanguagePackage#getModel()
- * @model
- * @generated
- */
-public interface Model extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>First</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>First</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>First</em>' attribute.
-   * @see #setFirst(boolean)
-   * @see org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.KeywordsTestLanguagePackage#getModel_First()
-   * @model
-   * @generated
-   */
-  boolean isFirst();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.Model#isFirst <em>First</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>First</em>' attribute.
-   * @see #isFirst()
-   * @generated
-   */
-  void setFirst(boolean value);
-
-  /**
-   * Returns the value of the '<em><b>Second</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Second</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Second</em>' attribute.
-   * @see #setSecond(boolean)
-   * @see org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.KeywordsTestLanguagePackage#getModel_Second()
-   * @model
-   * @generated
-   */
-  boolean isSecond();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.Model#isSecond <em>Second</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Second</em>' attribute.
-   * @see #isSecond()
-   * @generated
-   */
-  void setSecond(boolean value);
-
-  /**
-   * Returns the value of the '<em><b>Third</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Third</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Third</em>' attribute.
-   * @see #setThird(boolean)
-   * @see org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.KeywordsTestLanguagePackage#getModel_Third()
-   * @model
-   * @generated
-   */
-  boolean isThird();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.Model#isThird <em>Third</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Third</em>' attribute.
-   * @see #isThird()
-   * @generated
-   */
-  void setThird(boolean value);
-
-  /**
-   * Returns the value of the '<em><b>Forth</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Forth</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Forth</em>' attribute.
-   * @see #setForth(boolean)
-   * @see org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.KeywordsTestLanguagePackage#getModel_Forth()
-   * @model
-   * @generated
-   */
-  boolean isForth();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.Model#isForth <em>Forth</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Forth</em>' attribute.
-   * @see #isForth()
-   * @generated
-   */
-  void setForth(boolean value);
-
-} // Model
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/impl/KeywordsTestLanguageFactoryImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/impl/KeywordsTestLanguageFactoryImpl.java
deleted file mode 100644
index 74f06b3..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/impl/KeywordsTestLanguageFactoryImpl.java
+++ b/dev/null
@@ -1,110 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: KeywordsTestLanguageFactoryImpl.java,v 1.1 2009/02/06 09:46:54 jkohnlein Exp $
- */
-package org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class KeywordsTestLanguageFactoryImpl extends EFactoryImpl implements KeywordsTestLanguageFactory
-{
-  /**
-   * Creates the default factory implementation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static KeywordsTestLanguageFactory init()
-  {
-    try
-    {
-      KeywordsTestLanguageFactory theKeywordsTestLanguageFactory = (KeywordsTestLanguageFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/2009/tmf/xtext/KeywordsTestLanguage"); 
-      if (theKeywordsTestLanguageFactory != null)
-      {
-        return theKeywordsTestLanguageFactory;
-      }
-    }
-    catch (Exception exception)
-    {
-      EcorePlugin.INSTANCE.log(exception);
-    }
-    return new KeywordsTestLanguageFactoryImpl();
-  }
-
-  /**
-   * Creates an instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public KeywordsTestLanguageFactoryImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EObject create(EClass eClass)
-  {
-    switch (eClass.getClassifierID())
-    {
-      case KeywordsTestLanguagePackage.MODEL: return createModel();
-      default:
-        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Model createModel()
-  {
-    ModelImpl model = new ModelImpl();
-    return model;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public KeywordsTestLanguagePackage getKeywordsTestLanguagePackage()
-  {
-    return (KeywordsTestLanguagePackage)getEPackage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @deprecated
-   * @generated
-   */
-  @Deprecated
-  public static KeywordsTestLanguagePackage getPackage()
-  {
-    return KeywordsTestLanguagePackage.eINSTANCE;
-  }
-
-} //KeywordsTestLanguageFactoryImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/impl/KeywordsTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/impl/KeywordsTestLanguagePackageImpl.java
deleted file mode 100644
index 1957e31..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/impl/KeywordsTestLanguagePackageImpl.java
+++ b/dev/null
@@ -1,232 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: KeywordsTestLanguagePackageImpl.java,v 1.1 2009/02/06 09:46:54 jkohnlein Exp $
- */
-package org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.KeywordsTestLanguageFactory;
-import org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.KeywordsTestLanguagePackage;
-import org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.Model;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class KeywordsTestLanguagePackageImpl extends EPackageImpl implements KeywordsTestLanguagePackage
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass modelEClass = null;
-
-  /**
-   * Creates an instance of the model <b>Package</b>, registered with
-   * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-   * package URI value.
-   * <p>Note: the correct way to create the package is via the static
-   * factory method {@link #init init()}, which also performs
-   * initialization of the package, or returns the registered package,
-   * if one already exists.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.emf.ecore.EPackage.Registry
-   * @see org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.KeywordsTestLanguagePackage#eNS_URI
-   * @see #init()
-   * @generated
-   */
-  private KeywordsTestLanguagePackageImpl()
-  {
-    super(eNS_URI, KeywordsTestLanguageFactory.eINSTANCE);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private static boolean isInited = false;
-
-  /**
-   * Creates, registers, and initializes the <b>Package</b> for this
-   * model, and for any others upon which it depends.  Simple
-   * dependencies are satisfied by calling this method on all
-   * dependent packages before doing anything else.  This method drives
-   * initialization for interdependent packages directly, in parallel
-   * with this package, itself.
-   * <p>Of this package and its interdependencies, all packages which
-   * have not yet been registered by their URI values are first created
-   * and registered.  The packages are then initialized in two steps:
-   * meta-model objects for all of the packages are created before any
-   * are initialized, since one package's meta-model objects may refer to
-   * those of another.
-   * <p>Invocation of this method will not affect any packages that have
-   * already been initialized.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #eNS_URI
-   * @see #createPackageContents()
-   * @see #initializePackageContents()
-   * @generated
-   */
-  public static KeywordsTestLanguagePackage init()
-  {
-    if (isInited) return (KeywordsTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(KeywordsTestLanguagePackage.eNS_URI);
-
-    // Obtain or create and register package
-    KeywordsTestLanguagePackageImpl theKeywordsTestLanguagePackage = (KeywordsTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof KeywordsTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new KeywordsTestLanguagePackageImpl());
-
-    isInited = true;
-
-    // Create package meta-data objects
-    theKeywordsTestLanguagePackage.createPackageContents();
-
-    // Initialize created meta-data
-    theKeywordsTestLanguagePackage.initializePackageContents();
-
-    // Mark meta-data to indicate it can't be changed
-    theKeywordsTestLanguagePackage.freeze();
-
-    return theKeywordsTestLanguagePackage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getModel()
-  {
-    return modelEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getModel_First()
-  {
-    return (EAttribute)modelEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getModel_Second()
-  {
-    return (EAttribute)modelEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getModel_Third()
-  {
-    return (EAttribute)modelEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getModel_Forth()
-  {
-    return (EAttribute)modelEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public KeywordsTestLanguageFactory getKeywordsTestLanguageFactory()
-  {
-    return (KeywordsTestLanguageFactory)getEFactoryInstance();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private boolean isCreated = false;
-
-  /**
-   * Creates the meta-model objects for the package.  This method is
-   * guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void createPackageContents()
-  {
-    if (isCreated) return;
-    isCreated = true;
-
-    // Create classes and their features
-    modelEClass = createEClass(MODEL);
-    createEAttribute(modelEClass, MODEL__FIRST);
-    createEAttribute(modelEClass, MODEL__SECOND);
-    createEAttribute(modelEClass, MODEL__THIRD);
-    createEAttribute(modelEClass, MODEL__FORTH);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private boolean isInitialized = false;
-
-  /**
-   * Complete the initialization of the package and its meta-model.  This
-   * method is guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void initializePackageContents()
-  {
-    if (isInitialized) return;
-    isInitialized = true;
-
-    // Initialize package
-    setName(eNAME);
-    setNsPrefix(eNS_PREFIX);
-    setNsURI(eNS_URI);
-
-    // Create type parameters
-
-    // Set bounds for type parameters
-
-    // Add supertypes to classes
-
-    // Initialize classes and features; add operations and parameters
-    initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getModel_First(), ecorePackage.getEBoolean(), "first", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getModel_Second(), ecorePackage.getEBoolean(), "second", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getModel_Third(), ecorePackage.getEBoolean(), "third", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getModel_Forth(), ecorePackage.getEBoolean(), "forth", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    // Create resource
-    createResource(eNS_URI);
-  }
-
-} //KeywordsTestLanguagePackageImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/impl/ModelImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/impl/ModelImpl.java
deleted file mode 100644
index 8c56c47..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/impl/ModelImpl.java
+++ b/dev/null
@@ -1,349 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ModelImpl.java,v 1.1 2009/02/06 09:46:54 jkohnlein Exp $
- */
-package org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.KeywordsTestLanguagePackage;
-import org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.Model;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Model</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.impl.ModelImpl#isFirst <em>First</em>}</li>
- *   <li>{@link org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.impl.ModelImpl#isSecond <em>Second</em>}</li>
- *   <li>{@link org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.impl.ModelImpl#isThird <em>Third</em>}</li>
- *   <li>{@link org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.impl.ModelImpl#isForth <em>Forth</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ModelImpl extends EObjectImpl implements Model
-{
-  /**
-   * The default value of the '{@link #isFirst() <em>First</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isFirst()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean FIRST_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isFirst() <em>First</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isFirst()
-   * @generated
-   * @ordered
-   */
-  protected boolean first = FIRST_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isSecond() <em>Second</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSecond()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean SECOND_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isSecond() <em>Second</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSecond()
-   * @generated
-   * @ordered
-   */
-  protected boolean second = SECOND_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isThird() <em>Third</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isThird()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean THIRD_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isThird() <em>Third</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isThird()
-   * @generated
-   * @ordered
-   */
-  protected boolean third = THIRD_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isForth() <em>Forth</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isForth()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean FORTH_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isForth() <em>Forth</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isForth()
-   * @generated
-   * @ordered
-   */
-  protected boolean forth = FORTH_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ModelImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return KeywordsTestLanguagePackage.Literals.MODEL;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isFirst()
-  {
-    return first;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setFirst(boolean newFirst)
-  {
-    boolean oldFirst = first;
-    first = newFirst;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, KeywordsTestLanguagePackage.MODEL__FIRST, oldFirst, first));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSecond()
-  {
-    return second;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setSecond(boolean newSecond)
-  {
-    boolean oldSecond = second;
-    second = newSecond;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, KeywordsTestLanguagePackage.MODEL__SECOND, oldSecond, second));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isThird()
-  {
-    return third;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setThird(boolean newThird)
-  {
-    boolean oldThird = third;
-    third = newThird;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, KeywordsTestLanguagePackage.MODEL__THIRD, oldThird, third));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isForth()
-  {
-    return forth;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setForth(boolean newForth)
-  {
-    boolean oldForth = forth;
-    forth = newForth;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, KeywordsTestLanguagePackage.MODEL__FORTH, oldForth, forth));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case KeywordsTestLanguagePackage.MODEL__FIRST:
-        return isFirst() ? Boolean.TRUE : Boolean.FALSE;
-      case KeywordsTestLanguagePackage.MODEL__SECOND:
-        return isSecond() ? Boolean.TRUE : Boolean.FALSE;
-      case KeywordsTestLanguagePackage.MODEL__THIRD:
-        return isThird() ? Boolean.TRUE : Boolean.FALSE;
-      case KeywordsTestLanguagePackage.MODEL__FORTH:
-        return isForth() ? Boolean.TRUE : Boolean.FALSE;
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case KeywordsTestLanguagePackage.MODEL__FIRST:
-        setFirst(((Boolean)newValue).booleanValue());
-        return;
-      case KeywordsTestLanguagePackage.MODEL__SECOND:
-        setSecond(((Boolean)newValue).booleanValue());
-        return;
-      case KeywordsTestLanguagePackage.MODEL__THIRD:
-        setThird(((Boolean)newValue).booleanValue());
-        return;
-      case KeywordsTestLanguagePackage.MODEL__FORTH:
-        setForth(((Boolean)newValue).booleanValue());
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case KeywordsTestLanguagePackage.MODEL__FIRST:
-        setFirst(FIRST_EDEFAULT);
-        return;
-      case KeywordsTestLanguagePackage.MODEL__SECOND:
-        setSecond(SECOND_EDEFAULT);
-        return;
-      case KeywordsTestLanguagePackage.MODEL__THIRD:
-        setThird(THIRD_EDEFAULT);
-        return;
-      case KeywordsTestLanguagePackage.MODEL__FORTH:
-        setForth(FORTH_EDEFAULT);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case KeywordsTestLanguagePackage.MODEL__FIRST:
-        return first != FIRST_EDEFAULT;
-      case KeywordsTestLanguagePackage.MODEL__SECOND:
-        return second != SECOND_EDEFAULT;
-      case KeywordsTestLanguagePackage.MODEL__THIRD:
-        return third != THIRD_EDEFAULT;
-      case KeywordsTestLanguagePackage.MODEL__FORTH:
-        return forth != FORTH_EDEFAULT;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (first: ");
-    result.append(first);
-    result.append(", second: ");
-    result.append(second);
-    result.append(", third: ");
-    result.append(third);
-    result.append(", forth: ");
-    result.append(forth);
-    result.append(')');
-    return result.toString();
-  }
-
-} //ModelImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/util/KeywordsTestLanguageAdapterFactory.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/util/KeywordsTestLanguageAdapterFactory.java
deleted file mode 100644
index ddb3b5d..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/util/KeywordsTestLanguageAdapterFactory.java
+++ b/dev/null
@@ -1,136 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: KeywordsTestLanguageAdapterFactory.java,v 1.1 2009/02/06 09:46:54 jkohnlein Exp $
- */
-package org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.KeywordsTestLanguagePackage
- * @generated
- */
-public class KeywordsTestLanguageAdapterFactory extends AdapterFactoryImpl
-{
-  /**
-   * The cached model package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected static KeywordsTestLanguagePackage modelPackage;
-
-  /**
-   * Creates an instance of the adapter factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public KeywordsTestLanguageAdapterFactory()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = KeywordsTestLanguagePackage.eINSTANCE;
-    }
-  }
-
-  /**
-   * Returns whether this factory is applicable for the type of the object.
-   * <!-- begin-user-doc -->
-   * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-   * <!-- end-user-doc -->
-   * @return whether this factory is applicable for the type of the object.
-   * @generated
-   */
-  @Override
-  public boolean isFactoryForType(Object object)
-  {
-    if (object == modelPackage)
-    {
-      return true;
-    }
-    if (object instanceof EObject)
-    {
-      return ((EObject)object).eClass().getEPackage() == modelPackage;
-    }
-    return false;
-  }
-
-  /**
-   * The switch that delegates to the <code>createXXX</code> methods.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected KeywordsTestLanguageSwitch<Adapter> modelSwitch =
-    new KeywordsTestLanguageSwitch<Adapter>()
-    {
-      @Override
-      public Adapter caseModel(Model object)
-      {
-        return createModelAdapter();
-      }
-      @Override
-      public Adapter defaultCase(EObject object)
-      {
-        return createEObjectAdapter();
-      }
-    };
-
-  /**
-   * Creates an adapter for the <code>target</code>.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param target the object to adapt.
-   * @return the adapter for the <code>target</code>.
-   * @generated
-   */
-  @Override
-  public Adapter createAdapter(Notifier target)
-  {
-    return modelSwitch.doSwitch((EObject)target);
-  }
-
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.Model <em>Model</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.Model
-   * @generated
-   */
-  public Adapter createModelAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for the default case.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @generated
-   */
-  public Adapter createEObjectAdapter()
-  {
-    return null;
-  }
-
-} //KeywordsTestLanguageAdapterFactory
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/util/KeywordsTestLanguageSwitch.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/util/KeywordsTestLanguageSwitch.java
deleted file mode 100644
index dd0436a..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/KeywordsTestLanguage/util/KeywordsTestLanguageSwitch.java
+++ b/dev/null
@@ -1,142 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: KeywordsTestLanguageSwitch.java,v 1.1 2009/02/06 09:46:54 jkohnlein Exp $
- */
-package org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.xtext.parser.keywords.keywordsTestLanguage.KeywordsTestLanguage.KeywordsTestLanguagePackage
- * @generated
- */
-public class KeywordsTestLanguageSwitch<T>
-{
-  /**
-   * The cached model package
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected static KeywordsTestLanguagePackage modelPackage;
-
-  /**
-   * Creates an instance of the switch.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public KeywordsTestLanguageSwitch()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = KeywordsTestLanguagePackage.eINSTANCE;
-    }
-  }
-
-  /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-  public T doSwitch(EObject theEObject)
-  {
-    return doSwitch(theEObject.eClass(), theEObject);
-  }
-
-  /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-  protected T doSwitch(EClass theEClass, EObject theEObject)
-  {
-    if (theEClass.eContainer() == modelPackage)
-    {
-      return doSwitch(theEClass.getClassifierID(), theEObject);
-    }
-    else
-    {
-      List<EClass> eSuperTypes = theEClass.getESuperTypes();
-      return
-        eSuperTypes.isEmpty() ?
-          defaultCase(theEObject) :
-          doSwitch(eSuperTypes.get(0), theEObject);
-    }
-  }
-
-  /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-  protected T doSwitch(int classifierID, EObject theEObject)
-  {
-    switch (classifierID)
-    {
-      case KeywordsTestLanguagePackage.MODEL:
-      {
-        Model model = (Model)theEObject;
-        T result = caseModel(model);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      default: return defaultCase(theEObject);
-    }
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Model</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Model</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseModel(Model object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch, but this is the last case anyway.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-   * @generated
-   */
-  public T defaultCase(EObject object)
-  {
-    return null;
-  }
-
-} //KeywordsTestLanguageSwitch
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageScopeProvider.ext b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageScopeProvider.ext
index 4dcc6d1..5602b43 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageScopeProvider.ext
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenContentAssistTestLanguageScopeProvider.ext
@@ -18,6 +18,7 @@ extension org::eclipse::xtend::util::stdlib::io;
 
 List[IScopedElement] scope_rule(AbstractRuleCall this):
 	allElements().typeSelect(AbstractRule).collect(x | createScopedElement(x.referenceName(), x));
+	
 List[IScopedElement] scope_rule(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext
index e5de2db..c586f67 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/GenReferenceGrammarTestLanguageScopeProvider.ext
@@ -16,18 +16,21 @@ extension org::eclipse::xtend::util::stdlib::io;
  */
 
 
-List[IScopedElement] scope_mutter(Familie this):
-	allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x));
-List[IScopedElement] scope_mutter(emf::EObject this) :
-	allElements().collect(x | createScopedElement(x.referenceName(), x));
-
 List[IScopedElement] scope_vater(Familie this):
 	allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x));
+	
 List[IScopedElement] scope_vater(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
 List[IScopedElement] scope_kinder(Familie this):
 	allElements().typeSelect(Kind).collect(x | createScopedElement(x.referenceName(), x));
+	
 List[IScopedElement] scope_kinder(emf::EObject this) :
 	allElements().collect(x | createScopedElement(x.referenceName(), x));
 
+List[IScopedElement] scope_mutter(Familie this):
+	allElements().typeSelect(Erwachsener).collect(x | createScopedElement(x.referenceName(), x));
+	
+List[IScopedElement] scope_mutter(emf::EObject this) :
+	allElements().collect(x | createScopedElement(x.referenceName(), x));
+
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore
index d0d0a55..8d02c8e 100644
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore
+++ b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammar.ecore
@@ -13,12 +13,12 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="familie" unique="false" upperBound="-1" eType="//Familie" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Person">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="age">
-      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name">
       <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="age">
+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Kind" eSuperTypes="//Person"/>
   <eClassifiers xsi:type="ecore:EClass" name="Erwachsener" eSuperTypes="//Person"/>
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/AbstractRule.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/AbstractRule.java
deleted file mode 100644
index 00b26d7..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/AbstractRule.java
+++ b/dev/null
@@ -1,55 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AbstractRule.java,v 1.1 2009/02/06 09:46:50 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abstract Rule</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRule#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.ContentAssistTestLanguagePackage#getAbstractRule()
- * @model
- * @generated
- */
-public interface AbstractRule extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.ContentAssistTestLanguagePackage#getAbstractRule_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRule#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-  void setName(String value);
-
-} // AbstractRule
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/AbstractRuleCall.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/AbstractRuleCall.java
deleted file mode 100644
index ec1cad1..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/AbstractRuleCall.java
+++ b/dev/null
@@ -1,55 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AbstractRuleCall.java,v 1.1 2009/02/06 09:46:50 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abstract Rule Call</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRuleCall#getRule <em>Rule</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.ContentAssistTestLanguagePackage#getAbstractRuleCall()
- * @model
- * @generated
- */
-public interface AbstractRuleCall extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Rule</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Rule</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Rule</em>' reference.
-   * @see #setRule(AbstractRule)
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.ContentAssistTestLanguagePackage#getAbstractRuleCall_Rule()
-   * @model
-   * @generated
-   */
-  AbstractRule getRule();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRuleCall#getRule <em>Rule</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Rule</em>' reference.
-   * @see #getRule()
-   * @generated
-   */
-  void setRule(AbstractRule value);
-
-} // AbstractRuleCall
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/ContentAssistTestLanguageFactory.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/ContentAssistTestLanguageFactory.java
deleted file mode 100644
index 5963ef8..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/ContentAssistTestLanguageFactory.java
+++ b/dev/null
@@ -1,83 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ContentAssistTestLanguageFactory.java,v 1.1 2009/02/06 09:46:50 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.ContentAssistTestLanguagePackage
- * @generated
- */
-public interface ContentAssistTestLanguageFactory extends EFactory
-{
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  ContentAssistTestLanguageFactory eINSTANCE = org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.ContentAssistTestLanguageFactoryImpl.init();
-
-  /**
-   * Returns a new object of class '<em>Start</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Start</em>'.
-   * @generated
-   */
-  Start createStart();
-
-  /**
-   * Returns a new object of class '<em>Abstract Rule</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Abstract Rule</em>'.
-   * @generated
-   */
-  AbstractRule createAbstractRule();
-
-  /**
-   * Returns a new object of class '<em>First Abstract Rule Child</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>First Abstract Rule Child</em>'.
-   * @generated
-   */
-  FirstAbstractRuleChild createFirstAbstractRuleChild();
-
-  /**
-   * Returns a new object of class '<em>Second Abstract Rule Child</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Second Abstract Rule Child</em>'.
-   * @generated
-   */
-  SecondAbstractRuleChild createSecondAbstractRuleChild();
-
-  /**
-   * Returns a new object of class '<em>Abstract Rule Call</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Abstract Rule Call</em>'.
-   * @generated
-   */
-  AbstractRuleCall createAbstractRuleCall();
-
-  /**
-   * Returns the package supported by this factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the package supported by this factory.
-   * @generated
-   */
-  ContentAssistTestLanguagePackage getContentAssistTestLanguagePackage();
-
-} //ContentAssistTestLanguageFactory
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/ContentAssistTestLanguagePackage.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/ContentAssistTestLanguagePackage.java
deleted file mode 100644
index 5d8c96f..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/ContentAssistTestLanguagePackage.java
+++ b/dev/null
@@ -1,442 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ContentAssistTestLanguagePackage.java,v 1.1 2009/02/06 09:46:50 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.ContentAssistTestLanguageFactory
- * @model kind="package"
- * @generated
- */
-public interface ContentAssistTestLanguagePackage extends EPackage
-{
-  /**
-   * The package name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNAME = "contentAssistTestLanguage";
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_URI = "http://www.eclipse.org/2008/xtext/tests/ContentAssist";
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_PREFIX = "contentAssistTestLanguage";
-
-  /**
-   * The singleton instance of the package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  ContentAssistTestLanguagePackage eINSTANCE = org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.ContentAssistTestLanguagePackageImpl.init();
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.StartImpl <em>Start</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.StartImpl
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.ContentAssistTestLanguagePackageImpl#getStart()
-   * @generated
-   */
-  int START = 0;
-
-  /**
-   * The feature id for the '<em><b>Rules</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int START__RULES = 0;
-
-  /**
-   * The number of structural features of the '<em>Start</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int START_FEATURE_COUNT = 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.AbstractRuleImpl <em>Abstract Rule</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.AbstractRuleImpl
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.ContentAssistTestLanguagePackageImpl#getAbstractRule()
-   * @generated
-   */
-  int ABSTRACT_RULE = 1;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ABSTRACT_RULE__NAME = 0;
-
-  /**
-   * The number of structural features of the '<em>Abstract Rule</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ABSTRACT_RULE_FEATURE_COUNT = 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.FirstAbstractRuleChildImpl <em>First Abstract Rule Child</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.FirstAbstractRuleChildImpl
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.ContentAssistTestLanguagePackageImpl#getFirstAbstractRuleChild()
-   * @generated
-   */
-  int FIRST_ABSTRACT_RULE_CHILD = 2;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int FIRST_ABSTRACT_RULE_CHILD__NAME = ABSTRACT_RULE__NAME;
-
-  /**
-   * The feature id for the '<em><b>Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int FIRST_ABSTRACT_RULE_CHILD__ELEMENTS = ABSTRACT_RULE_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the '<em>First Abstract Rule Child</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int FIRST_ABSTRACT_RULE_CHILD_FEATURE_COUNT = ABSTRACT_RULE_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.SecondAbstractRuleChildImpl <em>Second Abstract Rule Child</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.SecondAbstractRuleChildImpl
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.ContentAssistTestLanguagePackageImpl#getSecondAbstractRuleChild()
-   * @generated
-   */
-  int SECOND_ABSTRACT_RULE_CHILD = 3;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SECOND_ABSTRACT_RULE_CHILD__NAME = ABSTRACT_RULE__NAME;
-
-  /**
-   * The feature id for the '<em><b>Rule</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SECOND_ABSTRACT_RULE_CHILD__RULE = ABSTRACT_RULE_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the '<em>Second Abstract Rule Child</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SECOND_ABSTRACT_RULE_CHILD_FEATURE_COUNT = ABSTRACT_RULE_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.AbstractRuleCallImpl <em>Abstract Rule Call</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.AbstractRuleCallImpl
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.ContentAssistTestLanguagePackageImpl#getAbstractRuleCall()
-   * @generated
-   */
-  int ABSTRACT_RULE_CALL = 4;
-
-  /**
-   * The feature id for the '<em><b>Rule</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ABSTRACT_RULE_CALL__RULE = 0;
-
-  /**
-   * The number of structural features of the '<em>Abstract Rule Call</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ABSTRACT_RULE_CALL_FEATURE_COUNT = 1;
-
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.Start <em>Start</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Start</em>'.
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.Start
-   * @generated
-   */
-  EClass getStart();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.Start#getRules <em>Rules</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Rules</em>'.
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.Start#getRules()
-   * @see #getStart()
-   * @generated
-   */
-  EReference getStart_Rules();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRule <em>Abstract Rule</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Abstract Rule</em>'.
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRule
-   * @generated
-   */
-  EClass getAbstractRule();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRule#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRule#getName()
-   * @see #getAbstractRule()
-   * @generated
-   */
-  EAttribute getAbstractRule_Name();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.FirstAbstractRuleChild <em>First Abstract Rule Child</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>First Abstract Rule Child</em>'.
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.FirstAbstractRuleChild
-   * @generated
-   */
-  EClass getFirstAbstractRuleChild();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.FirstAbstractRuleChild#getElements <em>Elements</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Elements</em>'.
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.FirstAbstractRuleChild#getElements()
-   * @see #getFirstAbstractRuleChild()
-   * @generated
-   */
-  EReference getFirstAbstractRuleChild_Elements();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.SecondAbstractRuleChild <em>Second Abstract Rule Child</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Second Abstract Rule Child</em>'.
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.SecondAbstractRuleChild
-   * @generated
-   */
-  EClass getSecondAbstractRuleChild();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.SecondAbstractRuleChild#getRule <em>Rule</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Rule</em>'.
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.SecondAbstractRuleChild#getRule()
-   * @see #getSecondAbstractRuleChild()
-   * @generated
-   */
-  EReference getSecondAbstractRuleChild_Rule();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRuleCall <em>Abstract Rule Call</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Abstract Rule Call</em>'.
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRuleCall
-   * @generated
-   */
-  EClass getAbstractRuleCall();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRuleCall#getRule <em>Rule</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Rule</em>'.
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRuleCall#getRule()
-   * @see #getAbstractRuleCall()
-   * @generated
-   */
-  EReference getAbstractRuleCall_Rule();
-
-  /**
-   * Returns the factory that creates the instances of the model.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the factory that creates the instances of the model.
-   * @generated
-   */
-  ContentAssistTestLanguageFactory getContentAssistTestLanguageFactory();
-
-  /**
-   * <!-- begin-user-doc -->
-   * Defines literals for the meta objects that represent
-   * <ul>
-   *   <li>each class,</li>
-   *   <li>each feature of each class,</li>
-   *   <li>each enum,</li>
-   *   <li>and each data type</li>
-   * </ul>
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  interface Literals
-  {
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.StartImpl <em>Start</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.StartImpl
-     * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.ContentAssistTestLanguagePackageImpl#getStart()
-     * @generated
-     */
-    EClass START = eINSTANCE.getStart();
-
-    /**
-     * The meta object literal for the '<em><b>Rules</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference START__RULES = eINSTANCE.getStart_Rules();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.AbstractRuleImpl <em>Abstract Rule</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.AbstractRuleImpl
-     * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.ContentAssistTestLanguagePackageImpl#getAbstractRule()
-     * @generated
-     */
-    EClass ABSTRACT_RULE = eINSTANCE.getAbstractRule();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute ABSTRACT_RULE__NAME = eINSTANCE.getAbstractRule_Name();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.FirstAbstractRuleChildImpl <em>First Abstract Rule Child</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.FirstAbstractRuleChildImpl
-     * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.ContentAssistTestLanguagePackageImpl#getFirstAbstractRuleChild()
-     * @generated
-     */
-    EClass FIRST_ABSTRACT_RULE_CHILD = eINSTANCE.getFirstAbstractRuleChild();
-
-    /**
-     * The meta object literal for the '<em><b>Elements</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference FIRST_ABSTRACT_RULE_CHILD__ELEMENTS = eINSTANCE.getFirstAbstractRuleChild_Elements();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.SecondAbstractRuleChildImpl <em>Second Abstract Rule Child</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.SecondAbstractRuleChildImpl
-     * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.ContentAssistTestLanguagePackageImpl#getSecondAbstractRuleChild()
-     * @generated
-     */
-    EClass SECOND_ABSTRACT_RULE_CHILD = eINSTANCE.getSecondAbstractRuleChild();
-
-    /**
-     * The meta object literal for the '<em><b>Rule</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference SECOND_ABSTRACT_RULE_CHILD__RULE = eINSTANCE.getSecondAbstractRuleChild_Rule();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.AbstractRuleCallImpl <em>Abstract Rule Call</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.AbstractRuleCallImpl
-     * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.ContentAssistTestLanguagePackageImpl#getAbstractRuleCall()
-     * @generated
-     */
-    EClass ABSTRACT_RULE_CALL = eINSTANCE.getAbstractRuleCall();
-
-    /**
-     * The meta object literal for the '<em><b>Rule</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference ABSTRACT_RULE_CALL__RULE = eINSTANCE.getAbstractRuleCall_Rule();
-
-  }
-
-} //ContentAssistTestLanguagePackage
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/FirstAbstractRuleChild.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/FirstAbstractRuleChild.java
deleted file mode 100644
index ed5221c..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/FirstAbstractRuleChild.java
+++ b/dev/null
@@ -1,45 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FirstAbstractRuleChild.java,v 1.1 2009/02/06 09:46:50 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>First Abstract Rule Child</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.FirstAbstractRuleChild#getElements <em>Elements</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.ContentAssistTestLanguagePackage#getFirstAbstractRuleChild()
- * @model
- * @generated
- */
-public interface FirstAbstractRuleChild extends AbstractRule
-{
-  /**
-   * Returns the value of the '<em><b>Elements</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRule}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Elements</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Elements</em>' containment reference list.
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.ContentAssistTestLanguagePackage#getFirstAbstractRuleChild_Elements()
-   * @model containment="true"
-   * @generated
-   */
-  EList<AbstractRule> getElements();
-
-} // FirstAbstractRuleChild
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/SecondAbstractRuleChild.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/SecondAbstractRuleChild.java
deleted file mode 100644
index b73172a..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/SecondAbstractRuleChild.java
+++ b/dev/null
@@ -1,54 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SecondAbstractRuleChild.java,v 1.1 2009/02/06 09:46:50 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Second Abstract Rule Child</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.SecondAbstractRuleChild#getRule <em>Rule</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.ContentAssistTestLanguagePackage#getSecondAbstractRuleChild()
- * @model
- * @generated
- */
-public interface SecondAbstractRuleChild extends AbstractRule
-{
-  /**
-   * Returns the value of the '<em><b>Rule</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Rule</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Rule</em>' containment reference.
-   * @see #setRule(AbstractRuleCall)
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.ContentAssistTestLanguagePackage#getSecondAbstractRuleChild_Rule()
-   * @model containment="true"
-   * @generated
-   */
-  AbstractRuleCall getRule();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.SecondAbstractRuleChild#getRule <em>Rule</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Rule</em>' containment reference.
-   * @see #getRule()
-   * @generated
-   */
-  void setRule(AbstractRuleCall value);
-
-} // SecondAbstractRuleChild
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/Start.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/Start.java
deleted file mode 100644
index b4f4d61..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/Start.java
+++ b/dev/null
@@ -1,47 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Start.java,v 1.1 2009/02/06 09:46:50 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Start</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.Start#getRules <em>Rules</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.ContentAssistTestLanguagePackage#getStart()
- * @model
- * @generated
- */
-public interface Start extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Rules</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRule}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Rules</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Rules</em>' containment reference list.
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.ContentAssistTestLanguagePackage#getStart_Rules()
-   * @model containment="true"
-   * @generated
-   */
-  EList<AbstractRule> getRules();
-
-} // Start
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/impl/AbstractRuleCallImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/impl/AbstractRuleCallImpl.java
deleted file mode 100644
index 623957d..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/impl/AbstractRuleCallImpl.java
+++ b/dev/null
@@ -1,177 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AbstractRuleCallImpl.java,v 1.1 2009/02/06 09:46:55 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRule;
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRuleCall;
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.ContentAssistTestLanguagePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Abstract Rule Call</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.AbstractRuleCallImpl#getRule <em>Rule</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AbstractRuleCallImpl extends EObjectImpl implements AbstractRuleCall
-{
-  /**
-   * The cached value of the '{@link #getRule() <em>Rule</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getRule()
-   * @generated
-   * @ordered
-   */
-  protected AbstractRule rule;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected AbstractRuleCallImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return ContentAssistTestLanguagePackage.Literals.ABSTRACT_RULE_CALL;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public AbstractRule getRule()
-  {
-    if (rule != null && rule.eIsProxy())
-    {
-      InternalEObject oldRule = (InternalEObject)rule;
-      rule = (AbstractRule)eResolveProxy(oldRule);
-      if (rule != oldRule)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, ContentAssistTestLanguagePackage.ABSTRACT_RULE_CALL__RULE, oldRule, rule));
-      }
-    }
-    return rule;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public AbstractRule basicGetRule()
-  {
-    return rule;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setRule(AbstractRule newRule)
-  {
-    AbstractRule oldRule = rule;
-    rule = newRule;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, ContentAssistTestLanguagePackage.ABSTRACT_RULE_CALL__RULE, oldRule, rule));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case ContentAssistTestLanguagePackage.ABSTRACT_RULE_CALL__RULE:
-        if (resolve) return getRule();
-        return basicGetRule();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case ContentAssistTestLanguagePackage.ABSTRACT_RULE_CALL__RULE:
-        setRule((AbstractRule)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case ContentAssistTestLanguagePackage.ABSTRACT_RULE_CALL__RULE:
-        setRule((AbstractRule)null);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case ContentAssistTestLanguagePackage.ABSTRACT_RULE_CALL__RULE:
-        return rule != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-} //AbstractRuleCallImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/impl/AbstractRuleImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/impl/AbstractRuleImpl.java
deleted file mode 100644
index 3c5fdfa..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/impl/AbstractRuleImpl.java
+++ b/dev/null
@@ -1,181 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AbstractRuleImpl.java,v 1.1 2009/02/06 09:46:55 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRule;
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.ContentAssistTestLanguagePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Abstract Rule</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.AbstractRuleImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AbstractRuleImpl extends EObjectImpl implements AbstractRule
-{
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected AbstractRuleImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return ContentAssistTestLanguagePackage.Literals.ABSTRACT_RULE;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, ContentAssistTestLanguagePackage.ABSTRACT_RULE__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case ContentAssistTestLanguagePackage.ABSTRACT_RULE__NAME:
-        return getName();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case ContentAssistTestLanguagePackage.ABSTRACT_RULE__NAME:
-        setName((String)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case ContentAssistTestLanguagePackage.ABSTRACT_RULE__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case ContentAssistTestLanguagePackage.ABSTRACT_RULE__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-} //AbstractRuleImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/impl/ContentAssistTestLanguageFactoryImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/impl/ContentAssistTestLanguageFactoryImpl.java
deleted file mode 100644
index 29117e5..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/impl/ContentAssistTestLanguageFactoryImpl.java
+++ b/dev/null
@@ -1,158 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ContentAssistTestLanguageFactoryImpl.java,v 1.1 2009/02/06 09:46:55 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ContentAssistTestLanguageFactoryImpl extends EFactoryImpl implements ContentAssistTestLanguageFactory
-{
-  /**
-   * Creates the default factory implementation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static ContentAssistTestLanguageFactory init()
-  {
-    try
-    {
-      ContentAssistTestLanguageFactory theContentAssistTestLanguageFactory = (ContentAssistTestLanguageFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/2008/xtext/tests/ContentAssist"); 
-      if (theContentAssistTestLanguageFactory != null)
-      {
-        return theContentAssistTestLanguageFactory;
-      }
-    }
-    catch (Exception exception)
-    {
-      EcorePlugin.INSTANCE.log(exception);
-    }
-    return new ContentAssistTestLanguageFactoryImpl();
-  }
-
-  /**
-   * Creates an instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ContentAssistTestLanguageFactoryImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EObject create(EClass eClass)
-  {
-    switch (eClass.getClassifierID())
-    {
-      case ContentAssistTestLanguagePackage.START: return createStart();
-      case ContentAssistTestLanguagePackage.ABSTRACT_RULE: return createAbstractRule();
-      case ContentAssistTestLanguagePackage.FIRST_ABSTRACT_RULE_CHILD: return createFirstAbstractRuleChild();
-      case ContentAssistTestLanguagePackage.SECOND_ABSTRACT_RULE_CHILD: return createSecondAbstractRuleChild();
-      case ContentAssistTestLanguagePackage.ABSTRACT_RULE_CALL: return createAbstractRuleCall();
-      default:
-        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Start createStart()
-  {
-    StartImpl start = new StartImpl();
-    return start;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public AbstractRule createAbstractRule()
-  {
-    AbstractRuleImpl abstractRule = new AbstractRuleImpl();
-    return abstractRule;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public FirstAbstractRuleChild createFirstAbstractRuleChild()
-  {
-    FirstAbstractRuleChildImpl firstAbstractRuleChild = new FirstAbstractRuleChildImpl();
-    return firstAbstractRuleChild;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public SecondAbstractRuleChild createSecondAbstractRuleChild()
-  {
-    SecondAbstractRuleChildImpl secondAbstractRuleChild = new SecondAbstractRuleChildImpl();
-    return secondAbstractRuleChild;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public AbstractRuleCall createAbstractRuleCall()
-  {
-    AbstractRuleCallImpl abstractRuleCall = new AbstractRuleCallImpl();
-    return abstractRuleCall;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ContentAssistTestLanguagePackage getContentAssistTestLanguagePackage()
-  {
-    return (ContentAssistTestLanguagePackage)getEPackage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @deprecated
-   * @generated
-   */
-  @Deprecated
-  public static ContentAssistTestLanguagePackage getPackage()
-  {
-    return ContentAssistTestLanguagePackage.eINSTANCE;
-  }
-
-} //ContentAssistTestLanguageFactoryImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/impl/ContentAssistTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/impl/ContentAssistTestLanguagePackageImpl.java
deleted file mode 100644
index a782220..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/impl/ContentAssistTestLanguagePackageImpl.java
+++ b/dev/null
@@ -1,335 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ContentAssistTestLanguagePackageImpl.java,v 1.1 2009/02/06 09:46:55 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRule;
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRuleCall;
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.ContentAssistTestLanguageFactory;
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.ContentAssistTestLanguagePackage;
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.FirstAbstractRuleChild;
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.SecondAbstractRuleChild;
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.Start;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ContentAssistTestLanguagePackageImpl extends EPackageImpl implements ContentAssistTestLanguagePackage
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass startEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass abstractRuleEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass firstAbstractRuleChildEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass secondAbstractRuleChildEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass abstractRuleCallEClass = null;
-
-  /**
-   * Creates an instance of the model <b>Package</b>, registered with
-   * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-   * package URI value.
-   * <p>Note: the correct way to create the package is via the static
-   * factory method {@link #init init()}, which also performs
-   * initialization of the package, or returns the registered package,
-   * if one already exists.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.emf.ecore.EPackage.Registry
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.ContentAssistTestLanguagePackage#eNS_URI
-   * @see #init()
-   * @generated
-   */
-  private ContentAssistTestLanguagePackageImpl()
-  {
-    super(eNS_URI, ContentAssistTestLanguageFactory.eINSTANCE);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private static boolean isInited = false;
-
-  /**
-   * Creates, registers, and initializes the <b>Package</b> for this
-   * model, and for any others upon which it depends.  Simple
-   * dependencies are satisfied by calling this method on all
-   * dependent packages before doing anything else.  This method drives
-   * initialization for interdependent packages directly, in parallel
-   * with this package, itself.
-   * <p>Of this package and its interdependencies, all packages which
-   * have not yet been registered by their URI values are first created
-   * and registered.  The packages are then initialized in two steps:
-   * meta-model objects for all of the packages are created before any
-   * are initialized, since one package's meta-model objects may refer to
-   * those of another.
-   * <p>Invocation of this method will not affect any packages that have
-   * already been initialized.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #eNS_URI
-   * @see #createPackageContents()
-   * @see #initializePackageContents()
-   * @generated
-   */
-  public static ContentAssistTestLanguagePackage init()
-  {
-    if (isInited) return (ContentAssistTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(ContentAssistTestLanguagePackage.eNS_URI);
-
-    // Obtain or create and register package
-    ContentAssistTestLanguagePackageImpl theContentAssistTestLanguagePackage = (ContentAssistTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ContentAssistTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ContentAssistTestLanguagePackageImpl());
-
-    isInited = true;
-
-    // Create package meta-data objects
-    theContentAssistTestLanguagePackage.createPackageContents();
-
-    // Initialize created meta-data
-    theContentAssistTestLanguagePackage.initializePackageContents();
-
-    // Mark meta-data to indicate it can't be changed
-    theContentAssistTestLanguagePackage.freeze();
-
-    return theContentAssistTestLanguagePackage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getStart()
-  {
-    return startEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getStart_Rules()
-  {
-    return (EReference)startEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getAbstractRule()
-  {
-    return abstractRuleEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getAbstractRule_Name()
-  {
-    return (EAttribute)abstractRuleEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getFirstAbstractRuleChild()
-  {
-    return firstAbstractRuleChildEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getFirstAbstractRuleChild_Elements()
-  {
-    return (EReference)firstAbstractRuleChildEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getSecondAbstractRuleChild()
-  {
-    return secondAbstractRuleChildEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getSecondAbstractRuleChild_Rule()
-  {
-    return (EReference)secondAbstractRuleChildEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getAbstractRuleCall()
-  {
-    return abstractRuleCallEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getAbstractRuleCall_Rule()
-  {
-    return (EReference)abstractRuleCallEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ContentAssistTestLanguageFactory getContentAssistTestLanguageFactory()
-  {
-    return (ContentAssistTestLanguageFactory)getEFactoryInstance();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private boolean isCreated = false;
-
-  /**
-   * Creates the meta-model objects for the package.  This method is
-   * guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void createPackageContents()
-  {
-    if (isCreated) return;
-    isCreated = true;
-
-    // Create classes and their features
-    startEClass = createEClass(START);
-    createEReference(startEClass, START__RULES);
-
-    abstractRuleEClass = createEClass(ABSTRACT_RULE);
-    createEAttribute(abstractRuleEClass, ABSTRACT_RULE__NAME);
-
-    firstAbstractRuleChildEClass = createEClass(FIRST_ABSTRACT_RULE_CHILD);
-    createEReference(firstAbstractRuleChildEClass, FIRST_ABSTRACT_RULE_CHILD__ELEMENTS);
-
-    secondAbstractRuleChildEClass = createEClass(SECOND_ABSTRACT_RULE_CHILD);
-    createEReference(secondAbstractRuleChildEClass, SECOND_ABSTRACT_RULE_CHILD__RULE);
-
-    abstractRuleCallEClass = createEClass(ABSTRACT_RULE_CALL);
-    createEReference(abstractRuleCallEClass, ABSTRACT_RULE_CALL__RULE);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private boolean isInitialized = false;
-
-  /**
-   * Complete the initialization of the package and its meta-model.  This
-   * method is guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void initializePackageContents()
-  {
-    if (isInitialized) return;
-    isInitialized = true;
-
-    // Initialize package
-    setName(eNAME);
-    setNsPrefix(eNS_PREFIX);
-    setNsURI(eNS_URI);
-
-    // Create type parameters
-
-    // Set bounds for type parameters
-
-    // Add supertypes to classes
-    firstAbstractRuleChildEClass.getESuperTypes().add(this.getAbstractRule());
-    secondAbstractRuleChildEClass.getESuperTypes().add(this.getAbstractRule());
-
-    // Initialize classes and features; add operations and parameters
-    initEClass(startEClass, Start.class, "Start", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getStart_Rules(), this.getAbstractRule(), null, "rules", null, 0, -1, Start.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(abstractRuleEClass, AbstractRule.class, "AbstractRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getAbstractRule_Name(), ecorePackage.getEString(), "name", null, 0, 1, AbstractRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(firstAbstractRuleChildEClass, FirstAbstractRuleChild.class, "FirstAbstractRuleChild", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getFirstAbstractRuleChild_Elements(), this.getAbstractRule(), null, "elements", null, 0, -1, FirstAbstractRuleChild.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(secondAbstractRuleChildEClass, SecondAbstractRuleChild.class, "SecondAbstractRuleChild", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getSecondAbstractRuleChild_Rule(), this.getAbstractRuleCall(), null, "rule", null, 0, 1, SecondAbstractRuleChild.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(abstractRuleCallEClass, AbstractRuleCall.class, "AbstractRuleCall", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getAbstractRuleCall_Rule(), this.getAbstractRule(), null, "rule", null, 0, 1, AbstractRuleCall.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    // Create resource
-    createResource(eNS_URI);
-  }
-
-} //ContentAssistTestLanguagePackageImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/impl/FirstAbstractRuleChildImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/impl/FirstAbstractRuleChildImpl.java
deleted file mode 100644
index b1fd76c..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/impl/FirstAbstractRuleChildImpl.java
+++ b/dev/null
@@ -1,169 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FirstAbstractRuleChildImpl.java,v 1.1 2009/02/06 09:46:55 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRule;
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.ContentAssistTestLanguagePackage;
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.FirstAbstractRuleChild;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>First Abstract Rule Child</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.FirstAbstractRuleChildImpl#getElements <em>Elements</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FirstAbstractRuleChildImpl extends AbstractRuleImpl implements FirstAbstractRuleChild
-{
-  /**
-   * The cached value of the '{@link #getElements() <em>Elements</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getElements()
-   * @generated
-   * @ordered
-   */
-  protected EList<AbstractRule> elements;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected FirstAbstractRuleChildImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return ContentAssistTestLanguagePackage.Literals.FIRST_ABSTRACT_RULE_CHILD;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList<AbstractRule> getElements()
-  {
-    if (elements == null)
-    {
-      elements = new EObjectContainmentEList<AbstractRule>(AbstractRule.class, this, ContentAssistTestLanguagePackage.FIRST_ABSTRACT_RULE_CHILD__ELEMENTS);
-    }
-    return elements;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case ContentAssistTestLanguagePackage.FIRST_ABSTRACT_RULE_CHILD__ELEMENTS:
-        return ((InternalEList<?>)getElements()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case ContentAssistTestLanguagePackage.FIRST_ABSTRACT_RULE_CHILD__ELEMENTS:
-        return getElements();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case ContentAssistTestLanguagePackage.FIRST_ABSTRACT_RULE_CHILD__ELEMENTS:
-        getElements().clear();
-        getElements().addAll((Collection<? extends AbstractRule>)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case ContentAssistTestLanguagePackage.FIRST_ABSTRACT_RULE_CHILD__ELEMENTS:
-        getElements().clear();
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case ContentAssistTestLanguagePackage.FIRST_ABSTRACT_RULE_CHILD__ELEMENTS:
-        return elements != null && !elements.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-} //FirstAbstractRuleChildImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/impl/SecondAbstractRuleChildImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/impl/SecondAbstractRuleChildImpl.java
deleted file mode 100644
index 8224fce..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/impl/SecondAbstractRuleChildImpl.java
+++ b/dev/null
@@ -1,197 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SecondAbstractRuleChildImpl.java,v 1.1 2009/02/06 09:46:55 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRuleCall;
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.ContentAssistTestLanguagePackage;
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.SecondAbstractRuleChild;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Second Abstract Rule Child</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.SecondAbstractRuleChildImpl#getRule <em>Rule</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SecondAbstractRuleChildImpl extends AbstractRuleImpl implements SecondAbstractRuleChild
-{
-  /**
-   * The cached value of the '{@link #getRule() <em>Rule</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getRule()
-   * @generated
-   * @ordered
-   */
-  protected AbstractRuleCall rule;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected SecondAbstractRuleChildImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return ContentAssistTestLanguagePackage.Literals.SECOND_ABSTRACT_RULE_CHILD;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public AbstractRuleCall getRule()
-  {
-    return rule;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetRule(AbstractRuleCall newRule, NotificationChain msgs)
-  {
-    AbstractRuleCall oldRule = rule;
-    rule = newRule;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ContentAssistTestLanguagePackage.SECOND_ABSTRACT_RULE_CHILD__RULE, oldRule, newRule);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setRule(AbstractRuleCall newRule)
-  {
-    if (newRule != rule)
-    {
-      NotificationChain msgs = null;
-      if (rule != null)
-        msgs = ((InternalEObject)rule).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ContentAssistTestLanguagePackage.SECOND_ABSTRACT_RULE_CHILD__RULE, null, msgs);
-      if (newRule != null)
-        msgs = ((InternalEObject)newRule).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ContentAssistTestLanguagePackage.SECOND_ABSTRACT_RULE_CHILD__RULE, null, msgs);
-      msgs = basicSetRule(newRule, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, ContentAssistTestLanguagePackage.SECOND_ABSTRACT_RULE_CHILD__RULE, newRule, newRule));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case ContentAssistTestLanguagePackage.SECOND_ABSTRACT_RULE_CHILD__RULE:
-        return basicSetRule(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case ContentAssistTestLanguagePackage.SECOND_ABSTRACT_RULE_CHILD__RULE:
-        return getRule();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case ContentAssistTestLanguagePackage.SECOND_ABSTRACT_RULE_CHILD__RULE:
-        setRule((AbstractRuleCall)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case ContentAssistTestLanguagePackage.SECOND_ABSTRACT_RULE_CHILD__RULE:
-        setRule((AbstractRuleCall)null);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case ContentAssistTestLanguagePackage.SECOND_ABSTRACT_RULE_CHILD__RULE:
-        return rule != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-} //SecondAbstractRuleChildImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/impl/StartImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/impl/StartImpl.java
deleted file mode 100644
index eb83110..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/impl/StartImpl.java
+++ b/dev/null
@@ -1,171 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: StartImpl.java,v 1.1 2009/02/06 09:46:55 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRule;
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.ContentAssistTestLanguagePackage;
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.Start;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Start</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.impl.StartImpl#getRules <em>Rules</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class StartImpl extends EObjectImpl implements Start
-{
-  /**
-   * The cached value of the '{@link #getRules() <em>Rules</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getRules()
-   * @generated
-   * @ordered
-   */
-  protected EList<AbstractRule> rules;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected StartImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return ContentAssistTestLanguagePackage.Literals.START;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList<AbstractRule> getRules()
-  {
-    if (rules == null)
-    {
-      rules = new EObjectContainmentEList<AbstractRule>(AbstractRule.class, this, ContentAssistTestLanguagePackage.START__RULES);
-    }
-    return rules;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case ContentAssistTestLanguagePackage.START__RULES:
-        return ((InternalEList<?>)getRules()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case ContentAssistTestLanguagePackage.START__RULES:
-        return getRules();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case ContentAssistTestLanguagePackage.START__RULES:
-        getRules().clear();
-        getRules().addAll((Collection<? extends AbstractRule>)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case ContentAssistTestLanguagePackage.START__RULES:
-        getRules().clear();
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case ContentAssistTestLanguagePackage.START__RULES:
-        return rules != null && !rules.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-} //StartImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/util/ContentAssistTestLanguageAdapterFactory.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/util/ContentAssistTestLanguageAdapterFactory.java
deleted file mode 100644
index 2a7bc74..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/util/ContentAssistTestLanguageAdapterFactory.java
+++ b/dev/null
@@ -1,216 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ContentAssistTestLanguageAdapterFactory.java,v 1.1 2009/02/06 09:46:55 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.ContentAssistTestLanguagePackage
- * @generated
- */
-public class ContentAssistTestLanguageAdapterFactory extends AdapterFactoryImpl
-{
-  /**
-   * The cached model package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected static ContentAssistTestLanguagePackage modelPackage;
-
-  /**
-   * Creates an instance of the adapter factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ContentAssistTestLanguageAdapterFactory()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = ContentAssistTestLanguagePackage.eINSTANCE;
-    }
-  }
-
-  /**
-   * Returns whether this factory is applicable for the type of the object.
-   * <!-- begin-user-doc -->
-   * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-   * <!-- end-user-doc -->
-   * @return whether this factory is applicable for the type of the object.
-   * @generated
-   */
-  @Override
-  public boolean isFactoryForType(Object object)
-  {
-    if (object == modelPackage)
-    {
-      return true;
-    }
-    if (object instanceof EObject)
-    {
-      return ((EObject)object).eClass().getEPackage() == modelPackage;
-    }
-    return false;
-  }
-
-  /**
-   * The switch that delegates to the <code>createXXX</code> methods.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ContentAssistTestLanguageSwitch<Adapter> modelSwitch =
-    new ContentAssistTestLanguageSwitch<Adapter>()
-    {
-      @Override
-      public Adapter caseStart(Start object)
-      {
-        return createStartAdapter();
-      }
-      @Override
-      public Adapter caseAbstractRule(AbstractRule object)
-      {
-        return createAbstractRuleAdapter();
-      }
-      @Override
-      public Adapter caseFirstAbstractRuleChild(FirstAbstractRuleChild object)
-      {
-        return createFirstAbstractRuleChildAdapter();
-      }
-      @Override
-      public Adapter caseSecondAbstractRuleChild(SecondAbstractRuleChild object)
-      {
-        return createSecondAbstractRuleChildAdapter();
-      }
-      @Override
-      public Adapter caseAbstractRuleCall(AbstractRuleCall object)
-      {
-        return createAbstractRuleCallAdapter();
-      }
-      @Override
-      public Adapter defaultCase(EObject object)
-      {
-        return createEObjectAdapter();
-      }
-    };
-
-  /**
-   * Creates an adapter for the <code>target</code>.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param target the object to adapt.
-   * @return the adapter for the <code>target</code>.
-   * @generated
-   */
-  @Override
-  public Adapter createAdapter(Notifier target)
-  {
-    return modelSwitch.doSwitch((EObject)target);
-  }
-
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.Start <em>Start</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.Start
-   * @generated
-   */
-  public Adapter createStartAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRule <em>Abstract Rule</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRule
-   * @generated
-   */
-  public Adapter createAbstractRuleAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.FirstAbstractRuleChild <em>First Abstract Rule Child</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.FirstAbstractRuleChild
-   * @generated
-   */
-  public Adapter createFirstAbstractRuleChildAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.SecondAbstractRuleChild <em>Second Abstract Rule Child</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.SecondAbstractRuleChild
-   * @generated
-   */
-  public Adapter createSecondAbstractRuleChildAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRuleCall <em>Abstract Rule Call</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.AbstractRuleCall
-   * @generated
-   */
-  public Adapter createAbstractRuleCallAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for the default case.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @generated
-   */
-  public Adapter createEObjectAdapter()
-  {
-    return null;
-  }
-
-} //ContentAssistTestLanguageAdapterFactory
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/util/ContentAssistTestLanguageSwitch.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/util/ContentAssistTestLanguageSwitch.java
deleted file mode 100644
index 535280f..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/contentAssistTestLanguage/contentAssistTestLanguage/util/ContentAssistTestLanguageSwitch.java
+++ b/dev/null
@@ -1,236 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ContentAssistTestLanguageSwitch.java,v 1.1 2009/02/06 09:46:55 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.xtext.testlanguages.contentAssistTestLanguage.contentAssistTestLanguage.ContentAssistTestLanguagePackage
- * @generated
- */
-public class ContentAssistTestLanguageSwitch<T>
-{
-  /**
-   * The cached model package
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected static ContentAssistTestLanguagePackage modelPackage;
-
-  /**
-   * Creates an instance of the switch.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ContentAssistTestLanguageSwitch()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = ContentAssistTestLanguagePackage.eINSTANCE;
-    }
-  }
-
-  /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-  public T doSwitch(EObject theEObject)
-  {
-    return doSwitch(theEObject.eClass(), theEObject);
-  }
-
-  /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-  protected T doSwitch(EClass theEClass, EObject theEObject)
-  {
-    if (theEClass.eContainer() == modelPackage)
-    {
-      return doSwitch(theEClass.getClassifierID(), theEObject);
-    }
-    else
-    {
-      List<EClass> eSuperTypes = theEClass.getESuperTypes();
-      return
-        eSuperTypes.isEmpty() ?
-          defaultCase(theEObject) :
-          doSwitch(eSuperTypes.get(0), theEObject);
-    }
-  }
-
-  /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-  protected T doSwitch(int classifierID, EObject theEObject)
-  {
-    switch (classifierID)
-    {
-      case ContentAssistTestLanguagePackage.START:
-      {
-        Start start = (Start)theEObject;
-        T result = caseStart(start);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case ContentAssistTestLanguagePackage.ABSTRACT_RULE:
-      {
-        AbstractRule abstractRule = (AbstractRule)theEObject;
-        T result = caseAbstractRule(abstractRule);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case ContentAssistTestLanguagePackage.FIRST_ABSTRACT_RULE_CHILD:
-      {
-        FirstAbstractRuleChild firstAbstractRuleChild = (FirstAbstractRuleChild)theEObject;
-        T result = caseFirstAbstractRuleChild(firstAbstractRuleChild);
-        if (result == null) result = caseAbstractRule(firstAbstractRuleChild);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case ContentAssistTestLanguagePackage.SECOND_ABSTRACT_RULE_CHILD:
-      {
-        SecondAbstractRuleChild secondAbstractRuleChild = (SecondAbstractRuleChild)theEObject;
-        T result = caseSecondAbstractRuleChild(secondAbstractRuleChild);
-        if (result == null) result = caseAbstractRule(secondAbstractRuleChild);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case ContentAssistTestLanguagePackage.ABSTRACT_RULE_CALL:
-      {
-        AbstractRuleCall abstractRuleCall = (AbstractRuleCall)theEObject;
-        T result = caseAbstractRuleCall(abstractRuleCall);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      default: return defaultCase(theEObject);
-    }
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Start</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Start</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseStart(Start object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Abstract Rule</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Abstract Rule</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseAbstractRule(AbstractRule object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>First Abstract Rule Child</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>First Abstract Rule Child</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseFirstAbstractRuleChild(FirstAbstractRuleChild object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Second Abstract Rule Child</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Second Abstract Rule Child</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseSecondAbstractRuleChild(SecondAbstractRuleChild object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Abstract Rule Call</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Abstract Rule Call</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseAbstractRuleCall(AbstractRuleCall object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch, but this is the last case anyway.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-   * @generated
-   */
-  public T defaultCase(EObject object)
-  {
-    return null;
-  }
-
-} //ContentAssistTestLanguageSwitch
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/Erwachsener.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/Erwachsener.java
deleted file mode 100644
index d331826..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/Erwachsener.java
+++ b/dev/null
@@ -1,22 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Erwachsener.java,v 1.2 2009/02/06 09:46:53 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Erwachsener</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage#getErwachsener()
- * @model
- * @generated
- */
-public interface Erwachsener extends Person
-{
-} // Erwachsener
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/Familie.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/Familie.java
deleted file mode 100644
index dc52249..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/Familie.java
+++ b/dev/null
@@ -1,128 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Familie.java,v 1.2 2009/02/06 09:46:53 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Familie</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Familie#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Familie#getMutter <em>Mutter</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Familie#getVater <em>Vater</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Familie#getKinder <em>Kinder</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage#getFamilie()
- * @model
- * @generated
- */
-public interface Familie extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage#getFamilie_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Familie#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-  void setName(String value);
-
-  /**
-   * Returns the value of the '<em><b>Mutter</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Mutter</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Mutter</em>' reference.
-   * @see #setMutter(Erwachsener)
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage#getFamilie_Mutter()
-   * @model
-   * @generated
-   */
-  Erwachsener getMutter();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Familie#getMutter <em>Mutter</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Mutter</em>' reference.
-   * @see #getMutter()
-   * @generated
-   */
-  void setMutter(Erwachsener value);
-
-  /**
-   * Returns the value of the '<em><b>Vater</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Vater</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Vater</em>' reference.
-   * @see #setVater(Erwachsener)
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage#getFamilie_Vater()
-   * @model
-   * @generated
-   */
-  Erwachsener getVater();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Familie#getVater <em>Vater</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Vater</em>' reference.
-   * @see #getVater()
-   * @generated
-   */
-  void setVater(Erwachsener value);
-
-  /**
-   * Returns the value of the '<em><b>Kinder</b></em>' reference list.
-   * The list contents are of type {@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Kind}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Kinder</em>' reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Kinder</em>' reference list.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage#getFamilie_Kinder()
-   * @model
-   * @generated
-   */
-  EList<Kind> getKinder();
-
-} // Familie
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/Farbe.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/Farbe.java
deleted file mode 100644
index 342acb6..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/Farbe.java
+++ b/dev/null
@@ -1,23 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Farbe.java,v 1.2 2009/02/06 09:46:53 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Farbe</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage#getFarbe()
- * @model
- * @generated
- */
-public interface Farbe extends EObject
-{
-} // Farbe
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/Kind.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/Kind.java
deleted file mode 100644
index cff3c45..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/Kind.java
+++ b/dev/null
@@ -1,22 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Kind.java,v 1.2 2009/02/06 09:46:53 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Kind</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage#getKind()
- * @model
- * @generated
- */
-public interface Kind extends Person
-{
-} // Kind
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/Person.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/Person.java
deleted file mode 100644
index 163435f..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/Person.java
+++ b/dev/null
@@ -1,82 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Person.java,v 1.2 2009/02/06 09:46:53 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Person</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Person#getAge <em>Age</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Person#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage#getPerson()
- * @model
- * @generated
- */
-public interface Person extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Age</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Age</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Age</em>' attribute.
-   * @see #setAge(int)
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage#getPerson_Age()
-   * @model
-   * @generated
-   */
-  int getAge();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Person#getAge <em>Age</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Age</em>' attribute.
-   * @see #getAge()
-   * @generated
-   */
-  void setAge(int value);
-
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage#getPerson_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Person#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-  void setName(String value);
-
-} // Person
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/ReferenceGrammarFactory.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/ReferenceGrammarFactory.java
deleted file mode 100644
index fed2701..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/ReferenceGrammarFactory.java
+++ b/dev/null
@@ -1,101 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ReferenceGrammarFactory.java,v 1.2 2009/02/06 09:46:53 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage
- * @generated
- */
-public interface ReferenceGrammarFactory extends EFactory
-{
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  ReferenceGrammarFactory eINSTANCE = org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.ReferenceGrammarFactoryImpl.init();
-
-  /**
-   * Returns a new object of class '<em>Spielplatz</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Spielplatz</em>'.
-   * @generated
-   */
-  Spielplatz createSpielplatz();
-
-  /**
-   * Returns a new object of class '<em>Person</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Person</em>'.
-   * @generated
-   */
-  Person createPerson();
-
-  /**
-   * Returns a new object of class '<em>Kind</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Kind</em>'.
-   * @generated
-   */
-  Kind createKind();
-
-  /**
-   * Returns a new object of class '<em>Erwachsener</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Erwachsener</em>'.
-   * @generated
-   */
-  Erwachsener createErwachsener();
-
-  /**
-   * Returns a new object of class '<em>Spielzeug</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Spielzeug</em>'.
-   * @generated
-   */
-  Spielzeug createSpielzeug();
-
-  /**
-   * Returns a new object of class '<em>Farbe</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Farbe</em>'.
-   * @generated
-   */
-  Farbe createFarbe();
-
-  /**
-   * Returns a new object of class '<em>Familie</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Familie</em>'.
-   * @generated
-   */
-  Familie createFamilie();
-
-  /**
-   * Returns the package supported by this factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the package supported by this factory.
-   * @generated
-   */
-  ReferenceGrammarPackage getReferenceGrammarPackage();
-
-} //ReferenceGrammarFactory
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/ReferenceGrammarPackage.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/ReferenceGrammarPackage.java
deleted file mode 100644
index 846af38..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/ReferenceGrammarPackage.java
+++ b/dev/null
@@ -1,790 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ReferenceGrammarPackage.java,v 1.2 2009/02/06 09:46:53 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarFactory
- * @model kind="package"
- * @generated
- */
-public interface ReferenceGrammarPackage extends EPackage
-{
-  /**
-   * The package name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNAME = "ReferenceGrammar";
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_URI = "http://eclipse.org/xtext/reference/ReferenceGrammar";
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_PREFIX = "ReferenceGrammar";
-
-  /**
-   * The singleton instance of the package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  ReferenceGrammarPackage eINSTANCE = org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.ReferenceGrammarPackageImpl.init();
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.SpielplatzImpl <em>Spielplatz</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.SpielplatzImpl
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.ReferenceGrammarPackageImpl#getSpielplatz()
-   * @generated
-   */
-  int SPIELPLATZ = 0;
-
-  /**
-   * The feature id for the '<em><b>Groesse</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SPIELPLATZ__GROESSE = 0;
-
-  /**
-   * The feature id for the '<em><b>Beschreibung</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SPIELPLATZ__BESCHREIBUNG = 1;
-
-  /**
-   * The feature id for the '<em><b>Kinder</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SPIELPLATZ__KINDER = 2;
-
-  /**
-   * The feature id for the '<em><b>Erzieher</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SPIELPLATZ__ERZIEHER = 3;
-
-  /**
-   * The feature id for the '<em><b>Spielzeuge</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SPIELPLATZ__SPIELZEUGE = 4;
-
-  /**
-   * The feature id for the '<em><b>Familie</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SPIELPLATZ__FAMILIE = 5;
-
-  /**
-   * The number of structural features of the '<em>Spielplatz</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SPIELPLATZ_FEATURE_COUNT = 6;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.PersonImpl <em>Person</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.PersonImpl
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.ReferenceGrammarPackageImpl#getPerson()
-   * @generated
-   */
-  int PERSON = 1;
-
-  /**
-   * The feature id for the '<em><b>Age</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PERSON__AGE = 0;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PERSON__NAME = 1;
-
-  /**
-   * The number of structural features of the '<em>Person</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PERSON_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.KindImpl <em>Kind</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.KindImpl
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.ReferenceGrammarPackageImpl#getKind()
-   * @generated
-   */
-  int KIND = 2;
-
-  /**
-   * The feature id for the '<em><b>Age</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int KIND__AGE = PERSON__AGE;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int KIND__NAME = PERSON__NAME;
-
-  /**
-   * The number of structural features of the '<em>Kind</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int KIND_FEATURE_COUNT = PERSON_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.ErwachsenerImpl <em>Erwachsener</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.ErwachsenerImpl
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.ReferenceGrammarPackageImpl#getErwachsener()
-   * @generated
-   */
-  int ERWACHSENER = 3;
-
-  /**
-   * The feature id for the '<em><b>Age</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ERWACHSENER__AGE = PERSON__AGE;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ERWACHSENER__NAME = PERSON__NAME;
-
-  /**
-   * The number of structural features of the '<em>Erwachsener</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ERWACHSENER_FEATURE_COUNT = PERSON_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.SpielzeugImpl <em>Spielzeug</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.SpielzeugImpl
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.ReferenceGrammarPackageImpl#getSpielzeug()
-   * @generated
-   */
-  int SPIELZEUG = 4;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SPIELZEUG__NAME = 0;
-
-  /**
-   * The feature id for the '<em><b>Farbe</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SPIELZEUG__FARBE = 1;
-
-  /**
-   * The number of structural features of the '<em>Spielzeug</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SPIELZEUG_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.FarbeImpl <em>Farbe</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.FarbeImpl
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.ReferenceGrammarPackageImpl#getFarbe()
-   * @generated
-   */
-  int FARBE = 5;
-
-  /**
-   * The number of structural features of the '<em>Farbe</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int FARBE_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.FamilieImpl <em>Familie</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.FamilieImpl
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.ReferenceGrammarPackageImpl#getFamilie()
-   * @generated
-   */
-  int FAMILIE = 6;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int FAMILIE__NAME = 0;
-
-  /**
-   * The feature id for the '<em><b>Mutter</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int FAMILIE__MUTTER = 1;
-
-  /**
-   * The feature id for the '<em><b>Vater</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int FAMILIE__VATER = 2;
-
-  /**
-   * The feature id for the '<em><b>Kinder</b></em>' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int FAMILIE__KINDER = 3;
-
-  /**
-   * The number of structural features of the '<em>Familie</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int FAMILIE_FEATURE_COUNT = 4;
-
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz <em>Spielplatz</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Spielplatz</em>'.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz
-   * @generated
-   */
-  EClass getSpielplatz();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz#getGroesse <em>Groesse</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Groesse</em>'.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz#getGroesse()
-   * @see #getSpielplatz()
-   * @generated
-   */
-  EAttribute getSpielplatz_Groesse();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz#getBeschreibung <em>Beschreibung</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Beschreibung</em>'.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz#getBeschreibung()
-   * @see #getSpielplatz()
-   * @generated
-   */
-  EAttribute getSpielplatz_Beschreibung();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz#getKinder <em>Kinder</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Kinder</em>'.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz#getKinder()
-   * @see #getSpielplatz()
-   * @generated
-   */
-  EReference getSpielplatz_Kinder();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz#getErzieher <em>Erzieher</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Erzieher</em>'.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz#getErzieher()
-   * @see #getSpielplatz()
-   * @generated
-   */
-  EReference getSpielplatz_Erzieher();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz#getSpielzeuge <em>Spielzeuge</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Spielzeuge</em>'.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz#getSpielzeuge()
-   * @see #getSpielplatz()
-   * @generated
-   */
-  EReference getSpielplatz_Spielzeuge();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz#getFamilie <em>Familie</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Familie</em>'.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz#getFamilie()
-   * @see #getSpielplatz()
-   * @generated
-   */
-  EReference getSpielplatz_Familie();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Person <em>Person</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Person</em>'.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Person
-   * @generated
-   */
-  EClass getPerson();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Person#getAge <em>Age</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Age</em>'.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Person#getAge()
-   * @see #getPerson()
-   * @generated
-   */
-  EAttribute getPerson_Age();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Person#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Person#getName()
-   * @see #getPerson()
-   * @generated
-   */
-  EAttribute getPerson_Name();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Kind <em>Kind</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Kind</em>'.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Kind
-   * @generated
-   */
-  EClass getKind();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Erwachsener <em>Erwachsener</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Erwachsener</em>'.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Erwachsener
-   * @generated
-   */
-  EClass getErwachsener();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielzeug <em>Spielzeug</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Spielzeug</em>'.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielzeug
-   * @generated
-   */
-  EClass getSpielzeug();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielzeug#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielzeug#getName()
-   * @see #getSpielzeug()
-   * @generated
-   */
-  EAttribute getSpielzeug_Name();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielzeug#getFarbe <em>Farbe</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Farbe</em>'.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielzeug#getFarbe()
-   * @see #getSpielzeug()
-   * @generated
-   */
-  EReference getSpielzeug_Farbe();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Farbe <em>Farbe</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Farbe</em>'.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Farbe
-   * @generated
-   */
-  EClass getFarbe();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Familie <em>Familie</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Familie</em>'.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Familie
-   * @generated
-   */
-  EClass getFamilie();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Familie#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Familie#getName()
-   * @see #getFamilie()
-   * @generated
-   */
-  EAttribute getFamilie_Name();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Familie#getMutter <em>Mutter</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Mutter</em>'.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Familie#getMutter()
-   * @see #getFamilie()
-   * @generated
-   */
-  EReference getFamilie_Mutter();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Familie#getVater <em>Vater</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Vater</em>'.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Familie#getVater()
-   * @see #getFamilie()
-   * @generated
-   */
-  EReference getFamilie_Vater();
-
-  /**
-   * Returns the meta object for the reference list '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Familie#getKinder <em>Kinder</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference list '<em>Kinder</em>'.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Familie#getKinder()
-   * @see #getFamilie()
-   * @generated
-   */
-  EReference getFamilie_Kinder();
-
-  /**
-   * Returns the factory that creates the instances of the model.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the factory that creates the instances of the model.
-   * @generated
-   */
-  ReferenceGrammarFactory getReferenceGrammarFactory();
-
-  /**
-   * <!-- begin-user-doc -->
-   * Defines literals for the meta objects that represent
-   * <ul>
-   *   <li>each class,</li>
-   *   <li>each feature of each class,</li>
-   *   <li>each enum,</li>
-   *   <li>and each data type</li>
-   * </ul>
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  interface Literals
-  {
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.SpielplatzImpl <em>Spielplatz</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.SpielplatzImpl
-     * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.ReferenceGrammarPackageImpl#getSpielplatz()
-     * @generated
-     */
-    EClass SPIELPLATZ = eINSTANCE.getSpielplatz();
-
-    /**
-     * The meta object literal for the '<em><b>Groesse</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute SPIELPLATZ__GROESSE = eINSTANCE.getSpielplatz_Groesse();
-
-    /**
-     * The meta object literal for the '<em><b>Beschreibung</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute SPIELPLATZ__BESCHREIBUNG = eINSTANCE.getSpielplatz_Beschreibung();
-
-    /**
-     * The meta object literal for the '<em><b>Kinder</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference SPIELPLATZ__KINDER = eINSTANCE.getSpielplatz_Kinder();
-
-    /**
-     * The meta object literal for the '<em><b>Erzieher</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference SPIELPLATZ__ERZIEHER = eINSTANCE.getSpielplatz_Erzieher();
-
-    /**
-     * The meta object literal for the '<em><b>Spielzeuge</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference SPIELPLATZ__SPIELZEUGE = eINSTANCE.getSpielplatz_Spielzeuge();
-
-    /**
-     * The meta object literal for the '<em><b>Familie</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference SPIELPLATZ__FAMILIE = eINSTANCE.getSpielplatz_Familie();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.PersonImpl <em>Person</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.PersonImpl
-     * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.ReferenceGrammarPackageImpl#getPerson()
-     * @generated
-     */
-    EClass PERSON = eINSTANCE.getPerson();
-
-    /**
-     * The meta object literal for the '<em><b>Age</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute PERSON__AGE = eINSTANCE.getPerson_Age();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute PERSON__NAME = eINSTANCE.getPerson_Name();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.KindImpl <em>Kind</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.KindImpl
-     * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.ReferenceGrammarPackageImpl#getKind()
-     * @generated
-     */
-    EClass KIND = eINSTANCE.getKind();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.ErwachsenerImpl <em>Erwachsener</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.ErwachsenerImpl
-     * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.ReferenceGrammarPackageImpl#getErwachsener()
-     * @generated
-     */
-    EClass ERWACHSENER = eINSTANCE.getErwachsener();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.SpielzeugImpl <em>Spielzeug</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.SpielzeugImpl
-     * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.ReferenceGrammarPackageImpl#getSpielzeug()
-     * @generated
-     */
-    EClass SPIELZEUG = eINSTANCE.getSpielzeug();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute SPIELZEUG__NAME = eINSTANCE.getSpielzeug_Name();
-
-    /**
-     * The meta object literal for the '<em><b>Farbe</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference SPIELZEUG__FARBE = eINSTANCE.getSpielzeug_Farbe();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.FarbeImpl <em>Farbe</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.FarbeImpl
-     * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.ReferenceGrammarPackageImpl#getFarbe()
-     * @generated
-     */
-    EClass FARBE = eINSTANCE.getFarbe();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.FamilieImpl <em>Familie</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.FamilieImpl
-     * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.ReferenceGrammarPackageImpl#getFamilie()
-     * @generated
-     */
-    EClass FAMILIE = eINSTANCE.getFamilie();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute FAMILIE__NAME = eINSTANCE.getFamilie_Name();
-
-    /**
-     * The meta object literal for the '<em><b>Mutter</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference FAMILIE__MUTTER = eINSTANCE.getFamilie_Mutter();
-
-    /**
-     * The meta object literal for the '<em><b>Vater</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference FAMILIE__VATER = eINSTANCE.getFamilie_Vater();
-
-    /**
-     * The meta object literal for the '<em><b>Kinder</b></em>' reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference FAMILIE__KINDER = eINSTANCE.getFamilie_Kinder();
-
-  }
-
-} //ReferenceGrammarPackage
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/Spielplatz.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/Spielplatz.java
deleted file mode 100644
index 43249c5..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/Spielplatz.java
+++ b/dev/null
@@ -1,152 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Spielplatz.java,v 1.2 2009/02/06 09:46:53 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Spielplatz</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz#getGroesse <em>Groesse</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz#getBeschreibung <em>Beschreibung</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz#getKinder <em>Kinder</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz#getErzieher <em>Erzieher</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz#getSpielzeuge <em>Spielzeuge</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz#getFamilie <em>Familie</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage#getSpielplatz()
- * @model
- * @generated
- */
-public interface Spielplatz extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Groesse</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Groesse</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Groesse</em>' attribute.
-   * @see #setGroesse(int)
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage#getSpielplatz_Groesse()
-   * @model
-   * @generated
-   */
-  int getGroesse();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz#getGroesse <em>Groesse</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Groesse</em>' attribute.
-   * @see #getGroesse()
-   * @generated
-   */
-  void setGroesse(int value);
-
-  /**
-   * Returns the value of the '<em><b>Beschreibung</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Beschreibung</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Beschreibung</em>' attribute.
-   * @see #setBeschreibung(String)
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage#getSpielplatz_Beschreibung()
-   * @model
-   * @generated
-   */
-  String getBeschreibung();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz#getBeschreibung <em>Beschreibung</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Beschreibung</em>' attribute.
-   * @see #getBeschreibung()
-   * @generated
-   */
-  void setBeschreibung(String value);
-
-  /**
-   * Returns the value of the '<em><b>Kinder</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Kind}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Kinder</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Kinder</em>' containment reference list.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage#getSpielplatz_Kinder()
-   * @model containment="true"
-   * @generated
-   */
-  EList<Kind> getKinder();
-
-  /**
-   * Returns the value of the '<em><b>Erzieher</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Erwachsener}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Erzieher</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Erzieher</em>' containment reference list.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage#getSpielplatz_Erzieher()
-   * @model containment="true"
-   * @generated
-   */
-  EList<Erwachsener> getErzieher();
-
-  /**
-   * Returns the value of the '<em><b>Spielzeuge</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielzeug}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Spielzeuge</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Spielzeuge</em>' containment reference list.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage#getSpielplatz_Spielzeuge()
-   * @model containment="true"
-   * @generated
-   */
-  EList<Spielzeug> getSpielzeuge();
-
-  /**
-   * Returns the value of the '<em><b>Familie</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Familie}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Familie</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Familie</em>' containment reference list.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage#getSpielplatz_Familie()
-   * @model containment="true"
-   * @generated
-   */
-  EList<Familie> getFamilie();
-
-} // Spielplatz
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/Spielzeug.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/Spielzeug.java
deleted file mode 100644
index f3b51c0..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/Spielzeug.java
+++ b/dev/null
@@ -1,82 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Spielzeug.java,v 1.2 2009/02/06 09:46:53 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Spielzeug</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielzeug#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielzeug#getFarbe <em>Farbe</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage#getSpielzeug()
- * @model
- * @generated
- */
-public interface Spielzeug extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage#getSpielzeug_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielzeug#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-  void setName(String value);
-
-  /**
-   * Returns the value of the '<em><b>Farbe</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Farbe</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Farbe</em>' containment reference.
-   * @see #setFarbe(Farbe)
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage#getSpielzeug_Farbe()
-   * @model containment="true"
-   * @generated
-   */
-  Farbe getFarbe();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielzeug#getFarbe <em>Farbe</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Farbe</em>' containment reference.
-   * @see #getFarbe()
-   * @generated
-   */
-  void setFarbe(Farbe value);
-
-} // Spielzeug
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/ErwachsenerImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/ErwachsenerImpl.java
deleted file mode 100644
index d081dd1..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/ErwachsenerImpl.java
+++ b/dev/null
@@ -1,46 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ErwachsenerImpl.java,v 1.2 2009/02/06 09:46:54 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Erwachsener;
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Erwachsener</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ErwachsenerImpl extends PersonImpl implements Erwachsener
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ErwachsenerImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return ReferenceGrammarPackage.Literals.ERWACHSENER;
-  }
-
-} //ErwachsenerImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/FamilieImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/FamilieImpl.java
deleted file mode 100644
index e40fa70..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/FamilieImpl.java
+++ b/dev/null
@@ -1,357 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FamilieImpl.java,v 1.2 2009/02/06 09:46:54 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Erwachsener;
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Familie;
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Kind;
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Familie</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.FamilieImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.FamilieImpl#getMutter <em>Mutter</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.FamilieImpl#getVater <em>Vater</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.FamilieImpl#getKinder <em>Kinder</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FamilieImpl extends EObjectImpl implements Familie
-{
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getMutter() <em>Mutter</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getMutter()
-   * @generated
-   * @ordered
-   */
-  protected Erwachsener mutter;
-
-  /**
-   * The cached value of the '{@link #getVater() <em>Vater</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getVater()
-   * @generated
-   * @ordered
-   */
-  protected Erwachsener vater;
-
-  /**
-   * The cached value of the '{@link #getKinder() <em>Kinder</em>}' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getKinder()
-   * @generated
-   * @ordered
-   */
-  protected EList<Kind> kinder;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected FamilieImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return ReferenceGrammarPackage.Literals.FAMILIE;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, ReferenceGrammarPackage.FAMILIE__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Erwachsener getMutter()
-  {
-    if (mutter != null && mutter.eIsProxy())
-    {
-      InternalEObject oldMutter = (InternalEObject)mutter;
-      mutter = (Erwachsener)eResolveProxy(oldMutter);
-      if (mutter != oldMutter)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReferenceGrammarPackage.FAMILIE__MUTTER, oldMutter, mutter));
-      }
-    }
-    return mutter;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Erwachsener basicGetMutter()
-  {
-    return mutter;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setMutter(Erwachsener newMutter)
-  {
-    Erwachsener oldMutter = mutter;
-    mutter = newMutter;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, ReferenceGrammarPackage.FAMILIE__MUTTER, oldMutter, mutter));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Erwachsener getVater()
-  {
-    if (vater != null && vater.eIsProxy())
-    {
-      InternalEObject oldVater = (InternalEObject)vater;
-      vater = (Erwachsener)eResolveProxy(oldVater);
-      if (vater != oldVater)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, ReferenceGrammarPackage.FAMILIE__VATER, oldVater, vater));
-      }
-    }
-    return vater;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Erwachsener basicGetVater()
-  {
-    return vater;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setVater(Erwachsener newVater)
-  {
-    Erwachsener oldVater = vater;
-    vater = newVater;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, ReferenceGrammarPackage.FAMILIE__VATER, oldVater, vater));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList<Kind> getKinder()
-  {
-    if (kinder == null)
-    {
-      kinder = new EObjectResolvingEList<Kind>(Kind.class, this, ReferenceGrammarPackage.FAMILIE__KINDER);
-    }
-    return kinder;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case ReferenceGrammarPackage.FAMILIE__NAME:
-        return getName();
-      case ReferenceGrammarPackage.FAMILIE__MUTTER:
-        if (resolve) return getMutter();
-        return basicGetMutter();
-      case ReferenceGrammarPackage.FAMILIE__VATER:
-        if (resolve) return getVater();
-        return basicGetVater();
-      case ReferenceGrammarPackage.FAMILIE__KINDER:
-        return getKinder();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case ReferenceGrammarPackage.FAMILIE__NAME:
-        setName((String)newValue);
-        return;
-      case ReferenceGrammarPackage.FAMILIE__MUTTER:
-        setMutter((Erwachsener)newValue);
-        return;
-      case ReferenceGrammarPackage.FAMILIE__VATER:
-        setVater((Erwachsener)newValue);
-        return;
-      case ReferenceGrammarPackage.FAMILIE__KINDER:
-        getKinder().clear();
-        getKinder().addAll((Collection<? extends Kind>)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case ReferenceGrammarPackage.FAMILIE__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case ReferenceGrammarPackage.FAMILIE__MUTTER:
-        setMutter((Erwachsener)null);
-        return;
-      case ReferenceGrammarPackage.FAMILIE__VATER:
-        setVater((Erwachsener)null);
-        return;
-      case ReferenceGrammarPackage.FAMILIE__KINDER:
-        getKinder().clear();
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case ReferenceGrammarPackage.FAMILIE__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case ReferenceGrammarPackage.FAMILIE__MUTTER:
-        return mutter != null;
-      case ReferenceGrammarPackage.FAMILIE__VATER:
-        return vater != null;
-      case ReferenceGrammarPackage.FAMILIE__KINDER:
-        return kinder != null && !kinder.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-} //FamilieImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/FarbeImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/FarbeImpl.java
deleted file mode 100644
index 2b3df00..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/FarbeImpl.java
+++ b/dev/null
@@ -1,48 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FarbeImpl.java,v 1.2 2009/02/06 09:46:54 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Farbe;
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Farbe</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class FarbeImpl extends EObjectImpl implements Farbe
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected FarbeImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return ReferenceGrammarPackage.Literals.FARBE;
-  }
-
-} //FarbeImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/KindImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/KindImpl.java
deleted file mode 100644
index aeaf9e1..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/KindImpl.java
+++ b/dev/null
@@ -1,46 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: KindImpl.java,v 1.2 2009/02/06 09:46:54 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Kind;
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Kind</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class KindImpl extends PersonImpl implements Kind
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected KindImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return ReferenceGrammarPackage.Literals.KIND;
-  }
-
-} //KindImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/PersonImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/PersonImpl.java
deleted file mode 100644
index 77edf72..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/PersonImpl.java
+++ b/dev/null
@@ -1,237 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: PersonImpl.java,v 1.2 2009/02/06 09:46:54 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Person;
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Person</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.PersonImpl#getAge <em>Age</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.PersonImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PersonImpl extends EObjectImpl implements Person
-{
-  /**
-   * The default value of the '{@link #getAge() <em>Age</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAge()
-   * @generated
-   * @ordered
-   */
-  protected static final int AGE_EDEFAULT = 0;
-
-  /**
-   * The cached value of the '{@link #getAge() <em>Age</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAge()
-   * @generated
-   * @ordered
-   */
-  protected int age = AGE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected PersonImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return ReferenceGrammarPackage.Literals.PERSON;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public int getAge()
-  {
-    return age;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setAge(int newAge)
-  {
-    int oldAge = age;
-    age = newAge;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, ReferenceGrammarPackage.PERSON__AGE, oldAge, age));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, ReferenceGrammarPackage.PERSON__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case ReferenceGrammarPackage.PERSON__AGE:
-        return new Integer(getAge());
-      case ReferenceGrammarPackage.PERSON__NAME:
-        return getName();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case ReferenceGrammarPackage.PERSON__AGE:
-        setAge(((Integer)newValue).intValue());
-        return;
-      case ReferenceGrammarPackage.PERSON__NAME:
-        setName((String)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case ReferenceGrammarPackage.PERSON__AGE:
-        setAge(AGE_EDEFAULT);
-        return;
-      case ReferenceGrammarPackage.PERSON__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case ReferenceGrammarPackage.PERSON__AGE:
-        return age != AGE_EDEFAULT;
-      case ReferenceGrammarPackage.PERSON__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (age: ");
-    result.append(age);
-    result.append(", name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-} //PersonImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/ReferenceGrammarFactoryImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/ReferenceGrammarFactoryImpl.java
deleted file mode 100644
index 23c13c6..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/ReferenceGrammarFactoryImpl.java
+++ b/dev/null
@@ -1,182 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ReferenceGrammarFactoryImpl.java,v 1.2 2009/02/06 09:46:54 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ReferenceGrammarFactoryImpl extends EFactoryImpl implements ReferenceGrammarFactory
-{
-  /**
-   * Creates the default factory implementation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static ReferenceGrammarFactory init()
-  {
-    try
-    {
-      ReferenceGrammarFactory theReferenceGrammarFactory = (ReferenceGrammarFactory)EPackage.Registry.INSTANCE.getEFactory("http://eclipse.org/xtext/reference/ReferenceGrammar"); 
-      if (theReferenceGrammarFactory != null)
-      {
-        return theReferenceGrammarFactory;
-      }
-    }
-    catch (Exception exception)
-    {
-      EcorePlugin.INSTANCE.log(exception);
-    }
-    return new ReferenceGrammarFactoryImpl();
-  }
-
-  /**
-   * Creates an instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ReferenceGrammarFactoryImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EObject create(EClass eClass)
-  {
-    switch (eClass.getClassifierID())
-    {
-      case ReferenceGrammarPackage.SPIELPLATZ: return createSpielplatz();
-      case ReferenceGrammarPackage.PERSON: return createPerson();
-      case ReferenceGrammarPackage.KIND: return createKind();
-      case ReferenceGrammarPackage.ERWACHSENER: return createErwachsener();
-      case ReferenceGrammarPackage.SPIELZEUG: return createSpielzeug();
-      case ReferenceGrammarPackage.FARBE: return createFarbe();
-      case ReferenceGrammarPackage.FAMILIE: return createFamilie();
-      default:
-        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Spielplatz createSpielplatz()
-  {
-    SpielplatzImpl spielplatz = new SpielplatzImpl();
-    return spielplatz;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Person createPerson()
-  {
-    PersonImpl person = new PersonImpl();
-    return person;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Kind createKind()
-  {
-    KindImpl kind = new KindImpl();
-    return kind;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Erwachsener createErwachsener()
-  {
-    ErwachsenerImpl erwachsener = new ErwachsenerImpl();
-    return erwachsener;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Spielzeug createSpielzeug()
-  {
-    SpielzeugImpl spielzeug = new SpielzeugImpl();
-    return spielzeug;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Farbe createFarbe()
-  {
-    FarbeImpl farbe = new FarbeImpl();
-    return farbe;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Familie createFamilie()
-  {
-    FamilieImpl familie = new FamilieImpl();
-    return familie;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ReferenceGrammarPackage getReferenceGrammarPackage()
-  {
-    return (ReferenceGrammarPackage)getEPackage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @deprecated
-   * @generated
-   */
-  @Deprecated
-  public static ReferenceGrammarPackage getPackage()
-  {
-    return ReferenceGrammarPackage.eINSTANCE;
-  }
-
-} //ReferenceGrammarFactoryImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/ReferenceGrammarPackageImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/ReferenceGrammarPackageImpl.java
deleted file mode 100644
index 7e03710..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/ReferenceGrammarPackageImpl.java
+++ b/dev/null
@@ -1,487 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ReferenceGrammarPackageImpl.java,v 1.2 2009/02/06 09:46:54 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Erwachsener;
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Familie;
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Farbe;
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Kind;
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Person;
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarFactory;
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage;
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz;
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielzeug;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ReferenceGrammarPackageImpl extends EPackageImpl implements ReferenceGrammarPackage
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass spielplatzEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass personEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass kindEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass erwachsenerEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass spielzeugEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass farbeEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass familieEClass = null;
-
-  /**
-   * Creates an instance of the model <b>Package</b>, registered with
-   * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-   * package URI value.
-   * <p>Note: the correct way to create the package is via the static
-   * factory method {@link #init init()}, which also performs
-   * initialization of the package, or returns the registered package,
-   * if one already exists.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.emf.ecore.EPackage.Registry
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage#eNS_URI
-   * @see #init()
-   * @generated
-   */
-  private ReferenceGrammarPackageImpl()
-  {
-    super(eNS_URI, ReferenceGrammarFactory.eINSTANCE);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private static boolean isInited = false;
-
-  /**
-   * Creates, registers, and initializes the <b>Package</b> for this
-   * model, and for any others upon which it depends.  Simple
-   * dependencies are satisfied by calling this method on all
-   * dependent packages before doing anything else.  This method drives
-   * initialization for interdependent packages directly, in parallel
-   * with this package, itself.
-   * <p>Of this package and its interdependencies, all packages which
-   * have not yet been registered by their URI values are first created
-   * and registered.  The packages are then initialized in two steps:
-   * meta-model objects for all of the packages are created before any
-   * are initialized, since one package's meta-model objects may refer to
-   * those of another.
-   * <p>Invocation of this method will not affect any packages that have
-   * already been initialized.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #eNS_URI
-   * @see #createPackageContents()
-   * @see #initializePackageContents()
-   * @generated
-   */
-  public static ReferenceGrammarPackage init()
-  {
-    if (isInited) return (ReferenceGrammarPackage)EPackage.Registry.INSTANCE.getEPackage(ReferenceGrammarPackage.eNS_URI);
-
-    // Obtain or create and register package
-    ReferenceGrammarPackageImpl theReferenceGrammarPackage = (ReferenceGrammarPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ReferenceGrammarPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ReferenceGrammarPackageImpl());
-
-    isInited = true;
-
-    // Create package meta-data objects
-    theReferenceGrammarPackage.createPackageContents();
-
-    // Initialize created meta-data
-    theReferenceGrammarPackage.initializePackageContents();
-
-    // Mark meta-data to indicate it can't be changed
-    theReferenceGrammarPackage.freeze();
-
-    return theReferenceGrammarPackage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getSpielplatz()
-  {
-    return spielplatzEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getSpielplatz_Groesse()
-  {
-    return (EAttribute)spielplatzEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getSpielplatz_Beschreibung()
-  {
-    return (EAttribute)spielplatzEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getSpielplatz_Kinder()
-  {
-    return (EReference)spielplatzEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getSpielplatz_Erzieher()
-  {
-    return (EReference)spielplatzEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getSpielplatz_Spielzeuge()
-  {
-    return (EReference)spielplatzEClass.getEStructuralFeatures().get(4);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getSpielplatz_Familie()
-  {
-    return (EReference)spielplatzEClass.getEStructuralFeatures().get(5);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getPerson()
-  {
-    return personEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getPerson_Age()
-  {
-    return (EAttribute)personEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getPerson_Name()
-  {
-    return (EAttribute)personEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getKind()
-  {
-    return kindEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getErwachsener()
-  {
-    return erwachsenerEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getSpielzeug()
-  {
-    return spielzeugEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getSpielzeug_Name()
-  {
-    return (EAttribute)spielzeugEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getSpielzeug_Farbe()
-  {
-    return (EReference)spielzeugEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getFarbe()
-  {
-    return farbeEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getFamilie()
-  {
-    return familieEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getFamilie_Name()
-  {
-    return (EAttribute)familieEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getFamilie_Mutter()
-  {
-    return (EReference)familieEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getFamilie_Vater()
-  {
-    return (EReference)familieEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getFamilie_Kinder()
-  {
-    return (EReference)familieEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ReferenceGrammarFactory getReferenceGrammarFactory()
-  {
-    return (ReferenceGrammarFactory)getEFactoryInstance();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private boolean isCreated = false;
-
-  /**
-   * Creates the meta-model objects for the package.  This method is
-   * guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void createPackageContents()
-  {
-    if (isCreated) return;
-    isCreated = true;
-
-    // Create classes and their features
-    spielplatzEClass = createEClass(SPIELPLATZ);
-    createEAttribute(spielplatzEClass, SPIELPLATZ__GROESSE);
-    createEAttribute(spielplatzEClass, SPIELPLATZ__BESCHREIBUNG);
-    createEReference(spielplatzEClass, SPIELPLATZ__KINDER);
-    createEReference(spielplatzEClass, SPIELPLATZ__ERZIEHER);
-    createEReference(spielplatzEClass, SPIELPLATZ__SPIELZEUGE);
-    createEReference(spielplatzEClass, SPIELPLATZ__FAMILIE);
-
-    personEClass = createEClass(PERSON);
-    createEAttribute(personEClass, PERSON__AGE);
-    createEAttribute(personEClass, PERSON__NAME);
-
-    kindEClass = createEClass(KIND);
-
-    erwachsenerEClass = createEClass(ERWACHSENER);
-
-    spielzeugEClass = createEClass(SPIELZEUG);
-    createEAttribute(spielzeugEClass, SPIELZEUG__NAME);
-    createEReference(spielzeugEClass, SPIELZEUG__FARBE);
-
-    farbeEClass = createEClass(FARBE);
-
-    familieEClass = createEClass(FAMILIE);
-    createEAttribute(familieEClass, FAMILIE__NAME);
-    createEReference(familieEClass, FAMILIE__MUTTER);
-    createEReference(familieEClass, FAMILIE__VATER);
-    createEReference(familieEClass, FAMILIE__KINDER);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private boolean isInitialized = false;
-
-  /**
-   * Complete the initialization of the package and its meta-model.  This
-   * method is guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void initializePackageContents()
-  {
-    if (isInitialized) return;
-    isInitialized = true;
-
-    // Initialize package
-    setName(eNAME);
-    setNsPrefix(eNS_PREFIX);
-    setNsURI(eNS_URI);
-
-    // Create type parameters
-
-    // Set bounds for type parameters
-
-    // Add supertypes to classes
-    kindEClass.getESuperTypes().add(this.getPerson());
-    erwachsenerEClass.getESuperTypes().add(this.getPerson());
-
-    // Initialize classes and features; add operations and parameters
-    initEClass(spielplatzEClass, Spielplatz.class, "Spielplatz", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getSpielplatz_Groesse(), ecorePackage.getEInt(), "groesse", null, 0, 1, Spielplatz.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getSpielplatz_Beschreibung(), ecorePackage.getEString(), "beschreibung", null, 0, 1, Spielplatz.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getSpielplatz_Kinder(), this.getKind(), null, "kinder", null, 0, -1, Spielplatz.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getSpielplatz_Erzieher(), this.getErwachsener(), null, "erzieher", null, 0, -1, Spielplatz.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getSpielplatz_Spielzeuge(), this.getSpielzeug(), null, "spielzeuge", null, 0, -1, Spielplatz.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getSpielplatz_Familie(), this.getFamilie(), null, "familie", null, 0, -1, Spielplatz.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(personEClass, Person.class, "Person", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPerson_Age(), ecorePackage.getEInt(), "age", null, 0, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getPerson_Name(), ecorePackage.getEString(), "name", null, 0, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(kindEClass, Kind.class, "Kind", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(erwachsenerEClass, Erwachsener.class, "Erwachsener", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(spielzeugEClass, Spielzeug.class, "Spielzeug", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getSpielzeug_Name(), ecorePackage.getEString(), "name", null, 0, 1, Spielzeug.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getSpielzeug_Farbe(), this.getFarbe(), null, "farbe", null, 0, 1, Spielzeug.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(farbeEClass, Farbe.class, "Farbe", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(familieEClass, Familie.class, "Familie", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getFamilie_Name(), ecorePackage.getEString(), "name", null, 0, 1, Familie.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getFamilie_Mutter(), this.getErwachsener(), null, "mutter", null, 0, 1, Familie.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getFamilie_Vater(), this.getErwachsener(), null, "vater", null, 0, 1, Familie.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getFamilie_Kinder(), this.getKind(), null, "kinder", null, 0, -1, Familie.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    // Create resource
-    createResource(eNS_URI);
-  }
-
-} //ReferenceGrammarPackageImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/SpielplatzImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/SpielplatzImpl.java
deleted file mode 100644
index e09d402..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/SpielplatzImpl.java
+++ b/dev/null
@@ -1,417 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SpielplatzImpl.java,v 1.2 2009/02/06 09:46:54 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Erwachsener;
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Familie;
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Kind;
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage;
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz;
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielzeug;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Spielplatz</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.SpielplatzImpl#getGroesse <em>Groesse</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.SpielplatzImpl#getBeschreibung <em>Beschreibung</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.SpielplatzImpl#getKinder <em>Kinder</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.SpielplatzImpl#getErzieher <em>Erzieher</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.SpielplatzImpl#getSpielzeuge <em>Spielzeuge</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.SpielplatzImpl#getFamilie <em>Familie</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SpielplatzImpl extends EObjectImpl implements Spielplatz
-{
-  /**
-   * The default value of the '{@link #getGroesse() <em>Groesse</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getGroesse()
-   * @generated
-   * @ordered
-   */
-  protected static final int GROESSE_EDEFAULT = 0;
-
-  /**
-   * The cached value of the '{@link #getGroesse() <em>Groesse</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getGroesse()
-   * @generated
-   * @ordered
-   */
-  protected int groesse = GROESSE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getBeschreibung() <em>Beschreibung</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getBeschreibung()
-   * @generated
-   * @ordered
-   */
-  protected static final String BESCHREIBUNG_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getBeschreibung() <em>Beschreibung</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getBeschreibung()
-   * @generated
-   * @ordered
-   */
-  protected String beschreibung = BESCHREIBUNG_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getKinder() <em>Kinder</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getKinder()
-   * @generated
-   * @ordered
-   */
-  protected EList<Kind> kinder;
-
-  /**
-   * The cached value of the '{@link #getErzieher() <em>Erzieher</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getErzieher()
-   * @generated
-   * @ordered
-   */
-  protected EList<Erwachsener> erzieher;
-
-  /**
-   * The cached value of the '{@link #getSpielzeuge() <em>Spielzeuge</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getSpielzeuge()
-   * @generated
-   * @ordered
-   */
-  protected EList<Spielzeug> spielzeuge;
-
-  /**
-   * The cached value of the '{@link #getFamilie() <em>Familie</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getFamilie()
-   * @generated
-   * @ordered
-   */
-  protected EList<Familie> familie;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected SpielplatzImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return ReferenceGrammarPackage.Literals.SPIELPLATZ;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public int getGroesse()
-  {
-    return groesse;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setGroesse(int newGroesse)
-  {
-    int oldGroesse = groesse;
-    groesse = newGroesse;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, ReferenceGrammarPackage.SPIELPLATZ__GROESSE, oldGroesse, groesse));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getBeschreibung()
-  {
-    return beschreibung;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setBeschreibung(String newBeschreibung)
-  {
-    String oldBeschreibung = beschreibung;
-    beschreibung = newBeschreibung;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, ReferenceGrammarPackage.SPIELPLATZ__BESCHREIBUNG, oldBeschreibung, beschreibung));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList<Kind> getKinder()
-  {
-    if (kinder == null)
-    {
-      kinder = new EObjectContainmentEList<Kind>(Kind.class, this, ReferenceGrammarPackage.SPIELPLATZ__KINDER);
-    }
-    return kinder;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList<Erwachsener> getErzieher()
-  {
-    if (erzieher == null)
-    {
-      erzieher = new EObjectContainmentEList<Erwachsener>(Erwachsener.class, this, ReferenceGrammarPackage.SPIELPLATZ__ERZIEHER);
-    }
-    return erzieher;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList<Spielzeug> getSpielzeuge()
-  {
-    if (spielzeuge == null)
-    {
-      spielzeuge = new EObjectContainmentEList<Spielzeug>(Spielzeug.class, this, ReferenceGrammarPackage.SPIELPLATZ__SPIELZEUGE);
-    }
-    return spielzeuge;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList<Familie> getFamilie()
-  {
-    if (familie == null)
-    {
-      familie = new EObjectContainmentEList<Familie>(Familie.class, this, ReferenceGrammarPackage.SPIELPLATZ__FAMILIE);
-    }
-    return familie;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case ReferenceGrammarPackage.SPIELPLATZ__KINDER:
-        return ((InternalEList<?>)getKinder()).basicRemove(otherEnd, msgs);
-      case ReferenceGrammarPackage.SPIELPLATZ__ERZIEHER:
-        return ((InternalEList<?>)getErzieher()).basicRemove(otherEnd, msgs);
-      case ReferenceGrammarPackage.SPIELPLATZ__SPIELZEUGE:
-        return ((InternalEList<?>)getSpielzeuge()).basicRemove(otherEnd, msgs);
-      case ReferenceGrammarPackage.SPIELPLATZ__FAMILIE:
-        return ((InternalEList<?>)getFamilie()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case ReferenceGrammarPackage.SPIELPLATZ__GROESSE:
-        return new Integer(getGroesse());
-      case ReferenceGrammarPackage.SPIELPLATZ__BESCHREIBUNG:
-        return getBeschreibung();
-      case ReferenceGrammarPackage.SPIELPLATZ__KINDER:
-        return getKinder();
-      case ReferenceGrammarPackage.SPIELPLATZ__ERZIEHER:
-        return getErzieher();
-      case ReferenceGrammarPackage.SPIELPLATZ__SPIELZEUGE:
-        return getSpielzeuge();
-      case ReferenceGrammarPackage.SPIELPLATZ__FAMILIE:
-        return getFamilie();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case ReferenceGrammarPackage.SPIELPLATZ__GROESSE:
-        setGroesse(((Integer)newValue).intValue());
-        return;
-      case ReferenceGrammarPackage.SPIELPLATZ__BESCHREIBUNG:
-        setBeschreibung((String)newValue);
-        return;
-      case ReferenceGrammarPackage.SPIELPLATZ__KINDER:
-        getKinder().clear();
-        getKinder().addAll((Collection<? extends Kind>)newValue);
-        return;
-      case ReferenceGrammarPackage.SPIELPLATZ__ERZIEHER:
-        getErzieher().clear();
-        getErzieher().addAll((Collection<? extends Erwachsener>)newValue);
-        return;
-      case ReferenceGrammarPackage.SPIELPLATZ__SPIELZEUGE:
-        getSpielzeuge().clear();
-        getSpielzeuge().addAll((Collection<? extends Spielzeug>)newValue);
-        return;
-      case ReferenceGrammarPackage.SPIELPLATZ__FAMILIE:
-        getFamilie().clear();
-        getFamilie().addAll((Collection<? extends Familie>)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case ReferenceGrammarPackage.SPIELPLATZ__GROESSE:
-        setGroesse(GROESSE_EDEFAULT);
-        return;
-      case ReferenceGrammarPackage.SPIELPLATZ__BESCHREIBUNG:
-        setBeschreibung(BESCHREIBUNG_EDEFAULT);
-        return;
-      case ReferenceGrammarPackage.SPIELPLATZ__KINDER:
-        getKinder().clear();
-        return;
-      case ReferenceGrammarPackage.SPIELPLATZ__ERZIEHER:
-        getErzieher().clear();
-        return;
-      case ReferenceGrammarPackage.SPIELPLATZ__SPIELZEUGE:
-        getSpielzeuge().clear();
-        return;
-      case ReferenceGrammarPackage.SPIELPLATZ__FAMILIE:
-        getFamilie().clear();
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case ReferenceGrammarPackage.SPIELPLATZ__GROESSE:
-        return groesse != GROESSE_EDEFAULT;
-      case ReferenceGrammarPackage.SPIELPLATZ__BESCHREIBUNG:
-        return BESCHREIBUNG_EDEFAULT == null ? beschreibung != null : !BESCHREIBUNG_EDEFAULT.equals(beschreibung);
-      case ReferenceGrammarPackage.SPIELPLATZ__KINDER:
-        return kinder != null && !kinder.isEmpty();
-      case ReferenceGrammarPackage.SPIELPLATZ__ERZIEHER:
-        return erzieher != null && !erzieher.isEmpty();
-      case ReferenceGrammarPackage.SPIELPLATZ__SPIELZEUGE:
-        return spielzeuge != null && !spielzeuge.isEmpty();
-      case ReferenceGrammarPackage.SPIELPLATZ__FAMILIE:
-        return familie != null && !familie.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (groesse: ");
-    result.append(groesse);
-    result.append(", beschreibung: ");
-    result.append(beschreibung);
-    result.append(')');
-    return result.toString();
-  }
-
-} //SpielplatzImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/SpielzeugImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/SpielzeugImpl.java
deleted file mode 100644
index f0a3ef9..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/impl/SpielzeugImpl.java
+++ b/dev/null
@@ -1,269 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SpielzeugImpl.java,v 1.2 2009/02/06 09:46:54 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Farbe;
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage;
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielzeug;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Spielzeug</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.SpielzeugImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.impl.SpielzeugImpl#getFarbe <em>Farbe</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SpielzeugImpl extends EObjectImpl implements Spielzeug
-{
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getFarbe() <em>Farbe</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getFarbe()
-   * @generated
-   * @ordered
-   */
-  protected Farbe farbe;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected SpielzeugImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return ReferenceGrammarPackage.Literals.SPIELZEUG;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, ReferenceGrammarPackage.SPIELZEUG__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Farbe getFarbe()
-  {
-    return farbe;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetFarbe(Farbe newFarbe, NotificationChain msgs)
-  {
-    Farbe oldFarbe = farbe;
-    farbe = newFarbe;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ReferenceGrammarPackage.SPIELZEUG__FARBE, oldFarbe, newFarbe);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setFarbe(Farbe newFarbe)
-  {
-    if (newFarbe != farbe)
-    {
-      NotificationChain msgs = null;
-      if (farbe != null)
-        msgs = ((InternalEObject)farbe).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ReferenceGrammarPackage.SPIELZEUG__FARBE, null, msgs);
-      if (newFarbe != null)
-        msgs = ((InternalEObject)newFarbe).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ReferenceGrammarPackage.SPIELZEUG__FARBE, null, msgs);
-      msgs = basicSetFarbe(newFarbe, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, ReferenceGrammarPackage.SPIELZEUG__FARBE, newFarbe, newFarbe));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case ReferenceGrammarPackage.SPIELZEUG__FARBE:
-        return basicSetFarbe(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case ReferenceGrammarPackage.SPIELZEUG__NAME:
-        return getName();
-      case ReferenceGrammarPackage.SPIELZEUG__FARBE:
-        return getFarbe();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case ReferenceGrammarPackage.SPIELZEUG__NAME:
-        setName((String)newValue);
-        return;
-      case ReferenceGrammarPackage.SPIELZEUG__FARBE:
-        setFarbe((Farbe)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case ReferenceGrammarPackage.SPIELZEUG__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case ReferenceGrammarPackage.SPIELZEUG__FARBE:
-        setFarbe((Farbe)null);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case ReferenceGrammarPackage.SPIELZEUG__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case ReferenceGrammarPackage.SPIELZEUG__FARBE:
-        return farbe != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-} //SpielzeugImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/util/ReferenceGrammarAdapterFactory.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/util/ReferenceGrammarAdapterFactory.java
deleted file mode 100644
index 44ff6b4..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/util/ReferenceGrammarAdapterFactory.java
+++ b/dev/null
@@ -1,256 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ReferenceGrammarAdapterFactory.java,v 1.2 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage
- * @generated
- */
-public class ReferenceGrammarAdapterFactory extends AdapterFactoryImpl
-{
-  /**
-   * The cached model package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected static ReferenceGrammarPackage modelPackage;
-
-  /**
-   * Creates an instance of the adapter factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ReferenceGrammarAdapterFactory()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = ReferenceGrammarPackage.eINSTANCE;
-    }
-  }
-
-  /**
-   * Returns whether this factory is applicable for the type of the object.
-   * <!-- begin-user-doc -->
-   * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-   * <!-- end-user-doc -->
-   * @return whether this factory is applicable for the type of the object.
-   * @generated
-   */
-  @Override
-  public boolean isFactoryForType(Object object)
-  {
-    if (object == modelPackage)
-    {
-      return true;
-    }
-    if (object instanceof EObject)
-    {
-      return ((EObject)object).eClass().getEPackage() == modelPackage;
-    }
-    return false;
-  }
-
-  /**
-   * The switch that delegates to the <code>createXXX</code> methods.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ReferenceGrammarSwitch<Adapter> modelSwitch =
-    new ReferenceGrammarSwitch<Adapter>()
-    {
-      @Override
-      public Adapter caseSpielplatz(Spielplatz object)
-      {
-        return createSpielplatzAdapter();
-      }
-      @Override
-      public Adapter casePerson(Person object)
-      {
-        return createPersonAdapter();
-      }
-      @Override
-      public Adapter caseKind(Kind object)
-      {
-        return createKindAdapter();
-      }
-      @Override
-      public Adapter caseErwachsener(Erwachsener object)
-      {
-        return createErwachsenerAdapter();
-      }
-      @Override
-      public Adapter caseSpielzeug(Spielzeug object)
-      {
-        return createSpielzeugAdapter();
-      }
-      @Override
-      public Adapter caseFarbe(Farbe object)
-      {
-        return createFarbeAdapter();
-      }
-      @Override
-      public Adapter caseFamilie(Familie object)
-      {
-        return createFamilieAdapter();
-      }
-      @Override
-      public Adapter defaultCase(EObject object)
-      {
-        return createEObjectAdapter();
-      }
-    };
-
-  /**
-   * Creates an adapter for the <code>target</code>.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param target the object to adapt.
-   * @return the adapter for the <code>target</code>.
-   * @generated
-   */
-  @Override
-  public Adapter createAdapter(Notifier target)
-  {
-    return modelSwitch.doSwitch((EObject)target);
-  }
-
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz <em>Spielplatz</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielplatz
-   * @generated
-   */
-  public Adapter createSpielplatzAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Person <em>Person</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Person
-   * @generated
-   */
-  public Adapter createPersonAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Kind <em>Kind</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Kind
-   * @generated
-   */
-  public Adapter createKindAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Erwachsener <em>Erwachsener</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Erwachsener
-   * @generated
-   */
-  public Adapter createErwachsenerAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielzeug <em>Spielzeug</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Spielzeug
-   * @generated
-   */
-  public Adapter createSpielzeugAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Farbe <em>Farbe</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Farbe
-   * @generated
-   */
-  public Adapter createFarbeAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Familie <em>Familie</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.Familie
-   * @generated
-   */
-  public Adapter createFamilieAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for the default case.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @generated
-   */
-  public Adapter createEObjectAdapter()
-  {
-    return null;
-  }
-
-} //ReferenceGrammarAdapterFactory
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/util/ReferenceGrammarSwitch.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/util/ReferenceGrammarSwitch.java
deleted file mode 100644
index 3fe3fb8..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammarTestLanguage/ReferenceGrammar/util/ReferenceGrammarSwitch.java
+++ b/dev/null
@@ -1,282 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ReferenceGrammarSwitch.java,v 1.2 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.xtext.testlanguages.referenceGrammarTestLanguage.ReferenceGrammar.ReferenceGrammarPackage
- * @generated
- */
-public class ReferenceGrammarSwitch<T>
-{
-  /**
-   * The cached model package
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected static ReferenceGrammarPackage modelPackage;
-
-  /**
-   * Creates an instance of the switch.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ReferenceGrammarSwitch()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = ReferenceGrammarPackage.eINSTANCE;
-    }
-  }
-
-  /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-  public T doSwitch(EObject theEObject)
-  {
-    return doSwitch(theEObject.eClass(), theEObject);
-  }
-
-  /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-  protected T doSwitch(EClass theEClass, EObject theEObject)
-  {
-    if (theEClass.eContainer() == modelPackage)
-    {
-      return doSwitch(theEClass.getClassifierID(), theEObject);
-    }
-    else
-    {
-      List<EClass> eSuperTypes = theEClass.getESuperTypes();
-      return
-        eSuperTypes.isEmpty() ?
-          defaultCase(theEObject) :
-          doSwitch(eSuperTypes.get(0), theEObject);
-    }
-  }
-
-  /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-  protected T doSwitch(int classifierID, EObject theEObject)
-  {
-    switch (classifierID)
-    {
-      case ReferenceGrammarPackage.SPIELPLATZ:
-      {
-        Spielplatz spielplatz = (Spielplatz)theEObject;
-        T result = caseSpielplatz(spielplatz);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case ReferenceGrammarPackage.PERSON:
-      {
-        Person person = (Person)theEObject;
-        T result = casePerson(person);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case ReferenceGrammarPackage.KIND:
-      {
-        Kind kind = (Kind)theEObject;
-        T result = caseKind(kind);
-        if (result == null) result = casePerson(kind);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case ReferenceGrammarPackage.ERWACHSENER:
-      {
-        Erwachsener erwachsener = (Erwachsener)theEObject;
-        T result = caseErwachsener(erwachsener);
-        if (result == null) result = casePerson(erwachsener);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case ReferenceGrammarPackage.SPIELZEUG:
-      {
-        Spielzeug spielzeug = (Spielzeug)theEObject;
-        T result = caseSpielzeug(spielzeug);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case ReferenceGrammarPackage.FARBE:
-      {
-        Farbe farbe = (Farbe)theEObject;
-        T result = caseFarbe(farbe);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case ReferenceGrammarPackage.FAMILIE:
-      {
-        Familie familie = (Familie)theEObject;
-        T result = caseFamilie(familie);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      default: return defaultCase(theEObject);
-    }
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Spielplatz</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Spielplatz</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseSpielplatz(Spielplatz object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Person</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Person</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T casePerson(Person object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Kind</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Kind</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseKind(Kind object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Erwachsener</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Erwachsener</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseErwachsener(Erwachsener object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Spielzeug</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Spielzeug</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseSpielzeug(Spielzeug object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Farbe</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Farbe</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseFarbe(Farbe object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Familie</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Familie</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseFamilie(Familie object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch, but this is the last case anyway.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-   * @generated
-   */
-  public T defaultCase(EObject object)
-  {
-    return null;
-  }
-
-} //ReferenceGrammarSwitch
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/Model.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/Model.java
deleted file mode 100644
index a8874f0..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/Model.java
+++ b/dev/null
@@ -1,47 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Model.java,v 1.1 2009/02/06 09:46:53 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Model</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Model#getChildren <em>Children</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.TreeTestLanguagePackage#getModel()
- * @model
- * @generated
- */
-public interface Model extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Children</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Node}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Children</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Children</em>' containment reference list.
-   * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.TreeTestLanguagePackage#getModel_Children()
-   * @model containment="true"
-   * @generated
-   */
-  EList<Node> getChildren();
-
-} // Model
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/Node.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/Node.java
deleted file mode 100644
index 80a234b..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/Node.java
+++ b/dev/null
@@ -1,101 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Node.java,v 1.1 2009/02/06 09:46:53 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Node</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Node#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Node#getAttrib <em>Attrib</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Node#getChildren <em>Children</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.TreeTestLanguagePackage#getNode()
- * @model
- * @generated
- */
-public interface Node extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.TreeTestLanguagePackage#getNode_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Node#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-  void setName(String value);
-
-  /**
-   * Returns the value of the '<em><b>Attrib</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Attrib</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Attrib</em>' attribute.
-   * @see #setAttrib(String)
-   * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.TreeTestLanguagePackage#getNode_Attrib()
-   * @model
-   * @generated
-   */
-  String getAttrib();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Node#getAttrib <em>Attrib</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Attrib</em>' attribute.
-   * @see #getAttrib()
-   * @generated
-   */
-  void setAttrib(String value);
-
-  /**
-   * Returns the value of the '<em><b>Children</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Node}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Children</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Children</em>' containment reference list.
-   * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.TreeTestLanguagePackage#getNode_Children()
-   * @model containment="true"
-   * @generated
-   */
-  EList<Node> getChildren();
-
-} // Node
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/TreeTestLanguageFactory.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/TreeTestLanguageFactory.java
deleted file mode 100644
index b694018..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/TreeTestLanguageFactory.java
+++ b/dev/null
@@ -1,56 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TreeTestLanguageFactory.java,v 1.1 2009/02/06 09:46:53 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.TreeTestLanguagePackage
- * @generated
- */
-public interface TreeTestLanguageFactory extends EFactory
-{
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  TreeTestLanguageFactory eINSTANCE = org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.impl.TreeTestLanguageFactoryImpl.init();
-
-  /**
-   * Returns a new object of class '<em>Model</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Model</em>'.
-   * @generated
-   */
-  Model createModel();
-
-  /**
-   * Returns a new object of class '<em>Node</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Node</em>'.
-   * @generated
-   */
-  Node createNode();
-
-  /**
-   * Returns the package supported by this factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the package supported by this factory.
-   * @generated
-   */
-  TreeTestLanguagePackage getTreeTestLanguagePackage();
-
-} //TreeTestLanguageFactory
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/TreeTestLanguagePackage.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/TreeTestLanguagePackage.java
deleted file mode 100644
index 5af7817..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/TreeTestLanguagePackage.java
+++ b/dev/null
@@ -1,279 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TreeTestLanguagePackage.java,v 1.1 2009/02/06 09:46:53 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.TreeTestLanguageFactory
- * @model kind="package"
- * @generated
- */
-public interface TreeTestLanguagePackage extends EPackage
-{
-  /**
-   * The package name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNAME = "TreeTestLanguage";
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_URI = "http://www.eclipse.org/2008/tmf/xtext/TreeTestLanguage";
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_PREFIX = "TreeTestLanguage";
-
-  /**
-   * The singleton instance of the package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  TreeTestLanguagePackage eINSTANCE = org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.impl.TreeTestLanguagePackageImpl.init();
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.impl.ModelImpl <em>Model</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.impl.ModelImpl
-   * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.impl.TreeTestLanguagePackageImpl#getModel()
-   * @generated
-   */
-  int MODEL = 0;
-
-  /**
-   * The feature id for the '<em><b>Children</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MODEL__CHILDREN = 0;
-
-  /**
-   * The number of structural features of the '<em>Model</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MODEL_FEATURE_COUNT = 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.impl.NodeImpl <em>Node</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.impl.NodeImpl
-   * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.impl.TreeTestLanguagePackageImpl#getNode()
-   * @generated
-   */
-  int NODE = 1;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int NODE__NAME = 0;
-
-  /**
-   * The feature id for the '<em><b>Attrib</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int NODE__ATTRIB = 1;
-
-  /**
-   * The feature id for the '<em><b>Children</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int NODE__CHILDREN = 2;
-
-  /**
-   * The number of structural features of the '<em>Node</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int NODE_FEATURE_COUNT = 3;
-
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Model <em>Model</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Model</em>'.
-   * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Model
-   * @generated
-   */
-  EClass getModel();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Model#getChildren <em>Children</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Children</em>'.
-   * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Model#getChildren()
-   * @see #getModel()
-   * @generated
-   */
-  EReference getModel_Children();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Node <em>Node</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Node</em>'.
-   * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Node
-   * @generated
-   */
-  EClass getNode();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Node#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Node#getName()
-   * @see #getNode()
-   * @generated
-   */
-  EAttribute getNode_Name();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Node#getAttrib <em>Attrib</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Attrib</em>'.
-   * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Node#getAttrib()
-   * @see #getNode()
-   * @generated
-   */
-  EAttribute getNode_Attrib();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Node#getChildren <em>Children</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Children</em>'.
-   * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Node#getChildren()
-   * @see #getNode()
-   * @generated
-   */
-  EReference getNode_Children();
-
-  /**
-   * Returns the factory that creates the instances of the model.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the factory that creates the instances of the model.
-   * @generated
-   */
-  TreeTestLanguageFactory getTreeTestLanguageFactory();
-
-  /**
-   * <!-- begin-user-doc -->
-   * Defines literals for the meta objects that represent
-   * <ul>
-   *   <li>each class,</li>
-   *   <li>each feature of each class,</li>
-   *   <li>each enum,</li>
-   *   <li>and each data type</li>
-   * </ul>
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  interface Literals
-  {
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.impl.ModelImpl <em>Model</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.impl.ModelImpl
-     * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.impl.TreeTestLanguagePackageImpl#getModel()
-     * @generated
-     */
-    EClass MODEL = eINSTANCE.getModel();
-
-    /**
-     * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference MODEL__CHILDREN = eINSTANCE.getModel_Children();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.impl.NodeImpl <em>Node</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.impl.NodeImpl
-     * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.impl.TreeTestLanguagePackageImpl#getNode()
-     * @generated
-     */
-    EClass NODE = eINSTANCE.getNode();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute NODE__NAME = eINSTANCE.getNode_Name();
-
-    /**
-     * The meta object literal for the '<em><b>Attrib</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute NODE__ATTRIB = eINSTANCE.getNode_Attrib();
-
-    /**
-     * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference NODE__CHILDREN = eINSTANCE.getNode_Children();
-
-  }
-
-} //TreeTestLanguagePackage
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/impl/ModelImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/impl/ModelImpl.java
deleted file mode 100644
index 7d67556..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/impl/ModelImpl.java
+++ b/dev/null
@@ -1,171 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ModelImpl.java,v 1.1 2009/02/06 09:46:52 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Model;
-import org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Node;
-import org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.TreeTestLanguagePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Model</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.impl.ModelImpl#getChildren <em>Children</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ModelImpl extends EObjectImpl implements Model
-{
-  /**
-   * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getChildren()
-   * @generated
-   * @ordered
-   */
-  protected EList<Node> children;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ModelImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return TreeTestLanguagePackage.Literals.MODEL;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList<Node> getChildren()
-  {
-    if (children == null)
-    {
-      children = new EObjectContainmentEList<Node>(Node.class, this, TreeTestLanguagePackage.MODEL__CHILDREN);
-    }
-    return children;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case TreeTestLanguagePackage.MODEL__CHILDREN:
-        return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case TreeTestLanguagePackage.MODEL__CHILDREN:
-        return getChildren();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case TreeTestLanguagePackage.MODEL__CHILDREN:
-        getChildren().clear();
-        getChildren().addAll((Collection<? extends Node>)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case TreeTestLanguagePackage.MODEL__CHILDREN:
-        getChildren().clear();
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case TreeTestLanguagePackage.MODEL__CHILDREN:
-        return children != null && !children.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-} //ModelImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/impl/NodeImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/impl/NodeImpl.java
deleted file mode 100644
index b9b39a5..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/impl/NodeImpl.java
+++ b/dev/null
@@ -1,299 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: NodeImpl.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Node;
-import org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.TreeTestLanguagePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Node</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.impl.NodeImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.impl.NodeImpl#getAttrib <em>Attrib</em>}</li>
- *   <li>{@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.impl.NodeImpl#getChildren <em>Children</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class NodeImpl extends EObjectImpl implements Node
-{
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getAttrib() <em>Attrib</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAttrib()
-   * @generated
-   * @ordered
-   */
-  protected static final String ATTRIB_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getAttrib() <em>Attrib</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAttrib()
-   * @generated
-   * @ordered
-   */
-  protected String attrib = ATTRIB_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getChildren()
-   * @generated
-   * @ordered
-   */
-  protected EList<Node> children;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected NodeImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return TreeTestLanguagePackage.Literals.NODE;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, TreeTestLanguagePackage.NODE__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getAttrib()
-  {
-    return attrib;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setAttrib(String newAttrib)
-  {
-    String oldAttrib = attrib;
-    attrib = newAttrib;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, TreeTestLanguagePackage.NODE__ATTRIB, oldAttrib, attrib));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList<Node> getChildren()
-  {
-    if (children == null)
-    {
-      children = new EObjectContainmentEList<Node>(Node.class, this, TreeTestLanguagePackage.NODE__CHILDREN);
-    }
-    return children;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case TreeTestLanguagePackage.NODE__CHILDREN:
-        return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case TreeTestLanguagePackage.NODE__NAME:
-        return getName();
-      case TreeTestLanguagePackage.NODE__ATTRIB:
-        return getAttrib();
-      case TreeTestLanguagePackage.NODE__CHILDREN:
-        return getChildren();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case TreeTestLanguagePackage.NODE__NAME:
-        setName((String)newValue);
-        return;
-      case TreeTestLanguagePackage.NODE__ATTRIB:
-        setAttrib((String)newValue);
-        return;
-      case TreeTestLanguagePackage.NODE__CHILDREN:
-        getChildren().clear();
-        getChildren().addAll((Collection<? extends Node>)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case TreeTestLanguagePackage.NODE__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case TreeTestLanguagePackage.NODE__ATTRIB:
-        setAttrib(ATTRIB_EDEFAULT);
-        return;
-      case TreeTestLanguagePackage.NODE__CHILDREN:
-        getChildren().clear();
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case TreeTestLanguagePackage.NODE__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case TreeTestLanguagePackage.NODE__ATTRIB:
-        return ATTRIB_EDEFAULT == null ? attrib != null : !ATTRIB_EDEFAULT.equals(attrib);
-      case TreeTestLanguagePackage.NODE__CHILDREN:
-        return children != null && !children.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(", attrib: ");
-    result.append(attrib);
-    result.append(')');
-    return result.toString();
-  }
-
-} //NodeImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/impl/TreeTestLanguageFactoryImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/impl/TreeTestLanguageFactoryImpl.java
deleted file mode 100644
index e3751d4..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/impl/TreeTestLanguageFactoryImpl.java
+++ b/dev/null
@@ -1,122 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TreeTestLanguageFactoryImpl.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class TreeTestLanguageFactoryImpl extends EFactoryImpl implements TreeTestLanguageFactory
-{
-  /**
-   * Creates the default factory implementation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static TreeTestLanguageFactory init()
-  {
-    try
-    {
-      TreeTestLanguageFactory theTreeTestLanguageFactory = (TreeTestLanguageFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/2008/tmf/xtext/TreeTestLanguage"); 
-      if (theTreeTestLanguageFactory != null)
-      {
-        return theTreeTestLanguageFactory;
-      }
-    }
-    catch (Exception exception)
-    {
-      EcorePlugin.INSTANCE.log(exception);
-    }
-    return new TreeTestLanguageFactoryImpl();
-  }
-
-  /**
-   * Creates an instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public TreeTestLanguageFactoryImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EObject create(EClass eClass)
-  {
-    switch (eClass.getClassifierID())
-    {
-      case TreeTestLanguagePackage.MODEL: return createModel();
-      case TreeTestLanguagePackage.NODE: return createNode();
-      default:
-        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Model createModel()
-  {
-    ModelImpl model = new ModelImpl();
-    return model;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Node createNode()
-  {
-    NodeImpl node = new NodeImpl();
-    return node;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public TreeTestLanguagePackage getTreeTestLanguagePackage()
-  {
-    return (TreeTestLanguagePackage)getEPackage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @deprecated
-   * @generated
-   */
-  @Deprecated
-  public static TreeTestLanguagePackage getPackage()
-  {
-    return TreeTestLanguagePackage.eINSTANCE;
-  }
-
-} //TreeTestLanguageFactoryImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/impl/TreeTestLanguagePackageImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/impl/TreeTestLanguagePackageImpl.java
deleted file mode 100644
index 07756dd..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/impl/TreeTestLanguagePackageImpl.java
+++ b/dev/null
@@ -1,255 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TreeTestLanguagePackageImpl.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Model;
-import org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Node;
-import org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.TreeTestLanguageFactory;
-import org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.TreeTestLanguagePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class TreeTestLanguagePackageImpl extends EPackageImpl implements TreeTestLanguagePackage
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass modelEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass nodeEClass = null;
-
-  /**
-   * Creates an instance of the model <b>Package</b>, registered with
-   * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-   * package URI value.
-   * <p>Note: the correct way to create the package is via the static
-   * factory method {@link #init init()}, which also performs
-   * initialization of the package, or returns the registered package,
-   * if one already exists.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.emf.ecore.EPackage.Registry
-   * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.TreeTestLanguagePackage#eNS_URI
-   * @see #init()
-   * @generated
-   */
-  private TreeTestLanguagePackageImpl()
-  {
-    super(eNS_URI, TreeTestLanguageFactory.eINSTANCE);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private static boolean isInited = false;
-
-  /**
-   * Creates, registers, and initializes the <b>Package</b> for this
-   * model, and for any others upon which it depends.  Simple
-   * dependencies are satisfied by calling this method on all
-   * dependent packages before doing anything else.  This method drives
-   * initialization for interdependent packages directly, in parallel
-   * with this package, itself.
-   * <p>Of this package and its interdependencies, all packages which
-   * have not yet been registered by their URI values are first created
-   * and registered.  The packages are then initialized in two steps:
-   * meta-model objects for all of the packages are created before any
-   * are initialized, since one package's meta-model objects may refer to
-   * those of another.
-   * <p>Invocation of this method will not affect any packages that have
-   * already been initialized.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #eNS_URI
-   * @see #createPackageContents()
-   * @see #initializePackageContents()
-   * @generated
-   */
-  public static TreeTestLanguagePackage init()
-  {
-    if (isInited) return (TreeTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(TreeTestLanguagePackage.eNS_URI);
-
-    // Obtain or create and register package
-    TreeTestLanguagePackageImpl theTreeTestLanguagePackage = (TreeTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof TreeTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new TreeTestLanguagePackageImpl());
-
-    isInited = true;
-
-    // Create package meta-data objects
-    theTreeTestLanguagePackage.createPackageContents();
-
-    // Initialize created meta-data
-    theTreeTestLanguagePackage.initializePackageContents();
-
-    // Mark meta-data to indicate it can't be changed
-    theTreeTestLanguagePackage.freeze();
-
-    return theTreeTestLanguagePackage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getModel()
-  {
-    return modelEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getModel_Children()
-  {
-    return (EReference)modelEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getNode()
-  {
-    return nodeEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getNode_Name()
-  {
-    return (EAttribute)nodeEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getNode_Attrib()
-  {
-    return (EAttribute)nodeEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getNode_Children()
-  {
-    return (EReference)nodeEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public TreeTestLanguageFactory getTreeTestLanguageFactory()
-  {
-    return (TreeTestLanguageFactory)getEFactoryInstance();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private boolean isCreated = false;
-
-  /**
-   * Creates the meta-model objects for the package.  This method is
-   * guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void createPackageContents()
-  {
-    if (isCreated) return;
-    isCreated = true;
-
-    // Create classes and their features
-    modelEClass = createEClass(MODEL);
-    createEReference(modelEClass, MODEL__CHILDREN);
-
-    nodeEClass = createEClass(NODE);
-    createEAttribute(nodeEClass, NODE__NAME);
-    createEAttribute(nodeEClass, NODE__ATTRIB);
-    createEReference(nodeEClass, NODE__CHILDREN);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private boolean isInitialized = false;
-
-  /**
-   * Complete the initialization of the package and its meta-model.  This
-   * method is guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void initializePackageContents()
-  {
-    if (isInitialized) return;
-    isInitialized = true;
-
-    // Initialize package
-    setName(eNAME);
-    setNsPrefix(eNS_PREFIX);
-    setNsURI(eNS_URI);
-
-    // Create type parameters
-
-    // Set bounds for type parameters
-
-    // Add supertypes to classes
-
-    // Initialize classes and features; add operations and parameters
-    initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getModel_Children(), this.getNode(), null, "children", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(nodeEClass, Node.class, "Node", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getNode_Name(), ecorePackage.getEString(), "name", null, 0, 1, Node.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getNode_Attrib(), ecorePackage.getEString(), "attrib", null, 0, 1, Node.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNode_Children(), this.getNode(), null, "children", null, 0, -1, Node.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    // Create resource
-    createResource(eNS_URI);
-  }
-
-} //TreeTestLanguagePackageImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/util/TreeTestLanguageAdapterFactory.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/util/TreeTestLanguageAdapterFactory.java
deleted file mode 100644
index 69d484b..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/util/TreeTestLanguageAdapterFactory.java
+++ b/dev/null
@@ -1,156 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TreeTestLanguageAdapterFactory.java,v 1.1 2009/02/06 09:46:53 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.TreeTestLanguagePackage
- * @generated
- */
-public class TreeTestLanguageAdapterFactory extends AdapterFactoryImpl
-{
-  /**
-   * The cached model package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected static TreeTestLanguagePackage modelPackage;
-
-  /**
-   * Creates an instance of the adapter factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public TreeTestLanguageAdapterFactory()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = TreeTestLanguagePackage.eINSTANCE;
-    }
-  }
-
-  /**
-   * Returns whether this factory is applicable for the type of the object.
-   * <!-- begin-user-doc -->
-   * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-   * <!-- end-user-doc -->
-   * @return whether this factory is applicable for the type of the object.
-   * @generated
-   */
-  @Override
-  public boolean isFactoryForType(Object object)
-  {
-    if (object == modelPackage)
-    {
-      return true;
-    }
-    if (object instanceof EObject)
-    {
-      return ((EObject)object).eClass().getEPackage() == modelPackage;
-    }
-    return false;
-  }
-
-  /**
-   * The switch that delegates to the <code>createXXX</code> methods.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected TreeTestLanguageSwitch<Adapter> modelSwitch =
-    new TreeTestLanguageSwitch<Adapter>()
-    {
-      @Override
-      public Adapter caseModel(Model object)
-      {
-        return createModelAdapter();
-      }
-      @Override
-      public Adapter caseNode(Node object)
-      {
-        return createNodeAdapter();
-      }
-      @Override
-      public Adapter defaultCase(EObject object)
-      {
-        return createEObjectAdapter();
-      }
-    };
-
-  /**
-   * Creates an adapter for the <code>target</code>.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param target the object to adapt.
-   * @return the adapter for the <code>target</code>.
-   * @generated
-   */
-  @Override
-  public Adapter createAdapter(Notifier target)
-  {
-    return modelSwitch.doSwitch((EObject)target);
-  }
-
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Model <em>Model</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Model
-   * @generated
-   */
-  public Adapter createModelAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Node <em>Node</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.Node
-   * @generated
-   */
-  public Adapter createNodeAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for the default case.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @generated
-   */
-  public Adapter createEObjectAdapter()
-  {
-    return null;
-  }
-
-} //TreeTestLanguageAdapterFactory
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/util/TreeTestLanguageSwitch.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/util/TreeTestLanguageSwitch.java
deleted file mode 100644
index 1377653..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/TreeTestLanguage/util/TreeTestLanguageSwitch.java
+++ b/dev/null
@@ -1,165 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TreeTestLanguageSwitch.java,v 1.1 2009/02/06 09:46:53 jkohnlein Exp $
- */
-package org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguage.TreeTestLanguagePackage
- * @generated
- */
-public class TreeTestLanguageSwitch<T>
-{
-  /**
-   * The cached model package
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected static TreeTestLanguagePackage modelPackage;
-
-  /**
-   * Creates an instance of the switch.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public TreeTestLanguageSwitch()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = TreeTestLanguagePackage.eINSTANCE;
-    }
-  }
-
-  /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-  public T doSwitch(EObject theEObject)
-  {
-    return doSwitch(theEObject.eClass(), theEObject);
-  }
-
-  /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-  protected T doSwitch(EClass theEClass, EObject theEObject)
-  {
-    if (theEClass.eContainer() == modelPackage)
-    {
-      return doSwitch(theEClass.getClassifierID(), theEObject);
-    }
-    else
-    {
-      List<EClass> eSuperTypes = theEClass.getESuperTypes();
-      return
-        eSuperTypes.isEmpty() ?
-          defaultCase(theEObject) :
-          doSwitch(eSuperTypes.get(0), theEObject);
-    }
-  }
-
-  /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-  protected T doSwitch(int classifierID, EObject theEObject)
-  {
-    switch (classifierID)
-    {
-      case TreeTestLanguagePackage.MODEL:
-      {
-        Model model = (Model)theEObject;
-        T result = caseModel(model);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case TreeTestLanguagePackage.NODE:
-      {
-        Node node = (Node)theEObject;
-        T result = caseNode(node);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      default: return defaultCase(theEObject);
-    }
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Model</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Model</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseModel(Model object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Node</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Node</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseNode(Node object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch, but this is the last case anyway.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-   * @generated
-   */
-  public T defaultCase(EObject object)
-  {
-    return null;
-  }
-
-} //TreeTestLanguageSwitch
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/AbstractElement.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/AbstractElement.java
deleted file mode 100644
index 1d77374..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/AbstractElement.java
+++ b/dev/null
@@ -1,55 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AbstractElement.java,v 1.1 2009/02/06 09:46:50 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abstract Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractElement#getCardinality <em>Cardinality</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getAbstractElement()
- * @model
- * @generated
- */
-public interface AbstractElement extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Cardinality</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Cardinality</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Cardinality</em>' attribute.
-   * @see #setCardinality(String)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getAbstractElement_Cardinality()
-   * @model
-   * @generated
-   */
-  String getCardinality();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractElement#getCardinality <em>Cardinality</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Cardinality</em>' attribute.
-   * @see #getCardinality()
-   * @generated
-   */
-  void setCardinality(String value);
-
-} // AbstractElement
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/AbstractMetamodelDeclaration.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/AbstractMetamodelDeclaration.java
deleted file mode 100644
index eab666b..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/AbstractMetamodelDeclaration.java
+++ b/dev/null
@@ -1,83 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AbstractMetamodelDeclaration.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abstract Metamodel Declaration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractMetamodelDeclaration#getEPackage <em>EPackage</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractMetamodelDeclaration#getAlias <em>Alias</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getAbstractMetamodelDeclaration()
- * @model
- * @generated
- */
-public interface AbstractMetamodelDeclaration extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>EPackage</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>EPackage</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>EPackage</em>' reference.
-   * @see #setEPackage(EPackage)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getAbstractMetamodelDeclaration_EPackage()
-   * @model
-   * @generated
-   */
-  EPackage getEPackage();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractMetamodelDeclaration#getEPackage <em>EPackage</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>EPackage</em>' reference.
-   * @see #getEPackage()
-   * @generated
-   */
-  void setEPackage(EPackage value);
-
-  /**
-   * Returns the value of the '<em><b>Alias</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Alias</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Alias</em>' attribute.
-   * @see #setAlias(String)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getAbstractMetamodelDeclaration_Alias()
-   * @model
-   * @generated
-   */
-  String getAlias();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractMetamodelDeclaration#getAlias <em>Alias</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Alias</em>' attribute.
-   * @see #getAlias()
-   * @generated
-   */
-  void setAlias(String value);
-
-} // AbstractMetamodelDeclaration
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/AbstractNegatedToken.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/AbstractNegatedToken.java
deleted file mode 100644
index 2a6df36..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/AbstractNegatedToken.java
+++ b/dev/null
@@ -1,54 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AbstractNegatedToken.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abstract Negated Token</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractNegatedToken#getTerminal <em>Terminal</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getAbstractNegatedToken()
- * @model
- * @generated
- */
-public interface AbstractNegatedToken extends AbstractElement
-{
-  /**
-   * Returns the value of the '<em><b>Terminal</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Terminal</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Terminal</em>' containment reference.
-   * @see #setTerminal(AbstractElement)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getAbstractNegatedToken_Terminal()
-   * @model containment="true"
-   * @generated
-   */
-  AbstractElement getTerminal();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractNegatedToken#getTerminal <em>Terminal</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Terminal</em>' containment reference.
-   * @see #getTerminal()
-   * @generated
-   */
-  void setTerminal(AbstractElement value);
-
-} // AbstractNegatedToken
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/AbstractRule.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/AbstractRule.java
deleted file mode 100644
index 5d19b95..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/AbstractRule.java
+++ b/dev/null
@@ -1,82 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AbstractRule.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abstract Rule</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractRule#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractRule#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getAbstractRule()
- * @model
- * @generated
- */
-public interface AbstractRule extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Type</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Type</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Type</em>' containment reference.
-   * @see #setType(TypeRef)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getAbstractRule_Type()
-   * @model containment="true"
-   * @generated
-   */
-  TypeRef getType();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractRule#getType <em>Type</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Type</em>' containment reference.
-   * @see #getType()
-   * @generated
-   */
-  void setType(TypeRef value);
-
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getAbstractRule_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractRule#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-  void setName(String value);
-
-} // AbstractRule
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/Action.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/Action.java
deleted file mode 100644
index d4cbfea..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/Action.java
+++ b/dev/null
@@ -1,108 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Action.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Action</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Action#getTypeName <em>Type Name</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Action#getFeature <em>Feature</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Action#getOperator <em>Operator</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getAction()
- * @model
- * @generated
- */
-public interface Action extends AbstractElement
-{
-  /**
-   * Returns the value of the '<em><b>Type Name</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Type Name</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Type Name</em>' containment reference.
-   * @see #setTypeName(TypeRef)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getAction_TypeName()
-   * @model containment="true"
-   * @generated
-   */
-  TypeRef getTypeName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Action#getTypeName <em>Type Name</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Type Name</em>' containment reference.
-   * @see #getTypeName()
-   * @generated
-   */
-  void setTypeName(TypeRef value);
-
-  /**
-   * Returns the value of the '<em><b>Feature</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Feature</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Feature</em>' attribute.
-   * @see #setFeature(String)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getAction_Feature()
-   * @model
-   * @generated
-   */
-  String getFeature();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Action#getFeature <em>Feature</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Feature</em>' attribute.
-   * @see #getFeature()
-   * @generated
-   */
-  void setFeature(String value);
-
-  /**
-   * Returns the value of the '<em><b>Operator</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Operator</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Operator</em>' attribute.
-   * @see #setOperator(String)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getAction_Operator()
-   * @model
-   * @generated
-   */
-  String getOperator();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Action#getOperator <em>Operator</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Operator</em>' attribute.
-   * @see #getOperator()
-   * @generated
-   */
-  void setOperator(String value);
-
-} // Action
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/Alternatives.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/Alternatives.java
deleted file mode 100644
index 8791787..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/Alternatives.java
+++ b/dev/null
@@ -1,45 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Alternatives.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Alternatives</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Alternatives#getGroups <em>Groups</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getAlternatives()
- * @model
- * @generated
- */
-public interface Alternatives extends AbstractElement
-{
-  /**
-   * Returns the value of the '<em><b>Groups</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractElement}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Groups</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Groups</em>' containment reference list.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getAlternatives_Groups()
-   * @model containment="true"
-   * @generated
-   */
-  EList<AbstractElement> getGroups();
-
-} // Alternatives
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/Assignment.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/Assignment.java
deleted file mode 100644
index 2c5f21b..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/Assignment.java
+++ b/dev/null
@@ -1,108 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Assignment.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Assignment</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Assignment#getFeature <em>Feature</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Assignment#getOperator <em>Operator</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Assignment#getTerminal <em>Terminal</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getAssignment()
- * @model
- * @generated
- */
-public interface Assignment extends AbstractElement
-{
-  /**
-   * Returns the value of the '<em><b>Feature</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Feature</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Feature</em>' attribute.
-   * @see #setFeature(String)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getAssignment_Feature()
-   * @model
-   * @generated
-   */
-  String getFeature();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Assignment#getFeature <em>Feature</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Feature</em>' attribute.
-   * @see #getFeature()
-   * @generated
-   */
-  void setFeature(String value);
-
-  /**
-   * Returns the value of the '<em><b>Operator</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Operator</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Operator</em>' attribute.
-   * @see #setOperator(String)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getAssignment_Operator()
-   * @model
-   * @generated
-   */
-  String getOperator();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Assignment#getOperator <em>Operator</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Operator</em>' attribute.
-   * @see #getOperator()
-   * @generated
-   */
-  void setOperator(String value);
-
-  /**
-   * Returns the value of the '<em><b>Terminal</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Terminal</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Terminal</em>' containment reference.
-   * @see #setTerminal(AbstractElement)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getAssignment_Terminal()
-   * @model containment="true"
-   * @generated
-   */
-  AbstractElement getTerminal();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Assignment#getTerminal <em>Terminal</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Terminal</em>' containment reference.
-   * @see #getTerminal()
-   * @generated
-   */
-  void setTerminal(AbstractElement value);
-
-} // Assignment
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/CharacterRange.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/CharacterRange.java
deleted file mode 100644
index 07388f8..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/CharacterRange.java
+++ b/dev/null
@@ -1,81 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CharacterRange.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Character Range</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.CharacterRange#getLeft <em>Left</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.CharacterRange#getRight <em>Right</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getCharacterRange()
- * @model
- * @generated
- */
-public interface CharacterRange extends AbstractElement
-{
-  /**
-   * Returns the value of the '<em><b>Left</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Left</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Left</em>' containment reference.
-   * @see #setLeft(Keyword)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getCharacterRange_Left()
-   * @model containment="true"
-   * @generated
-   */
-  Keyword getLeft();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.CharacterRange#getLeft <em>Left</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Left</em>' containment reference.
-   * @see #getLeft()
-   * @generated
-   */
-  void setLeft(Keyword value);
-
-  /**
-   * Returns the value of the '<em><b>Right</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Right</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Right</em>' containment reference.
-   * @see #setRight(Keyword)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getCharacterRange_Right()
-   * @model containment="true"
-   * @generated
-   */
-  Keyword getRight();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.CharacterRange#getRight <em>Right</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Right</em>' containment reference.
-   * @see #getRight()
-   * @generated
-   */
-  void setRight(Keyword value);
-
-} // CharacterRange
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/CrossReference.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/CrossReference.java
deleted file mode 100644
index e268645..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/CrossReference.java
+++ b/dev/null
@@ -1,81 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CrossReference.java,v 1.1 2009/02/06 09:46:50 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Cross Reference</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.CrossReference#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.CrossReference#getRule <em>Rule</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getCrossReference()
- * @model
- * @generated
- */
-public interface CrossReference extends AbstractElement
-{
-  /**
-   * Returns the value of the '<em><b>Type</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Type</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Type</em>' containment reference.
-   * @see #setType(TypeRef)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getCrossReference_Type()
-   * @model containment="true"
-   * @generated
-   */
-  TypeRef getType();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.CrossReference#getType <em>Type</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Type</em>' containment reference.
-   * @see #getType()
-   * @generated
-   */
-  void setType(TypeRef value);
-
-  /**
-   * Returns the value of the '<em><b>Rule</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Rule</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Rule</em>' reference.
-   * @see #setRule(AbstractRule)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getCrossReference_Rule()
-   * @model
-   * @generated
-   */
-  AbstractRule getRule();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.CrossReference#getRule <em>Rule</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Rule</em>' reference.
-   * @see #getRule()
-   * @generated
-   */
-  void setRule(AbstractRule value);
-
-} // CrossReference
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/GeneratedMetamodel.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/GeneratedMetamodel.java
deleted file mode 100644
index f078635..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/GeneratedMetamodel.java
+++ b/dev/null
@@ -1,54 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: GeneratedMetamodel.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Generated Metamodel</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.GeneratedMetamodel#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getGeneratedMetamodel()
- * @model
- * @generated
- */
-public interface GeneratedMetamodel extends AbstractMetamodelDeclaration
-{
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getGeneratedMetamodel_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.GeneratedMetamodel#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-  void setName(String value);
-
-} // GeneratedMetamodel
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/Grammar.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/Grammar.java
deleted file mode 100644
index 559aa91..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/Grammar.java
+++ b/dev/null
@@ -1,125 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Grammar.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Grammar</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Grammar#isAbstract <em>Abstract</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Grammar#getIdElements <em>Id Elements</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Grammar#getSuperGrammarIdElements <em>Super Grammar Id Elements</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Grammar#getMetamodelDeclarations <em>Metamodel Declarations</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Grammar#getRules <em>Rules</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getGrammar()
- * @model
- * @generated
- */
-public interface Grammar extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Abstract</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Abstract</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Abstract</em>' attribute.
-   * @see #setAbstract(boolean)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getGrammar_Abstract()
-   * @model
-   * @generated
-   */
-  boolean isAbstract();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Grammar#isAbstract <em>Abstract</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Abstract</em>' attribute.
-   * @see #isAbstract()
-   * @generated
-   */
-  void setAbstract(boolean value);
-
-  /**
-   * Returns the value of the '<em><b>Id Elements</b></em>' attribute list.
-   * The list contents are of type {@link java.lang.String}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id Elements</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id Elements</em>' attribute list.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getGrammar_IdElements()
-   * @model unique="false"
-   * @generated
-   */
-  EList<String> getIdElements();
-
-  /**
-   * Returns the value of the '<em><b>Super Grammar Id Elements</b></em>' attribute list.
-   * The list contents are of type {@link java.lang.String}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Super Grammar Id Elements</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Super Grammar Id Elements</em>' attribute list.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getGrammar_SuperGrammarIdElements()
-   * @model unique="false"
-   * @generated
-   */
-  EList<String> getSuperGrammarIdElements();
-
-  /**
-   * Returns the value of the '<em><b>Metamodel Declarations</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractMetamodelDeclaration}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Metamodel Declarations</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Metamodel Declarations</em>' containment reference list.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getGrammar_MetamodelDeclarations()
-   * @model containment="true"
-   * @generated
-   */
-  EList<AbstractMetamodelDeclaration> getMetamodelDeclarations();
-
-  /**
-   * Returns the value of the '<em><b>Rules</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractRule}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Rules</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Rules</em>' containment reference list.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getGrammar_Rules()
-   * @model containment="true"
-   * @generated
-   */
-  EList<AbstractRule> getRules();
-
-} // Grammar
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/Group.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/Group.java
deleted file mode 100644
index a13706f..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/Group.java
+++ b/dev/null
@@ -1,45 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Group.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Group</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Group#getAbstractTokens <em>Abstract Tokens</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getGroup()
- * @model
- * @generated
- */
-public interface Group extends AbstractElement
-{
-  /**
-   * Returns the value of the '<em><b>Abstract Tokens</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractElement}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Abstract Tokens</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Abstract Tokens</em>' containment reference list.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getGroup_AbstractTokens()
-   * @model containment="true"
-   * @generated
-   */
-  EList<AbstractElement> getAbstractTokens();
-
-} // Group
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/Keyword.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/Keyword.java
deleted file mode 100644
index c3f6639..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/Keyword.java
+++ b/dev/null
@@ -1,54 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Keyword.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Keyword</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Keyword#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getKeyword()
- * @model
- * @generated
- */
-public interface Keyword extends AbstractElement
-{
-  /**
-   * Returns the value of the '<em><b>Value</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Value</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Value</em>' attribute.
-   * @see #setValue(String)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getKeyword_Value()
-   * @model
-   * @generated
-   */
-  String getValue();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Keyword#getValue <em>Value</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Value</em>' attribute.
-   * @see #getValue()
-   * @generated
-   */
-  void setValue(String value);
-
-} // Keyword
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/LexerRule.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/LexerRule.java
deleted file mode 100644
index 3a444b4..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/LexerRule.java
+++ b/dev/null
@@ -1,54 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: LexerRule.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Lexer Rule</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.LexerRule#getBody <em>Body</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getLexerRule()
- * @model
- * @generated
- */
-public interface LexerRule extends AbstractRule
-{
-  /**
-   * Returns the value of the '<em><b>Body</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Body</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Body</em>' attribute.
-   * @see #setBody(String)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getLexerRule_Body()
-   * @model
-   * @generated
-   */
-  String getBody();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.LexerRule#getBody <em>Body</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Body</em>' attribute.
-   * @see #getBody()
-   * @generated
-   */
-  void setBody(String value);
-
-} // LexerRule
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/NegatedToken.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/NegatedToken.java
deleted file mode 100644
index 74a2143..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/NegatedToken.java
+++ b/dev/null
@@ -1,22 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: NegatedToken.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Negated Token</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getNegatedToken()
- * @model
- * @generated
- */
-public interface NegatedToken extends AbstractNegatedToken
-{
-} // NegatedToken
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/ParserRule.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/ParserRule.java
deleted file mode 100644
index a2aff1b..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/ParserRule.java
+++ b/dev/null
@@ -1,126 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ParserRule.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Parser Rule</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.ParserRule#isDefinesHiddenTokens <em>Defines Hidden Tokens</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.ParserRule#getHiddenTokens <em>Hidden Tokens</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.ParserRule#getAlternatives <em>Alternatives</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.ParserRule#isTerminal <em>Terminal</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getParserRule()
- * @model
- * @generated
- */
-public interface ParserRule extends AbstractRule
-{
-  /**
-   * Returns the value of the '<em><b>Defines Hidden Tokens</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Defines Hidden Tokens</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Defines Hidden Tokens</em>' attribute.
-   * @see #setDefinesHiddenTokens(boolean)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getParserRule_DefinesHiddenTokens()
-   * @model
-   * @generated
-   */
-  boolean isDefinesHiddenTokens();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.ParserRule#isDefinesHiddenTokens <em>Defines Hidden Tokens</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Defines Hidden Tokens</em>' attribute.
-   * @see #isDefinesHiddenTokens()
-   * @generated
-   */
-  void setDefinesHiddenTokens(boolean value);
-
-  /**
-   * Returns the value of the '<em><b>Hidden Tokens</b></em>' reference list.
-   * The list contents are of type {@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractRule}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Hidden Tokens</em>' reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Hidden Tokens</em>' reference list.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getParserRule_HiddenTokens()
-   * @model
-   * @generated
-   */
-  EList<AbstractRule> getHiddenTokens();
-
-  /**
-   * Returns the value of the '<em><b>Alternatives</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Alternatives</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Alternatives</em>' containment reference.
-   * @see #setAlternatives(AbstractElement)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getParserRule_Alternatives()
-   * @model containment="true"
-   * @generated
-   */
-  AbstractElement getAlternatives();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.ParserRule#getAlternatives <em>Alternatives</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Alternatives</em>' containment reference.
-   * @see #getAlternatives()
-   * @generated
-   */
-  void setAlternatives(AbstractElement value);
-
-  /**
-   * Returns the value of the '<em><b>Terminal</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Terminal</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Terminal</em>' attribute.
-   * @see #setTerminal(boolean)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getParserRule_Terminal()
-   * @model
-   * @generated
-   */
-  boolean isTerminal();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.ParserRule#isTerminal <em>Terminal</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Terminal</em>' attribute.
-   * @see #isTerminal()
-   * @generated
-   */
-  void setTerminal(boolean value);
-
-} // ParserRule
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/ReferencedMetamodel.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/ReferencedMetamodel.java
deleted file mode 100644
index bc84d17..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/ReferencedMetamodel.java
+++ b/dev/null
@@ -1,22 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ReferencedMetamodel.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Referenced Metamodel</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getReferencedMetamodel()
- * @model
- * @generated
- */
-public interface ReferencedMetamodel extends AbstractMetamodelDeclaration
-{
-} // ReferencedMetamodel
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/RuleCall.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/RuleCall.java
deleted file mode 100644
index 53c2405..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/RuleCall.java
+++ b/dev/null
@@ -1,54 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RuleCall.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Rule Call</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.RuleCall#getRule <em>Rule</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getRuleCall()
- * @model
- * @generated
- */
-public interface RuleCall extends AbstractElement
-{
-  /**
-   * Returns the value of the '<em><b>Rule</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Rule</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Rule</em>' reference.
-   * @see #setRule(AbstractRule)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getRuleCall_Rule()
-   * @model
-   * @generated
-   */
-  AbstractRule getRule();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.RuleCall#getRule <em>Rule</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Rule</em>' reference.
-   * @see #getRule()
-   * @generated
-   */
-  void setRule(AbstractRule value);
-
-} // RuleCall
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/TypeRef.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/TypeRef.java
deleted file mode 100644
index eced0d8..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/TypeRef.java
+++ b/dev/null
@@ -1,83 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TypeRef.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Type Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.TypeRef#getMetamodel <em>Metamodel</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.TypeRef#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getTypeRef()
- * @model
- * @generated
- */
-public interface TypeRef extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Metamodel</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Metamodel</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Metamodel</em>' reference.
-   * @see #setMetamodel(AbstractMetamodelDeclaration)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getTypeRef_Metamodel()
-   * @model
-   * @generated
-   */
-  AbstractMetamodelDeclaration getMetamodel();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.TypeRef#getMetamodel <em>Metamodel</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Metamodel</em>' reference.
-   * @see #getMetamodel()
-   * @generated
-   */
-  void setMetamodel(AbstractMetamodelDeclaration value);
-
-  /**
-   * Returns the value of the '<em><b>Type</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Type</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Type</em>' reference.
-   * @see #setType(EClassifier)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getTypeRef_Type()
-   * @model
-   * @generated
-   */
-  EClassifier getType();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.TypeRef#getType <em>Type</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Type</em>' reference.
-   * @see #getType()
-   * @generated
-   */
-  void setType(EClassifier value);
-
-} // TypeRef
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/UpToToken.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/UpToToken.java
deleted file mode 100644
index e568c59..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/UpToToken.java
+++ b/dev/null
@@ -1,22 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UpToToken.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Up To Token</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getUpToToken()
- * @model
- * @generated
- */
-public interface UpToToken extends AbstractNegatedToken
-{
-} // UpToToken
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/Wildcard.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/Wildcard.java
deleted file mode 100644
index d41d7ae..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/Wildcard.java
+++ b/dev/null
@@ -1,54 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Wildcard.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Wildcard</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Wildcard#isIsWildcard <em>Is Wildcard</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getWildcard()
- * @model
- * @generated
- */
-public interface Wildcard extends AbstractElement
-{
-  /**
-   * Returns the value of the '<em><b>Is Wildcard</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Is Wildcard</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Is Wildcard</em>' attribute.
-   * @see #setIsWildcard(boolean)
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage#getWildcard_IsWildcard()
-   * @model
-   * @generated
-   */
-  boolean isIsWildcard();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Wildcard#isIsWildcard <em>Is Wildcard</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Is Wildcard</em>' attribute.
-   * @see #isIsWildcard()
-   * @generated
-   */
-  void setIsWildcard(boolean value);
-
-} // Wildcard
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/XtextTestFactory.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/XtextTestFactory.java
deleted file mode 100644
index 23509c5..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/XtextTestFactory.java
+++ b/dev/null
@@ -1,227 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: XtextTestFactory.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage
- * @generated
- */
-public interface XtextTestFactory extends EFactory
-{
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  XtextTestFactory eINSTANCE = org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestFactoryImpl.init();
-
-  /**
-   * Returns a new object of class '<em>Grammar</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Grammar</em>'.
-   * @generated
-   */
-  Grammar createGrammar();
-
-  /**
-   * Returns a new object of class '<em>Abstract Rule</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Abstract Rule</em>'.
-   * @generated
-   */
-  AbstractRule createAbstractRule();
-
-  /**
-   * Returns a new object of class '<em>Abstract Metamodel Declaration</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Abstract Metamodel Declaration</em>'.
-   * @generated
-   */
-  AbstractMetamodelDeclaration createAbstractMetamodelDeclaration();
-
-  /**
-   * Returns a new object of class '<em>Generated Metamodel</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Generated Metamodel</em>'.
-   * @generated
-   */
-  GeneratedMetamodel createGeneratedMetamodel();
-
-  /**
-   * Returns a new object of class '<em>Referenced Metamodel</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Referenced Metamodel</em>'.
-   * @generated
-   */
-  ReferencedMetamodel createReferencedMetamodel();
-
-  /**
-   * Returns a new object of class '<em>Lexer Rule</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Lexer Rule</em>'.
-   * @generated
-   */
-  LexerRule createLexerRule();
-
-  /**
-   * Returns a new object of class '<em>Parser Rule</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Parser Rule</em>'.
-   * @generated
-   */
-  ParserRule createParserRule();
-
-  /**
-   * Returns a new object of class '<em>Type Ref</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Type Ref</em>'.
-   * @generated
-   */
-  TypeRef createTypeRef();
-
-  /**
-   * Returns a new object of class '<em>Abstract Element</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Abstract Element</em>'.
-   * @generated
-   */
-  AbstractElement createAbstractElement();
-
-  /**
-   * Returns a new object of class '<em>Assignment</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Assignment</em>'.
-   * @generated
-   */
-  Assignment createAssignment();
-
-  /**
-   * Returns a new object of class '<em>Action</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Action</em>'.
-   * @generated
-   */
-  Action createAction();
-
-  /**
-   * Returns a new object of class '<em>Abstract Negated Token</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Abstract Negated Token</em>'.
-   * @generated
-   */
-  AbstractNegatedToken createAbstractNegatedToken();
-
-  /**
-   * Returns a new object of class '<em>Negated Token</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Negated Token</em>'.
-   * @generated
-   */
-  NegatedToken createNegatedToken();
-
-  /**
-   * Returns a new object of class '<em>Up To Token</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Up To Token</em>'.
-   * @generated
-   */
-  UpToToken createUpToToken();
-
-  /**
-   * Returns a new object of class '<em>Wildcard</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Wildcard</em>'.
-   * @generated
-   */
-  Wildcard createWildcard();
-
-  /**
-   * Returns a new object of class '<em>Cross Reference</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Cross Reference</em>'.
-   * @generated
-   */
-  CrossReference createCrossReference();
-
-  /**
-   * Returns a new object of class '<em>Keyword</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Keyword</em>'.
-   * @generated
-   */
-  Keyword createKeyword();
-
-  /**
-   * Returns a new object of class '<em>Rule Call</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Rule Call</em>'.
-   * @generated
-   */
-  RuleCall createRuleCall();
-
-  /**
-   * Returns a new object of class '<em>Alternatives</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Alternatives</em>'.
-   * @generated
-   */
-  Alternatives createAlternatives();
-
-  /**
-   * Returns a new object of class '<em>Group</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Group</em>'.
-   * @generated
-   */
-  Group createGroup();
-
-  /**
-   * Returns a new object of class '<em>Character Range</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Character Range</em>'.
-   * @generated
-   */
-  CharacterRange createCharacterRange();
-
-  /**
-   * Returns the package supported by this factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the package supported by this factory.
-   * @generated
-   */
-  XtextTestPackage getXtextTestPackage();
-
-} //XtextTestFactory
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/XtextTestPackage.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/XtextTestPackage.java
deleted file mode 100644
index a86ed46..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/XtextTestPackage.java
+++ b/dev/null
@@ -1,2058 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: XtextTestPackage.java,v 1.1 2009/02/06 09:46:51 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestFactory
- * @model kind="package"
- * @generated
- */
-public interface XtextTestPackage extends EPackage
-{
-  /**
-   * The package name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNAME = "XtextTest";
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_URI = "http://www.eclipse.org/2008/Test/XtextTest";
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_PREFIX = "XtextTest";
-
-  /**
-   * The singleton instance of the package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  XtextTestPackage eINSTANCE = org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl.init();
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.GrammarImpl <em>Grammar</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.GrammarImpl
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getGrammar()
-   * @generated
-   */
-  int GRAMMAR = 0;
-
-  /**
-   * The feature id for the '<em><b>Abstract</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int GRAMMAR__ABSTRACT = 0;
-
-  /**
-   * The feature id for the '<em><b>Id Elements</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int GRAMMAR__ID_ELEMENTS = 1;
-
-  /**
-   * The feature id for the '<em><b>Super Grammar Id Elements</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int GRAMMAR__SUPER_GRAMMAR_ID_ELEMENTS = 2;
-
-  /**
-   * The feature id for the '<em><b>Metamodel Declarations</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int GRAMMAR__METAMODEL_DECLARATIONS = 3;
-
-  /**
-   * The feature id for the '<em><b>Rules</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int GRAMMAR__RULES = 4;
-
-  /**
-   * The number of structural features of the '<em>Grammar</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int GRAMMAR_FEATURE_COUNT = 5;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AbstractRuleImpl <em>Abstract Rule</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AbstractRuleImpl
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getAbstractRule()
-   * @generated
-   */
-  int ABSTRACT_RULE = 1;
-
-  /**
-   * The feature id for the '<em><b>Type</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ABSTRACT_RULE__TYPE = 0;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ABSTRACT_RULE__NAME = 1;
-
-  /**
-   * The number of structural features of the '<em>Abstract Rule</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ABSTRACT_RULE_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AbstractMetamodelDeclarationImpl <em>Abstract Metamodel Declaration</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AbstractMetamodelDeclarationImpl
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getAbstractMetamodelDeclaration()
-   * @generated
-   */
-  int ABSTRACT_METAMODEL_DECLARATION = 2;
-
-  /**
-   * The feature id for the '<em><b>EPackage</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ABSTRACT_METAMODEL_DECLARATION__EPACKAGE = 0;
-
-  /**
-   * The feature id for the '<em><b>Alias</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ABSTRACT_METAMODEL_DECLARATION__ALIAS = 1;
-
-  /**
-   * The number of structural features of the '<em>Abstract Metamodel Declaration</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ABSTRACT_METAMODEL_DECLARATION_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.GeneratedMetamodelImpl <em>Generated Metamodel</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.GeneratedMetamodelImpl
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getGeneratedMetamodel()
-   * @generated
-   */
-  int GENERATED_METAMODEL = 3;
-
-  /**
-   * The feature id for the '<em><b>EPackage</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int GENERATED_METAMODEL__EPACKAGE = ABSTRACT_METAMODEL_DECLARATION__EPACKAGE;
-
-  /**
-   * The feature id for the '<em><b>Alias</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int GENERATED_METAMODEL__ALIAS = ABSTRACT_METAMODEL_DECLARATION__ALIAS;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int GENERATED_METAMODEL__NAME = ABSTRACT_METAMODEL_DECLARATION_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the '<em>Generated Metamodel</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int GENERATED_METAMODEL_FEATURE_COUNT = ABSTRACT_METAMODEL_DECLARATION_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.ReferencedMetamodelImpl <em>Referenced Metamodel</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.ReferencedMetamodelImpl
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getReferencedMetamodel()
-   * @generated
-   */
-  int REFERENCED_METAMODEL = 4;
-
-  /**
-   * The feature id for the '<em><b>EPackage</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCED_METAMODEL__EPACKAGE = ABSTRACT_METAMODEL_DECLARATION__EPACKAGE;
-
-  /**
-   * The feature id for the '<em><b>Alias</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCED_METAMODEL__ALIAS = ABSTRACT_METAMODEL_DECLARATION__ALIAS;
-
-  /**
-   * The number of structural features of the '<em>Referenced Metamodel</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCED_METAMODEL_FEATURE_COUNT = ABSTRACT_METAMODEL_DECLARATION_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.LexerRuleImpl <em>Lexer Rule</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.LexerRuleImpl
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getLexerRule()
-   * @generated
-   */
-  int LEXER_RULE = 5;
-
-  /**
-   * The feature id for the '<em><b>Type</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int LEXER_RULE__TYPE = ABSTRACT_RULE__TYPE;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int LEXER_RULE__NAME = ABSTRACT_RULE__NAME;
-
-  /**
-   * The feature id for the '<em><b>Body</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int LEXER_RULE__BODY = ABSTRACT_RULE_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the '<em>Lexer Rule</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int LEXER_RULE_FEATURE_COUNT = ABSTRACT_RULE_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.ParserRuleImpl <em>Parser Rule</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.ParserRuleImpl
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getParserRule()
-   * @generated
-   */
-  int PARSER_RULE = 6;
-
-  /**
-   * The feature id for the '<em><b>Type</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PARSER_RULE__TYPE = ABSTRACT_RULE__TYPE;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PARSER_RULE__NAME = ABSTRACT_RULE__NAME;
-
-  /**
-   * The feature id for the '<em><b>Defines Hidden Tokens</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PARSER_RULE__DEFINES_HIDDEN_TOKENS = ABSTRACT_RULE_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Hidden Tokens</b></em>' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PARSER_RULE__HIDDEN_TOKENS = ABSTRACT_RULE_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Alternatives</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PARSER_RULE__ALTERNATIVES = ABSTRACT_RULE_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Terminal</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PARSER_RULE__TERMINAL = ABSTRACT_RULE_FEATURE_COUNT + 3;
-
-  /**
-   * The number of structural features of the '<em>Parser Rule</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PARSER_RULE_FEATURE_COUNT = ABSTRACT_RULE_FEATURE_COUNT + 4;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.TypeRefImpl <em>Type Ref</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.TypeRefImpl
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getTypeRef()
-   * @generated
-   */
-  int TYPE_REF = 7;
-
-  /**
-   * The feature id for the '<em><b>Metamodel</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TYPE_REF__METAMODEL = 0;
-
-  /**
-   * The feature id for the '<em><b>Type</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TYPE_REF__TYPE = 1;
-
-  /**
-   * The number of structural features of the '<em>Type Ref</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TYPE_REF_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AbstractElementImpl <em>Abstract Element</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AbstractElementImpl
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getAbstractElement()
-   * @generated
-   */
-  int ABSTRACT_ELEMENT = 8;
-
-  /**
-   * The feature id for the '<em><b>Cardinality</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ABSTRACT_ELEMENT__CARDINALITY = 0;
-
-  /**
-   * The number of structural features of the '<em>Abstract Element</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ABSTRACT_ELEMENT_FEATURE_COUNT = 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AssignmentImpl <em>Assignment</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AssignmentImpl
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getAssignment()
-   * @generated
-   */
-  int ASSIGNMENT = 9;
-
-  /**
-   * The feature id for the '<em><b>Cardinality</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ASSIGNMENT__CARDINALITY = ABSTRACT_ELEMENT__CARDINALITY;
-
-  /**
-   * The feature id for the '<em><b>Feature</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ASSIGNMENT__FEATURE = ABSTRACT_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Operator</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ASSIGNMENT__OPERATOR = ABSTRACT_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Terminal</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ASSIGNMENT__TERMINAL = ABSTRACT_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The number of structural features of the '<em>Assignment</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ASSIGNMENT_FEATURE_COUNT = ABSTRACT_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.ActionImpl <em>Action</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.ActionImpl
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getAction()
-   * @generated
-   */
-  int ACTION = 10;
-
-  /**
-   * The feature id for the '<em><b>Cardinality</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ACTION__CARDINALITY = ABSTRACT_ELEMENT__CARDINALITY;
-
-  /**
-   * The feature id for the '<em><b>Type Name</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ACTION__TYPE_NAME = ABSTRACT_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Feature</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ACTION__FEATURE = ABSTRACT_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Operator</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ACTION__OPERATOR = ABSTRACT_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The number of structural features of the '<em>Action</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ACTION_FEATURE_COUNT = ABSTRACT_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AbstractNegatedTokenImpl <em>Abstract Negated Token</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AbstractNegatedTokenImpl
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getAbstractNegatedToken()
-   * @generated
-   */
-  int ABSTRACT_NEGATED_TOKEN = 11;
-
-  /**
-   * The feature id for the '<em><b>Cardinality</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ABSTRACT_NEGATED_TOKEN__CARDINALITY = ABSTRACT_ELEMENT__CARDINALITY;
-
-  /**
-   * The feature id for the '<em><b>Terminal</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ABSTRACT_NEGATED_TOKEN__TERMINAL = ABSTRACT_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the '<em>Abstract Negated Token</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ABSTRACT_NEGATED_TOKEN_FEATURE_COUNT = ABSTRACT_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.NegatedTokenImpl <em>Negated Token</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.NegatedTokenImpl
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getNegatedToken()
-   * @generated
-   */
-  int NEGATED_TOKEN = 12;
-
-  /**
-   * The feature id for the '<em><b>Cardinality</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int NEGATED_TOKEN__CARDINALITY = ABSTRACT_NEGATED_TOKEN__CARDINALITY;
-
-  /**
-   * The feature id for the '<em><b>Terminal</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int NEGATED_TOKEN__TERMINAL = ABSTRACT_NEGATED_TOKEN__TERMINAL;
-
-  /**
-   * The number of structural features of the '<em>Negated Token</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int NEGATED_TOKEN_FEATURE_COUNT = ABSTRACT_NEGATED_TOKEN_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.UpToTokenImpl <em>Up To Token</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.UpToTokenImpl
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getUpToToken()
-   * @generated
-   */
-  int UP_TO_TOKEN = 13;
-
-  /**
-   * The feature id for the '<em><b>Cardinality</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int UP_TO_TOKEN__CARDINALITY = ABSTRACT_NEGATED_TOKEN__CARDINALITY;
-
-  /**
-   * The feature id for the '<em><b>Terminal</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int UP_TO_TOKEN__TERMINAL = ABSTRACT_NEGATED_TOKEN__TERMINAL;
-
-  /**
-   * The number of structural features of the '<em>Up To Token</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int UP_TO_TOKEN_FEATURE_COUNT = ABSTRACT_NEGATED_TOKEN_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.WildcardImpl <em>Wildcard</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.WildcardImpl
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getWildcard()
-   * @generated
-   */
-  int WILDCARD = 14;
-
-  /**
-   * The feature id for the '<em><b>Cardinality</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WILDCARD__CARDINALITY = ABSTRACT_ELEMENT__CARDINALITY;
-
-  /**
-   * The feature id for the '<em><b>Is Wildcard</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WILDCARD__IS_WILDCARD = ABSTRACT_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the '<em>Wildcard</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WILDCARD_FEATURE_COUNT = ABSTRACT_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.CrossReferenceImpl <em>Cross Reference</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.CrossReferenceImpl
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getCrossReference()
-   * @generated
-   */
-  int CROSS_REFERENCE = 15;
-
-  /**
-   * The feature id for the '<em><b>Cardinality</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CROSS_REFERENCE__CARDINALITY = ABSTRACT_ELEMENT__CARDINALITY;
-
-  /**
-   * The feature id for the '<em><b>Type</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CROSS_REFERENCE__TYPE = ABSTRACT_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Rule</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CROSS_REFERENCE__RULE = ABSTRACT_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the '<em>Cross Reference</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CROSS_REFERENCE_FEATURE_COUNT = ABSTRACT_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.KeywordImpl <em>Keyword</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.KeywordImpl
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getKeyword()
-   * @generated
-   */
-  int KEYWORD = 16;
-
-  /**
-   * The feature id for the '<em><b>Cardinality</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int KEYWORD__CARDINALITY = ABSTRACT_ELEMENT__CARDINALITY;
-
-  /**
-   * The feature id for the '<em><b>Value</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int KEYWORD__VALUE = ABSTRACT_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the '<em>Keyword</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int KEYWORD_FEATURE_COUNT = ABSTRACT_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.RuleCallImpl <em>Rule Call</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.RuleCallImpl
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getRuleCall()
-   * @generated
-   */
-  int RULE_CALL = 17;
-
-  /**
-   * The feature id for the '<em><b>Cardinality</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int RULE_CALL__CARDINALITY = ABSTRACT_ELEMENT__CARDINALITY;
-
-  /**
-   * The feature id for the '<em><b>Rule</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int RULE_CALL__RULE = ABSTRACT_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the '<em>Rule Call</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int RULE_CALL_FEATURE_COUNT = ABSTRACT_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AlternativesImpl <em>Alternatives</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AlternativesImpl
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getAlternatives()
-   * @generated
-   */
-  int ALTERNATIVES = 18;
-
-  /**
-   * The feature id for the '<em><b>Cardinality</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ALTERNATIVES__CARDINALITY = ABSTRACT_ELEMENT__CARDINALITY;
-
-  /**
-   * The feature id for the '<em><b>Groups</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ALTERNATIVES__GROUPS = ABSTRACT_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the '<em>Alternatives</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ALTERNATIVES_FEATURE_COUNT = ABSTRACT_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.GroupImpl <em>Group</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.GroupImpl
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getGroup()
-   * @generated
-   */
-  int GROUP = 19;
-
-  /**
-   * The feature id for the '<em><b>Cardinality</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int GROUP__CARDINALITY = ABSTRACT_ELEMENT__CARDINALITY;
-
-  /**
-   * The feature id for the '<em><b>Abstract Tokens</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int GROUP__ABSTRACT_TOKENS = ABSTRACT_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the '<em>Group</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int GROUP_FEATURE_COUNT = ABSTRACT_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.CharacterRangeImpl <em>Character Range</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.CharacterRangeImpl
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getCharacterRange()
-   * @generated
-   */
-  int CHARACTER_RANGE = 20;
-
-  /**
-   * The feature id for the '<em><b>Cardinality</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CHARACTER_RANGE__CARDINALITY = ABSTRACT_ELEMENT__CARDINALITY;
-
-  /**
-   * The feature id for the '<em><b>Left</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CHARACTER_RANGE__LEFT = ABSTRACT_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Right</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CHARACTER_RANGE__RIGHT = ABSTRACT_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the '<em>Character Range</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CHARACTER_RANGE_FEATURE_COUNT = ABSTRACT_ELEMENT_FEATURE_COUNT + 2;
-
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Grammar <em>Grammar</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Grammar</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Grammar
-   * @generated
-   */
-  EClass getGrammar();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Grammar#isAbstract <em>Abstract</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Abstract</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Grammar#isAbstract()
-   * @see #getGrammar()
-   * @generated
-   */
-  EAttribute getGrammar_Abstract();
-
-  /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Grammar#getIdElements <em>Id Elements</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute list '<em>Id Elements</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Grammar#getIdElements()
-   * @see #getGrammar()
-   * @generated
-   */
-  EAttribute getGrammar_IdElements();
-
-  /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Grammar#getSuperGrammarIdElements <em>Super Grammar Id Elements</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute list '<em>Super Grammar Id Elements</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Grammar#getSuperGrammarIdElements()
-   * @see #getGrammar()
-   * @generated
-   */
-  EAttribute getGrammar_SuperGrammarIdElements();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Grammar#getMetamodelDeclarations <em>Metamodel Declarations</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Metamodel Declarations</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Grammar#getMetamodelDeclarations()
-   * @see #getGrammar()
-   * @generated
-   */
-  EReference getGrammar_MetamodelDeclarations();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Grammar#getRules <em>Rules</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Rules</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Grammar#getRules()
-   * @see #getGrammar()
-   * @generated
-   */
-  EReference getGrammar_Rules();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractRule <em>Abstract Rule</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Abstract Rule</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractRule
-   * @generated
-   */
-  EClass getAbstractRule();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractRule#getType <em>Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Type</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractRule#getType()
-   * @see #getAbstractRule()
-   * @generated
-   */
-  EReference getAbstractRule_Type();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractRule#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractRule#getName()
-   * @see #getAbstractRule()
-   * @generated
-   */
-  EAttribute getAbstractRule_Name();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractMetamodelDeclaration <em>Abstract Metamodel Declaration</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Abstract Metamodel Declaration</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractMetamodelDeclaration
-   * @generated
-   */
-  EClass getAbstractMetamodelDeclaration();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractMetamodelDeclaration#getEPackage <em>EPackage</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>EPackage</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractMetamodelDeclaration#getEPackage()
-   * @see #getAbstractMetamodelDeclaration()
-   * @generated
-   */
-  EReference getAbstractMetamodelDeclaration_EPackage();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractMetamodelDeclaration#getAlias <em>Alias</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Alias</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractMetamodelDeclaration#getAlias()
-   * @see #getAbstractMetamodelDeclaration()
-   * @generated
-   */
-  EAttribute getAbstractMetamodelDeclaration_Alias();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.GeneratedMetamodel <em>Generated Metamodel</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Generated Metamodel</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.GeneratedMetamodel
-   * @generated
-   */
-  EClass getGeneratedMetamodel();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.GeneratedMetamodel#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.GeneratedMetamodel#getName()
-   * @see #getGeneratedMetamodel()
-   * @generated
-   */
-  EAttribute getGeneratedMetamodel_Name();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.ReferencedMetamodel <em>Referenced Metamodel</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Referenced Metamodel</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.ReferencedMetamodel
-   * @generated
-   */
-  EClass getReferencedMetamodel();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.LexerRule <em>Lexer Rule</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Lexer Rule</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.LexerRule
-   * @generated
-   */
-  EClass getLexerRule();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.LexerRule#getBody <em>Body</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Body</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.LexerRule#getBody()
-   * @see #getLexerRule()
-   * @generated
-   */
-  EAttribute getLexerRule_Body();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.ParserRule <em>Parser Rule</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Parser Rule</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.ParserRule
-   * @generated
-   */
-  EClass getParserRule();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.ParserRule#isDefinesHiddenTokens <em>Defines Hidden Tokens</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Defines Hidden Tokens</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.ParserRule#isDefinesHiddenTokens()
-   * @see #getParserRule()
-   * @generated
-   */
-  EAttribute getParserRule_DefinesHiddenTokens();
-
-  /**
-   * Returns the meta object for the reference list '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.ParserRule#getHiddenTokens <em>Hidden Tokens</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference list '<em>Hidden Tokens</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.ParserRule#getHiddenTokens()
-   * @see #getParserRule()
-   * @generated
-   */
-  EReference getParserRule_HiddenTokens();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.ParserRule#getAlternatives <em>Alternatives</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Alternatives</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.ParserRule#getAlternatives()
-   * @see #getParserRule()
-   * @generated
-   */
-  EReference getParserRule_Alternatives();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.ParserRule#isTerminal <em>Terminal</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Terminal</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.ParserRule#isTerminal()
-   * @see #getParserRule()
-   * @generated
-   */
-  EAttribute getParserRule_Terminal();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.TypeRef <em>Type Ref</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Type Ref</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.TypeRef
-   * @generated
-   */
-  EClass getTypeRef();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.TypeRef#getMetamodel <em>Metamodel</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Metamodel</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.TypeRef#getMetamodel()
-   * @see #getTypeRef()
-   * @generated
-   */
-  EReference getTypeRef_Metamodel();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.TypeRef#getType <em>Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Type</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.TypeRef#getType()
-   * @see #getTypeRef()
-   * @generated
-   */
-  EReference getTypeRef_Type();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractElement <em>Abstract Element</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Abstract Element</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractElement
-   * @generated
-   */
-  EClass getAbstractElement();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractElement#getCardinality <em>Cardinality</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Cardinality</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractElement#getCardinality()
-   * @see #getAbstractElement()
-   * @generated
-   */
-  EAttribute getAbstractElement_Cardinality();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Assignment <em>Assignment</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Assignment</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Assignment
-   * @generated
-   */
-  EClass getAssignment();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Assignment#getFeature <em>Feature</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Feature</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Assignment#getFeature()
-   * @see #getAssignment()
-   * @generated
-   */
-  EAttribute getAssignment_Feature();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Assignment#getOperator <em>Operator</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Operator</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Assignment#getOperator()
-   * @see #getAssignment()
-   * @generated
-   */
-  EAttribute getAssignment_Operator();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Assignment#getTerminal <em>Terminal</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Terminal</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Assignment#getTerminal()
-   * @see #getAssignment()
-   * @generated
-   */
-  EReference getAssignment_Terminal();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Action <em>Action</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Action</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Action
-   * @generated
-   */
-  EClass getAction();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Action#getTypeName <em>Type Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Type Name</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Action#getTypeName()
-   * @see #getAction()
-   * @generated
-   */
-  EReference getAction_TypeName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Action#getFeature <em>Feature</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Feature</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Action#getFeature()
-   * @see #getAction()
-   * @generated
-   */
-  EAttribute getAction_Feature();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Action#getOperator <em>Operator</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Operator</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Action#getOperator()
-   * @see #getAction()
-   * @generated
-   */
-  EAttribute getAction_Operator();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractNegatedToken <em>Abstract Negated Token</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Abstract Negated Token</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractNegatedToken
-   * @generated
-   */
-  EClass getAbstractNegatedToken();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractNegatedToken#getTerminal <em>Terminal</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Terminal</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractNegatedToken#getTerminal()
-   * @see #getAbstractNegatedToken()
-   * @generated
-   */
-  EReference getAbstractNegatedToken_Terminal();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.NegatedToken <em>Negated Token</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Negated Token</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.NegatedToken
-   * @generated
-   */
-  EClass getNegatedToken();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.UpToToken <em>Up To Token</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Up To Token</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.UpToToken
-   * @generated
-   */
-  EClass getUpToToken();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Wildcard <em>Wildcard</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Wildcard</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Wildcard
-   * @generated
-   */
-  EClass getWildcard();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Wildcard#isIsWildcard <em>Is Wildcard</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Is Wildcard</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Wildcard#isIsWildcard()
-   * @see #getWildcard()
-   * @generated
-   */
-  EAttribute getWildcard_IsWildcard();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.CrossReference <em>Cross Reference</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Cross Reference</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.CrossReference
-   * @generated
-   */
-  EClass getCrossReference();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.CrossReference#getType <em>Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Type</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.CrossReference#getType()
-   * @see #getCrossReference()
-   * @generated
-   */
-  EReference getCrossReference_Type();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.CrossReference#getRule <em>Rule</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Rule</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.CrossReference#getRule()
-   * @see #getCrossReference()
-   * @generated
-   */
-  EReference getCrossReference_Rule();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Keyword <em>Keyword</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Keyword</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Keyword
-   * @generated
-   */
-  EClass getKeyword();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Keyword#getValue <em>Value</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Value</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Keyword#getValue()
-   * @see #getKeyword()
-   * @generated
-   */
-  EAttribute getKeyword_Value();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.RuleCall <em>Rule Call</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Rule Call</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.RuleCall
-   * @generated
-   */
-  EClass getRuleCall();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.RuleCall#getRule <em>Rule</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Rule</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.RuleCall#getRule()
-   * @see #getRuleCall()
-   * @generated
-   */
-  EReference getRuleCall_Rule();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Alternatives <em>Alternatives</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Alternatives</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Alternatives
-   * @generated
-   */
-  EClass getAlternatives();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Alternatives#getGroups <em>Groups</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Groups</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Alternatives#getGroups()
-   * @see #getAlternatives()
-   * @generated
-   */
-  EReference getAlternatives_Groups();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Group <em>Group</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Group</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Group
-   * @generated
-   */
-  EClass getGroup();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Group#getAbstractTokens <em>Abstract Tokens</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Abstract Tokens</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Group#getAbstractTokens()
-   * @see #getGroup()
-   * @generated
-   */
-  EReference getGroup_AbstractTokens();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.CharacterRange <em>Character Range</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Character Range</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.CharacterRange
-   * @generated
-   */
-  EClass getCharacterRange();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.CharacterRange#getLeft <em>Left</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Left</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.CharacterRange#getLeft()
-   * @see #getCharacterRange()
-   * @generated
-   */
-  EReference getCharacterRange_Left();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.CharacterRange#getRight <em>Right</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Right</em>'.
-   * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.CharacterRange#getRight()
-   * @see #getCharacterRange()
-   * @generated
-   */
-  EReference getCharacterRange_Right();
-
-  /**
-   * Returns the factory that creates the instances of the model.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the factory that creates the instances of the model.
-   * @generated
-   */
-  XtextTestFactory getXtextTestFactory();
-
-  /**
-   * <!-- begin-user-doc -->
-   * Defines literals for the meta objects that represent
-   * <ul>
-   *   <li>each class,</li>
-   *   <li>each feature of each class,</li>
-   *   <li>each enum,</li>
-   *   <li>and each data type</li>
-   * </ul>
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  interface Literals
-  {
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.GrammarImpl <em>Grammar</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.GrammarImpl
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getGrammar()
-     * @generated
-     */
-    EClass GRAMMAR = eINSTANCE.getGrammar();
-
-    /**
-     * The meta object literal for the '<em><b>Abstract</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute GRAMMAR__ABSTRACT = eINSTANCE.getGrammar_Abstract();
-
-    /**
-     * The meta object literal for the '<em><b>Id Elements</b></em>' attribute list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute GRAMMAR__ID_ELEMENTS = eINSTANCE.getGrammar_IdElements();
-
-    /**
-     * The meta object literal for the '<em><b>Super Grammar Id Elements</b></em>' attribute list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute GRAMMAR__SUPER_GRAMMAR_ID_ELEMENTS = eINSTANCE.getGrammar_SuperGrammarIdElements();
-
-    /**
-     * The meta object literal for the '<em><b>Metamodel Declarations</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference GRAMMAR__METAMODEL_DECLARATIONS = eINSTANCE.getGrammar_MetamodelDeclarations();
-
-    /**
-     * The meta object literal for the '<em><b>Rules</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference GRAMMAR__RULES = eINSTANCE.getGrammar_Rules();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AbstractRuleImpl <em>Abstract Rule</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AbstractRuleImpl
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getAbstractRule()
-     * @generated
-     */
-    EClass ABSTRACT_RULE = eINSTANCE.getAbstractRule();
-
-    /**
-     * The meta object literal for the '<em><b>Type</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference ABSTRACT_RULE__TYPE = eINSTANCE.getAbstractRule_Type();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute ABSTRACT_RULE__NAME = eINSTANCE.getAbstractRule_Name();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AbstractMetamodelDeclarationImpl <em>Abstract Metamodel Declaration</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AbstractMetamodelDeclarationImpl
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getAbstractMetamodelDeclaration()
-     * @generated
-     */
-    EClass ABSTRACT_METAMODEL_DECLARATION = eINSTANCE.getAbstractMetamodelDeclaration();
-
-    /**
-     * The meta object literal for the '<em><b>EPackage</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference ABSTRACT_METAMODEL_DECLARATION__EPACKAGE = eINSTANCE.getAbstractMetamodelDeclaration_EPackage();
-
-    /**
-     * The meta object literal for the '<em><b>Alias</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute ABSTRACT_METAMODEL_DECLARATION__ALIAS = eINSTANCE.getAbstractMetamodelDeclaration_Alias();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.GeneratedMetamodelImpl <em>Generated Metamodel</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.GeneratedMetamodelImpl
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getGeneratedMetamodel()
-     * @generated
-     */
-    EClass GENERATED_METAMODEL = eINSTANCE.getGeneratedMetamodel();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute GENERATED_METAMODEL__NAME = eINSTANCE.getGeneratedMetamodel_Name();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.ReferencedMetamodelImpl <em>Referenced Metamodel</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.ReferencedMetamodelImpl
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getReferencedMetamodel()
-     * @generated
-     */
-    EClass REFERENCED_METAMODEL = eINSTANCE.getReferencedMetamodel();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.LexerRuleImpl <em>Lexer Rule</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.LexerRuleImpl
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getLexerRule()
-     * @generated
-     */
-    EClass LEXER_RULE = eINSTANCE.getLexerRule();
-
-    /**
-     * The meta object literal for the '<em><b>Body</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute LEXER_RULE__BODY = eINSTANCE.getLexerRule_Body();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.ParserRuleImpl <em>Parser Rule</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.ParserRuleImpl
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getParserRule()
-     * @generated
-     */
-    EClass PARSER_RULE = eINSTANCE.getParserRule();
-
-    /**
-     * The meta object literal for the '<em><b>Defines Hidden Tokens</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute PARSER_RULE__DEFINES_HIDDEN_TOKENS = eINSTANCE.getParserRule_DefinesHiddenTokens();
-
-    /**
-     * The meta object literal for the '<em><b>Hidden Tokens</b></em>' reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference PARSER_RULE__HIDDEN_TOKENS = eINSTANCE.getParserRule_HiddenTokens();
-
-    /**
-     * The meta object literal for the '<em><b>Alternatives</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference PARSER_RULE__ALTERNATIVES = eINSTANCE.getParserRule_Alternatives();
-
-    /**
-     * The meta object literal for the '<em><b>Terminal</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute PARSER_RULE__TERMINAL = eINSTANCE.getParserRule_Terminal();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.TypeRefImpl <em>Type Ref</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.TypeRefImpl
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getTypeRef()
-     * @generated
-     */
-    EClass TYPE_REF = eINSTANCE.getTypeRef();
-
-    /**
-     * The meta object literal for the '<em><b>Metamodel</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference TYPE_REF__METAMODEL = eINSTANCE.getTypeRef_Metamodel();
-
-    /**
-     * The meta object literal for the '<em><b>Type</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference TYPE_REF__TYPE = eINSTANCE.getTypeRef_Type();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AbstractElementImpl <em>Abstract Element</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AbstractElementImpl
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getAbstractElement()
-     * @generated
-     */
-    EClass ABSTRACT_ELEMENT = eINSTANCE.getAbstractElement();
-
-    /**
-     * The meta object literal for the '<em><b>Cardinality</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute ABSTRACT_ELEMENT__CARDINALITY = eINSTANCE.getAbstractElement_Cardinality();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AssignmentImpl <em>Assignment</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AssignmentImpl
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getAssignment()
-     * @generated
-     */
-    EClass ASSIGNMENT = eINSTANCE.getAssignment();
-
-    /**
-     * The meta object literal for the '<em><b>Feature</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute ASSIGNMENT__FEATURE = eINSTANCE.getAssignment_Feature();
-
-    /**
-     * The meta object literal for the '<em><b>Operator</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute ASSIGNMENT__OPERATOR = eINSTANCE.getAssignment_Operator();
-
-    /**
-     * The meta object literal for the '<em><b>Terminal</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference ASSIGNMENT__TERMINAL = eINSTANCE.getAssignment_Terminal();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.ActionImpl <em>Action</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.ActionImpl
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getAction()
-     * @generated
-     */
-    EClass ACTION = eINSTANCE.getAction();
-
-    /**
-     * The meta object literal for the '<em><b>Type Name</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference ACTION__TYPE_NAME = eINSTANCE.getAction_TypeName();
-
-    /**
-     * The meta object literal for the '<em><b>Feature</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute ACTION__FEATURE = eINSTANCE.getAction_Feature();
-
-    /**
-     * The meta object literal for the '<em><b>Operator</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute ACTION__OPERATOR = eINSTANCE.getAction_Operator();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AbstractNegatedTokenImpl <em>Abstract Negated Token</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AbstractNegatedTokenImpl
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getAbstractNegatedToken()
-     * @generated
-     */
-    EClass ABSTRACT_NEGATED_TOKEN = eINSTANCE.getAbstractNegatedToken();
-
-    /**
-     * The meta object literal for the '<em><b>Terminal</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference ABSTRACT_NEGATED_TOKEN__TERMINAL = eINSTANCE.getAbstractNegatedToken_Terminal();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.NegatedTokenImpl <em>Negated Token</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.NegatedTokenImpl
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getNegatedToken()
-     * @generated
-     */
-    EClass NEGATED_TOKEN = eINSTANCE.getNegatedToken();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.UpToTokenImpl <em>Up To Token</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.UpToTokenImpl
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getUpToToken()
-     * @generated
-     */
-    EClass UP_TO_TOKEN = eINSTANCE.getUpToToken();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.WildcardImpl <em>Wildcard</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.WildcardImpl
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getWildcard()
-     * @generated
-     */
-    EClass WILDCARD = eINSTANCE.getWildcard();
-
-    /**
-     * The meta object literal for the '<em><b>Is Wildcard</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute WILDCARD__IS_WILDCARD = eINSTANCE.getWildcard_IsWildcard();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.CrossReferenceImpl <em>Cross Reference</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.CrossReferenceImpl
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getCrossReference()
-     * @generated
-     */
-    EClass CROSS_REFERENCE = eINSTANCE.getCrossReference();
-
-    /**
-     * The meta object literal for the '<em><b>Type</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference CROSS_REFERENCE__TYPE = eINSTANCE.getCrossReference_Type();
-
-    /**
-     * The meta object literal for the '<em><b>Rule</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference CROSS_REFERENCE__RULE = eINSTANCE.getCrossReference_Rule();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.KeywordImpl <em>Keyword</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.KeywordImpl
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getKeyword()
-     * @generated
-     */
-    EClass KEYWORD = eINSTANCE.getKeyword();
-
-    /**
-     * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute KEYWORD__VALUE = eINSTANCE.getKeyword_Value();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.RuleCallImpl <em>Rule Call</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.RuleCallImpl
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getRuleCall()
-     * @generated
-     */
-    EClass RULE_CALL = eINSTANCE.getRuleCall();
-
-    /**
-     * The meta object literal for the '<em><b>Rule</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference RULE_CALL__RULE = eINSTANCE.getRuleCall_Rule();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AlternativesImpl <em>Alternatives</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AlternativesImpl
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getAlternatives()
-     * @generated
-     */
-    EClass ALTERNATIVES = eINSTANCE.getAlternatives();
-
-    /**
-     * The meta object literal for the '<em><b>Groups</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference ALTERNATIVES__GROUPS = eINSTANCE.getAlternatives_Groups();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.GroupImpl <em>Group</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.GroupImpl
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getGroup()
-     * @generated
-     */
-    EClass GROUP = eINSTANCE.getGroup();
-
-    /**
-     * The meta object literal for the '<em><b>Abstract Tokens</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference GROUP__ABSTRACT_TOKENS = eINSTANCE.getGroup_AbstractTokens();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.CharacterRangeImpl <em>Character Range</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.CharacterRangeImpl
-     * @see org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.XtextTestPackageImpl#getCharacterRange()
-     * @generated
-     */
-    EClass CHARACTER_RANGE = eINSTANCE.getCharacterRange();
-
-    /**
-     * The meta object literal for the '<em><b>Left</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference CHARACTER_RANGE__LEFT = eINSTANCE.getCharacterRange_Left();
-
-    /**
-     * The meta object literal for the '<em><b>Right</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference CHARACTER_RANGE__RIGHT = eINSTANCE.getCharacterRange_Right();
-
-  }
-
-} //XtextTestPackage
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/AbstractElementImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/AbstractElementImpl.java
deleted file mode 100644
index 94bb19d..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/AbstractElementImpl.java
+++ b/dev/null
@@ -1,181 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AbstractElementImpl.java,v 1.1 2009/02/06 09:46:50 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractElement;
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Abstract Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AbstractElementImpl#getCardinality <em>Cardinality</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AbstractElementImpl extends EObjectImpl implements AbstractElement
-{
-  /**
-   * The default value of the '{@link #getCardinality() <em>Cardinality</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getCardinality()
-   * @generated
-   * @ordered
-   */
-  protected static final String CARDINALITY_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getCardinality() <em>Cardinality</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getCardinality()
-   * @generated
-   * @ordered
-   */
-  protected String cardinality = CARDINALITY_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected AbstractElementImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return XtextTestPackage.Literals.ABSTRACT_ELEMENT;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getCardinality()
-  {
-    return cardinality;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setCardinality(String newCardinality)
-  {
-    String oldCardinality = cardinality;
-    cardinality = newCardinality;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, XtextTestPackage.ABSTRACT_ELEMENT__CARDINALITY, oldCardinality, cardinality));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ABSTRACT_ELEMENT__CARDINALITY:
-        return getCardinality();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ABSTRACT_ELEMENT__CARDINALITY:
-        setCardinality((String)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ABSTRACT_ELEMENT__CARDINALITY:
-        setCardinality(CARDINALITY_EDEFAULT);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ABSTRACT_ELEMENT__CARDINALITY:
-        return CARDINALITY_EDEFAULT == null ? cardinality != null : !CARDINALITY_EDEFAULT.equals(cardinality);
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (cardinality: ");
-    result.append(cardinality);
-    result.append(')');
-    return result.toString();
-  }
-
-} //AbstractElementImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/AbstractMetamodelDeclarationImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/AbstractMetamodelDeclarationImpl.java
deleted file mode 100644
index fa42c07..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/AbstractMetamodelDeclarationImpl.java
+++ b/dev/null
@@ -1,248 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AbstractMetamodelDeclarationImpl.java,v 1.1 2009/02/06 09:46:50 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractMetamodelDeclaration;
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Abstract Metamodel Declaration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AbstractMetamodelDeclarationImpl#getEPackage <em>EPackage</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AbstractMetamodelDeclarationImpl#getAlias <em>Alias</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AbstractMetamodelDeclarationImpl extends EObjectImpl implements AbstractMetamodelDeclaration
-{
-  /**
-   * The cached value of the '{@link #getEPackage() <em>EPackage</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEPackage()
-   * @generated
-   * @ordered
-   */
-  protected EPackage ePackage;
-
-  /**
-   * The default value of the '{@link #getAlias() <em>Alias</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAlias()
-   * @generated
-   * @ordered
-   */
-  protected static final String ALIAS_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getAlias() <em>Alias</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAlias()
-   * @generated
-   * @ordered
-   */
-  protected String alias = ALIAS_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected AbstractMetamodelDeclarationImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return XtextTestPackage.Literals.ABSTRACT_METAMODEL_DECLARATION;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EPackage getEPackage()
-  {
-    if (ePackage != null && ePackage.eIsProxy())
-    {
-      InternalEObject oldEPackage = (InternalEObject)ePackage;
-      ePackage = (EPackage)eResolveProxy(oldEPackage);
-      if (ePackage != oldEPackage)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, XtextTestPackage.ABSTRACT_METAMODEL_DECLARATION__EPACKAGE, oldEPackage, ePackage));
-      }
-    }
-    return ePackage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EPackage basicGetEPackage()
-  {
-    return ePackage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEPackage(EPackage newEPackage)
-  {
-    EPackage oldEPackage = ePackage;
-    ePackage = newEPackage;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, XtextTestPackage.ABSTRACT_METAMODEL_DECLARATION__EPACKAGE, oldEPackage, ePackage));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getAlias()
-  {
-    return alias;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setAlias(String newAlias)
-  {
-    String oldAlias = alias;
-    alias = newAlias;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, XtextTestPackage.ABSTRACT_METAMODEL_DECLARATION__ALIAS, oldAlias, alias));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ABSTRACT_METAMODEL_DECLARATION__EPACKAGE:
-        if (resolve) return getEPackage();
-        return basicGetEPackage();
-      case XtextTestPackage.ABSTRACT_METAMODEL_DECLARATION__ALIAS:
-        return getAlias();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ABSTRACT_METAMODEL_DECLARATION__EPACKAGE:
-        setEPackage((EPackage)newValue);
-        return;
-      case XtextTestPackage.ABSTRACT_METAMODEL_DECLARATION__ALIAS:
-        setAlias((String)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ABSTRACT_METAMODEL_DECLARATION__EPACKAGE:
-        setEPackage((EPackage)null);
-        return;
-      case XtextTestPackage.ABSTRACT_METAMODEL_DECLARATION__ALIAS:
-        setAlias(ALIAS_EDEFAULT);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ABSTRACT_METAMODEL_DECLARATION__EPACKAGE:
-        return ePackage != null;
-      case XtextTestPackage.ABSTRACT_METAMODEL_DECLARATION__ALIAS:
-        return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (alias: ");
-    result.append(alias);
-    result.append(')');
-    return result.toString();
-  }
-
-} //AbstractMetamodelDeclarationImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/AbstractNegatedTokenImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/AbstractNegatedTokenImpl.java
deleted file mode 100644
index d76cdff..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/AbstractNegatedTokenImpl.java
+++ b/dev/null
@@ -1,197 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AbstractNegatedTokenImpl.java,v 1.1 2009/02/06 09:46:50 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractElement;
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractNegatedToken;
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Abstract Negated Token</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AbstractNegatedTokenImpl#getTerminal <em>Terminal</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AbstractNegatedTokenImpl extends AbstractElementImpl implements AbstractNegatedToken
-{
-  /**
-   * The cached value of the '{@link #getTerminal() <em>Terminal</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getTerminal()
-   * @generated
-   * @ordered
-   */
-  protected AbstractElement terminal;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected AbstractNegatedTokenImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return XtextTestPackage.Literals.ABSTRACT_NEGATED_TOKEN;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public AbstractElement getTerminal()
-  {
-    return terminal;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetTerminal(AbstractElement newTerminal, NotificationChain msgs)
-  {
-    AbstractElement oldTerminal = terminal;
-    terminal = newTerminal;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, XtextTestPackage.ABSTRACT_NEGATED_TOKEN__TERMINAL, oldTerminal, newTerminal);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setTerminal(AbstractElement newTerminal)
-  {
-    if (newTerminal != terminal)
-    {
-      NotificationChain msgs = null;
-      if (terminal != null)
-        msgs = ((InternalEObject)terminal).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - XtextTestPackage.ABSTRACT_NEGATED_TOKEN__TERMINAL, null, msgs);
-      if (newTerminal != null)
-        msgs = ((InternalEObject)newTerminal).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - XtextTestPackage.ABSTRACT_NEGATED_TOKEN__TERMINAL, null, msgs);
-      msgs = basicSetTerminal(newTerminal, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, XtextTestPackage.ABSTRACT_NEGATED_TOKEN__TERMINAL, newTerminal, newTerminal));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ABSTRACT_NEGATED_TOKEN__TERMINAL:
-        return basicSetTerminal(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ABSTRACT_NEGATED_TOKEN__TERMINAL:
-        return getTerminal();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ABSTRACT_NEGATED_TOKEN__TERMINAL:
-        setTerminal((AbstractElement)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ABSTRACT_NEGATED_TOKEN__TERMINAL:
-        setTerminal((AbstractElement)null);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ABSTRACT_NEGATED_TOKEN__TERMINAL:
-        return terminal != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-} //AbstractNegatedTokenImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/AbstractRuleImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/AbstractRuleImpl.java
deleted file mode 100644
index 3f595ca..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/AbstractRuleImpl.java
+++ b/dev/null
@@ -1,269 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AbstractRuleImpl.java,v 1.1 2009/02/06 09:46:50 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractRule;
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.TypeRef;
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Abstract Rule</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AbstractRuleImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AbstractRuleImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AbstractRuleImpl extends EObjectImpl implements AbstractRule
-{
-  /**
-   * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getType()
-   * @generated
-   * @ordered
-   */
-  protected TypeRef type;
-
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected AbstractRuleImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return XtextTestPackage.Literals.ABSTRACT_RULE;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public TypeRef getType()
-  {
-    return type;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetType(TypeRef newType, NotificationChain msgs)
-  {
-    TypeRef oldType = type;
-    type = newType;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, XtextTestPackage.ABSTRACT_RULE__TYPE, oldType, newType);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setType(TypeRef newType)
-  {
-    if (newType != type)
-    {
-      NotificationChain msgs = null;
-      if (type != null)
-        msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - XtextTestPackage.ABSTRACT_RULE__TYPE, null, msgs);
-      if (newType != null)
-        msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - XtextTestPackage.ABSTRACT_RULE__TYPE, null, msgs);
-      msgs = basicSetType(newType, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, XtextTestPackage.ABSTRACT_RULE__TYPE, newType, newType));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, XtextTestPackage.ABSTRACT_RULE__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ABSTRACT_RULE__TYPE:
-        return basicSetType(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ABSTRACT_RULE__TYPE:
-        return getType();
-      case XtextTestPackage.ABSTRACT_RULE__NAME:
-        return getName();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ABSTRACT_RULE__TYPE:
-        setType((TypeRef)newValue);
-        return;
-      case XtextTestPackage.ABSTRACT_RULE__NAME:
-        setName((String)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ABSTRACT_RULE__TYPE:
-        setType((TypeRef)null);
-        return;
-      case XtextTestPackage.ABSTRACT_RULE__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ABSTRACT_RULE__TYPE:
-        return type != null;
-      case XtextTestPackage.ABSTRACT_RULE__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-} //AbstractRuleImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/ActionImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/ActionImpl.java
deleted file mode 100644
index 7cd5dc3..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/ActionImpl.java
+++ b/dev/null
@@ -1,324 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ActionImpl.java,v 1.1 2009/02/06 09:46:50 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Action;
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.TypeRef;
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Action</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.ActionImpl#getTypeName <em>Type Name</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.ActionImpl#getFeature <em>Feature</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.ActionImpl#getOperator <em>Operator</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ActionImpl extends AbstractElementImpl implements Action
-{
-  /**
-   * The cached value of the '{@link #getTypeName() <em>Type Name</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getTypeName()
-   * @generated
-   * @ordered
-   */
-  protected TypeRef typeName;
-
-  /**
-   * The default value of the '{@link #getFeature() <em>Feature</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getFeature()
-   * @generated
-   * @ordered
-   */
-  protected static final String FEATURE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getFeature() <em>Feature</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getFeature()
-   * @generated
-   * @ordered
-   */
-  protected String feature = FEATURE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getOperator() <em>Operator</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getOperator()
-   * @generated
-   * @ordered
-   */
-  protected static final String OPERATOR_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getOperator() <em>Operator</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getOperator()
-   * @generated
-   * @ordered
-   */
-  protected String operator = OPERATOR_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ActionImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return XtextTestPackage.Literals.ACTION;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public TypeRef getTypeName()
-  {
-    return typeName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetTypeName(TypeRef newTypeName, NotificationChain msgs)
-  {
-    TypeRef oldTypeName = typeName;
-    typeName = newTypeName;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, XtextTestPackage.ACTION__TYPE_NAME, oldTypeName, newTypeName);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setTypeName(TypeRef newTypeName)
-  {
-    if (newTypeName != typeName)
-    {
-      NotificationChain msgs = null;
-      if (typeName != null)
-        msgs = ((InternalEObject)typeName).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - XtextTestPackage.ACTION__TYPE_NAME, null, msgs);
-      if (newTypeName != null)
-        msgs = ((InternalEObject)newTypeName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - XtextTestPackage.ACTION__TYPE_NAME, null, msgs);
-      msgs = basicSetTypeName(newTypeName, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, XtextTestPackage.ACTION__TYPE_NAME, newTypeName, newTypeName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getFeature()
-  {
-    return feature;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setFeature(String newFeature)
-  {
-    String oldFeature = feature;
-    feature = newFeature;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, XtextTestPackage.ACTION__FEATURE, oldFeature, feature));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getOperator()
-  {
-    return operator;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setOperator(String newOperator)
-  {
-    String oldOperator = operator;
-    operator = newOperator;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, XtextTestPackage.ACTION__OPERATOR, oldOperator, operator));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ACTION__TYPE_NAME:
-        return basicSetTypeName(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ACTION__TYPE_NAME:
-        return getTypeName();
-      case XtextTestPackage.ACTION__FEATURE:
-        return getFeature();
-      case XtextTestPackage.ACTION__OPERATOR:
-        return getOperator();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ACTION__TYPE_NAME:
-        setTypeName((TypeRef)newValue);
-        return;
-      case XtextTestPackage.ACTION__FEATURE:
-        setFeature((String)newValue);
-        return;
-      case XtextTestPackage.ACTION__OPERATOR:
-        setOperator((String)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ACTION__TYPE_NAME:
-        setTypeName((TypeRef)null);
-        return;
-      case XtextTestPackage.ACTION__FEATURE:
-        setFeature(FEATURE_EDEFAULT);
-        return;
-      case XtextTestPackage.ACTION__OPERATOR:
-        setOperator(OPERATOR_EDEFAULT);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ACTION__TYPE_NAME:
-        return typeName != null;
-      case XtextTestPackage.ACTION__FEATURE:
-        return FEATURE_EDEFAULT == null ? feature != null : !FEATURE_EDEFAULT.equals(feature);
-      case XtextTestPackage.ACTION__OPERATOR:
-        return OPERATOR_EDEFAULT == null ? operator != null : !OPERATOR_EDEFAULT.equals(operator);
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (feature: ");
-    result.append(feature);
-    result.append(", operator: ");
-    result.append(operator);
-    result.append(')');
-    return result.toString();
-  }
-
-} //ActionImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/AlternativesImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/AlternativesImpl.java
deleted file mode 100644
index d45e04a..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/AlternativesImpl.java
+++ b/dev/null
@@ -1,169 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AlternativesImpl.java,v 1.1 2009/02/06 09:46:50 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractElement;
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Alternatives;
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Alternatives</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AlternativesImpl#getGroups <em>Groups</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AlternativesImpl extends AbstractElementImpl implements Alternatives
-{
-  /**
-   * The cached value of the '{@link #getGroups() <em>Groups</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getGroups()
-   * @generated
-   * @ordered
-   */
-  protected EList<AbstractElement> groups;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected AlternativesImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return XtextTestPackage.Literals.ALTERNATIVES;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList<AbstractElement> getGroups()
-  {
-    if (groups == null)
-    {
-      groups = new EObjectContainmentEList<AbstractElement>(AbstractElement.class, this, XtextTestPackage.ALTERNATIVES__GROUPS);
-    }
-    return groups;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ALTERNATIVES__GROUPS:
-        return ((InternalEList<?>)getGroups()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ALTERNATIVES__GROUPS:
-        return getGroups();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ALTERNATIVES__GROUPS:
-        getGroups().clear();
-        getGroups().addAll((Collection<? extends AbstractElement>)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ALTERNATIVES__GROUPS:
-        getGroups().clear();
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ALTERNATIVES__GROUPS:
-        return groups != null && !groups.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-} //AlternativesImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/AssignmentImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/AssignmentImpl.java
deleted file mode 100644
index 9961756..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/AssignmentImpl.java
+++ b/dev/null
@@ -1,324 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AssignmentImpl.java,v 1.1 2009/02/06 09:46:50 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractElement;
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Assignment;
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Assignment</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AssignmentImpl#getFeature <em>Feature</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AssignmentImpl#getOperator <em>Operator</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.AssignmentImpl#getTerminal <em>Terminal</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AssignmentImpl extends AbstractElementImpl implements Assignment
-{
-  /**
-   * The default value of the '{@link #getFeature() <em>Feature</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getFeature()
-   * @generated
-   * @ordered
-   */
-  protected static final String FEATURE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getFeature() <em>Feature</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getFeature()
-   * @generated
-   * @ordered
-   */
-  protected String feature = FEATURE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getOperator() <em>Operator</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getOperator()
-   * @generated
-   * @ordered
-   */
-  protected static final String OPERATOR_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getOperator() <em>Operator</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getOperator()
-   * @generated
-   * @ordered
-   */
-  protected String operator = OPERATOR_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getTerminal() <em>Terminal</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getTerminal()
-   * @generated
-   * @ordered
-   */
-  protected AbstractElement terminal;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected AssignmentImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return XtextTestPackage.Literals.ASSIGNMENT;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getFeature()
-  {
-    return feature;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setFeature(String newFeature)
-  {
-    String oldFeature = feature;
-    feature = newFeature;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, XtextTestPackage.ASSIGNMENT__FEATURE, oldFeature, feature));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getOperator()
-  {
-    return operator;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setOperator(String newOperator)
-  {
-    String oldOperator = operator;
-    operator = newOperator;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, XtextTestPackage.ASSIGNMENT__OPERATOR, oldOperator, operator));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public AbstractElement getTerminal()
-  {
-    return terminal;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetTerminal(AbstractElement newTerminal, NotificationChain msgs)
-  {
-    AbstractElement oldTerminal = terminal;
-    terminal = newTerminal;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, XtextTestPackage.ASSIGNMENT__TERMINAL, oldTerminal, newTerminal);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setTerminal(AbstractElement newTerminal)
-  {
-    if (newTerminal != terminal)
-    {
-      NotificationChain msgs = null;
-      if (terminal != null)
-        msgs = ((InternalEObject)terminal).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - XtextTestPackage.ASSIGNMENT__TERMINAL, null, msgs);
-      if (newTerminal != null)
-        msgs = ((InternalEObject)newTerminal).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - XtextTestPackage.ASSIGNMENT__TERMINAL, null, msgs);
-      msgs = basicSetTerminal(newTerminal, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, XtextTestPackage.ASSIGNMENT__TERMINAL, newTerminal, newTerminal));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ASSIGNMENT__TERMINAL:
-        return basicSetTerminal(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ASSIGNMENT__FEATURE:
-        return getFeature();
-      case XtextTestPackage.ASSIGNMENT__OPERATOR:
-        return getOperator();
-      case XtextTestPackage.ASSIGNMENT__TERMINAL:
-        return getTerminal();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ASSIGNMENT__FEATURE:
-        setFeature((String)newValue);
-        return;
-      case XtextTestPackage.ASSIGNMENT__OPERATOR:
-        setOperator((String)newValue);
-        return;
-      case XtextTestPackage.ASSIGNMENT__TERMINAL:
-        setTerminal((AbstractElement)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ASSIGNMENT__FEATURE:
-        setFeature(FEATURE_EDEFAULT);
-        return;
-      case XtextTestPackage.ASSIGNMENT__OPERATOR:
-        setOperator(OPERATOR_EDEFAULT);
-        return;
-      case XtextTestPackage.ASSIGNMENT__TERMINAL:
-        setTerminal((AbstractElement)null);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.ASSIGNMENT__FEATURE:
-        return FEATURE_EDEFAULT == null ? feature != null : !FEATURE_EDEFAULT.equals(feature);
-      case XtextTestPackage.ASSIGNMENT__OPERATOR:
-        return OPERATOR_EDEFAULT == null ? operator != null : !OPERATOR_EDEFAULT.equals(operator);
-      case XtextTestPackage.ASSIGNMENT__TERMINAL:
-        return terminal != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (feature: ");
-    result.append(feature);
-    result.append(", operator: ");
-    result.append(operator);
-    result.append(')');
-    return result.toString();
-  }
-
-} //AssignmentImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/CharacterRangeImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/CharacterRangeImpl.java
deleted file mode 100644
index b45d2b6..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/CharacterRangeImpl.java
+++ b/dev/null
@@ -1,268 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CharacterRangeImpl.java,v 1.1 2009/02/06 09:46:50 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.CharacterRange;
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.Keyword;
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Character Range</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.CharacterRangeImpl#getLeft <em>Left</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.CharacterRangeImpl#getRight <em>Right</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CharacterRangeImpl extends AbstractElementImpl implements CharacterRange
-{
-  /**
-   * The cached value of the '{@link #getLeft() <em>Left</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getLeft()
-   * @generated
-   * @ordered
-   */
-  protected Keyword left;
-
-  /**
-   * The cached value of the '{@link #getRight() <em>Right</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getRight()
-   * @generated
-   * @ordered
-   */
-  protected Keyword right;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected CharacterRangeImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return XtextTestPackage.Literals.CHARACTER_RANGE;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Keyword getLeft()
-  {
-    return left;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetLeft(Keyword newLeft, NotificationChain msgs)
-  {
-    Keyword oldLeft = left;
-    left = newLeft;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, XtextTestPackage.CHARACTER_RANGE__LEFT, oldLeft, newLeft);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setLeft(Keyword newLeft)
-  {
-    if (newLeft != left)
-    {
-      NotificationChain msgs = null;
-      if (left != null)
-        msgs = ((InternalEObject)left).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - XtextTestPackage.CHARACTER_RANGE__LEFT, null, msgs);
-      if (newLeft != null)
-        msgs = ((InternalEObject)newLeft).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - XtextTestPackage.CHARACTER_RANGE__LEFT, null, msgs);
-      msgs = basicSetLeft(newLeft, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, XtextTestPackage.CHARACTER_RANGE__LEFT, newLeft, newLeft));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Keyword getRight()
-  {
-    return right;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetRight(Keyword newRight, NotificationChain msgs)
-  {
-    Keyword oldRight = right;
-    right = newRight;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, XtextTestPackage.CHARACTER_RANGE__RIGHT, oldRight, newRight);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setRight(Keyword newRight)
-  {
-    if (newRight != right)
-    {
-      NotificationChain msgs = null;
-      if (right != null)
-        msgs = ((InternalEObject)right).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - XtextTestPackage.CHARACTER_RANGE__RIGHT, null, msgs);
-      if (newRight != null)
-        msgs = ((InternalEObject)newRight).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - XtextTestPackage.CHARACTER_RANGE__RIGHT, null, msgs);
-      msgs = basicSetRight(newRight, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, XtextTestPackage.CHARACTER_RANGE__RIGHT, newRight, newRight));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.CHARACTER_RANGE__LEFT:
-        return basicSetLeft(null, msgs);
-      case XtextTestPackage.CHARACTER_RANGE__RIGHT:
-        return basicSetRight(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.CHARACTER_RANGE__LEFT:
-        return getLeft();
-      case XtextTestPackage.CHARACTER_RANGE__RIGHT:
-        return getRight();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.CHARACTER_RANGE__LEFT:
-        setLeft((Keyword)newValue);
-        return;
-      case XtextTestPackage.CHARACTER_RANGE__RIGHT:
-        setRight((Keyword)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.CHARACTER_RANGE__LEFT:
-        setLeft((Keyword)null);
-        return;
-      case XtextTestPackage.CHARACTER_RANGE__RIGHT:
-        setRight((Keyword)null);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.CHARACTER_RANGE__LEFT:
-        return left != null;
-      case XtextTestPackage.CHARACTER_RANGE__RIGHT:
-        return right != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-} //CharacterRangeImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/CrossReferenceImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/CrossReferenceImpl.java
deleted file mode 100644
index 161c73a..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/CrossReferenceImpl.java
+++ b/dev/null
@@ -1,263 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CrossReferenceImpl.java,v 1.1 2009/02/06 09:46:50 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.AbstractRule;
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.CrossReference;
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.TypeRef;
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Cross Reference</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.CrossReferenceImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.CrossReferenceImpl#getRule <em>Rule</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CrossReferenceImpl extends AbstractElementImpl implements CrossReference
-{
-  /**
-   * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getType()
-   * @generated
-   * @ordered
-   */
-  protected TypeRef type;
-
-  /**
-   * The cached value of the '{@link #getRule() <em>Rule</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getRule()
-   * @generated
-   * @ordered
-   */
-  protected AbstractRule rule;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected CrossReferenceImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return XtextTestPackage.Literals.CROSS_REFERENCE;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public TypeRef getType()
-  {
-    return type;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetType(TypeRef newType, NotificationChain msgs)
-  {
-    TypeRef oldType = type;
-    type = newType;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, XtextTestPackage.CROSS_REFERENCE__TYPE, oldType, newType);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setType(TypeRef newType)
-  {
-    if (newType != type)
-    {
-      NotificationChain msgs = null;
-      if (type != null)
-        msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - XtextTestPackage.CROSS_REFERENCE__TYPE, null, msgs);
-      if (newType != null)
-        msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - XtextTestPackage.CROSS_REFERENCE__TYPE, null, msgs);
-      msgs = basicSetType(newType, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, XtextTestPackage.CROSS_REFERENCE__TYPE, newType, newType));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public AbstractRule getRule()
-  {
-    if (rule != null && rule.eIsProxy())
-    {
-      InternalEObject oldRule = (InternalEObject)rule;
-      rule = (AbstractRule)eResolveProxy(oldRule);
-      if (rule != oldRule)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, XtextTestPackage.CROSS_REFERENCE__RULE, oldRule, rule));
-      }
-    }
-    return rule;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public AbstractRule basicGetRule()
-  {
-    return rule;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setRule(AbstractRule newRule)
-  {
-    AbstractRule oldRule = rule;
-    rule = newRule;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, XtextTestPackage.CROSS_REFERENCE__RULE, oldRule, rule));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.CROSS_REFERENCE__TYPE:
-        return basicSetType(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.CROSS_REFERENCE__TYPE:
-        return getType();
-      case XtextTestPackage.CROSS_REFERENCE__RULE:
-        if (resolve) return getRule();
-        return basicGetRule();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.CROSS_REFERENCE__TYPE:
-        setType((TypeRef)newValue);
-        return;
-      case XtextTestPackage.CROSS_REFERENCE__RULE:
-        setRule((AbstractRule)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.CROSS_REFERENCE__TYPE:
-        setType((TypeRef)null);
-        return;
-      case XtextTestPackage.CROSS_REFERENCE__RULE:
-        setRule((AbstractRule)null);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.CROSS_REFERENCE__TYPE:
-        return type != null;
-      case XtextTestPackage.CROSS_REFERENCE__RULE:
-        return rule != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-} //CrossReferenceImpl
diff --git a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/GeneratedMetamodelImpl.java b/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/GeneratedMetamodelImpl.java
deleted file mode 100644
index 3175b11..0000000
--- a/tests/org.eclipse.xtext.xtend.tests/src-gen/org/eclipse/xtext/xtextGrammarTestLanguage/XtextTest/impl/GeneratedMetamodelImpl.java
+++ b/dev/null
@@ -1,180 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: GeneratedMetamodelImpl.java,v 1.1 2009/02/06 09:46:50 jkohnlein Exp $
- */
-package org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.GeneratedMetamodel;
-import org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.XtextTestPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Generated Metamodel</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.xtext.xtextGrammarTestLanguage.XtextTest.impl.GeneratedMetamodelImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class GeneratedMetamodelImpl extends AbstractMetamodelDeclarationImpl implements GeneratedMetamodel
-{
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected GeneratedMetamodelImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return XtextTestPackage.Literals.GENERATED_METAMODEL;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, XtextTestPackage.GENERATED_METAMODEL__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.GENERATED_METAMODEL__NAME:
-        return getName();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.GENERATED_METAMODEL__NAME:
-        setName((String)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.GENERATED_METAMODEL__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case XtextTestPackage.GENERATED_ME